@lenne.tech/nest-server 8.6.5 → 8.6.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lenne.tech/nest-server",
-  "version": "8.6.5",
+  "version": "8.6.6",
   "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",
@@ -57,12 +57,12 @@
   },
   "dependencies": {
     "@apollo/gateway": "0.50.2",
-    "@nestjs/apollo": "10.0.11",
+    "@nestjs/apollo": "10.0.12",
     "@nestjs/common": "8.4.5",
     "@nestjs/core": "8.4.5",
-    "@nestjs/graphql": "10.0.11",
-    "@nestjs/jwt": "8.0.0",
-    "@nestjs/mongoose": "9.0.3",
+    "@nestjs/graphql": "10.0.12",
+    "@nestjs/jwt": "8.0.1",
+    "@nestjs/mongoose": "9.1.0",
     "@nestjs/passport": "8.2.1",
     "@nestjs/platform-express": "8.4.5",
     "apollo-server-core": "3.7.0",
@@ -75,15 +75,15 @@
     "graphql-subscriptions": "2.0.0",
     "graphql-upload": "13.0.0",
     "json-to-graphql-query": "2.2.4",
-    "light-my-request": "4.10.1",
+    "light-my-request": "5.0.0",
     "lodash": "4.17.21",
     "mongodb": "4.6.0",
-    "mongoose": "6.3.3",
+    "mongoose": "6.3.4",
     "multer": "1.4.4",
     "node-mailjet": "3.4.1",
     "nodemailer": "6.7.5",
     "nodemon": "2.0.16",
-    "passport": "0.5.2",
+    "passport": "0.5.3",
     "passport-jwt": "4.0.0",
     "reflect-metadata": "0.1.13",
     "rimraf": "3.0.2",
@@ -95,15 +95,15 @@
     "@types/jest": "27.5.1",
     "@types/lodash": "4.14.182",
     "@types/multer": "1.4.7",
-    "@types/node": "16.11.35",
-    "@types/node-mailjet": "3.3.8",
+    "@types/node": "16.11.36",
+    "@types/node-mailjet": "3.3.9",
     "@types/nodemailer": "6.4.4",
     "@types/passport": "1.0.7",
     "@types/supertest": "2.0.12",
-    "@typescript-eslint/eslint-plugin": "5.23.0",
-    "@typescript-eslint/parser": "5.23.0",
+    "@typescript-eslint/eslint-plugin": "5.25.0",
+    "@typescript-eslint/parser": "5.25.0",
     "coffeescript": "2.7.0",
-    "eslint": "8.15.0",
+    "eslint": "8.16.0",
     "eslint-config-prettier": "8.5.0",
     "find-file-up": "2.0.1",
     "grunt": "1.5.3",
@@ -119,7 +119,7 @@
     "supertest": "6.2.3",
     "ts-jest": "28.0.2",
     "ts-morph": "14.0.0",
-    "ts-node": "10.7.0",
+    "ts-node": "10.8.0",
     "tsconfig-paths": "4.0.0",
     "typescript": "4.6.4"
   },

package/src/core/common/decorators/restricted.decorator.ts

