gemcap-be-common 1.4.13 → 1.4.15

package/models/UserLog.model.d.ts

@@ -22,7 +22,7 @@
 /// <reference types="mongoose/types/validation" />
 /// <reference types="mongoose/types/virtuals" />
 /// <reference types="mongoose/types/inferschematype" />
-import mongoose, { Model } from 'mongoose';
+import mongoose, { Document, Model } from 'mongoose';
 export declare enum ELogType {
     TRANSACTIONS_UPLOAD = "TRANSACTIONS_UPLOAD",
     COLLATERAL_UPLOAD = "COLLATERAL_UPLOAD",
@@ -44,7 +44,6 @@ export declare enum ELogActionType {
     DELETE = "DELETE"
 }
 export interface IUserLog {
-    _id?: mongoose.Types.ObjectId;
     logType: ELogType;
     userId: string;
     timestamp: Date;
@@ -53,12 +52,14 @@ export interface IUserLog {
     recordCollection: string;
     details: any;
 }
+export interface IUserLogDoc extends IUserLog, Document {
+}
 export interface IUserLogWithLookup extends IUserLog {
     record?: any;
 }
 type UserLogModel = Model<IUserLog, {}, {}>;
-export declare const UserLogSchema: mongoose.Schema<IUserLog, UserLogModel, {}, {}, {}, {}, mongoose.DefaultSchemaOptions, IUserLog, mongoose.Document<unknown, {}, mongoose.FlatRecord<IUserLog>> & mongoose.FlatRecord<IUserLog> & Required<{
+export declare const UserLogSchema: mongoose.Schema<IUserLog, UserLogModel, {}, {}, {}, {}, mongoose.DefaultSchemaOptions, IUserLog, mongoose.Document<unknown, {}, mongoose.FlatRecord<IUserLog>> & mongoose.FlatRecord<IUserLog> & {
     _id: mongoose.Types.ObjectId;
-}>>;
+}>;
 export declare const UserLog: UserLogModel;
 export {};

package/models/UserLog.model.ts

@@ -1,4 +1,4 @@
-import mongoose, { Model } from 'mongoose';
+import mongoose, { Document, Model } from 'mongoose';
 
 import { MODEL_NAMES } from './_models';
 
@@ -25,7 +25,6 @@ export enum ELogActionType {
 }
 
 export interface IUserLog {
-  _id?: mongoose.Types.ObjectId;
   logType: ELogType;
   userId: string;
   timestamp: Date;
@@ -35,6 +34,9 @@ export interface IUserLog {
   details: any;
 }
 
+export interface IUserLogDoc extends IUserLog, Document {
+}
+
 export interface IUserLogWithLookup extends IUserLog {
   record?: any;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gemcap-be-common",
-  "version": "1.4.13",
+  "version": "1.4.15",
   "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/brokers.service.d.ts

@@ -46,9 +46,9 @@ export declare class BrokersService {
     getAllProductBrokers(): Promise<(import("mongoose").FlattenMaps<import("../models/ProductBroker.model").IProductBrokerDoc> & {
         _id: import("mongoose").Types.ObjectId;
     })[]>;
-    getBorrowerBrokers(borrowerId: string): Promise<BrokerView[] | (import("mongoose").FlattenMaps<import("../models/ProductBroker.model").IProductBrokerDoc> & {
+    getBorrowerBrokers(borrowerId: string): Promise<(import("mongoose").FlattenMaps<import("../models/ProductBroker.model").IProductBrokerDoc> & {
         _id: import("mongoose").Types.ObjectId;
-    })[]>;
+    })[] | BrokerView[]>;
     getProductBrokers(productId: string): Promise<import("../models/ProductBroker.model").IProductBrokerDocWithBroker[]>;
     getTotalShares(borrowerId: string, brokers: IProductBrokerView[], replaceNames?: boolean): Promise<ProductTotal>;
     getTotals(borrowerId: string): Promise<BrokerTotalView[]>;

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, "borrower" | "fundingStatus" | "items"> | {
+    getAllBorrowersShortened(userAccess: any): Promise<(Pick<IComplianceBorrowerDocument, "borrower" | "items" | "fundingStatus"> | {
         items: {
             instances: any[];
             item: import("../models/ComplianceItem.model").IComplianceItemDocument;

package/services/loan-transactions.service.d.ts

@@ -155,7 +155,7 @@ export declare class LoanTransactionsService {
     getTransactionReport(transactionIds: string[], borrowerId: string, effectiveDate: Date): Promise<{
         transactionIdsToMark: any[];
         transactions: {
-            [x: string]: (string | number | string[] | Date)[];
+            [x: string]: (string | number | Date | string[])[];
         }[];
     }>;
     getBorrowerIdsForFile(transactionFileId: string): Promise<{

package/services/user-logs.service.d.ts

@@ -1,5 +1,5 @@
 import { ICreateLogParams } from '../db/user-logs.db';
-import { IUserLog, IUserLogWithLookup } from '../models/UserLog.model';
+import { IUserLogDoc, IUserLogWithLookup } from '../models/UserLog.model';
 import { BanksService } from './banks.service';
 import { BorrowersDB } from './borrowers.db';
 import { LoanChargesService } from './loan-charges.service';
@@ -17,7 +17,7 @@ export declare class UserLogsService {
     createUserLog(params: ICreateLogParams): Promise<void>;
     filterByBorrower(logs: IUserLogWithLookup[], borrowerId: string): Promise<IUserLogWithLookup[]>;
     replaceBorrowers(logs: IUserLogWithLookup[]): Promise<void[]>;
-    performDynamicLookup(record: IUserLog): Promise<IUserLogWithLookup>;
+    performDynamicLookup(record: IUserLogDoc): Promise<IUserLogWithLookup>;
     getLogs(filter: IUserLogFilter): Promise<IUserLogWithLookup[]>;
     getDocumentLogs(documentId: string): Promise<IUserLogWithLookup[]>;
 }

package/services/user-logs.service.ts

@@ -1,7 +1,7 @@
 import mongoose from 'mongoose';
 
 import { createLog, ICreateLogParams } from '../db/user-logs.db';
-import { ELogType, IUserLog, IUserLogWithLookup, UserLog } from '../models/UserLog.model';
+import { ELogType, IUserLogDoc, IUserLogWithLookup, UserLog } from '../models/UserLog.model';
 import { DeletedRecord } from '../models/DeletedRecords.model';
 
 import { BanksService } from './banks.service';
@@ -82,7 +82,7 @@ export class UserLogsService {
     });
   }
 
-  async performDynamicLookup(record: IUserLog): Promise<IUserLogWithLookup> {
+  async performDynamicLookup(record: IUserLogDoc): Promise<IUserLogWithLookup> {
     try {
       const { _id, recordCollection } = record;
       if (!recordCollection) {
@@ -132,7 +132,7 @@ export class UserLogsService {
   }
 
   async getLogs(filter: IUserLogFilter) {
-    const logs = await UserLog.aggregate<IUserLog>([
+    const logs = await UserLog.aggregate<IUserLogDoc>([
       {
         $match: {
           $and: [
@@ -157,7 +157,7 @@ export class UserLogsService {
   }
 
   async getDocumentLogs(documentId: string) {
-    const logs = await UserLog.aggregate<IUserLog>([
+    const logs = await UserLog.aggregate<IUserLogDoc>([
       {
         $match: {
           $and: [

package/services/users.service.d.ts

@@ -43,9 +43,8 @@ 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<{
+    getUserLogByDate(userId: string, date: Date): Promise<import("mongoose").FlattenMaps<import("../models/UserLog.model").IUserLog> & {
         _id: import("mongoose").Types.ObjectId;
-    }>>;
+    }>;
 }
 export {};

package/services/users.service.js

@@ -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);
@@ -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({ 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

@@ -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) {
@@ -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({ 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();
   }