gemcap-be-common 1.2.135 → 1.2.136

package/models/BorrowerCompliance.model.d.ts

@@ -23,7 +23,7 @@
 /// <reference types="mongoose/types/virtuals" />
 /// <reference types="mongoose/types/inferschematype" />
 import mongoose, { Document } from 'mongoose';
-import { IBorrowerItemDocument, IEmailRecipient } from '../models/ComplianceItem.model';
+import { IBorrowerItemDocument, IEmailRecipient } from './ComplianceItem.model';
 export interface IComplianceNote {
     note: string;
     date: Date;

package/models/BorrowerCompliance.model.js

@@ -5,7 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BorrowerCompliance = void 0;
 const mongoose_1 = __importDefault(require("mongoose"));
-const _models_1 = require("../models/_models");
+const _models_1 = require("./_models");
 const mongooseLeanId = require('../plugins/id.plugin');
 const BorrowerComplianceInstanceSchema = new mongoose_1.default.Schema({
     nextDate: {

package/models/BorrowerCompliance.model.ts

@@ -3,8 +3,8 @@ import mongoose, { Document } from 'mongoose';
 import {
   IBorrowerItemDocument,
   IEmailRecipient,
-} from '../models/ComplianceItem.model';
-import { MODEL_NAMES } from '../models/_models';
+} from './ComplianceItem.model';
+import { MODEL_NAMES } from './_models';
 
 const mongooseLeanId = require('../plugins/id.plugin');
 

package/models/UserMobileAccess.model.js

@@ -5,7 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.UserMobileAccess = void 0;
 const mongoose_1 = __importDefault(require("mongoose"));
-const _models_1 = require("../models/_models");
+const _models_1 = require("./_models");
 const UserMobileAccessSchema = new mongoose_1.default.Schema({
     keycloakUserId: {
         type: String,

package/models/UserMobileAccess.model.ts

@@ -1,5 +1,6 @@
 import mongoose, { Model } from 'mongoose';
-import { MODEL_NAMES } from '../models/_models';
+
+import { MODEL_NAMES } from './_models';
 
 export interface IUserMobileAccess {
   _id?: mongoose.Types.ObjectId;

package/package.json

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

package/services/users.service.d.ts

@@ -42,7 +42,7 @@ export declare class UsersService {
     getUserRepresentationById(authorization: string, userId: string): Promise<IKeycloakUser>;
     getUserRepresentationByUsername(authorization: string, username: string): Promise<IKeycloakUser>;
     getKeyCloakAdminBearer(): Promise<any>;
-    getUserList(authorization: any): Promise<IKeycloakUser[]>;
+    getUserList(authorization: string): Promise<IKeycloakUser[]>;
     getUsersWithRoles(authorization: string): Promise<{
         keycloakUserId: string;
         _id: any;
@@ -55,12 +55,12 @@ export declare class UsersService {
             hasAccess: boolean;
             canSignDocument: boolean;
         };
+        email: string;
         firstName: string;
         lastName: string;
         roles?: IGroupedKeycloakRoles;
         username: string;
         enabled: boolean;
-        email: string;
         emailVerified: boolean;
         access: {
             manageGroupMembership: boolean;
@@ -86,7 +86,7 @@ export declare class UsersService {
     getUserRoles(authorization: string, userId: string): Promise<{
         realmMappings: IKeycloakRole[];
     }>;
-    createUser(authorization: any, user: any): Promise<any>;
+    createUser(authorization: string, user: any): Promise<any>;
     updateUser(authorization: string, userId: string, keyValue: any): Promise<any>;
     updateMobileUser(userId: string, keyValue: {
         [key: string]: string | number | boolean;
@@ -97,7 +97,7 @@ export declare class UsersService {
     resetPassword(authorization: string, userId: string, temporaryPassword: string): Promise<any>;
     createNewPasswordWithEmail(authorization: string, userId: string, newPassword: string): Promise<import("axios").AxiosResponse<any, any>>;
     deleteUser(authorization: string, userId: string): Promise<void>;
-    getRoleList(authorization: any): Promise<IKeycloakRole[]>;
+    getRoleList(authorization: string): Promise<IKeycloakRole[]>;
     groupRoles(roles: IKeycloakRole[]): IGroupedKeycloakRoles;
     mapRolesToUsers(authorization: string, users: IKeycloakUser[]): Promise<{
         roles: IGroupedKeycloakRoles;
@@ -141,12 +141,12 @@ export declare class UsersService {
             hasAccess: boolean;
             canSignDocument: boolean;
         };
+        email: string;
         firstName: string;
         lastName: string;
         roles?: IGroupedKeycloakRoles;
         username: string;
         enabled: boolean;
-        email: string;
         emailVerified: boolean;
         access: {
             manageGroupMembership: boolean;

package/services/users.service.js

@@ -9,12 +9,12 @@ const lodash_1 = __importDefault(require("lodash"));
 const axios_1 = __importDefault(require("axios"));
 const dayjs_1 = __importDefault(require("dayjs"));
 const mongoose_1 = __importDefault(require("mongoose"));
+const qs_1 = __importDefault(require("qs"));
 const User_model_1 = require("../models/User.model");
-const user_logs_db_1 = require("../db/user-logs.db");
-const UserLog_model_1 = require("../models/UserLog.model");
 const BorrowerCompliance_model_1 = require("../models/BorrowerCompliance.model");
 const UserMobileAccess_model_1 = require("../models/UserMobileAccess.model");
-const request = require('request');
+const UserLog_model_1 = require("../models/UserLog.model");
+const user_logs_db_1 = require("../db/user-logs.db");
 class UsersService {
     config;
     constructor(config) {
@@ -48,8 +48,7 @@ class UsersService {
             },
         };
         const result = await axios_1.default.request(options);
-        const user = result.data;
-        return user;
+        return result.data;
     }
     async getUserRepresentationByUsername(authorization, username) {
         const options = {
@@ -64,52 +63,31 @@ class UsersService {
         const users = result.data;
         return users.find((user) => user.username === username);
     }
-    getKeyCloakAdminBearer() {
-        console.log('this in getKeyCloakAdminBearer:', this);
-        console.log('this.config:', this?.config);
-        return new Promise(function (resolve, reject) {
-            const options = {
-                method: 'POST',
-                url: `${this.config.keycloakHost}/realms/master/protocol/openid-connect/token`,
-                headers: {
-                    'Content-Type': 'application/x-www-form-urlencoded',
-                },
-                form: {
-                    username: this.config.adminUser,
-                    password: this.config.adminPass,
-                    client_id: 'admin-cli',
-                    grant_type: 'password',
-                },
-            };
-            request(options, (error, res, body) => {
-                if (!error && res.statusCode === 200) {
-                    resolve(JSON.parse(body));
-                }
-                else {
-                    reject(error);
-                }
-            });
+    async getKeyCloakAdminBearer() {
+        const url = `${this.config.keycloakHost}/realms/master/protocol/openid-connect/token`;
+        const data = qs_1.default.stringify({
+            username: this.config.adminUser,
+            password: this.config.adminPass,
+            client_id: 'admin-cli',
+            grant_type: 'password',
         });
+        const headers = {
+            'Content-Type': 'application/x-www-form-urlencoded',
+        };
+        const response = await axios_1.default.post(url, data, { headers });
+        return response.data;
     }
-    getUserList(authorization) {
-        return new Promise((resolve, reject) => {
-            const options = {
-                method: 'GET',
-                url: `${this.config.keycloakHost}/admin/realms/${this.config.realm}/users`,
-                headers: {
-                    'Content-Type': 'application/json',
-                    Authorization: `Bearer ${authorization}`,
-                },
-            };
-            request(options, (error, _res, body) => {
-                if (!error) {
-                    resolve(JSON.parse(body));
-                }
-                else {
-                    reject(error);
-                }
-            });
-        });
+    async getUserList(authorization) {
+        const options = {
+            method: 'GET',
+            url: `${this.config.keycloakHost}/admin/realms/${this.config.realm}/users`,
+            headers: {
+                'Content-Type': 'application/json',
+                Authorization: `Bearer ${authorization}`,
+            },
+        };
+        const result = await axios_1.default.request(options);
+        return result.data;
     }
     async getUsersWithRoles(authorization) {
         const users = await this.getUserList(authorization);
@@ -123,73 +101,45 @@ class UsersService {
         }
         return usersAndAccess;
     }
-    getUserRoles(authorization, userId) {
-        return new Promise((resolve, reject) => {
-            const options = {
-                method: 'GET',
-                url: `${this.config.keycloakHost}/admin/realms/${this.config.realm}/users/${userId}/role-mappings`,
-                headers: {
-                    'Content-Type': 'application/json',
-                    Authorization: `Bearer ${authorization}`,
-                },
-            };
-            request(options, (error, _res, body) => {
-                if (!error) {
-                    resolve(JSON.parse(body));
-                }
-                else {
-                    reject(error);
-                }
-            });
-        });
+    async getUserRoles(authorization, userId) {
+        const options = {
+            method: 'GET',
+            url: `${this.config.keycloakHost}/admin/realms/${this.config.realm}/users/${userId}/role-mappings`,
+            headers: {
+                'Content-Type': 'application/json',
+                Authorization: `Bearer ${authorization}`,
+            },
+        };
+        const result = await axios_1.default.request(options);
+        return result.data;
     }
-    createUser(authorization, user) {
-        return new Promise((resolve, reject) => {
-            const options = {
-                method: 'POST',
-                url: `${this.config.keycloakHost}/admin/realms/${this.config.realm}/users`,
-                headers: {
-                    'Content-Type': 'application/json',
-                    Authorization: `Bearer ${authorization}`,
-                },
-                body: {
-                    ...user,
-                },
-                json: true,
-            };
-            request(options, (error, res, body) => {
-                if (!error) {
-                    resolve(body);
-                }
-                else {
-                    console.error({ error });
-                    reject(error);
-                }
-            });
-        });
+    async createUser(authorization, user) {
+        const options = {
+            method: 'POST',
+            url: `${this.config.keycloakHost}/admin/realms/${this.config.realm}/users`,
+            headers: {
+                'Content-Type': 'application/json',
+                Authorization: `Bearer ${authorization}`,
+            },
+            data: {
+                ...user,
+            },
+        };
+        const result = await axios_1.default.request(options);
+        return result.data;
     }
-    updateUser(authorization, userId, keyValue) {
-        return new Promise((resolve, reject) => {
-            const options = {
-                method: 'PUT',
-                url: `${this.config.keycloakHost}/admin/realms/${this.config.realm}/users/${userId}`,
-                headers: {
-                    'Content-Type': 'application/json',
-                    Authorization: `Bearer ${authorization}`,
-                },
-                body: keyValue,
-                json: true,
-            };
-            request(options, (error, res, body) => {
-                if (!error) {
-                    resolve(body);
-                }
-                else {
-                    console.error({ error });
-                    reject(error);
-                }
-            });
-        });
+    async updateUser(authorization, userId, keyValue) {
+        const options = {
+            method: 'PUT',
+            url: `${this.config.keycloakHost}/admin/realms/${this.config.realm}/users/${userId}`,
+            headers: {
+                'Content-Type': 'application/json',
+                Authorization: `Bearer ${authorization}`,
+            },
+            data: keyValue,
+        };
+        const result = await axios_1.default.request(options);
+        return result.data;
     }
     async updateMobileUser(userId, keyValue) {
         await UserMobileAccess_model_1.UserMobileAccess.findOneAndUpdate({ keycloakUserId: userId }, keyValue, { upsert: true });
@@ -198,74 +148,44 @@ class UsersService {
         await User_model_1.UserModel
             .findOneAndUpdate({ keycloakUserId }, userAccess);
     }
-    removeUserRoles(authorization, userId, roles) {
-        return new Promise((resolve, reject) => {
-            const options = {
-                method: 'DELETE',
-                url: `${this.config.keycloakHost}/admin/realms/${this.config.realm}/users/${userId}/role-mappings/realm`,
-                headers: {
-                    'Content-Type': 'application/json',
-                    Authorization: `Bearer ${authorization}`,
-                },
-                body: [...roles],
-                json: true,
-            };
-            request(options, (error, res, body) => {
-                if (!error) {
-                    resolve(body);
-                }
-                else {
-                    console.error({ error });
-                    reject(error);
-                }
-            });
-        });
+    async removeUserRoles(authorization, userId, roles) {
+        const options = {
+            method: 'DELETE',
+            url: `${this.config.keycloakHost}/admin/realms/${this.config.realm}/users/${userId}/role-mappings/realm`,
+            headers: {
+                'Content-Type': 'application/json',
+                Authorization: `Bearer ${authorization}`,
+            },
+            data: [...roles],
+        };
+        const result = await axios_1.default.request(options);
+        return result.data;
     }
-    addUserRoles(authorization, userId, roles) {
-        return new Promise((resolve, reject) => {
-            const options = {
-                method: 'POST',
-                url: `${this.config.keycloakHost}/admin/realms/${this.config.realm}/users/${userId}/role-mappings/realm`,
-                headers: {
-                    'Content-Type': 'application/json',
-                    Authorization: `Bearer ${authorization}`,
-                },
-                body: [...roles],
-                json: true,
-            };
-            request(options, (error, res, body) => {
-                if (!error) {
-                    resolve(body);
-                }
-                else {
-                    console.error({ error });
-                    reject(error);
-                }
-            });
-        });
+    async addUserRoles(authorization, userId, roles) {
+        const options = {
+            method: 'POST',
+            url: `${this.config.keycloakHost}/admin/realms/${this.config.realm}/users/${userId}/role-mappings/realm`,
+            headers: {
+                'Content-Type': 'application/json',
+                Authorization: `Bearer ${authorization}`,
+            },
+            data: [...roles],
+        };
+        const result = await axios_1.default.request(options);
+        return result.data;
     }
-    resetPassword(authorization, userId, temporaryPassword) {
-        return new Promise((resolve, reject) => {
-            const options = {
-                method: 'PUT',
-                url: `${this.config.keycloakHost}/admin/realms/${this.config.realm}/users/${userId}/reset-password`,
-                headers: {
-                    'Content-Type': 'application/json',
-                    Authorization: `Bearer ${authorization}`,
-                },
-                body: { value: temporaryPassword, temporary: true },
-                json: true,
-            };
-            request(options, (error, res, body) => {
-                if (!error) {
-                    resolve(body);
-                }
-                else {
-                    console.error({ error });
-                    reject(error);
-                }
-            });
-        });
+    async resetPassword(authorization, userId, temporaryPassword) {
+        const options = {
+            method: 'PUT',
+            url: `${this.config.keycloakHost}/admin/realms/${this.config.realm}/users/${userId}/reset-password`,
+            headers: {
+                'Content-Type': 'application/json',
+                Authorization: `Bearer ${authorization}`,
+            },
+            data: { value: temporaryPassword, temporary: true },
+        };
+        const result = await axios_1.default.request(options);
+        return result.data;
     }
     async createNewPasswordWithEmail(authorization, userId, newPassword) {
         const options = {
@@ -305,26 +225,17 @@ class UsersService {
             console.log(error);
         }
     }
-    getRoleList(authorization) {
-        return new Promise((resolve, reject) => {
-            const options = {
-                method: 'GET',
-                url: `${this.config.keycloakHost}/admin/realms/${this.config.realm}/roles`,
-                headers: {
-                    'Content-Type': 'application/json',
-                    Authorization: `Bearer ${authorization}`,
-                },
-            };
-            request(options, (error, _res, body) => {
-                if (!error) {
-                    resolve(JSON.parse(body));
-                }
-                else {
-                    console.error({ error });
-                    reject(error);
-                }
-            });
-        });
+    async getRoleList(authorization) {
+        const options = {
+            method: 'GET',
+            url: `${this.config.keycloakHost}/admin/realms/${this.config.realm}/roles`,
+            headers: {
+                'Content-Type': 'application/json',
+                Authorization: `Bearer ${authorization}`,
+            },
+        };
+        const result = await axios_1.default.request(options);
+        return result.data;
     }
     groupRoles(roles) {
         return roles.reduce((acc, role) => {