gemcap-be-common 1.4.9 → 1.4.11

package/interfaces/auth-user.interface.d.ts

@@ -22,10 +22,13 @@ export interface IUser extends IUserBasic, IUserAccess {
     isEnabled?: boolean;
     lastLogin?: Date | null;
 }
-export interface IRole {
+export interface IUserRole {
     id: string;
     name: string;
     representation: string;
     createdAt?: Date;
     updatedAt?: Date;
 }
+export interface IGroupedUserRoles {
+    [module: string]: IUserRole[];
+}

package/interfaces/auth-user.interface.ts

@@ -25,7 +25,7 @@ export interface IUser extends IUserBasic, IUserAccess {
   lastLogin?: Date | null;
 }
 
-export interface IRole {
+export interface IUserRole {
   id: string;
   name: string;
   representation: string;
@@ -33,3 +33,6 @@ export interface IRole {
   updatedAt?: Date;
 }
 
+export interface IGroupedUserRoles {
+  [module: string]: IUserRole[];
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gemcap-be-common",
-  "version": "1.4.9",
+  "version": "1.4.11",
   "description": "",
   "main": "index.js",
   "scripts": {

package/services/compliance-borrowers.service.d.ts

@@ -45,7 +45,7 @@ export declare class ComplianceBorrowersService {
         };
     };
     getFullComplianceBorrowerById(complianceBorrowerId: string): Promise<any>;
-    getAllBorrowersShortened(userAccess: any): Promise<(Pick<IComplianceBorrowerDocument, "items" | "borrower" | "fundingStatus"> | {
+    getAllBorrowersShortened(userAccess: any): Promise<(Pick<IComplianceBorrowerDocument, "borrower" | "fundingStatus" | "items"> | {
         items: {
             instances: any[];
             item: import("../models/ComplianceItem.model").IComplianceItemDocument;

package/services/users.service.d.ts

@@ -24,24 +24,20 @@
 /// <reference types="mongoose" />
 /// <reference types="mongoose/types/inferschematype" />
 import express from 'express';
-import { IRole, IUser, IUserAccess } from '../interfaces/auth-user.interface';
-interface IKeycloakConfig {
-    keycloakHost: string;
-    realm: string;
-    adminUser: string;
-    adminPass: string;
+import { IUserRole, IUser, IUserAccess } from '../interfaces/auth-user.interface';
+interface IAuthConfig {
     baseUrl: string;
 }
 export declare class UsersService {
     private readonly config;
-    constructor(config: IKeycloakConfig);
+    constructor(config: IAuthConfig);
     getUserAccessByRequest(req: express.Request): Promise<IUser | null>;
     getUserById(userId: string): Promise<IUser>;
     getUserByUsername(username: string): Promise<IUser>;
     getUserByToken(req: express.Request): Promise<IUser>;
     getUserIdByToken(req: express.Request): Promise<string>;
     getUserList(): Promise<IUser[]>;
-    getAllRoles(): Promise<IRole[]>;
+    getAllRoles(): Promise<IUserRole[]>;
     getUserRoles(userId: string): Promise<string[]>;
     updateMobileUser(userId: string, keyValue: {
         [key: string]: string | number | boolean;

package/services/users.service.ts

@@ -5,20 +5,16 @@ import axios from 'axios';
 import { BorrowerCompliance } from '../models/BorrowerCompliance.model';
 import { UserMobileAccess } from '../models/UserMobileAccess.model';
 import { UserLog } from '../models/UserLog.model';
-import { IRole, IUser, IUserAccess } from '../interfaces/auth-user.interface';
+import { IUserRole, IUser, IUserAccess } from '../interfaces/auth-user.interface';
 
-interface IKeycloakConfig {
-  keycloakHost: string;
-  realm: string;
-  adminUser: string;
-  adminPass: string;
+interface IAuthConfig {
   baseUrl: string;
 }
 
 export class UsersService {
-  private readonly config: IKeycloakConfig;
+  private readonly config: IAuthConfig;
 
-  constructor(config: IKeycloakConfig) {
+  constructor(config: IAuthConfig) {
     this.config = config;
   }
 
@@ -68,7 +64,7 @@ export class UsersService {
   }
 
   async getAllRoles() {
-    const { data } = await axios.get<IRole[]>(`${this.config.baseUrl}/users/roles`);
+    const { data } = await axios.get<IUserRole[]>(`${this.config.baseUrl}/users/roles`);
     return data ?? null;
   }