Skip to content

Commit

Permalink
Rename and move const
Browse files Browse the repository at this point in the history
  • Loading branch information
alex-yau-ttd committed Sep 3, 2024
1 parent 3f6273a commit 1ea6565
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 5 deletions.
4 changes: 2 additions & 2 deletions src/api/configureApi.ts
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ import makeMetricsApiMiddleware from './middleware/metrics';
import { createParticipantsRouter } from './routers/participants/participantsRouter';
import { createSitesRouter } from './routers/sitesRouter';
import { createUsersRouter } from './routers/usersRouter';
import { API_PARTICIPANT_MEMBER } from './services/kcUsersService';
import { API_PARTICIPANT_MEMBER_ROLE_NAME } from './services/kcUsersService';
import { LoggerService } from './services/loggerService';
import { UserService } from './services/userService';

Expand Down Expand Up @@ -135,7 +135,7 @@ export function configureAndStartApi(useMetrics: boolean = true, portNumber: num
bypassHandlerForPaths(
claimCheck((claim: Claim) => {
const roles = claim.resource_access?.self_serve_portal_apis?.roles || [];
return roles.includes(API_PARTICIPANT_MEMBER);
return roles.includes(API_PARTICIPANT_MEMBER_ROLE_NAME);
}),
...BYPASS_CLAIM_PATHS,
...BYPASS_AUTH_PATHS
Expand Down
7 changes: 4 additions & 3 deletions src/api/services/kcUsersService.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ import UserRepresentation from '@keycloak/keycloak-admin-client/lib/defs/userRep

import { SSP_KK_API_CLIENT_ID, SSP_KK_SSL_RESOURCE, SSP_WEB_BASE_URL } from '../envars';

export const API_PARTICIPANT_MEMBER_ROLE_NAME = 'api-participant-member';

export const queryUsersByEmail = async (kcAdminClient: KeycloakAdminClient, email: string) => {
return kcAdminClient.users.find({
email,
Expand Down Expand Up @@ -110,11 +112,10 @@ const assignClientRoleToUser = async (
});
};

export const API_PARTICIPANT_MEMBER = 'api-participant-member';

export const assignApiParticipantMemberRole = async (
kcAdminClient: KeycloakAdminClient,
userEmail: string
) => {
await assignClientRoleToUser(kcAdminClient, userEmail, API_PARTICIPANT_MEMBER);
await assignClientRoleToUser(kcAdminClient, userEmail, API_PARTICIPANT_MEMBER_ROLE_NAME);
};
};

0 comments on commit 1ea6565

Please sign in to comment.