@solidstarters/solid-core 1.2.63 → 1.2.66

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);
     }
 
 }

package/src/solid-core.module.ts

@@ -161,7 +161,7 @@ import { ChatterMessageDetails } from './entities/chatter-message-details.entity
 import { ChatterMessageDetailsService } from './services/chatter-message-details.service';
 import { ChatterMessageDetailsController } from './controllers/chatter-message-details.controller';
 import { AuditSubscriber } from './subscribers/audit.subscriber';
-import { UserContextService } from './services/user-context.service';
+import { ClsModule } from 'nestjs-cls';
 
 @Global()
 @Module({
@@ -213,6 +213,10 @@ import { UserContextService } from './services/user-context.service';
     TypeOrmModule.forFeature([ChatterMessage]),
     TypeOrmModule.forFeature([ChatterMessageDetails]),
     // TypeOrmModule.forFeature([User]),
+    ClsModule.forRoot({
+      middleware: {
+        mount: true,
+      }}),
   ],
   controllers: [
     ModuleMetadataController,
@@ -348,7 +352,6 @@ import { UserContextService } from './services/user-context.service';
     ChatterMessageService,
     ChatterMessageDetailsService,
     AuditSubscriber,
-    UserContextService,
   ],
   exports: [
     ModuleMetadataService,

package/src/subscribers/audit.subscriber.ts

@@ -5,7 +5,6 @@ import { InjectRepository } from '@nestjs/typeorm';
 import { ModelMetadata } from '../entities/model-metadata.entity';
 import { Repository } from 'typeorm';
 import { Injectable } from '@nestjs/common';
-import { UserContextService } from '../services/user-context.service';
 @Injectable()
 @EventSubscriber()
 export class AuditSubscriber implements EntitySubscriberInterface {
@@ -15,7 +14,6 @@ export class AuditSubscriber implements EntitySubscriberInterface {
         private readonly chatterMessageService: ChatterMessageService,
         @InjectRepository(ModelMetadata)
         private readonly modelMetadataRepo: Repository<ModelMetadata>,
-        private readonly userContextService: UserContextService
     ) {
         connection.subscribers.push(this);
     }
@@ -37,7 +35,8 @@ export class AuditSubscriber implements EntitySubscriberInterface {
 
         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')
         );
 
         if (auditFields.length === 0) {
@@ -52,22 +51,19 @@ export class AuditSubscriber implements EntitySubscriberInterface {
 
     async afterInsert(event: InsertEvent<any>) {
         if (await this.shouldTrackAudit(event.entity, event.metadata)) {
-            const activeUser = this.userContextService.getUser();
-            await this.chatterMessageService.postAuditMessageOnInsert(event.entity, event.metadata, activeUser);
+            await this.chatterMessageService.postAuditMessageOnInsert(event.entity, event.metadata);
         }
     }
 
     async afterUpdate(event: UpdateEvent<any>) {
         if (await this.shouldTrackAudit(event.entity, event.metadata)) {
-            const activeUser = this.userContextService.getUser();
-            await this.chatterMessageService.postAuditMessageOnUpdate(event.entity, event.metadata, event.databaseEntity, activeUser);
+            await this.chatterMessageService.postAuditMessageOnUpdate(event.entity, event.metadata, event.databaseEntity);
         }
     }
 
     async afterRemove(event: RemoveEvent<any>) {
         if (await this.shouldTrackAudit(event.entity, event.metadata)) {
-            const activeUser = this.userContextService.getUser();
-            await this.chatterMessageService.postAuditMessageOnDelete(event.entity, event.metadata, event.databaseEntity, activeUser);
+            await this.chatterMessageService.postAuditMessageOnDelete(event.entity, event.metadata, event.databaseEntity);
         }
     }
 } 

package/dist/services/user-context.service.d.ts

@@ -1,10 +0,0 @@
-import { ActiveUserData } from '../interfaces/active-user-data.interface';
-export declare class UserContextService {
-    private readonly logger;
-    private static currentUser;
-    setUser(user: any): void;
-    getUser(): any;
-    runWithUser<T>(user: any, callback: () => T): T;
-    getCurrentUser(): ActiveUserData | null;
-}
-//# sourceMappingURL=user-context.service.d.ts.map

package/dist/services/user-context.service.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"user-context.service.d.ts","sourceRoot":"","sources":["../../src/services/user-context.service.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,0CAA0C,CAAC;AAE1E,qBACa,kBAAkB;IAC3B,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAuC;IAC9D,OAAO,CAAC,MAAM,CAAC,WAAW,CAAa;IAEvC,OAAO,CAAC,IAAI,EAAE,GAAG;IAKjB,OAAO;IAIP,WAAW,CAAC,CAAC,EAAE,IAAI,EAAE,GAAG,EAAE,QAAQ,EAAE,MAAM,CAAC,GAAG,CAAC;IAU/C,cAAc,IAAI,cAAc,GAAG,IAAI;CAG1C"}

package/dist/services/user-context.service.js

@@ -1,42 +0,0 @@
-"use strict";
-var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
-    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
-    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
-    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
-    return c > 3 && r && Object.defineProperty(target, key, r), r;
-};
-var UserContextService_1;
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.UserContextService = void 0;
-const common_1 = require("@nestjs/common");
-let UserContextService = UserContextService_1 = class UserContextService {
-    constructor() {
-        this.logger = new common_1.Logger(UserContextService_1.name);
-    }
-    setUser(user) {
-        this.logger.debug(`Setting user: ${JSON.stringify(user)}`);
-        UserContextService_1.currentUser = user;
-    }
-    getUser() {
-        return UserContextService_1.currentUser;
-    }
-    runWithUser(user, callback) {
-        const previousUser = this.getUser();
-        try {
-            this.setUser(user);
-            return callback();
-        }
-        finally {
-            this.setUser(previousUser);
-        }
-    }
-    getCurrentUser() {
-        return this.getUser();
-    }
-};
-exports.UserContextService = UserContextService;
-UserContextService.currentUser = null;
-exports.UserContextService = UserContextService = UserContextService_1 = __decorate([
-    (0, common_1.Injectable)()
-], UserContextService);
-//# sourceMappingURL=user-context.service.js.map

package/dist/services/user-context.service.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"user-context.service.js","sourceRoot":"","sources":["../../src/services/user-context.service.ts"],"names":[],"mappings":";;;;;;;;;;AAAA,2CAAoD;AAI7C,IAAM,kBAAkB,0BAAxB,MAAM,kBAAkB;IAAxB;QACc,WAAM,GAAG,IAAI,eAAM,CAAC,oBAAkB,CAAC,IAAI,CAAC,CAAC;IAyBlE,CAAC;IAtBG,OAAO,CAAC,IAAS;QACb,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,iBAAiB,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QAC3D,oBAAkB,CAAC,WAAW,GAAG,IAAI,CAAC;IAC1C,CAAC;IAED,OAAO;QACH,OAAO,oBAAkB,CAAC,WAAW,CAAC;IAC1C,CAAC;IAED,WAAW,CAAI,IAAS,EAAE,QAAiB;QACvC,MAAM,YAAY,GAAG,IAAI,CAAC,OAAO,EAAE,CAAC;QACpC,IAAI,CAAC;YACD,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;YACnB,OAAO,QAAQ,EAAE,CAAC;QACtB,CAAC;gBAAS,CAAC;YACP,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC;QAC/B,CAAC;IACL,CAAC;IAED,cAAc;QACV,OAAO,IAAI,CAAC,OAAO,EAAE,CAAC;IAC1B,CAAC;;AAzBQ,gDAAkB;AAEZ,8BAAW,GAAQ,IAAI,AAAZ,CAAa;6BAF9B,kBAAkB;IAD9B,IAAA,mBAAU,GAAE;GACA,kBAAkB,CA0B9B"}

package/src/services/1.js

@@ -1,6 +0,0 @@
-1. Do i need to create a storeStreams method for aws service too?
-    - Handle later
-2. queues handling -> if queues is enabled by default, i.e triggerExport(exportTransactionEntity.id).
-    - startExport should either return the data or return the transaction id
-3. How to handle scenarios wherein, nested related exist.(do i need to only get the userkey)
-    - show the userKey

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

@@ -1,31 +0,0 @@
-import { Injectable, Logger } from '@nestjs/common';
-import { ActiveUserData } from '../interfaces/active-user-data.interface';
-
-@Injectable()
-export class UserContextService {
-    private readonly logger = new Logger(UserContextService.name);
-    private static currentUser: any = null;
-
-    setUser(user: any) {
-        this.logger.debug(`Setting user: ${JSON.stringify(user)}`);
-        UserContextService.currentUser = user;
-    }
-
-    getUser() {
-        return UserContextService.currentUser;
-    }
-
-    runWithUser<T>(user: any, callback: () => T): T {
-        const previousUser = this.getUser();
-        try {
-            this.setUser(user);
-            return callback();
-        } finally {
-            this.setUser(previousUser);
-        }
-    }
-
-    getCurrentUser(): ActiveUserData | null {
-        return this.getUser();
-    }
-}