gemcap-be-common 1.2.135 → 1.2.136

package/services/users.service.ts

@@ -4,17 +4,15 @@ import express from 'express';
 import axios from 'axios';
 import dayjs from 'dayjs';
 import mongoose from 'mongoose';
+import qs from 'qs';
 
 import { IUser, IUserDocument, UserModel } from '../models/User.model';
+import { BorrowerCompliance } from '../models/BorrowerCompliance.model';
+import { UserMobileAccess } from '../models/UserMobileAccess.model';
+import { ELogActionType, ELogType, UserLog } from '../models/UserLog.model';
 import { IGroupedKeycloakRoles, IKeycloakRole } from '../interfaces/keycloak-role.interface';
 import { IKeycloakUser } from '../interfaces/keycloak-user.interface';
 import { createLog, ICreateLogParams } from '../db/user-logs.db';
-import { ELogActionType, ELogType, UserLog } from '../models/UserLog.model';
-
-import { BorrowerCompliance } from '../models/BorrowerCompliance.model';
-import { UserMobileAccess } from '../models/UserMobileAccess.model';
-
-const request = require('request');
 
 interface IKeycloakConfig {
   keycloakHost: string;
@@ -61,8 +59,7 @@ export class UsersService {
       },
     };
     const result = await axios.request(options);
-    const user: IKeycloakUser = result.data;
-    return user;
+    return result.data;
   }
 
   async getUserRepresentationByUsername(authorization: string, username: string): Promise<IKeycloakUser> {
@@ -79,56 +76,35 @@ export class UsersService {
     return users.find((user) => user.username === username);
   }
 
-  getKeyCloakAdminBearer(): Promise<any> {
-    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',
-        },
-      };
+  async getKeyCloakAdminBearer() {
+    const url = `${this.config.keycloakHost}/realms/master/protocol/openid-connect/token`;
 
-      request(options, (error, res, body) => {
-        if (!error && res.statusCode === 200) {
-          resolve(JSON.parse(body));
-        } else {
-          reject(error);
-        }
-      });
+    const data = qs.stringify({
+      username: this.config.adminUser,
+      password: this.config.adminPass,
+      client_id: 'admin-cli',
+      grant_type: 'password',
     });
-  }
 
-  getUserList(authorization): Promise<IKeycloakUser[]> {
-    return new Promise((resolve, reject) => {
+    const headers = {
+      'Content-Type': 'application/x-www-form-urlencoded',
+    };
 
-      const options = {
-        method: 'GET',
-        url: `${this.config.keycloakHost}/admin/realms/${this.config.realm}/users`,
-        headers: {
-          'Content-Type': 'application/json',
-          Authorization: `Bearer ${authorization}`,
-        },
-      };
+    const response = await axios.post(url, data, { headers });
+    return response.data;
+  }
 
-      request(options, (error, _res, body) => {
-        if (!error) {
-          resolve(JSON.parse(body));
-        } else {
-          reject(error);
-        }
-      });
-    });
+  async getUserList(authorization: string): Promise<IKeycloakUser[]> {
+    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.request(options);
+    return result.data;
   }
 
   async getUsersWithRoles(authorization: string) {
@@ -147,77 +123,47 @@ export class UsersService {
     return usersAndAccess;
   }
 
-  getUserRoles(authorization: string, userId: string): Promise<{ realmMappings: IKeycloakRole[] }> {
-    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: string, userId: string): Promise<{ realmMappings: IKeycloakRole[] }> {
+    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.request(options);
+    return result.data;
   }
 
-  createUser(authorization, user): Promise<any> {
-    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: string, user): Promise<any> {
+    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.request(options);
+    return result.data;
   }
 
-  updateUser(authorization: string, userId: string, keyValue): Promise<any> {
-    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: string, userId: string, keyValue): Promise<any> {
+    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.request(options);
+    return result.data;
   }
 
   async updateMobileUser(userId: string, keyValue: { [key: string]: string | number | boolean }) {
@@ -229,78 +175,46 @@ export class UsersService {
       .findOneAndUpdate({ keycloakUserId }, userAccess);
   }
 
-  removeUserRoles(authorization: string, userId: string, roles: IKeycloakRole[]): Promise<any> {
-    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: string, userId: string, roles: IKeycloakRole[]): Promise<any> {
+    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.request(options);
+    return result.data;
   }
 
-  addUserRoles(authorization: string, userId: string, roles: IKeycloakRole[]): Promise<any> {
-    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: string, userId: string, roles: IKeycloakRole[]): Promise<any> {
+    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.request(options);
+    return result.data;
   }
 
-  resetPassword(authorization: string, userId: string, temporaryPassword: string): Promise<any> {
-    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: string, userId: string, temporaryPassword: string): Promise<any> {
+    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.request(options);
+    return result.data;
   }
 
   async createNewPasswordWithEmail(authorization: string, userId: string, newPassword: string) {
@@ -342,26 +256,17 @@ export class UsersService {
     }
   }
 
-  getRoleList(authorization): Promise<IKeycloakRole[]> {
-    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: string): Promise<IKeycloakRole[]> {
+    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.request(options);
+    return result.data;
   }
 
   groupRoles(roles: IKeycloakRole[]): IGroupedKeycloakRoles {
@@ -527,6 +432,6 @@ export class UsersService {
           lastName: keycloakUser.lastName,
         });
       }
-    }))
+    }));
   }
 }