@lenne.tech/nest-server 10.2.7 → 10.2.8

package/src/core.module.ts

@@ -4,8 +4,8 @@ import { APP_PIPE } from '@nestjs/core';
 import { GraphQLModule } from '@nestjs/graphql';
 import { MongooseModule } from '@nestjs/mongoose';
 import { Context } from 'apollo-server-core';
-import graphqlUploadExpress = require('graphql-upload/graphqlUploadExpress.js');
 import mongoose from 'mongoose';
+
 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';
@@ -13,9 +13,11 @@ import { ComplexityPlugin } from './core/common/plugins/complexity.plugin';
 import { ConfigService } from './core/common/services/config.service';
 import { EmailService } from './core/common/services/email.service';
 import { MailjetService } from './core/common/services/mailjet.service';
+import { ModelDocService } from './core/common/services/model-doc.service';
 import { TemplateService } from './core/common/services/template.service';
 import { CoreHealthCheckModule } from './core/modules/health-check/core-health-check.module';
-import { ModelDocService } from './core/common/services/model-doc.service';
+
+import graphqlUploadExpress = require('graphql-upload/graphqlUploadExpress.js');
 
 /**
  * Core module (dynamic)
@@ -88,12 +90,16 @@ export class CoreModule implements NestModule {
                   cors,
                   installSubscriptionHandlers: true,
                   subscriptions: {
-                    'subscriptions-transport-ws': {
-                      onConnect: async (connectionParams) => {
+                    'graphql-ws': {
+                      context: ({ extra }) => extra,
+                      onConnect: async (context: Context<any>) => {
+                        const { connectionParams, extra } = context;
                         if (config.graphQl.enableSubscriptionAuth) {
                           // get authToken from authorization header
-                          const authToken: string = connectionParams?.Authorization?.split(' ')[1];
-
+                          const headers = this.getHeaderFromArray(extra.request?.rawHeaders);
+                          const authToken: string
+                            = connectionParams?.Authorization?.split(' ')[1]
+                            ?? headers.Authorization?.split(' ')[1];
                           if (authToken) {
                             // verify authToken/getJwtPayLoad
                             const payload = authService.decodeJwt(authToken);
@@ -102,22 +108,21 @@ export class CoreModule implements NestModule {
                               throw new UnauthorizedException('No user found for token');
                             }
                             // the user/jwtPayload object found will be available as context.currentUser/jwtPayload in your GraphQL resolvers
-                            return { user, headers: connectionParams };
+                            extra.user = user;
+                            extra.headers = connectionParams ?? headers;
+                            return extra;
                           }
 
                           throw new UnauthorizedException('Missing authentication token');
                         }
                       },
                     },
-                    'graphql-ws': {
-                      onConnect: async (context: Context<any>) => {
-                        const { connectionParams, extra } = context;
+                    'subscriptions-transport-ws': {
+                      onConnect: async (connectionParams) => {
                         if (config.graphQl.enableSubscriptionAuth) {
                           // get authToken from authorization header
-                          const headers = this.getHeaderFromArray(extra.request?.rawHeaders);
-                          const authToken: string
-                            = connectionParams?.Authorization?.split(' ')[1]
-                            ?? headers.Authorization?.split(' ')[1];
+                          const authToken: string = connectionParams?.Authorization?.split(' ')[1];
+
                           if (authToken) {
                             // verify authToken/getJwtPayLoad
                             const payload = authService.decodeJwt(authToken);
@@ -126,15 +131,12 @@ export class CoreModule implements NestModule {
                               throw new UnauthorizedException('No user found for token');
                             }
                             // the user/jwtPayload object found will be available as context.currentUser/jwtPayload in your GraphQL resolvers
-                            extra.user = user;
-                            extra.headers = connectionParams ?? headers;
-                            return extra;
+                            return { headers: connectionParams, user };
                           }
 
                           throw new UnauthorizedException('Missing authentication token');
                         }
                       },
-                      context: ({ extra }) => extra,
                     },
                   },
                 },
@@ -143,16 +145,16 @@ export class CoreModule implements NestModule {
           },
           enableSubscriptionAuth: true,
         },
-        port: 3000,
         mongoose: {
-          uri: 'mongodb://localhost/nest-server-default',
           options: {
             connectionFactory: (connection) => {
               connection.plugin(require('./core/common/plugins/mongoose-id.plugin'));
               return connection;
             },
           },
+          uri: 'mongodb://localhost/nest-server-default',
         },
+        port: 3000,
       } as IServerOptions,
       options,
     );
@@ -207,10 +209,10 @@ export class CoreModule implements NestModule {
 
     // Return dynamic module
     return {
-      module: CoreModule,
+      exports: [ConfigService, EmailService, TemplateService, MailjetService, ComplexityPlugin],
       imports,
+      module: CoreModule,
       providers,
-      exports: [ConfigService, EmailService, TemplateService, MailjetService, ComplexityPlugin],
     };
   }
 }

package/src/main.ts

@@ -1,12 +1,14 @@
-import { exec } from 'child_process';
 import { NestFactory } from '@nestjs/core';
 import { NestExpressApplication } from '@nestjs/platform-express';
-import compression = require('compression');
-import cookieParser = require('cookie-parser');
+import { exec } from 'child_process';
+
 import envConfig from './config.env';
 import { HttpExceptionLogFilter } from './core/common/filters/http-exception-log.filter';
 import { ServerModule } from './server/server.module';
 
+import compression = require('compression');
+import cookieParser = require('cookie-parser');
+
 /**
  * Preparations for server start
  */

