gemcap-be-common 1.4.1 → 1.4.3

package/services/users.service.d.ts

@@ -24,7 +24,7 @@
 /// <reference types="mongoose/types/inferschematype" />
 import express from 'express';
 import mongoose from 'mongoose';
-import { IUser } from '../interfaces/auth-user.interface';
+import { IRole, IUser } from '../interfaces/auth-user.interface';
 interface IKeycloakConfig {
     keycloakHost: string;
     realm: string;
@@ -41,7 +41,8 @@ export declare class UsersService {
     getUserByToken(req: express.Request): Promise<IUser | null>;
     getUserIdByToken(req: express.Request): Promise<string | null>;
     getUserList(): Promise<IUser[]>;
-    getUserRoles(userId: string): Promise<Record<string, string[]>>;
+    getAllRoles(): Promise<IRole[]>;
+    getUserRoles(userId: string): Promise<string[]>;
     updateMobileUser(userId: string, keyValue: {
         [key: string]: string | number | boolean;
     }): Promise<void>;

package/services/users.service.js

@@ -54,9 +54,17 @@ class UsersService {
         const { data } = await axios_1.default.get(`${this.config.baseUrl}/users/users`);
         return data ?? null;
     }
+    async getAllRoles() {
+        const { data } = await axios_1.default.get(`${this.config.baseUrl}/users/roles`);
+        return data ?? null;
+    }
     async getUserRoles(userId) {
         const user = await this.getUserById(userId);
-        return user.roles;
+        const roles = await this.getAllRoles();
+        const userRoleIds = Object.values(user.roles).reduce((acc, roleIds) => [...acc, ...roleIds], []);
+        return roles
+            .filter((role) => userRoleIds.includes(role.id))
+            .map((role) => role.name);
     }
     async updateMobileUser(userId, keyValue) {
         await UserMobileAccess_model_1.UserMobileAccess.findOneAndUpdate({ keycloakUserId: userId }, keyValue, { upsert: true });

package/services/users.service.ts

@@ -6,7 +6,7 @@ import mongoose from 'mongoose';
 import { BorrowerCompliance } from '../models/BorrowerCompliance.model';
 import { UserMobileAccess } from '../models/UserMobileAccess.model';
 import { UserLog } from '../models/UserLog.model';
-import { IUser } from '../interfaces/auth-user.interface';
+import { IRole, IUser } from '../interfaces/auth-user.interface';
 
 interface IKeycloakConfig {
   keycloakHost: string;
@@ -63,14 +63,23 @@ export class UsersService {
     return null;
   }
 
-  async getUserList(): Promise<IUser[]> {
-    const { data } = await axios.get(`${this.config.baseUrl}/users/users`);
+  async getUserList() {
+    const { data } = await axios.get<IUser[]>(`${this.config.baseUrl}/users/users`);
+    return data ?? null;
+  }
+
+  async getAllRoles() {
+    const { data } = await axios.get<IRole[]>(`${this.config.baseUrl}/users/roles`);
     return data ?? null;
   }
 
   async getUserRoles(userId: string) {
     const user = await this.getUserById(userId);
-    return user.roles;
+    const roles = await this.getAllRoles();
+    const userRoleIds = Object.values(user.roles).reduce((acc, roleIds) => [...acc, ...roleIds], []);
+    return roles
+      .filter((role) => userRoleIds.includes(role.id))
+      .map((role) => role.name);
   }
 
   async updateMobileUser(userId: string, keyValue: { [key: string]: string | number | boolean }) {