@lenne.tech/nest-server 8.6.5 → 8.6.8

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/core.module.ts

@@ -4,7 +4,7 @@ import { APP_PIPE } from '@nestjs/core';
 import { GraphQLModule } from '@nestjs/graphql';
 import { MongooseModule } from '@nestjs/mongoose';
 import { Context } from 'apollo-server-core';
-import { graphqlUploadExpress } from 'graphql-upload';
+import * as graphqlUploadExpress from 'graphql-upload/graphqlUploadExpress.js';
 import { merge } from './core/common/helpers/config.helper';
 import { IServerOptions } from './core/common/interfaces/server-options.interface';
 import { MapAndValidatePipe } from './core/common/pipes/map-and-validate.pipe';

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

@@ -1,6 +1,7 @@
 import { Args, Mutation, Resolver } from '@nestjs/graphql';
 import { createWriteStream } from 'fs';
-import { FileUpload, GraphQLUpload } from 'graphql-upload';
+import * as GraphQLUpload from 'graphql-upload/GraphQLUpload.js';
+import type { FileUpload } from 'graphql-upload/processRequest.js';
 
 /**
  * File resolver

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