package/src/server/common/models/persistence.model.ts

@@ -1,10 +1,12 @@
-import { Types } from 'mongoose';
-import mongoose = require('mongoose');
-import { Prop } from '@nestjs/mongoose';
 import { Field, ObjectType } from '@nestjs/graphql';
+import { Prop } from '@nestjs/mongoose';
+import { Types } from 'mongoose';
+
 import { CorePersistenceModel } from '../../../core/common/models/core-persistence.model';
 import { User } from '../../modules/user/user.model';
 
+import mongoose = require('mongoose');
+
 /**
  * Metadata for persistent objects
  *
@@ -28,7 +30,7 @@ export abstract class PersistenceModel extends CorePersistenceModel {
     description: 'ID of the user who created the object',
     nullable: true,
   })
-  @Prop({ type: mongoose.Schema.Types.ObjectId, ref: 'User' })
+  @Prop({ ref: 'User', type: mongoose.Schema.Types.ObjectId })
   createdBy?: Types.ObjectId | string = undefined;
 
   /**
@@ -40,7 +42,7 @@ export abstract class PersistenceModel extends CorePersistenceModel {
     description: 'ID of the user who updated the object',
     nullable: true,
   })
-  @Prop({ type: mongoose.Schema.Types.ObjectId, ref: 'User' })
+  @Prop({ ref: 'User', type: mongoose.Schema.Types.ObjectId })
   updatedBy?: Types.ObjectId | string = undefined;
 
   // ===================================================================================================================

package/src/server/common/services/cron-jobs.service.ts

@@ -1,5 +1,6 @@
 import { Injectable } from '@nestjs/common';
 import { SchedulerRegistry } from '@nestjs/schedule';
+
 import { ConfigService } from '../../../core/common/services/config.service';
 import { CoreCronJobs } from '../../../core/common/services/core-cron-jobs.service';
 

package/src/server/modules/auth/auth.controller.ts

@@ -1,4 +1,5 @@
 import { Controller } from '@nestjs/common';
+
 import { ConfigService } from '../../../core/common/services/config.service';
 import { CoreAuthController } from '../../../core/modules/auth/core-auth.controller';
 import { AuthService } from './auth.service';

package/src/server/modules/auth/auth.model.ts

@@ -1,4 +1,5 @@
 import { Field, ObjectType } from '@nestjs/graphql';
+
 import { mapClasses } from '../../../core/common/helpers/model.helper';
 import { CoreAuthModel } from '../../../core/modules/auth/core-auth.model';
 import { User } from '../user/user.model';

package/src/server/modules/auth/auth.module.ts

@@ -1,5 +1,6 @@
 import { DynamicModule, Module } from '@nestjs/common';
 import { JwtModuleOptions } from '@nestjs/jwt';
+
 import { EmailService } from '../../../core/common/services/email.service';
 import { CoreAuthModule } from '../../../core/modules/auth/core-auth.module';
 import { UserModule } from '../user/user.module';
@@ -19,7 +20,7 @@ export class AuthModule {
    */
   static forRoot(options: JwtModuleOptions): DynamicModule {
     return {
-      module: AuthModule,
+      exports: [AuthController, AuthResolver, CoreAuthModule],
       imports: [
         CoreAuthModule.forRoot(UserModule, UserService, {
           ...options,
@@ -29,8 +30,8 @@ export class AuthModule {
           },
         }),
       ],
+      module: AuthModule,
       providers: [AuthController, AuthResolver, AuthService, EmailService],
-      exports: [AuthController, AuthResolver, CoreAuthModule],
     };
   }
 }

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

