@lenne.tech/nest-server 8.6.20 → 8.6.21

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lenne.tech/nest-server",
-  "version": "8.6.20",
+  "version": "8.6.21",
   "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/model.helper.ts

@@ -186,13 +186,12 @@ export function mapClasses<T = Record<string, any>>(
         for (const item of value) {
           if (value instanceof targetClass) {
             arr.push(value);
-          }
-          if (value instanceof Types.ObjectId) {
+          } else if (value instanceof Types.ObjectId) {
             arr.push(value);
           } else if (typeof value === 'object') {
             if (targetClass.map) {
               arr.push(targetClass.map(item));
-            } else if (typeof value === 'object') {
+            } else {
               arr.push(plainToInstance(targetClass, item));
             }
           } else {
@@ -211,11 +210,12 @@ export function mapClasses<T = Record<string, any>>(
       else if (typeof value === 'object') {
         if (value instanceof targetClass) {
           target[prop] = value as any;
-        }
-        if (targetClass.map) {
-          target[prop] = targetClass.map(value);
         } else {
-          target[prop] = plainToInstance(targetClass, value) as any;
+          if (targetClass.map) {
+            target[prop] = targetClass.map(value);
+          } else {
+            target[prop] = plainToInstance(targetClass, value) as any;
+          }
         }
       }
 
@@ -262,13 +262,12 @@ export async function mapClassesAsync<T = Record<string, any>>(
         for (const item of value) {
           if (value instanceof targetClass) {
             arr.push(value);
-          }
-          if (value instanceof Types.ObjectId) {
+          } else if (value instanceof Types.ObjectId) {
             arr.push(value);
           } else if (typeof value === 'object') {
             if (targetClass.map) {
               arr.push(await targetClass.map(item));
-            } else if (typeof value === 'object') {
+            } else {
               arr.push(plainToInstance(targetClass, item));
             }
           } else {
@@ -287,11 +286,12 @@ export async function mapClassesAsync<T = Record<string, any>>(
       else if (typeof value === 'object') {
         if (value instanceof targetClass) {
           target[prop] = value as any;
-        }
-        if (targetClass.map) {
-          target[prop] = await targetClass.map(value);
         } else {
-          target[prop] = plainToInstance(targetClass, value) as any;
+          if (targetClass.map) {
+            target[prop] = await targetClass.map(value);
+          } else {
+            target[prop] = plainToInstance(targetClass, value) as any;
+          }
         }
       }
 

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

@@ -107,6 +107,11 @@ export abstract class ModuleService<T extends CoreModel = any> {
       config.input = await this.prepareInput(config.input, opts);
     }
 
+    // Check rights
+    if (config.checkRights && this.checkRights) {
+      await this.checkRights(undefined, config.currentUser as any, config);
+    }
+
     // Get DB object
     if (config.dbObject && config.checkRights && this.checkRights) {
       if (typeof config.dbObject === 'string' || config.dbObject instanceof Types.ObjectId) {
@@ -144,7 +149,7 @@ export abstract class ModuleService<T extends CoreModel = any> {
     }
 
     // Check output rights
-    if (config.checkRights && this.checkRights) {
+    if (config.checkRights && (await this.checkRights(undefined, config.currentUser as any, config))) {
       const opts: any = {
         dbObject: config.dbObject,
         processType: ProcessType.OUTPUT,