@lenne.tech/nest-server 9.0.28 → 9.0.30

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lenne.tech/nest-server",
-  "version": "9.0.28",
+  "version": "9.0.30",
   "description": "Modern, fast, powerful Node.js web framework in TypeScript based on Nest with a GraphQL API and a connection to MongoDB (or other databases).",
   "keywords": [
     "node",

package/src/core/common/helpers/service.helper.ts

@@ -171,16 +171,6 @@ export async function prepareInput<T = any>(
     (input as any).password = await bcrypt.hash((input as any).password, 10);
   }
 
-  // Set creator
-  if (config.create && currentUser) {
-    (input as Record<string, any>).createdBy = currentUser.id;
-  }
-
-  // Set updater
-  if (currentUser) {
-    (input as Record<string, any>).updatedBy = currentUser.id;
-  }
-
   // Return prepared input
   return input;
 }

package/src/core/common/interfaces/service-options.interface.ts

@@ -20,6 +20,11 @@ export interface ServiceOptions {
   // See https://www.mongodb.com/docs/manual/reference/collation/
   collation?: CollationOptions;
 
+  // Create mode activated (see e.g. setCreateOrUpdateUserId)
+  // If falsy (default): create mode is deactivated
+  // If truly: create mode is activated
+  create?: boolean;
+
   // Current user to set ownership, check rights and other things
   currentUser?: {
     [key: string]: any;
@@ -63,6 +68,11 @@ export interface ServiceOptions {
   // Whether to publish action via GraphQL subscription
   pubSub?: boolean;
 
+  // Add updateBy and/or createBy user ID into input after check
+  // If falsy: input data will not be changed
+  // If truly (default): updatedBy and/or createdBy (when create mode is activated) will be set if current user is available
+  setCreateOrUpdateUserId?: boolean;
+
   // Roles (as string) to check
   roles?: string | string[];
 }

package/src/core/common/services/crud.service.ts

@@ -39,10 +39,9 @@ export abstract class CrudService<T extends CoreModel = any> extends ModuleServi
    * Warning: Disables the handling of rights and restrictions! The raw data may contain secrets (such as passwords).
    */
   async createRaw(input: any, serviceOptions: ServiceOptions = {}): Promise<T> {
-    if (serviceOptions) {
-      serviceOptions.prepareInput = null;
-      serviceOptions.prepareOutput = null;
-    }
+    serviceOptions = serviceOptions || {};
+    serviceOptions.prepareInput = null;
+    serviceOptions.prepareOutput = null;
     return this.createForce(input, serviceOptions);
   }
 
@@ -72,10 +71,9 @@ export abstract class CrudService<T extends CoreModel = any> extends ModuleServi
    * Warning: Disables the handling of rights and restrictions! The raw data may contain secrets (such as passwords).
    */
   async getRaw(id: string, serviceOptions: ServiceOptions = {}): Promise<T> {
-    if (serviceOptions) {
-      serviceOptions.prepareInput = null;
-      serviceOptions.prepareOutput = null;
-    }
+    serviceOptions = serviceOptions || {};
+    serviceOptions.prepareInput = null;
+    serviceOptions.prepareOutput = null;
     return this.getForce(id, serviceOptions);
   }
 
@@ -140,10 +138,9 @@ export abstract class CrudService<T extends CoreModel = any> extends ModuleServi
     filter?: FilterArgs | { filterQuery?: FilterQuery<any>; queryOptions?: QueryOptions; samples?: number },
     serviceOptions: ServiceOptions = {}
   ): Promise<T[]> {
-    if (serviceOptions) {
-      serviceOptions.prepareInput = null;
-      serviceOptions.prepareOutput = null;
-    }
+    serviceOptions = serviceOptions || {};
+    serviceOptions.prepareInput = null;
+    serviceOptions.prepareOutput = null;
     return this.findForce(filter, serviceOptions);
   }
 
@@ -246,10 +243,9 @@ export abstract class CrudService<T extends CoreModel = any> extends ModuleServi
     filter?: FilterArgs | { filterQuery?: FilterQuery<any>; queryOptions?: QueryOptions; samples?: number },
     serviceOptions: ServiceOptions = {}
   ): Promise<{ items: T[]; totalCount: number }> {
-    if (serviceOptions) {
-      serviceOptions.prepareInput = null;
-      serviceOptions.prepareOutput = null;
-    }
+    serviceOptions = serviceOptions || {};
+    serviceOptions.prepareInput = null;
+    serviceOptions.prepareOutput = null;
     return this.findAndCountForce(filter, serviceOptions);
   }
 
@@ -302,10 +298,9 @@ export abstract class CrudService<T extends CoreModel = any> extends ModuleServi
     filter?: FilterArgs | { filterQuery?: FilterQuery<any>; queryOptions?: QueryOptions; samples?: number },
     serviceOptions: ServiceOptions = {}
   ): Promise<T[]> {
-    if (serviceOptions) {
-      serviceOptions.prepareInput = null;
-      serviceOptions.prepareOutput = null;
-    }
+    serviceOptions = serviceOptions || {};
+    serviceOptions.prepareInput = null;
+    serviceOptions.prepareOutput = null;
     return this.findAndUpdateForce(filter, serviceOptions);
   }
 
@@ -428,10 +423,9 @@ export abstract class CrudService<T extends CoreModel = any> extends ModuleServi
    * Warning: Disables the handling of rights and restrictions! The raw data may contain secrets (such as passwords).
    */
   async updateRaw(id: string, input: any, serviceOptions?: ServiceOptions): Promise<T> {
-    if (serviceOptions) {
-      serviceOptions.prepareInput = null;
-      serviceOptions.prepareOutput = null;
-    }
+    serviceOptions = serviceOptions || {};
+    serviceOptions.prepareInput = null;
+    serviceOptions.prepareOutput = null;
     return this.updateForce(id, input, serviceOptions);
   }
 
@@ -467,10 +461,9 @@ export abstract class CrudService<T extends CoreModel = any> extends ModuleServi
    * Warning: Disables the handling of rights and restrictions! The raw data may contain secrets (such as passwords).
    */
   async deleteRaw(id: string, serviceOptions?: ServiceOptions): Promise<T> {
-    if (serviceOptions) {
-      serviceOptions.prepareInput = null;
-      serviceOptions.prepareOutput = null;
-    }
+    serviceOptions = serviceOptions || {};
+    serviceOptions.prepareInput = null;
+    serviceOptions.prepareOutput = null;
     return this.deleteForce(id, serviceOptions);
   }
 }

package/src/core/common/services/module.service.ts

@@ -86,6 +86,7 @@ export abstract class ModuleService<T extends CoreModel = any> {
       prepareInput: {},
       prepareOutput: {},
       pubSub: true,
+      setCreateOrUpdateUserId: true,
       ...options?.serviceOptions,
     };
 
@@ -138,6 +139,16 @@ export abstract class ModuleService<T extends CoreModel = any> {
       await this.checkRights(undefined, config.currentUser as any, config);
     }
 
+    if (config.input && config.currentUser && config.setCreateOrUpdateUserId) {
+      // Set creator
+      if (config.create) {
+        (config.input as Record<string, any>).createdBy = config.currentUser.id;
+      }
+
+      // Set updater
+      (config.input as Record<string, any>).updatedBy = config.currentUser.id;
+    }
+
     // Run service function
     let result = await serviceFunc(config);