@@ -1,5 +1,6 @@
 import { Args, Context, Mutation, Resolver } from '@nestjs/graphql';
 import { Response as ResponseType } from 'express';
+
 import { GraphQLServiceOptions } from '../../../core/common/decorators/graphql-service-options.decorator';
 import { ServiceOptions } from '../../../core/common/interfaces/service-options.interface';
 import { ConfigService } from '../../../core/common/services/config.service';

package/src/server/modules/auth/auth.service.ts

@@ -1,5 +1,6 @@
 import { Injectable } from '@nestjs/common';
 import { JwtService } from '@nestjs/jwt';
+
 import { ServiceOptions } from '../../../core/common/interfaces/service-options.interface';
 import { ConfigService } from '../../../core/common/services/config.service';
 import { EmailService } from '../../../core/common/services/email.service';
@@ -42,8 +43,8 @@ export class AuthService extends CoreAuthService {
     await this.emailService.sendMail(user.email, 'Welcome', {
       htmlTemplate: 'welcome',
       templateData: {
-        name: user.username,
         link: `${this.configService.configFastButReadOnly.email.verificationLink}/${user.verificationToken}`,
+        name: user.username,
       },
     });
 

package/src/server/modules/auth/inputs/auth-sign-in.input.ts

@@ -1,4 +1,5 @@
 import { InputType } from '@nestjs/graphql';
+
 import { CoreAuthSignInInput } from '../../../../core/modules/auth/inputs/core-auth-sign-in.input';
 
 /**

package/src/server/modules/auth/inputs/auth-sign-up.input.ts

@@ -1,4 +1,5 @@
 import { Field, InputType } from '@nestjs/graphql';
+
 import { CoreAuthSignUpInput } from '../../../../core/modules/auth/inputs/core-auth-sign-up.input';
 
 /**

package/src/server/modules/file/file-info.model.ts

@@ -1,5 +1,6 @@
 import { ObjectType } from '@nestjs/graphql';
 import { Schema as MongooseSchema, SchemaFactory } from '@nestjs/mongoose';
+
 import { CoreFileInfo } from '../../../core/modules/file/core-file-info.model';
 
 /**

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

@@ -11,6 +11,7 @@ import {
   UseInterceptors,
 } from '@nestjs/common';
 import { FileInterceptor } from '@nestjs/platform-express';
+
 import { Roles } from '../../../core/common/decorators/roles.decorator';
 import { RoleEnum } from '../../../core/common/enums/role.enum';
 import { FileService } from './file.service';

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

@@ -1,5 +1,6 @@
 import { Module, forwardRef } from '@nestjs/common';
 import { MulterModule } from '@nestjs/platform-express';
+
 import { UserModule } from '../user/user.module';
 import { FileController } from './file.controller';
 import { FileResolver } from './file.resolver';
@@ -10,14 +11,14 @@ import { GridFsMulterConfigService } from './multer-config.service';
  * File module
  */
 @Module({
+  controllers: [FileController],
+  exports: [FileService],
   imports: [
     MulterModule.registerAsync({
       useClass: GridFsMulterConfigService,
     } as any),
     forwardRef(() => UserModule),
   ],
-  controllers: [FileController],
   providers: [GridFsMulterConfigService, FileService, FileResolver],
-  exports: [FileService],
 })
 export class FileModule {}

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

@@ -1,12 +1,14 @@
-import fs = require('fs');
-import { createWriteStream } from 'fs';
 import { Args, Mutation, Query, Resolver } from '@nestjs/graphql';
-import GraphQLUpload = require('graphql-upload/GraphQLUpload.js');
+import { createWriteStream } from 'fs';
+
 import { Roles } from '../../../core/common/decorators/roles.decorator';
 import { RoleEnum } from '../../../core/common/enums/role.enum';
 import { FileUpload } from '../../../core/modules/file/interfaces/file-upload.interface';
-import { FileInfo } from './file-info.model';
 import { FileService } from './file.service';
+import { FileInfo } from './file-info.model';
+
+import fs = require('fs');
+import GraphQLUpload = require('graphql-upload/GraphQLUpload.js');
 
 /**
  * File resolver
@@ -64,7 +66,7 @@ export class FileResolver {
     const promises: Promise<any>[] = [];
     for (const file of files) {
       // eslint-disable-next-line unused-imports/no-unused-vars
-      const { filename, mimetype, encoding, createReadStream } = await file;
+      const { createReadStream, encoding, filename, mimetype } = await file;
       await fs.promises.mkdir('./uploads', { recursive: true });
       promises.push(
         new Promise((resolve, reject) =>

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

@@ -1,6 +1,7 @@
 import { Injectable } from '@nestjs/common';
 import { InjectConnection } from '@nestjs/mongoose';
 import { Connection } from 'mongoose';
+
 import { CoreFileService } from '../../../core/modules/file/core-file.service';
 
 /**

package/src/server/modules/file/multer-config.service.ts

@@ -1,6 +1,7 @@
+import { GridFsStorage } from '@lenne.tech/multer-gridfs-storage';
 import { Injectable } from '@nestjs/common';
 import { MulterModuleOptions, MulterOptionsFactory } from '@nestjs/platform-express';
-import { GridFsStorage } from '@lenne.tech/multer-gridfs-storage';
+
 import envConfig from '../../../config.env';
 
 @Injectable()
@@ -9,7 +10,6 @@ export class GridFsMulterConfigService implements MulterOptionsFactory {
 
   constructor() {
     this.gridFsStorage = new GridFsStorage({
-      url: envConfig.mongoose.uri,
       file: (req, file) => {
         return new Promise((resolve) => {
           const filename = file.originalname.trim();
@@ -19,6 +19,7 @@ export class GridFsMulterConfigService implements MulterOptionsFactory {
           resolve(fileInfo);
         });
       },
+      url: envConfig.mongoose.uri,
     });
   }
 

package/src/server/modules/user/avatar.controller.ts

@@ -1,6 +1,7 @@
 import { Post, UploadedFile, UseInterceptors } from '@nestjs/common';
 import { Controller } from '@nestjs/common/decorators/core/controller.decorator';
 import { FileInterceptor } from '@nestjs/platform-express';
+
 import envConfig from '../../../config.env';
 import { CurrentUser } from '../../../core/common/decorators/current-user.decorator';
 import { Roles } from '../../../core/common/decorators/roles.decorator';

package/src/server/modules/user/inputs/user-create.input.ts

@@ -1,4 +1,5 @@
 import { InputType } from '@nestjs/graphql';
+
 import { CoreUserCreateInput } from '../../../../core/modules/user/inputs/core-user-create.input';
 
 /**

package/src/server/modules/user/inputs/user.input.ts

@@ -1,4 +1,5 @@
 import { InputType } from '@nestjs/graphql';
+
 import { CoreUserInput } from '../../../../core/modules/user/inputs/core-user.input';
 
 /**

package/src/server/modules/user/outputs/find-and-count-users-result.output.ts

@@ -1,4 +1,5 @@
 import { Field, ObjectType } from '@nestjs/graphql';
+
 import { User } from '../user.model';
 
 @ObjectType({ description: 'Result of find and count' })

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

@@ -1,6 +1,7 @@
 import { Field, ObjectType } from '@nestjs/graphql';
 import { Schema as MongooseSchema, Prop, SchemaFactory } from '@nestjs/mongoose';
 import { Document, Schema } from 'mongoose';
+
 import { RoleEnum } from '../../../core/common/enums/role.enum';
 import { CoreUserModel } from '../../../core/modules/user/core-user.model';
 import { PersistenceModel } from '../../common/models/persistence.model';
@@ -33,7 +34,7 @@ export class User extends CoreUserModel implements PersistenceModel {
     description: 'ID of the user who created the object',
     nullable: true,
   })
-  @Prop({ type: Schema.Types.ObjectId, ref: 'User' })
+  @Prop({ ref: 'User', type: Schema.Types.ObjectId })
   createdBy: string = undefined;
 
   /**
@@ -45,7 +46,7 @@ export class User extends CoreUserModel implements PersistenceModel {
     description: 'ID of the user who last updated the object',
     nullable: true,
   })
-  @Prop({ type: Schema.Types.ObjectId, ref: 'User' })
+  @Prop({ ref: 'User', type: Schema.Types.ObjectId })
   updatedBy: string = undefined;
 
   // ===================================================================================================================

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

@@ -1,6 +1,7 @@
 import { Module } from '@nestjs/common';
 import { MongooseModule } from '@nestjs/mongoose';
 import { PubSub } from 'graphql-subscriptions';
+
 import { ConfigService } from '../../../core/common/services/config.service';
 import { AvatarController } from './avatar.controller';
 import { User, UserSchema } from './user.model';
@@ -11,8 +12,9 @@ import { UserService } from './user.service';
  * User module
  */
 @Module({
-  imports: [MongooseModule.forFeature([{ name: User.name, schema: UserSchema }])],
   controllers: [AvatarController],
+  exports: [MongooseModule, UserResolver, UserService, 'USER_CLASS'],
+  imports: [MongooseModule.forFeature([{ name: User.name, schema: UserSchema }])],
   providers: [
     UserResolver,
     ConfigService,
@@ -26,6 +28,5 @@ import { UserService } from './user.service';
       useValue: new PubSub(),
     },
   ],
-  exports: [MongooseModule, UserResolver, UserService, 'USER_CLASS'],
 })
 export class UserModule {}

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

