From d673b82badd04305c70a4307dab4b8c26c1fc7fe Mon Sep 17 00:00:00 2001 From: einhornimmond Date: Tue, 7 May 2024 11:08:12 +0200 Subject: [PATCH] replace circle in function name with humhub --- backend/src/auth/RIGHTS.ts | 2 +- backend/src/auth/USER_RIGHTS.ts | 2 +- backend/src/graphql/resolver/UserResolver.ts | 6 +++--- frontend/src/graphql/queries.js | 4 ++-- frontend/src/pages/Circles.vue | 12 ++++++------ 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/backend/src/auth/RIGHTS.ts b/backend/src/auth/RIGHTS.ts index 579fb7f0e..1f0bda2b3 100644 --- a/backend/src/auth/RIGHTS.ts +++ b/backend/src/auth/RIGHTS.ts @@ -38,7 +38,7 @@ export enum RIGHTS { OPEN_CREATIONS = 'OPEN_CREATIONS', USER = 'USER', GMS_USER_PLAYGROUND = 'GMS_USER_PLAYGROUND', - CIRCLES_AUTO_LOGIN = 'CIRCLES_AUTO_LOGIN', + HUMHUB_AUTO_LOGIN = 'HUMHUB_AUTO_LOGIN', // Moderator SEARCH_USERS = 'SEARCH_USERS', ADMIN_CREATE_CONTRIBUTION = 'ADMIN_CREATE_CONTRIBUTION', diff --git a/backend/src/auth/USER_RIGHTS.ts b/backend/src/auth/USER_RIGHTS.ts index d649a0649..de8e54af1 100644 --- a/backend/src/auth/USER_RIGHTS.ts +++ b/backend/src/auth/USER_RIGHTS.ts @@ -30,5 +30,5 @@ export const USER_RIGHTS = [ RIGHTS.OPEN_CREATIONS, RIGHTS.USER, RIGHTS.GMS_USER_PLAYGROUND, - RIGHTS.CIRCLES_AUTO_LOGIN, + RIGHTS.HUMHUB_AUTO_LOGIN, ] diff --git a/backend/src/graphql/resolver/UserResolver.ts b/backend/src/graphql/resolver/UserResolver.ts index eb43e7fc0..a75f69fed 100644 --- a/backend/src/graphql/resolver/UserResolver.ts +++ b/backend/src/graphql/resolver/UserResolver.ts @@ -704,10 +704,10 @@ export class UserResolver { return result } - @Authorized([RIGHTS.CIRCLES_AUTO_LOGIN]) + @Authorized([RIGHTS.HUMHUB_AUTO_LOGIN]) @Query(() => String) - async authenticateCirclesAutoLogin(@Ctx() context: Context): Promise { - logger.info(`authenticateCirclesAutoLogin()...`) + async authenticateHumhubAutoLogin(@Ctx() context: Context): Promise { + logger.info(`authenticateHumhubAutoLogin()...`) const dbUser = getUser(context) const humhubClient = HumHubClient.getInstance() if (!humhubClient) { diff --git a/frontend/src/graphql/queries.js b/frontend/src/graphql/queries.js index adb11bc8d..d389f7715 100644 --- a/frontend/src/graphql/queries.js +++ b/frontend/src/graphql/queries.js @@ -28,9 +28,9 @@ export const authenticateGmsUserSearch = gql` } ` -export const authenticateCirclesAutoLogin = gql` +export const authenticateHumhubAutoLogin = gql` query { - authenticateCirclesAutoLogin + authenticateHumhubAutoLogin } ` diff --git a/frontend/src/pages/Circles.vue b/frontend/src/pages/Circles.vue index 3ce50c847..7e23c89c3 100644 --- a/frontend/src/pages/Circles.vue +++ b/frontend/src/pages/Circles.vue @@ -15,7 +15,7 @@ v-if="this.humhubAllowed" variant="gradido" :disabled="this.enableButton === false" - @click="authenticateCirclesAutoLogin" + @click="authenticateHumhubAutoLogin" target="_blank" > {{ $t('circles.button') }} @@ -32,7 +32,7 @@