gemcap-be-common 1.4.11 → 1.4.13

package/db/user-logs.db.js

@@ -12,6 +12,9 @@ const createLog = async (params) => {
     if (!createLogs) {
         return;
     }
+    if (!params.userId) {
+        return;
+    }
     const newUserLog = new UserLog_model_1.UserLog({
         timestamp: params.timestamp ? params.timestamp : new Date(),
         logType: params.logType,

package/db/user-logs.db.ts

@@ -21,6 +21,9 @@ export const createLog = async (params: ICreateLogParams) => {
   if (!createLogs) {
     return;
   }
+  if (!params.userId) {
+    return;
+  }
   const newUserLog = new UserLog({
     timestamp: params.timestamp ? params.timestamp : new Date(),
     logType: params.logType,

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.11",
+  "version": "1.4.13",
   "description": "",
   "main": "index.js",
   "scripts": {

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);
@@ -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);
@@ -105,7 +105,7 @@ class UsersService {
         //     userDates[userId].add(formattedDate);
         //   });
         //   await Promise.all(Object.entries(userDates).map(async ([userId, dateSet]) => {
-        //     const user = await UserModel.findOne({ keycloakUserId: userId });
+        //     const user = await UserModel.findOne({ userId });
         //     if (!user) {
         //       return;
         //     }

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) {
@@ -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> {
@@ -120,7 +120,7 @@ export class UsersService {
     //     userDates[userId].add(formattedDate);
     //   });
     //   await Promise.all(Object.entries(userDates).map(async ([userId, dateSet]) => {
-    //     const user = await UserModel.findOne({ keycloakUserId: userId });
+    //     const user = await UserModel.findOne({ userId });
     //     if (!user) {
     //       return;
     //     }