@@ -1,13 +1,14 @@
 import { Inject } from '@nestjs/common';
 import { Args, Mutation, Query, Resolver, Subscription } from '@nestjs/graphql';
 import { PubSub } from 'graphql-subscriptions';
+
 import { FilterArgs } from '../../../core/common/args/filter.args';
 import { GraphQLServiceOptions } from '../../../core/common/decorators/graphql-service-options.decorator';
 import { Roles } from '../../../core/common/decorators/roles.decorator';
 import { RoleEnum } from '../../../core/common/enums/role.enum';
 import { ServiceOptions } from '../../../core/common/interfaces/service-options.interface';
-import { UserCreateInput } from './inputs/user-create.input';
 import { UserInput } from './inputs/user.input';
+import { UserCreateInput } from './inputs/user-create.input';
 import { FindAndCountUsersResult } from './outputs/find-and-count-users-result.output';
 import { User } from './user.model';
 import { UserService } from './user.service';

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

@@ -1,17 +1,19 @@
-import fs = require('fs');
 import { Inject, Injectable, UnauthorizedException, UnprocessableEntityException } from '@nestjs/common';
 import { InjectModel } from '@nestjs/mongoose';
 import { PubSub } from 'graphql-subscriptions';
 import { Model } from 'mongoose';
+
 import { ServiceOptions } from '../../../core/common/interfaces/service-options.interface';
 import { ConfigService } from '../../../core/common/services/config.service';
 import { EmailService } from '../../../core/common/services/email.service';
 import { CoreModelConstructor } from '../../../core/common/types/core-model-constructor.type';
 import { CoreUserService } from '../../../core/modules/user/core-user.service';
