gemcap-be-common 1.4.12 → 1.4.14

package/models/User.model.d.ts

@@ -27,7 +27,7 @@ export interface IUserLegacy {
     isDeleted?: boolean;
     firstName?: string;
     lastName?: string;
-    keycloakUserId?: string;
+    userId?: string;
     allBorrowers: boolean;
     lastLogin?: Date;
     borrowersAccess: {
@@ -42,8 +42,8 @@ export declare const UserSchema: mongoose.Schema<any, mongoose.Model<any, any, a
     createdAt: NativeDate;
     updatedAt: NativeDate;
 } & {
+    userId: string;
     isDeleted: boolean;
-    keycloakUserId: string;
     borrowersAccess: mongoose.Types.DocumentArray<{
         borrower: string;
     }>;
@@ -56,8 +56,8 @@ export declare const UserSchema: mongoose.Schema<any, mongoose.Model<any, any, a
     createdAt: NativeDate;
     updatedAt: NativeDate;
 } & {
+    userId: string;
     isDeleted: boolean;
-    keycloakUserId: string;
     borrowersAccess: mongoose.Types.DocumentArray<{
         borrower: string;
     }>;
@@ -70,8 +70,8 @@ export declare const UserSchema: mongoose.Schema<any, mongoose.Model<any, any, a
     createdAt: NativeDate;
     updatedAt: NativeDate;
 } & {
+    userId: string;
     isDeleted: boolean;
-    keycloakUserId: string;
     borrowersAccess: mongoose.Types.DocumentArray<{
         borrower: string;
     }>;

package/models/User.model.js

@@ -12,7 +12,7 @@ exports.UserSchema = new mongoose_1.default.Schema({
         type: Boolean,
         default: false,
     },
-    keycloakUserId: {
+    userId: {
         type: String,
         trim: true,
         required: true,

package/models/User.model.ts

@@ -8,7 +8,7 @@ export interface IUserLegacy {
   isDeleted?: boolean;
   firstName?: string;
   lastName?: string;
-  keycloakUserId?: string;
+  userId?: string;
   allBorrowers: boolean;
   lastLogin?: Date;
   borrowersAccess: {
@@ -25,7 +25,7 @@ export const UserSchema = new mongoose.Schema(
       type: Boolean,
       default: false,
     },
-    keycloakUserId: {
+    userId: {
       type: String,
       trim: true,
       required: true,

package/models/UserMobileAccess.model.d.ts

@@ -25,7 +25,7 @@
 import mongoose, { Model } from 'mongoose';
 export interface IUserMobileAccess {
     _id?: mongoose.Types.ObjectId;
-    keycloakUserId?: string;
+    userId?: string;
     hasAccess: boolean;
     canSignDocument: boolean;
 }

package/models/UserMobileAccess.model.js

@@ -7,7 +7,7 @@ exports.UserMobileAccess = exports.UserMobileAccessSchema = void 0;
 const mongoose_1 = __importDefault(require("mongoose"));
 const _models_1 = require("./_models");
 exports.UserMobileAccessSchema = new mongoose_1.default.Schema({
-    keycloakUserId: {
+    userId: {
         type: String,
         trim: true,
         required: true,

package/models/UserMobileAccess.model.ts

@@ -4,7 +4,7 @@ import { MODEL_NAMES } from './_models';
 
 export interface IUserMobileAccess {
   _id?: mongoose.Types.ObjectId;
-  keycloakUserId?: string;
+  userId?: string;
   hasAccess: boolean;
   canSignDocument: boolean;
 }
@@ -13,7 +13,7 @@ type UserMobileAccessModel = Model<IUserMobileAccess, {}, {}>;
 
 export const UserMobileAccessSchema = new mongoose.Schema<IUserMobileAccess, UserMobileAccessModel>(
   {
-    keycloakUserId: {
+    userId: {
       type: String,
       trim: true,
       required: true,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gemcap-be-common",
-  "version": "1.4.12",
+  "version": "1.4.14",
   "description": "",
   "main": "index.js",
   "scripts": {
@@ -14,6 +14,7 @@
     "@types/pdfmake": "^0.2.9",
     "amqplib": "^0.10.8",
     "aws-sdk": "^2.1691.0",
+    "axios": "^1.12.2",
     "class-transformer": "^0.5.1",
     "dayjs": "^1.11.13",
     "decimal.js": "^10.4.3",
@@ -21,7 +22,6 @@
     "express": "^4.21.0",
     "joi": "^17.13.3",
     "jwt-decode": "^4.0.0",
-    "keycloak-connect": "^24.0.5",
     "lodash": "^4.17.21",
     "mongoose": "^8.3.1",
     "nodemailer": "^6.9.15",

package/public/plaid/connect.js

@@ -1,5 +1,5 @@
 let linkTokenData;
-let keycloakToken;
+let authToken;
 let borrowerId;
 let redirectLink;
 
@@ -31,7 +31,7 @@ const startLink = () => {
 
   const handler = Plaid.create({
     token: linkTokenData.link_token,
-    onSuccess: async (publicToken) => await exchangeToken(publicToken, keycloakToken, borrowerId, redirectLink),
+    onSuccess: async (publicToken) => await exchangeToken(publicToken, authToken, borrowerId, redirectLink),
     onExit: (err, metadata) => {
     },
     onEvent: (eventName) => {
@@ -40,10 +40,10 @@ const startLink = () => {
   handler.open();
 };
 
-const exchangeToken = async (publicToken, keycloakToken, borrowerId, redirectLink) => {
+const exchangeToken = async (publicToken, authToken, borrowerId, redirectLink) => {
   const url = new URL(window.location);
   const searchParams = url.searchParams;
-  keycloakToken = searchParams.get('authorization');
+  authToken = searchParams.get('authorization');
   borrowerId = searchParams.get('borrowerId');
   redirectLink = searchParams.get('redirectLink');
 
@@ -52,7 +52,7 @@ const exchangeToken = async (publicToken, keycloakToken, borrowerId, redirectLin
     {
       method: 'POST',
       headers: { 'Content-type': 'application/json' },
-      body: JSON.stringify({ public_token: publicToken, keycloakToken, borrowerId }),
+      body: JSON.stringify({ public_token: publicToken, authToken, borrowerId }),
     },
   );
   window.location.href = redirectLink;

package/services/users.service.d.ts

@@ -43,7 +43,6 @@ export declare class UsersService {
         [key: string]: string | number | boolean;
     }): Promise<void>;
     getUserAccess(userId: string): Promise<IUserAccess>;
-    createUserLoginLog(): Promise<void>;
     getUserLogByDate(userId: string, date: Date): Promise<import("mongoose").FlattenMaps<import("../models/UserLog.model").IUserLog> & Required<{
         _id: import("mongoose").Types.ObjectId;
     }>>;

package/services/users.service.js

@@ -39,8 +39,8 @@ class UsersService {
         if (!authorization) {
             return null;
         }
-        const { sub: keycloakUserId } = (0, jwt_decode_1.jwtDecode)(authorization);
-        return this.getUserById(keycloakUserId);
+        const { sub } = (0, jwt_decode_1.jwtDecode)(authorization);
+        return this.getUserById(sub);
     }
     async getUserIdByToken(req) {
         const user = await this.getUserByToken(req);
@@ -55,7 +55,7 @@ class UsersService {
     }
     async getAllRoles() {
         const { data } = await axios_1.default.get(`${this.config.baseUrl}/users/roles`);
-        return data ?? null;
+        return data ?? [];
     }
     async getUserRoles(userId) {
         const user = await this.getUserById(userId);
@@ -66,7 +66,7 @@ class UsersService {
             .map((role) => role.name);
     }
     async updateMobileUser(userId, keyValue) {
-        await UserMobileAccess_model_1.UserMobileAccess.findOneAndUpdate({ keycloakUserId: userId }, keyValue, { upsert: true });
+        await UserMobileAccess_model_1.UserMobileAccess.findOneAndUpdate({ userId }, keyValue, { upsert: true });
     }
     async getUserAccess(userId) {
         const foundUser = await this.getUserById(userId);
@@ -75,58 +75,6 @@ class UsersService {
             .map((b) => b._id.toString());
         return { allBorrowers: foundUser.allBorrowers, borrowersAccess, complianceBorrowersAccess };
     }
-    async createUserLoginLog() {
-        // const { access_token } = await this.getKeyCloakAdminBearer();
-        // const dateFrom = dayjs().subtract(1, 'day').format('YYYY-MM-DD');
-        // const reqUrl = `${this.config.keycloakHost}/admin/realms/${this.config.realm}/events?type=LOGIN&dateFrom=${dateFrom}&max=10000`;
-        // const options = {
-        //   method: 'GET',
-        //   url: reqUrl,
-        //   headers: {
-        //     'Content-Type': 'application/json',
-        //     Authorization: `Bearer ${access_token}`,
-        //   },
-        // };
-        // try {
-        //   const result = await axios.request(options);
-        //   const userDates: { [userId: string]: Set<string> } = {};
-        //   result.data.forEach((log: { userId: string, time: number }) => {
-        //     const timestamp = new Date(log.time);
-        //     const formattedDate = timestamp.getFullYear() +
-        //       '-' + ('0' + (timestamp.getMonth() + 1)).slice(-2) +
-        //       '-' + ('0' + timestamp.getDate()).slice(-2) +
-        //       'T' + ('0' + timestamp.getHours()).slice(-2) +
-        //       ':' + ('0' + timestamp.getMinutes()).slice(-2);
-        //
-        //     const userId = log.userId;
-        //     if (!userDates[userId]) {
-        //       userDates[userId] = new Set<string>();
-        //     }
-        //     userDates[userId].add(formattedDate);
-        //   });
-        //   await Promise.all(Object.entries(userDates).map(async ([userId, dateSet]) => {
-        //     const user = await UserModel.findOne({ keycloakUserId: userId });
-        //     if (!user) {
-        //       return;
-        //     }
-        //     await Promise.all(Array.from(dateSet).map(async (date) => {
-        //       const existingLog = await this.getUserLogByDate(String(user._id), new Date(date));
-        //       if (!existingLog) {
-        //         const newLog: ICreateLogParams = {
-        //           action: ELogActionType.CREATE,
-        //           timestamp: new Date(date),
-        //           logType: ELogType.LOGIN,
-        //           userId: String(user._id),
-        //           details: {},
-        //         };
-        //         await createLog(newLog);
-        //       }
-        //     }));
-        //   }));
-        // } catch (e) {
-        //   console.error(e);
-        // }
-    }
     async getUserLogByDate(userId, date) {
         return UserLog_model_1.UserLog.findOne({ userId, timestamp: date }).lean();
     }

package/services/users.service.ts

@@ -46,8 +46,8 @@ export class UsersService {
     if (!authorization) {
       return null;
     }
-    const { sub: keycloakUserId }: { sub: string } = jwtDecode(authorization);
-    return this.getUserById(keycloakUserId);
+    const { sub }: { sub: string } = jwtDecode(authorization);
+    return this.getUserById(sub);
   }
 
   async getUserIdByToken(req: express.Request) {
@@ -63,9 +63,9 @@ export class UsersService {
     return data ?? null;
   }
 
-  async getAllRoles() {
+  async getAllRoles(): Promise<IUserRole[]> {
     const { data } = await axios.get<IUserRole[]>(`${this.config.baseUrl}/users/roles`);
-    return data ?? null;
+    return data ?? [];
   }
 
   async getUserRoles(userId: string) {
@@ -78,7 +78,7 @@ export class UsersService {
   }
 
   async updateMobileUser(userId: string, keyValue: { [key: string]: string | number | boolean }) {
-    await UserMobileAccess.findOneAndUpdate({ keycloakUserId: userId }, keyValue, { upsert: true });
+    await UserMobileAccess.findOneAndUpdate({ userId }, keyValue, { upsert: true });
   }
 
   async getUserAccess(userId: string): Promise<IUserAccess> {
@@ -90,59 +90,6 @@ export class UsersService {
     return { allBorrowers: foundUser.allBorrowers, borrowersAccess, complianceBorrowersAccess };
   }
 
-  async createUserLoginLog() {
-    // const { access_token } = await this.getKeyCloakAdminBearer();
-    // const dateFrom = dayjs().subtract(1, 'day').format('YYYY-MM-DD');
-    // const reqUrl = `${this.config.keycloakHost}/admin/realms/${this.config.realm}/events?type=LOGIN&dateFrom=${dateFrom}&max=10000`;
-    // const options = {
-    //   method: 'GET',
-    //   url: reqUrl,
-    //   headers: {
-    //     'Content-Type': 'application/json',
-    //     Authorization: `Bearer ${access_token}`,
-    //   },
-    // };
-    // try {
-    //   const result = await axios.request(options);
-    //   const userDates: { [userId: string]: Set<string> } = {};
-    //   result.data.forEach((log: { userId: string, time: number }) => {
-    //     const timestamp = new Date(log.time);
-    //     const formattedDate = timestamp.getFullYear() +
-    //       '-' + ('0' + (timestamp.getMonth() + 1)).slice(-2) +
-    //       '-' + ('0' + timestamp.getDate()).slice(-2) +
-    //       'T' + ('0' + timestamp.getHours()).slice(-2) +
-    //       ':' + ('0' + timestamp.getMinutes()).slice(-2);
-    //
-    //     const userId = log.userId;
-    //     if (!userDates[userId]) {
-    //       userDates[userId] = new Set<string>();
-    //     }
-    //     userDates[userId].add(formattedDate);
-    //   });
-    //   await Promise.all(Object.entries(userDates).map(async ([userId, dateSet]) => {
-    //     const user = await UserModel.findOne({ keycloakUserId: userId });
-    //     if (!user) {
-    //       return;
-    //     }
-    //     await Promise.all(Array.from(dateSet).map(async (date) => {
-    //       const existingLog = await this.getUserLogByDate(String(user._id), new Date(date));
-    //       if (!existingLog) {
-    //         const newLog: ICreateLogParams = {
-    //           action: ELogActionType.CREATE,
-    //           timestamp: new Date(date),
-    //           logType: ELogType.LOGIN,
-    //           userId: String(user._id),
-    //           details: {},
-    //         };
-    //         await createLog(newLog);
-    //       }
-    //     }));
-    //   }));
-    // } catch (e) {
-    //   console.error(e);
-    // }
-  }
-
   async getUserLogByDate(userId: string, date: Date) {
     return UserLog.findOne({ userId, timestamp: date }).lean();
   }