PIMS-1718: Keycloak not updating role

express-api/src/services/keycloak/keycloakService.ts

@@ -241,17 +241,17 @@ const getKeycloakUser = async (guid: string) => {
  * @returns {IKeycloakRole[]} A list of the user's roles.
  * @throws If the user is not found.
  */
-const getKeycloakUserRoles = async (username: string) => {
+const getKeycloakUserRoles = async (username: string): Promise<IKeycloakRole[]> => {
   const existingRolesResponse: IKeycloakRolesResponse | IKeycloakErrorResponse =
     await getUserRoles(username);
+
   if (!keycloakUserRolesSchema.safeParse(existingRolesResponse).success) {
-    const message = `keycloakService.getKeycloakUserRoles: ${
-      (existingRolesResponse as IKeycloakErrorResponse).message
-    }`;
+    const message = `keycloakService.getKeycloakUserRoles: ${(existingRolesResponse as IKeycloakErrorResponse).message}`;
     logger.warn(message);
     throw new Error(message);
   }
-  return (existingRolesResponse as IKeycloakRolesResponse).data;
+  // Ensure the response always returns an array of roles
+  return (existingRolesResponse as IKeycloakRolesResponse).data || [];
 };
 
 /**
@@ -288,7 +288,10 @@ const updateKeycloakUserRoles = async (username: string, roles: string[]) => {
       (e as IKeycloakErrorResponse).message
     }`;
     logger.warn(message);
-    throw new Error(message);
+    throw new ErrorWithCode(
+      `Failed to update user ${username}'s Keycloak roles. User's Keycloak account may not be active.`,
+      500,
+    );
   }
 };
 

express-api/src/services/users/usersServices.ts

@@ -264,6 +264,7 @@ const addUser = async (user: User) => {
 };
 
 const updateUser = async (user: DeepPartial<User>) => {
+  const roleName = user.Role?.Name;
   const resource = await AppDataSource.getRepository(User).findOne({ where: { Id: user.Id } });
   if (!resource) {
     throw new ErrorWithCode('Resource does not exist.', 404);
@@ -272,6 +273,9 @@ const updateUser = async (user: DeepPartial<User>) => {
     ...user,
     DisplayName: `${user.LastName}, ${user.FirstName}`,
   });
+  if (roleName) {
+    await KeycloakService.updateKeycloakUserRoles(resource.Username, [roleName]);
+  }
   return retUser.generatedMaps[0];
 };
 

express-api/tests/unit/services/keycloak/keycloakService.test.ts

@@ -249,7 +249,7 @@ describe('UNIT - KeycloakService', () => {
       (getUserRoles as jest.Mock).mockResolvedValueOnce({ message: 'no user found' });
 
       expect(KeycloakService.updateKeycloakUserRoles(mockUser.username, ['role1'])).rejects.toThrow(
-        `keycloakService.updateKeycloakUserRoles: `,
+        /^Failed to update user/,
       );
       expect(getUserRoles).toHaveBeenCalledTimes(1);
     });