-import { UserCreateInput } from './inputs/user-create.input';
 import { UserInput } from './inputs/user.input';
+import { UserCreateInput } from './inputs/user-create.input';
 import { User, UserDocument } from './user.model';
 
+import fs = require('fs');
+
 /**
  * User service
  */
@@ -72,8 +74,8 @@ export class UserService extends CoreUserService<User, UserInput, UserCreateInpu
     await this.emailService.sendMail(user.email, 'Password reset', {
       htmlTemplate: 'password-reset',
       templateData: {
-        name: user.username,
         link: `${this.configService.configFastButReadOnly.email.passwordResetLink}/${user.passwordResetToken}`,
+        name: user.username,
       },
     });
 

package/src/server/server.controller.ts

@@ -1,4 +1,5 @@
 import { Controller, Get, Render } from '@nestjs/common';
+
 import { ConfigService, RoleEnum, Roles } from '..';
 
 @Controller()

package/src/server/server.module.ts

@@ -1,6 +1,7 @@
 import { Module } from '@nestjs/common';
 import { APP_INTERCEPTOR } from '@nestjs/core';
 import { ScheduleModule } from '@nestjs/schedule';
+
 import envConfig from '../config.env';
 import { CoreModule } from '../core.module';
 import { CheckSecurityInterceptor } from '../core/common/interceptors/check-security.interceptor';
@@ -20,6 +21,12 @@ import { ServerController } from './server.controller';
  * for the project API
  */
 @Module({
+  // Include REST controllers
+  controllers: [ServerController],
+
+  // Export modules for reuse in other modules
+  exports: [CoreModule, AuthModule, FileModule],
+
   // Include modules
   imports: [
     // Include CoreModule for standard processes
@@ -46,11 +53,5 @@ import { ServerController } from './server.controller';
       useClass: CheckSecurityInterceptor,
     },
   ],
-
-  // Include REST controllers
-  controllers: [ServerController],
-
-  // Export modules for reuse in other modules
-  exports: [CoreModule, AuthModule, FileModule],
 })
 export class ServerModule {}