@lenne.tech/nest-server 8.6.20 → 8.6.23

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lenne.tech/nest-server",
-  "version": "8.6.20",
+  "version": "8.6.23",
   "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",
@@ -76,17 +76,17 @@
     "ejs": "3.1.8",
     "graphql": "16.5.0",
     "graphql-subscriptions": "2.0.0",
-    "graphql-upload": "15.0.1",
+    "graphql-upload": "15.0.2",
     "json-to-graphql-query": "2.2.4",
     "light-my-request": "5.0.0",
     "lodash": "4.17.21",
     "mongodb": "4.7.0",
-    "mongoose": "6.3.9",
+    "mongoose": "6.4.1",
     "mongoose-gridfs": "1.3.0",
-    "multer": "1.4.4",
-    "node-mailjet": "3.4.1",
-    "nodemailer": "6.7.5",
-    "nodemon": "2.0.16",
+    "multer": "1.4.5-lts.1",
+    "node-mailjet": "5.0.1",
+    "nodemailer": "6.7.6",
+    "nodemon": "2.0.18",
     "passport": "0.6.0",
     "passport-jwt": "4.0.0",
     "reflect-metadata": "0.1.13",
@@ -97,16 +97,15 @@
     "@nestjs/testing": "8.4.7",
     "@types/cron": "2.0.0",
     "@types/ejs": "3.1.1",
-    "@types/jest": "28.1.3",
+    "@types/jest": "28.1.4",
     "@types/lodash": "4.14.182",
     "@types/multer": "1.4.7",
     "@types/node": "18.0.0",
-    "@types/node-mailjet": "3.3.9",
     "@types/nodemailer": "6.4.4",
     "@types/passport": "1.0.9",
     "@types/supertest": "2.0.12",
-    "@typescript-eslint/eslint-plugin": "5.29.0",
-    "@typescript-eslint/parser": "5.29.0",
+    "@typescript-eslint/eslint-plugin": "5.30.0",
+    "@typescript-eslint/parser": "5.30.0",
     "coffeescript": "2.7.0",
     "eslint": "8.18.0",
     "eslint-config-prettier": "8.5.0",
@@ -117,7 +116,7 @@
     "grunt-contrib-watch": "1.1.0",
     "grunt-sync": "0.8.2",
     "husky": "8.0.1",
-    "jest": "28.1.1",
+    "jest": "28.1.2",
     "pm2": "5.2.0",
     "prettier": "2.7.1",
     "pretty-quick": "3.1.3",

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

@@ -597,7 +597,7 @@ function getStringId(element: any): string {
     return element;
   }
 
-  // Sring handling
+  // String handling
   if (typeof element === 'string') {
     return element;
   }

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/mailjet.service.ts

@@ -1,6 +1,6 @@
 import { Injectable } from '@nestjs/common';
 import { ConfigService } from './config.service';
-import mailjet from 'node-mailjet';
+import Mailjet from 'node-mailjet';
 
 /**
  * Mailjet service
@@ -22,11 +22,16 @@ export class MailjetService {
     config: {
       senderEmail?: string;
       senderName?: string;
-      attachments?: mailjet.Email.Attachment[];
+      attachments?: {
+        ContentID?: string;
+        ContentType: string;
+        Filename: string;
+        Base64Content: string;
+      }[];
       templateData?: { [key: string]: any };
       sandbox?: boolean;
     }
-  ): Promise<mailjet.Email.PostResponse> {
+  ) {
     // Process config
     const { senderName, senderEmail, templateData, attachments, sandbox } = {
       senderEmail: this.configService.get('email.defaultSender.email'),
@@ -49,7 +54,7 @@ export class MailjetService {
     }
 
     // Parse body for mailjet request
-    const body: mailjet.Email.SendParams = {
+    const body = {
       Messages: [
         {
           From: {
@@ -67,13 +72,13 @@ export class MailjetService {
       SandboxMode: sandbox,
     };
 
-    let connection: mailjet.Email.Client;
+    let connection;
     try {
       // Connect to mailjet
-      connection = await mailjet.connect(
-        this.configService.get('email.mailjet.api_key_public'),
-        this.configService.get('email.mailjet.api_key_private')
-      );
+      connection = new Mailjet({
+        apiKey: this.configService.get('email.mailjet.api_key_public'),
+        apiSecret: this.configService.get('email.mailjet.api_key_private'),
+      });
     } catch (e) {
       throw new Error('Cannot connect to mailjet.');
     }

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,