@@ -118,9 +118,8 @@ export const checkRestricted = (
 
       // Check roles
       if (roles.length) {
-        // Check roles
         if (
-          user?.hasRole(roles) ||
+          user?.hasRole?.(roles) ||
           (user?.id && roles.includes(RoleEnum.S_USER)) ||
           (roles.includes(RoleEnum.S_CREATOR) && getIncludedIds(config.dbObject?.createdBy, user))
         ) {

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

@@ -75,23 +75,21 @@ export function multerOptionsForImageUpload(options: {
   fileSize?: number;
   fileTypeRegex?: RegExp;
 }): MulterOptions {
-  // Default options
-  options = Object.assign(
-    {
-      fileSize: 1024 * 1024, // 1MB
-      fileTypeRegex: /jpeg|jpg|png/, // Images only
-    },
-    options
-  );
+  // Set config
+  const config = {
+    fileSize: 1024 * 1024, // 1MB
+    fileTypeRegex: /jpeg|jpg|png/, // Images only
+    ...options,
+  };
 
   return {
     // File filter
-    fileFilter: options.fileTypeRegex ? multerFileFilter(options.fileTypeRegex) : undefined,
+    fileFilter: config.fileTypeRegex ? multerFileFilter(config.fileTypeRegex) : undefined,
 
     // Limits
     limits: {
       // Limit of file size
-      fileSize: options.fileSize ? options.fileSize : undefined,
+      fileSize: config.fileSize ? config.fileSize : undefined,
     },
 
     // Automatic storage handling
@@ -100,7 +98,7 @@ export function multerOptionsForImageUpload(options: {
       // Destination for uploaded file
       // If destination is not set file will be buffered and can be processed
       // in the method
-      destination: options.destination ? options.destination : undefined,
+      destination: config.destination ? config.destination : undefined,
 
       // Generated random file name
       filename: multerRandomFileName(),

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

@@ -4,6 +4,8 @@ import { ComparisonOperatorEnum } from '../enums/comparison-operator.enum';
 import { LogicalOperatorEnum } from '../enums/logical-operator.enum';
 import { FilterInput } from '../inputs/filter.input';
 import { SortInput } from '../inputs/sort.input';
+import { getObjectIds } from './db.helper';
+import { assignPlain } from './input.helper';
 
 /**
  * Helper for filter handling
@@ -33,9 +35,72 @@ export class Filter {
   }
 }
 
+/**
+ * Helper function to create $and, $or or $nor filter
+ */
+export function findFilter(options?: {
+  conditions?: Record<string, any>[];
+  filterOptions?: FilterQuery<any>;
+  id?: any;
+  ids?: any[];
+  type?: '$and' | '$or' | '$nor';
+}): FilterQuery<any> {
+  const config = {
+    type: '$and',
+    ...options,
+  };
+
+  // Init filter Option
+  let filterOptions: FilterQuery<any> = config?.filterOptions;
+
+  // Check where condition
+  if (!filterOptions) {
+    filterOptions = {};
+    filterOptions[config.type] = [];
+  }
+
+  // Convert where condition to array
+  if (!Array.isArray(filterOptions?.[config.type])) {
+    filterOptions = {};
+    filterOptions[config.type] = [config?.filterOptions];
+  }
+
+  // ObjectId
+  if (config?.id) {
+    filterOptions[config.type].push({ _id: getObjectIds(config.id) });
+  }
+
+  // ObjectIds
+  if (config?.ids) {
+    if (!Array.isArray(config.ids)) {
+      config.ids = [config.ids];
+    }
+    filterOptions[config.type].push({ _id: { $in: getObjectIds(config.ids) } });
+  }
+
+  // Integrate conditions
+  if (config?.conditions) {
+    filterOptions[config.type] = [...filterOptions[config.type], ...config.conditions];
+  }
+
+  // Filter falsy values
+  filterOptions[config.type] = filterOptions[config.type].filter((value) => value);
+
+  // Optimizations
+  if (!filterOptions[config.type].length) {
+    filterOptions = {};
+  } else if (filterOptions[config.type].length === 1) {
+    const additionalProperties = filterOptions[config.type][0];
+    delete filterOptions[config.type];
+    assignPlain(filterOptions, additionalProperties);
+  }
+
+  // Return filter config
+  return filterOptions;
+}
+
 /**
  * Convert filter arguments to a query array
- * @param filterArgs
  */
 export function convertFilterArgsToQuery<T = any>(filterArgs: Partial<FilterArgs>): [FilterQuery<T>, QueryOptions] {
   return [generateFilterQuery(filterArgs?.filter), generateFindOptions(filterArgs)];

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

@@ -1,6 +1,7 @@
 import { BadRequestException, UnauthorizedException } from '@nestjs/common';
 import { plainToInstance } from 'class-transformer';
 import { validate } from 'class-validator';
+import { ValidatorOptions } from 'class-validator/types/validation/ValidatorOptions';
 import * as _ from 'lodash';
 import { checkRestricted } from '../decorators/restricted.decorator';
 import { ProcessType } from '../enums/process-type.enum';
@@ -182,6 +183,24 @@ export default class InputHelper {
   }
 }
 
+/**
+ * Assign plain objects to the target object and ignores undefined
+ */
+export function assignPlain(target: Record<any, any>, ...args: Record<any, any>[]): any {
+  return Object.assign(
+    target,
+    ...args.map(
+      // Prepare records
+      (item) =>
+        !item
+          ? // Return item if not an object
+            item
+          : // Return cloned record with undefined properties removed
+            filterProperties(JSON.parse(JSON.stringify(item)), (prop) => prop !== undefined)
+    )
+  );
+}
+
 /**
  * Check input
  */
@@ -194,11 +213,16 @@ export async function check(
     processType?: ProcessType;
     roles?: string | string[];
     throwError?: boolean;
+    validatorOptions?: ValidatorOptions;
   }
 ): Promise<any> {
   const config = {
     throwError: true,
     ...options,
+    validatorOptions: {
+      skipUndefinedProperties: true,
+      ...options?.validatorOptions,
+    },
   };
 
   // Check roles
@@ -212,7 +236,7 @@ export async function check(
       // check if user is logged in
       (roles.includes(RoleEnum.S_USER) && user?.id) ||
       // check if the user has at least one of the required roles
-      user.hasRole(roles) ||
+      user?.hasRole?.(roles) ||
       // check if the user is the creator
       (roles.includes(RoleEnum.S_CREATOR) && equalIds(config.dbObject?.createdBy, user))
     ) {
@@ -254,7 +278,7 @@ export async function check(
   }
 
   // Validate
-  const errors = await validate(value);
+  const errors = await validate(value, config.validatorOptions);
   if (errors.length > 0 && config.throwError) {
     throw new BadRequestException('Validation failed');
   }
@@ -264,6 +288,13 @@ export async function check(
   return value;
 }
 
+/**
+ * Combines objects to a new single plain object and ignores undefined
+ */
+export function combinePlain(...args: Record<any, any>[]): any {
+  return assignPlain({}, ...args);
+}
+
 /**
  * Standard error function
  */
@@ -273,6 +304,18 @@ export function errorFunction(caller: (...params) => any, message = 'Required pa
   throw err;
 }
 
+/**
+ * Filter function for objects
+ */
+export function filterProperties<T = Record<string, any>>(
+  obj: T,
+  filterFunction: (value?: any, key?: string, obj?: T) => boolean
+): Partial<T> {
+  return Object.keys(obj)
+    .filter((key) => filterFunction(obj[key], key, obj))
+    .reduce((res, key) => Object.assign(res, { [key]: obj[key] }), {});
+}
+
 /**
  * Check if parameter is an array
  */
@@ -433,6 +476,22 @@ export function returnFalse(): boolean {
   return false;
 }
 
+/**
+ * Match function to use instead of switch case
+ * Inspired by https://yusfuu.medium.com/dont-use-switch-or-if-else-in-javascript-instead-try-this-82f32616c269
+ *
+ * Example:
+ * const matched = match(expr, {
+ *   Oranges: 'Oranges are $0.59 a pound.',
+ *   Mangoes: 'Mangoes and papayas are $2.79 a pound.',
+ *   Papayas: 'Mangoes and papayas are $2.79 a pound.',
+ *   default: `Sorry, we are out of ${expr}.`,
+ * });
+ */
+export function match(expression: any, cases: Record<any, any>): any {
+  return cases[expression] || cases?.default;
+}
+
 /**
  * Map values into specific type
  */

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

@@ -68,7 +68,7 @@ export async function prepareInput<T = any>(
     clone: false,
     create: false,
     getNewArray: false,
-    removeUndefined: false,
+    removeUndefined: true,
     ...options,
   };
 
@@ -107,11 +107,7 @@ export async function prepareInput<T = any>(
   }
 
   // Process roles
-  if (
-    config.checkRoles &&
-    (input as Record<string, any>).roles &&
-    (!currentUser?.hasRole || !currentUser.hasRole(RoleEnum.ADMIN))
-  ) {
+  if (config.checkRoles && (input as Record<string, any>).roles && !currentUser?.hasRole?.(RoleEnum.ADMIN)) {
     if (!(currentUser as any)?.roles) {
       throw new UnauthorizedException('Missing roles of current user');
     } else {

package/src/core/common/models/core-model.model.ts

@@ -92,7 +92,10 @@ export abstract class CoreModel {
       mapId: false,
       ...options,
     };
-    return config.init ? map(data, this, config).init(config.init) : map(data, this, config);
+    if (config.init) {
+      this.init(config.init);
+    }
+    return map(data, this, config);
   }
 
   /**

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

@@ -2,6 +2,7 @@ import { NotFoundException } from '@nestjs/common';
 import { FilterArgs } from '../args/filter.args';
 import { merge } from '../helpers/config.helper';
 import { convertFilterArgsToQuery } from '../helpers/filter.helper';
+import { assignPlain } from '../helpers/input.helper';
 import { ServiceOptions } from '../interfaces/service-options.interface';
 import { CoreModel } from '../models/core-model.model';
 import { ModuleService } from './module.service';
@@ -14,7 +15,8 @@ export abstract class CrudService<T extends CoreModel = any> extends ModuleServi
     merge({ prepareInput: { create: true } }, serviceOptions);
     return this.process(
       async (data) => {
-        return new this.mainDbModel({ ...data.input }).save();
+        const currentUserId = serviceOptions?.currentUser?.id;
+        return new this.mainDbModel({ ...data.input, createdBy: currentUserId, updatedBy: currentUserId }).save();
       },
       { input, serviceOptions }
     );
@@ -75,7 +77,8 @@ export abstract class CrudService<T extends CoreModel = any> extends ModuleServi
     }
     return this.process(
       async (data) => {
-        return await Object.assign(dbObject, data.input).save();
+        const currentUserId = serviceOptions?.currentUser?.id;
+        return await assignPlain(dbObject, data.input, { updatedBy: currentUserId }).save();
       },
       { dbObject, input, serviceOptions }
     );
@@ -90,11 +93,11 @@ export abstract class CrudService<T extends CoreModel = any> extends ModuleServi
       throw new NotFoundException(`No ${this.mainModelConstructor.name} found with ID: ${id}`);
     }
     return this.process(
-      async (data) => {
+      async () => {
         await this.mainDbModel.findByIdAndDelete(id).exec();
         return dbObject;
       },
-      { dbObject, input: id, serviceOptions }
+      { dbObject, serviceOptions }
     );
   }
 }

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

@@ -150,7 +150,6 @@ export abstract class ModuleService<T extends CoreModel = any> {
    */
   async prepareInput(input: Record<string, any>, options: ServiceOptions = {}) {
     const config = {
-      targetModel: this.mainModelConstructor,
       ...options?.prepareInput,
     };
     return prepareInput(input, options.currentUser, config);

package/src/core/modules/auth/guards/roles.guard.ts

@@ -38,7 +38,7 @@ export class RolesGuard extends AuthGuard('jwt') {
     }
 
     // Check user and user roles
-    if (!user || !user.hasRole(roles)) {
+    if (!user?.hasRole?.(roles)) {
       // Get args
       const args: any = GqlExecutionContext.create(context).getArgs();
 

package/src/core/modules/user/core-user.service.ts

@@ -3,6 +3,7 @@ import * as bcrypt from 'bcrypt';
 import * as crypto from 'crypto';
 import { Document, Model } from 'mongoose';
 import { merge } from '../../common/helpers/config.helper';
+import { assignPlain } from '../../common/helpers/input.helper';
 import { ServiceOptions } from '../../common/interfaces/service-options.interface';
 import { CrudService } from '../../common/services/crud.service';
 import { EmailService } from '../../common/services/email.service';
@@ -39,9 +40,12 @@ export abstract class CoreUserService<
     return this.process(
       async (data) => {
         // Create user with verification token
+        const currentUserId = serviceOptions?.currentUser?._id;
         const createdUser = new this.mainDbModel({
           ...data.input,
           verificationToken: crypto.randomBytes(32).toString('hex'),
+          createdBy: currentUserId,
+          updatedBy: currentUserId,
         });
 
         // Distinguish between different error messages when saving
@@ -105,21 +109,15 @@ export abstract class CoreUserService<
     }
     return this.process(
       async () => {
-        // Update user
-        await Object.assign(dbObject, {
-          verified: true,
-          verificationToken: null,
-        }).save();
-
-        // Return prepared user
-        return dbObject;
+        // Update and return user
+        return await assignPlain(dbObject, { verified: true, verificationToken: null }).save();
       },
       { dbObject, serviceOptions }
     );
   }
 
   /**
-   * Set newpassword for user with token
+   * Set new password for user with token
    */
   async resetPassword(token: string, newPassword: string, serviceOptions?: ServiceOptions): Promise<TUser> {
     // Get user
@@ -130,14 +128,11 @@ export abstract class CoreUserService<
 
     return this.process(
       async () => {
-        // Update user
-        await Object.assign(dbObject, {
+        // Update and return user
+        return await assignPlain(dbObject, {
           password: await bcrypt.hash(newPassword, 10),
           passwordResetToken: null,
         }).save();
-
-        // Return user
-        return dbObject;
       },
       { dbObject, serviceOptions }
     );
@@ -154,13 +149,9 @@ export abstract class CoreUserService<
     }
     return this.process(
       async () => {
-        // Set reset token
-        const resetToken = crypto.randomBytes(32).toString('hex');
-        dbObject.passwordResetToken = resetToken;
-        await dbObject.save();
-
-        // Return user
-        return dbObject;
+        // Set reset token and return
+        dbObject.passwordResetToken = crypto.randomBytes(32).toString('hex');
+        return await dbObject.save();
       },
       { dbObject, serviceOptions }
     );
@@ -182,7 +173,7 @@ export abstract class CoreUserService<
 
     // Update and return user
     return this.process(
-      async (data) => {
+      async () => {
         return await this.mainDbModel.findByIdAndUpdate(userId, { roles }).exec();
       },
       { serviceOptions }

package/src/server/modules/user/user.resolver.ts

@@ -145,7 +145,7 @@ export class UserResolver {
    */
   @Subscription(() => User, {
     filter(this: UserResolver, payload, variables, context) {
-      return context.user.hasRole(RoleEnum.ADMIN);
+      return context?.user?.hasRole?.(RoleEnum.ADMIN);
     },
     resolve: (user) => user,
   })

package/src/test/test.helper.ts

@@ -1,6 +1,5 @@
 import { INestApplication } from '@nestjs/common';
 import { createClient } from 'graphql-ws';
-// import { FastifyInstance } from 'fastify';
 import { jsonToGraphQLQuery } from 'json-to-graphql-query';
 import * as LightMyRequest from 'light-my-request';
 import * as supertest from 'supertest';
@@ -125,25 +124,21 @@ export class TestHelper {
 
   /**
    * GraphQL request
-   * @param graphql
-   * @param options
    */
   async graphQl(graphql: string | TestGraphQLConfig, options: TestGraphQLOptions = {}): Promise<any> {
     // Default options
-    options = Object.assign(
-      {
-        convertEnums: true,
-        countOfSubscriptionMessages: 1,
-        token: null,
-        statusCode: 200,
-        log: false,
-        logError: false,
-      },
-      options
-    );
+    const config = {
+      convertEnums: true,
+      countOfSubscriptionMessages: 1,
+      token: null,
+      statusCode: 200,
+      log: false,
+      logError: false,
+      ...options,
+    };
 
     // Init vars
-    const { token, statusCode, log, logError } = options;
+    const { token, statusCode, log, logError } = config;
 
     // Init
     let query = '';
@@ -188,13 +183,13 @@ export class TestHelper {
     }
 
     if ((graphql as TestGraphQLConfig).type === TestGraphQLType.SUBSCRIPTION) {
-      return this.getSubscription(graphql as TestGraphQLConfig, query, options);
+      return this.getSubscription(graphql as TestGraphQLConfig, query, config);
     }
 
     // Convert uppercase strings in arguments of query to enums
-    if (options.convertEnums) {
-      if (Array.isArray(options.convertEnums)) {
-        for (const key of Object.values(options.convertEnums)) {
+    if (config.convertEnums) {
+      if (Array.isArray(config.convertEnums)) {
+        for (const key of Object.values(config.convertEnums)) {
           const regExpStr = '(' + key + ': )\\"([_A-Z][_0-9A-Z]*)\\"';
           const regExp = new RegExp(regExpStr, 'g');
           query = query.replace(regExp, '$1$2');
@@ -242,28 +237,26 @@ export class TestHelper {
    */
   async rest(url: string, options: TestRestOptions = {}): Promise<any> {
     // Default options
-    options = Object.assign(
-      {
-        token: null,
-        statusCode: 200,
-        log: false,
-        logError: false,
-        payload: null,
-        method: 'GET',
-      },
-      options
-    );
+    const config: TestRestOptions = {
+      token: null,
+      statusCode: 200,
+      log: false,
+      logError: false,
+      payload: null,
+      method: 'GET',
+      ...options,
+    };
 
     // Init vars
-    const { token, statusCode, log, logError } = options;
+    const { token, statusCode, log, logError } = config;
 
     // Request configuration
     const requestConfig: LightMyRequest.InjectOptions = {
-      method: options.method,
+      method: config.method,
       url,
     };
-    if (options.payload) {
-      requestConfig.payload = options.payload;
+    if (config.payload) {
+      requestConfig.payload = config.payload;
     }
 
     // Process response