@solidstarters/solid-core 1.2.64 → 1.2.67

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@solidstarters/solid-core",
-  "version": "1.2.64",
+  "version": "1.2.67",
   "description": "This module is a NestJS module containing all the required core providers required by a Solid application",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -51,6 +51,7 @@
     "mailgen": "^2.0.28",
     "mongoose": "^8.7.0",
     "mysql2": "^3.13.0",
+    "nestjs-cls": "^5.4.3",
     "nodemailer": "^6.9.13",
     "passport": "^0.7.0",
     "passport-google-oauth2": "^0.2.0",

package/src/controllers/chatter-message.controller.ts

@@ -98,8 +98,7 @@ export class ChatterMessageController {
   async postMessage(
     @Body() postDto: PostChatterMessageDto,
     @UploadedFiles() files: Array<Express.Multer.File>,
-    @SolidRequestContextDecorator() solidRequestContext: SolidRequestContextDto
   ) {
-    return this.service.postMessage(postDto, solidRequestContext, files);
+    return this.service.postMessage(postDto, files);
   }
 }

package/src/decorators/active-user.decorator.ts

@@ -5,6 +5,7 @@ import { REQUEST_USER_KEY } from "../constants";
 export const ActiveUser = createParamDecorator(
     (field: keyof ActiveUserData | undefined, ctx: ExecutionContext) => {
         const request = ctx.switchToHttp().getRequest();
+        // TODO idealiy we should use RequestContextService and getActiveUser method. (Works for async scenarios too)
         const user: ActiveUserData | undefined = request[REQUEST_USER_KEY];
         return field ? user?.[field] : user;
     },

package/src/decorators/solid-request-context.decorator.ts

@@ -6,7 +6,8 @@ import { SolidRequestContextDto } from 'src/dtos/solid-request-context.dto';
 export const SolidRequestContextDecorator = createParamDecorator(
   (data: unknown, ctx: ExecutionContext): SolidRequestContextDto => {
     const request = ctx.switchToHttp().getRequest();
-    const activeUser: ActiveUserData | undefined = request[REQUEST_USER_KEY]; // Get active user
+    // TODO idealiy we should use RequestContextService and getActiveUser method. (Works for async scenarios too)
+    const activeUser: ActiveUserData | undefined = request[REQUEST_USER_KEY];
 
     // Create a new instance of SolidRequestContextDto and stamp user data
     const solidRequestContext = new SolidRequestContextDto();

package/src/guards/access-token.guard.ts

@@ -12,6 +12,7 @@ import { ActiveUserData } from '../interfaces/active-user-data.interface';
 import { jwtConfig } from '../config/iam.config';
 import { REQUEST_USER_KEY } from "../constants";
 import { PermissionMetadataService } from '../services/permission-metadata.service';
+import { ClsService } from 'nestjs-cls';
 
 @Injectable()
 export class AccessTokenGuard implements CanActivate {
@@ -20,6 +21,7 @@ export class AccessTokenGuard implements CanActivate {
     @Inject(jwtConfig.KEY)
     private readonly jwtConfiguration: ConfigType<typeof jwtConfig>,
     private readonly permissionsService: PermissionMetadataService,
+    private readonly cls: ClsService
   ) { }
 
   async canActivate(context: ExecutionContext): Promise<boolean> {
@@ -40,6 +42,7 @@ export class AccessTokenGuard implements CanActivate {
       payload.permissions = permissions.map((permission) => permission.name);
 
       request[REQUEST_USER_KEY] = payload;
+      this.cls.set(REQUEST_USER_KEY, payload);
       // console.log(`About to set payload in the request user key:`);
       // console.log(payload);
     } catch {

package/src/index.ts

@@ -228,7 +228,6 @@ export * from './services/security-rule.service'
 export * from './services/request-context.service'
 export * from './services/chatter-message.service'
 export * from './services/chatter-message-details.service'
-export * from './services/user-context.service'
 // Repositories
 export * from './repository/solid-base.repository'
 export * from './repository/security-rule.repository'

package/src/providers/list-of-values-selection-providers.service.ts

@@ -34,12 +34,21 @@ export class ListOfValuesSelectionProvider implements ISelectionProvider<ListOfV
 
     async values(query: string, ctxt: ListOfValuesProviderContext): Promise<readonly ISelectionProviderValues[]> {
         const basicFilterQuery = new BasicFilterDto(DEFAULT_LIMIT, 0);
-        basicFilterQuery.filters = {
-            type: {
-                $eq: ctxt.type
-            }
+        if (ctxt.type) {
+            basicFilterQuery.filters = {
+                type: {
+                    $eq: ctxt.type
+                }
+            };
+        }
+        if (query) {
+            basicFilterQuery.filters = {
+                ...basicFilterQuery.filters,
+                display: {
+                    $containsi: `%${query}%`
+                }
+            };
         }
-
         const lovs = await this.listOfValuesService.find(basicFilterQuery);
         const selectionValues = lovs.records.map(lov => {
             return {

package/src/seeders/seed-data/solid-core-metadata.json

@@ -3807,7 +3807,7 @@
       "name": "media-menu-item",
       "sequenceNumber": 3,
       "actionUserKey": "media-root",
-      "moduleUserKey": "solid-core",                                             
+      "moduleUserKey": "solid-core",
       "parentMenuItemUserKey": ""
     },
     {
@@ -3980,32 +3980,11 @@
             {
               "attrs": {
                 "className": "pi pi-cog",
-                "label": "Generate Code"
-              },
-              "action": {
-                "title": "",
-                "body": "",
-                "confirmBtnLabel": "Generate Code",
-                "cancelBtnLabel": "Cancel",
-                "customComponent": "GenerateModuleCodeRowAction",
-                "customComponentIsSystem": true,
-                "endpoint": ""
-              }
-            }
-          ],
-          "headerButtons": [
-            {
-              "attrs": {
-                "className": "pi pi-cog",
-                "label": "Generate Code"
-              },
-              "action": {
-                "title": "",
-                "body": "",
-                "confirmBtnLabel": "Generate Code",
-                "cancelBtnLabel": "Cancel",
-                "customComponent": "GenerateModuleCode",
-                "endpoint": ""
+                "label": "Generate Code",
+                "action": "GenerateModuleCodeRowAction",
+                "openInPopup": true,
+                "actionInContextMenu": true,
+                "customComponentIsSystem": true
               }
             }
           ]
@@ -4172,32 +4151,11 @@
             {
               "attrs": {
                 "className": "pi pi-cog",
-                "label": "Generate Code"
-              },
-              "action": {
-                "title": "",
-                "body": "",
-                "confirmBtnLabel": "Generate Code",
-                "cancelBtnLabel": "Cancel",
-                "customComponent": "GenerateModelCodeRowAction",
+                "label": "Generate Code",
+                "action": "GenerateModelCodeRowAction",
                 "customComponentIsSystem": true,
-                "endpoint": ""
-              }
-            }
-          ],
-          "headerButtons": [
-            {
-              "attrs": {
-                "className": "pi pi-cog",
-                "label": "Generate Code"
-              },
-              "action": {
-                "title": "",
-                "body": "",
-                "confirmBtnLabel": "Generate Code",
-                "cancelBtnLabel": "Cancel",
-                "customComponent": "GenerateModelCode",
-                "endpoint": ""
+                "actionInContextMenu": true,
+                "openInPopup": true
               }
             }
           ]
@@ -6046,7 +6004,7 @@
             "attrs": {
               "name": "name",
               "isSearchable": true
-                        }
+            }
           },
           {
             "type": "field",
@@ -6210,7 +6168,6 @@
         ]
       }
     },
-    
     {
       "name": "media-list-view",
       "displayName": "Solid Media Model",
@@ -8673,6 +8630,5 @@
     }
   ],
   "checksums": [],
-  "listOfValues": [
-  ]
+  "listOfValues": []
 }

package/src/services/authentication.service.ts

@@ -41,6 +41,7 @@ import {
 } from "../constants";
 import { SettingService } from './setting.service';
 import { CreateUserDto } from 'src/dtos/create-user.dto';
+import { RoleMetadataService } from './role-metadata.service';
 
 enum LoginProvider {
     LOCAL = 'local',
@@ -73,6 +74,8 @@ export class AuthenticationService {
         private readonly smsService: Msg91OTPService,
         private readonly eventEmitter: EventEmitter2,
         private readonly settingService: SettingService,
+        private readonly roleMetadataService: RoleMetadataService
+
     ) { }
 
     async resolveUser(username: string, email: string) {
@@ -145,7 +148,7 @@ export class AuthenticationService {
             var { user, pwd, autoGeneratedPwd } = await this.populateForSignup<T>(extensionUser, signUpDto);
             const savedUser = await extensionUserRepo.save(user);
 
-            await this.handlePostSignup(savedUser, signUpDto.roles,  pwd, autoGeneratedPwd);
+            await this.handlePostSignup(savedUser, signUpDto.roles, pwd, autoGeneratedPwd);
 
             return savedUser;
         }
@@ -158,15 +161,23 @@ export class AuthenticationService {
         }
     }
 
-  
+
     private async populateForSignup<T extends User>(user: T, signUpDto: SignUpDto, isUserActive: boolean = true) {
         // const user = new User();
+
+        if (signUpDto.roles && signUpDto.roles.length > 0) {
+            for (let i = 0; i < signUpDto.roles.length; i++) {
+                const roleName = signUpDto.roles[i];
+                await this.roleMetadataService.findRoleByName(roleName);
+            }
+        }
         user.username = signUpDto.username;
         user.email = signUpDto.email;
         user.fullName = signUpDto.fullName;
         if (signUpDto.mobile) {
             user.mobile = signUpDto.mobile;
         }
+
         // If password has been specified by the user, then we simply create & activate the user based on the configuration parameter "activateUserOnRegistration".
         let pwd = '';
         let autoGeneratedPwd = '';
@@ -186,8 +197,9 @@ export class AuthenticationService {
         return { user, pwd, autoGeneratedPwd };
     }
 
-    private async handlePostSignup(user: User, roles: string[]=[], pwd: string, autoGeneratedPwd: string) {
-        this.userService.initializeRolesForNewUser(roles, user);
+
+    private async handlePostSignup(user: User, roles: string[] = [], pwd: string, autoGeneratedPwd: string) {
+        await this.userService.initializeRolesForNewUser(roles, user);
         // Tanay: Adding user password to history table
         const userPasswordHistory = new UserPasswordHistory();
         userPasswordHistory.passwordHash = pwd;

package/src/services/chatter-message-details.service.ts

@@ -11,7 +11,6 @@ import { FileService } from 'src/services/file.service';
 import { CrudHelperService } from 'src/services/crud-helper.service';
 
 import { ChatterMessageDetails } from '../entities/chatter-message-details.entity';
-import { UserContextService } from './user-context.service';
 
 @Injectable()
 export class ChatterMessageDetailsService extends CRUDService<ChatterMessageDetails>{
@@ -27,8 +26,7 @@ export class ChatterMessageDetailsService extends CRUDService<ChatterMessageDeta
     @InjectRepository(ChatterMessageDetails, 'default')
     readonly repo: Repository<ChatterMessageDetails>,
     readonly moduleRef: ModuleRef,
-    readonly userContextService: UserContextService
   ) {
-    super(modelMetadataService, moduleMetadataService, configService, fileService, discoveryService, crudHelperService, entityManager, repo, 'chatterMessageDetails', 'solid-core', moduleRef, userContextService);
+    super(modelMetadataService, moduleMetadataService, configService, fileService, discoveryService, crudHelperService, entityManager, repo, 'chatterMessageDetails', 'solid-core', moduleRef);
   }
 }

package/src/services/chatter-message.service.ts

@@ -16,7 +16,7 @@ import { getMediaStorageProvider } from './mediaStorageProviders';
 import { MediaStorageProviderType } from '../dtos/create-media-storage-provider-metadata.dto';
 import { ChatterMessageDetails } from '../entities/chatter-message-details.entity';
 import { ModelMetadata } from 'src/entities/model-metadata.entity';
-import { UserContextService } from './user-context.service';
+import { RequestContextService } from './request-context.service';
 @Injectable()
 export class ChatterMessageService extends CRUDService<ChatterMessage>{
   constructor(
@@ -35,24 +35,27 @@ export class ChatterMessageService extends CRUDService<ChatterMessage>{
     readonly moduleRef: ModuleRef,
     @InjectRepository(ModelMetadata)
     private readonly modelMetadataRepo: Repository<ModelMetadata>,
-    readonly userContextService: UserContextService
+    readonly requestContextService: RequestContextService
  ) {
-   super(modelMetadataService, moduleMetadataService,  configService, fileService,  discoveryService, crudHelperService,entityManager, repo, 'chatterMessage', 'solid-core', moduleRef, userContextService);
+   super(modelMetadataService, moduleMetadataService,  configService, fileService,  discoveryService, crudHelperService,entityManager, repo, 'chatterMessage', 'solid-core', moduleRef);
  }
 
- async postMessage(postDto: PostChatterMessageDto, solidRequestContext: SolidRequestContextDto, files: Express.Multer.File[] = []) {
+ async postMessage(postDto: PostChatterMessageDto, files: Express.Multer.File[] = []) {
     const chatterMessage = new ChatterMessage();
     chatterMessage.messageType = 'custom';
-    chatterMessage.messageSubType = postDto.messageSubType || 'general';
+    chatterMessage.messageSubType = postDto.messageSubType || 'post_message';
     chatterMessage.messageBody = postDto.messageBody;
     chatterMessage.coModelEntityId = postDto.coModelEntityId;
     chatterMessage.coModelName = postDto.coModelName;
     
-    const userId = typeof solidRequestContext.activeUser === 'object' 
-        ? solidRequestContext.activeUser.sub 
-        : solidRequestContext.activeUser;
-    
-    chatterMessage.user = { id: userId } as any;
+    const activeUser = this.requestContextService.getActiveUser();
+
+    if (activeUser) {
+        const userId = activeUser?.sub;
+        chatterMessage.user = { id: userId } as any;
+    } else {
+        chatterMessage.user = null;
+    }
 
     const savedMessage = await this.repo.save(chatterMessage);
 
@@ -81,7 +84,7 @@ export class ChatterMessageService extends CRUDService<ChatterMessage>{
     return savedMessage;
  }
 
- async postAuditMessageOnInsert(entity: any, metadata: EntityMetadata, activeUser: any, messageQueue: boolean = false) {
+ async postAuditMessageOnInsert(entity: any, metadata: EntityMetadata, messageQueue: boolean = false) {
     const model = await this.modelMetadataRepo.findOne({
         where: {
             displayName: metadata.name
@@ -98,9 +101,12 @@ export class ChatterMessageService extends CRUDService<ChatterMessage>{
 
     const auditFields = model.fields.filter(field => 
         field.enableAuditTracking && 
-        !['oneToMany', 'mediaSingle', 'mediaMultiple', 'computed', 'richText', 'json'].includes(field.type)
+        !['mediaSingle', 'mediaMultiple', 'computed', 'richText', 'json'].includes(field.type) &&
+        !(field.type === 'relation' && field.relationType === 'one-to-many')
     );
 
+    const activeUser = this.requestContextService.getActiveUser();
+
     const chatterMessage = new ChatterMessage();
     chatterMessage.messageType = 'audit';
     chatterMessage.messageSubType = 'insert';
@@ -109,7 +115,7 @@ export class ChatterMessageService extends CRUDService<ChatterMessage>{
     chatterMessage.messageBody = `New ${model.displayName} created`;
     
     if (activeUser) {
-        const userId = typeof activeUser === 'object' ? activeUser.sub : activeUser;
+        const userId = activeUser?.sub;
         chatterMessage.user = { id: userId } as any;
     } else {
         chatterMessage.user = null;
@@ -132,7 +138,7 @@ export class ChatterMessageService extends CRUDService<ChatterMessage>{
     }
 }
 
-async postAuditMessageOnUpdate(entity: any, metadata: EntityMetadata, databaseEntity: any, activeUser: any, messageQueue: boolean = false) {
+async postAuditMessageOnUpdate(entity: any, metadata: EntityMetadata, databaseEntity: any, messageQueue: boolean = false) {
     const model = await this.modelMetadataRepo.findOne({
         where: {
             displayName: metadata.name
@@ -149,7 +155,8 @@ async postAuditMessageOnUpdate(entity: any, metadata: EntityMetadata, databaseEn
 
     const auditFields = model.fields.filter(field => 
         field.enableAuditTracking && 
-        !['oneToMany', 'mediaSingle', 'mediaMultiple', 'computed', 'richText', 'json'].includes(field.type)
+        !['mediaSingle', 'mediaMultiple', 'computed', 'richText', 'json'].includes(field.type) &&
+        !(field.type === 'relation' && field.relationType === 'one-to-many')
     );
 
     const relationFields = auditFields.filter(field => 
@@ -164,16 +171,16 @@ async postAuditMessageOnUpdate(entity: any, metadata: EntityMetadata, databaseEn
             databaseEntity = populatedEntity;
         }
     }
-
     const changedFields = auditFields.filter(field => {
         const newValue = entity[field.name];
         const oldValue = databaseEntity[field.name];
         return this.hasValueChanged(newValue, oldValue);
     });
-
+    
     if (changedFields.length === 0) {
         return;
     }
+    const activeUser = this.requestContextService.getActiveUser();
 
     const chatterMessage = new ChatterMessage();
     chatterMessage.messageType = 'audit';
@@ -183,7 +190,7 @@ async postAuditMessageOnUpdate(entity: any, metadata: EntityMetadata, databaseEn
     chatterMessage.messageBody = `${model.displayName} updated`;
     
     if (activeUser) {
-        const userId = typeof activeUser === 'object' ? activeUser.sub : activeUser;
+        const userId = activeUser?.sub;
         chatterMessage.user = { id: userId } as any;
     } else {
         chatterMessage.user = null;
@@ -203,7 +210,7 @@ async postAuditMessageOnUpdate(entity: any, metadata: EntityMetadata, databaseEn
     }
 }
 
-async postAuditMessageOnDelete(entity: any, metadata: EntityMetadata, databaseEntity: any, activeUser: any, messageQueue: boolean = false) {
+async postAuditMessageOnDelete(entity: any, metadata: EntityMetadata, databaseEntity: any, messageQueue: boolean = false) {
     const model = await this.modelMetadataRepo.findOne({
         where: {
             displayName: metadata.name
@@ -225,8 +232,10 @@ async postAuditMessageOnDelete(entity: any, metadata: EntityMetadata, databaseEn
     chatterMessage.coModelName = model.singularName;
     chatterMessage.messageBody = `${model.displayName} deleted`;
     
+    const activeUser = this.requestContextService.getActiveUser();
+
     if (activeUser) {
-        const userId = typeof activeUser === 'object' ? activeUser.sub : activeUser;
+        const userId = activeUser?.sub;
         chatterMessage.user = { id: userId } as any;
     } else {
         chatterMessage.user = null;

package/src/services/crud.service.ts

@@ -34,7 +34,6 @@ import { FileService } from "./file.service";
 import { getMediaStorageProvider } from "./mediaStorageProviders";
 import { ModelMetadataService } from "./model-metadata.service";
 import { ModuleMetadataService } from "./module-metadata.service";
-import { UserContextService } from "./user-context.service";
 const DEFAULT_LIMIT = 10;
 const DEFAULT_OFFSET = 0;
 export class CRUDService<T> { // Add two generic value i.e Person,CreatePersonDto, so we get the proper types in our service
@@ -51,7 +50,6 @@ export class CRUDService<T> { // Add two generic value i.e Person,CreatePersonDt
         readonly modelName: string,
         readonly moduleName: string,
         readonly moduleRef: ModuleRef,
-        @Optional() readonly userContextService?: UserContextService
         //We can just have the Model Entity here
     ) { }
 
@@ -67,9 +65,6 @@ export class CRUDService<T> { // Add two generic value i.e Person,CreatePersonDt
         // Check wheather user has create permission for model
         if (solidRequestContext.activeUser) {
             const hasPermission = this.crudHelperService.hasCreatePermissionOnModel(solidRequestContext.activeUser, model.singularName);
-            if (this.userContextService) {
-                this.userContextService.setUser(solidRequestContext.activeUser);
-            }
             if (!hasPermission) {
                 throw new BadRequestException('Forbidden');
             }
@@ -164,9 +159,6 @@ export class CRUDService<T> { // Add two generic value i.e Person,CreatePersonDt
         // Check wheather user has update permission for model
         if (solidRequestContext.activeUser) {
             const hasPermission = this.crudHelperService.hasUpdatePermissionOnModel(solidRequestContext.activeUser, model.singularName);
-            if (this.userContextService) {
-                this.userContextService.setUser(solidRequestContext.activeUser);
-            }
             if (!hasPermission) {
                 throw new BadRequestException('Forbidden');
             }

package/src/services/field-metadata.service.ts

@@ -503,6 +503,7 @@ export class FieldMetadataService {
                     "encryptionType",
                     "decryptWhen",
                     "columnName",
+                    "enableAuditTracking"
                 ];
 
             case SolidFieldType.bigint:
@@ -521,7 +522,8 @@ export class FieldMetadataService {
                     "encrypt",
                     "encryptionType",
                     "decryptWhen",
-                    "columnName"
+                    "columnName",
+                    "enableAuditTracking"
                 ];
 
             // case SolidFieldType.float:
@@ -560,7 +562,8 @@ export class FieldMetadataService {
                     "encrypt",
                     "encryptionType",
                     "decryptWhen",
-                    "columnName"
+                    "columnName",
+                    "enableAuditTracking"
                 ];
 
             case SolidFieldType.shortText:
@@ -582,7 +585,8 @@ export class FieldMetadataService {
                     "encryptionType",
                     "decryptWhen",
                     "columnName",
-                    "isUserKey"
+                    "isUserKey",
+                    "enableAuditTracking"
                 ];
 
             case SolidFieldType.longtext:
@@ -665,7 +669,8 @@ export class FieldMetadataService {
                     "encrypt",
                     "encryptionType",
                     "decryptWhen",
-                    "columnName"
+                    "columnName",
+                    "enableAuditTracking"
                 ];
 
             case SolidFieldType.date:
@@ -684,7 +689,8 @@ export class FieldMetadataService {
                     "encrypt",
                     "encryptionType",
                     "decryptWhen",
-                    "columnName"
+                    "columnName",
+                    "enableAuditTracking"
                 ];
 
             case SolidFieldType.datetime:
@@ -703,7 +709,8 @@ export class FieldMetadataService {
                     "encrypt",
                     "encryptionType",
                     "decryptWhen",
-                    "columnName"
+                    "columnName",
+                    "enableAuditTracking"
                 ];
 
             case SolidFieldType.time:
@@ -722,7 +729,8 @@ export class FieldMetadataService {
                     "encrypt",
                     "encryptionType",
                     "decryptWhen",
-                    "columnName"
+                    "columnName",
+                    "enableAuditTracking"
                 ];
 
             case SolidFieldType.relation:
@@ -750,7 +758,8 @@ export class FieldMetadataService {
                     "columnName",
                     "relationJoinTableName",
                     "isRelationManyToManyOwner",
-                    "relationFieldFixedFilter"
+                    "relationFieldFixedFilter",
+                    "enableAuditTracking"
                 ];
 
             case SolidFieldType.mediaSingle:
@@ -812,7 +821,8 @@ export class FieldMetadataService {
                     "encrypt",
                     "encryptionType",
                     "decryptWhen",
-                    "columnName"
+                    "columnName",
+                    "enableAuditTracking"
                 ];
 
             case SolidFieldType.password:
@@ -855,7 +865,8 @@ export class FieldMetadataService {
                     "encrypt",
                     "encryptionType",
                     "decryptWhen",
-                    "columnName"
+                    "columnName",
+                    "enableAuditTracking"
                 ];
 
             case SolidFieldType.selectionDynamic:
@@ -877,8 +888,8 @@ export class FieldMetadataService {
                     "encryptionType",
                     "decryptWhen",
                     "columnName",
-                    "isUserKey"
-
+                    "isUserKey",
+                    "enableAuditTracking"
                 ];
             case SolidFieldType.computed:
                 return [

package/src/services/model-metadata.service.ts

@@ -184,16 +184,19 @@ export class ModelMetadataService {
         relations: {},
       });
     createDto['module'] = resolvedModule;
+    
+    if (createDto['parentModelId']) {
+      const resolvedParentModel = await this.dataSource
+        .getRepository(ModelMetadata)
+        .findOne({
+          where: {
+            id: createDto['parentModelId'],
+          },
+          relations: {},
+        });
+      createDto['parentModel'] = resolvedParentModel;
+    }
 
-    const resolvedParentModel = await this.dataSource
-      .getRepository(ModelMetadata)
-      .findOne({
-        where: {
-          id: createDto['parentModelId'],
-        },
-        relations: {},
-      });
-    createDto['parentModel'] = resolvedParentModel;
     const { fields: fieldsMetadata, ...modelMetaDataWithoutFields } = createDto;
     const modelMetadata = this.modelMetadataRepo.create(modelMetaDataWithoutFields);
     let model = await manager.save(modelMetadata);
@@ -515,8 +518,8 @@ export class ModelMetadataService {
 
     // Generate the code for models which are linked to fields having an inverse relation
     const coModelSingularNames = model.fields.
-                          filter(field => field.type === SolidFieldType.relation && field.relationCreateInverse === true)
-                          .map(field => field.relationCoModelSingularName);
+      filter(field => field.type === SolidFieldType.relation && field.relationCreateInverse === true)
+      .map(field => field.relationCoModelSingularName);
 
     for (const singularName of coModelSingularNames) {
       const coModel = await this.findOneBySingularName(singularName);
@@ -525,7 +528,7 @@ export class ModelMetadataService {
         dryRun: options.dryRun
       };
       await this.generateCode(inverseOptions);
-    }                      
+    }
 
     await this.generateVAMConfig(model.id);
 

package/src/services/request-context.service.ts

@@ -1,16 +1,15 @@
-import { Inject, Injectable, Scope } from "@nestjs/common";
-import { REQUEST } from "@nestjs/core";
+import { Injectable } from "@nestjs/common";
+import { ClsService } from "nestjs-cls";
 import { REQUEST_USER_KEY } from "src/constants";
-import { ActiveUserData } from "src/interfaces/active-user-data.interface";
 
-@Injectable({scope: Scope.REQUEST})
+@Injectable()
 export class RequestContextService {
-    constructor(@Inject(REQUEST) private readonly request: Request) {
+    constructor(private readonly cls: ClsService) {
     }
 
     // This method i.e getActiveUser() will fetch the user from the request object in the context
     getActiveUser() {
-        return this.request[REQUEST_USER_KEY] as ActiveUserData| undefined;
+        return this.cls.get(REQUEST_USER_KEY);
     }
 
 }