@lenne.tech/nest-server 9.0.18 → 9.0.20

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lenne.tech/nest-server",
-  "version": "9.0.18",
+  "version": "9.0.20",
   "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",
@@ -60,18 +60,18 @@
     "node": ">= 16.13.0"
   },
   "dependencies": {
-    "@apollo/gateway": "2.1.3",
-    "@nestjs/apollo": "10.1.3",
-    "@nestjs/common": "9.1.4",
-    "@nestjs/core": "9.1.4",
-    "@nestjs/graphql": "10.1.3",
+    "@apollo/gateway": "2.1.4",
+    "@nestjs/apollo": "10.1.4",
+    "@nestjs/common": "9.1.6",
+    "@nestjs/core": "9.1.6",
+    "@nestjs/graphql": "10.1.5",
     "@nestjs/jwt": "9.0.0",
-    "@nestjs/mongoose": "9.2.0",
+    "@nestjs/mongoose": "9.2.1",
     "@nestjs/passport": "9.0.0",
-    "@nestjs/platform-express": "9.1.4",
+    "@nestjs/platform-express": "9.1.6",
     "@nestjs/schedule": "2.1.0",
-    "apollo-server-core": "3.10.3",
-    "apollo-server-express": "3.10.3",
+    "apollo-server-core": "3.11.1",
+    "apollo-server-express": "3.11.1",
     "bcrypt": "5.1.0",
     "class-transformer": "0.5.1",
     "class-validator": "0.13.2",
@@ -83,9 +83,10 @@
     "json-to-graphql-query": "2.2.4",
     "light-my-request": "5.6.1",
     "lodash": "4.17.21",
-    "mongodb": "4.10.0",
-    "mongoose": "6.6.5",
+    "mongodb": "4.11.0",
+    "mongoose": "6.7.1",
     "mongoose-gridfs": "1.3.0",
+    "multer-gridfs-storage": "5.0.2",
     "multer": "1.4.5-lts.1",
     "node-mailjet": "5.1.1",
     "nodemailer": "6.8.0",
@@ -98,20 +99,20 @@
     "rxjs": "7.5.7"
   },
   "devDependencies": {
-    "@nestjs/testing": "9.1.4",
+    "@nestjs/testing": "9.1.6",
     "@types/cron": "2.0.0",
     "@types/ejs": "3.1.1",
-    "@types/jest": "29.2.0",
-    "@types/lodash": "4.14.186",
+    "@types/jest": "29.2.2",
+    "@types/lodash": "4.14.188",
     "@types/multer": "1.4.7",
-    "@types/node": "18.11.2",
+    "@types/node": "18.11.9",
     "@types/nodemailer": "6.4.6",
     "@types/passport": "1.0.11",
     "@types/supertest": "2.0.12",
-    "@typescript-eslint/eslint-plugin": "5.40.1",
-    "@typescript-eslint/parser": "5.40.1",
+    "@typescript-eslint/eslint-plugin": "5.42.0",
+    "@typescript-eslint/parser": "5.42.0",
     "coffeescript": "2.7.0",
-    "eslint": "8.25.0",
+    "eslint": "8.27.0",
     "eslint-config-prettier": "8.5.0",
     "find-file-up": "2.0.1",
     "grunt": "1.5.3",
@@ -120,12 +121,12 @@
     "grunt-contrib-watch": "1.1.0",
     "grunt-sync": "0.8.2",
     "husky": "8.0.1",
-    "jest": "29.2.1",
+    "jest": "29.2.2",
     "npm-watch": "0.11.0",
     "pm2": "5.2.2",
     "prettier": "2.7.1",
     "pretty-quick": "3.1.3",
-    "supertest": "6.3.0",
+    "supertest": "6.3.1",
     "ts-jest": "29.0.3",
     "ts-morph": "16.0.0",
     "ts-node": "10.9.1",
@@ -133,6 +134,11 @@
     "typescript": "4.8.4",
     "yalc": "1.0.0-pre.53"
   },
+  "overrides": {
+    "multer-gridfs-storage": {
+      "multer": "$multer"
+    }
+  },
   "jest": {
     "collectCoverage": true,
     "coverageDirectory": "../coverage",

package/src/config.env.ts

@@ -24,11 +24,11 @@ const config: { [env: string]: IServerOptions } = {
     email: {
       smtp: {
         auth: {
-          user: 'cade72@ethereal.email',
-          pass: 'jpvTwGYeSajEqDvRKT',
+          user: 'oren.satterfield@ethereal.email',
+          pass: 'K4DvD8U31VKseT7vQC',
         },
-        host: 'smtp.ethereal.email',
-        port: 587,
+        host: 'mailhog.lenne.tech',
+        port: 1025,
         secure: false,
       },
       mailjet: {
@@ -36,8 +36,8 @@ const config: { [env: string]: IServerOptions } = {
         api_key_private: 'MAILJET_API_KEY_PRIVATE',
       },
       defaultSender: {
-        email: 'cade72@ethereal.email',
-        name: 'Sandra Klein',
+        email: 'oren.satterfield@ethereal.email',
+        name: 'Nest Server Local',
       },
       verificationLink: 'http://localhost:4200/user/verification',
       passwordResetLink: 'http://localhost:4200/user/password-reset',
@@ -83,11 +83,11 @@ const config: { [env: string]: IServerOptions } = {
     email: {
       smtp: {
         auth: {
-          user: 'cade72@ethereal.email',
-          pass: 'jpvTwGYeSajEqDvRKT',
+          user: 'oren.satterfield@ethereal.email',
+          pass: 'K4DvD8U31VKseT7vQC',
         },
-        host: 'smtp.ethereal.email',
-        port: 587,
+        host: 'mailhog.lenne.tech',
+        port: 1025,
         secure: false,
       },
       mailjet: {
@@ -95,8 +95,8 @@ const config: { [env: string]: IServerOptions } = {
         api_key_private: 'MAILJET_API_KEY_PRIVATE',
       },
       defaultSender: {
-        email: 'cade72@ethereal.email',
-        name: 'Sandra Klein',
+        email: 'oren.satterfield@ethereal.email',
+        name: 'Nest Server Development',
       },
       verificationLink: 'http://localhost:4200/user/verification',
       passwordResetLink: 'http://localhost:4200/user/password-reset',
@@ -142,11 +142,11 @@ const config: { [env: string]: IServerOptions } = {
     email: {
       smtp: {
         auth: {
-          user: 'cade72@ethereal.email',
-          pass: 'jpvTwGYeSajEqDvRKT',
+          user: 'oren.satterfield@ethereal.email',
+          pass: 'K4DvD8U31VKseT7vQC',
         },
-        host: 'smtp.ethereal.email',
-        port: 587,
+        host: 'mailhog.lenne.tech',
+        port: 1025,
         secure: false,
       },
       mailjet: {
@@ -154,8 +154,8 @@ const config: { [env: string]: IServerOptions } = {
         api_key_private: 'MAILJET_API_KEY_PRIVATE',
       },
       defaultSender: {
-        email: 'cade72@ethereal.email',
-        name: 'Sandra Klein',
+        email: 'oren.satterfield@ethereal.email',
+        name: 'Nest Server Production',
       },
       verificationLink: 'http://localhost:4200/user/verification',
       passwordResetLink: 'http://localhost:4200/user/password-reset',

package/src/core/common/pipes/map-and-validate.pipe.ts

@@ -24,7 +24,7 @@ export class MapAndValidatePipe implements PipeTransform {
     // Validate
     const errors = await validate(value);
     if (errors.length > 0) {
-      throw new BadRequestException('Input validation failed');
+      throw new BadRequestException('Input validation failed:' + errors.join('; '));
     }
 
     return value;

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

@@ -1,47 +1,83 @@
-import { Body, Controller, Post, UploadedFiles, UseInterceptors } from '@nestjs/common';
-import { FilesInterceptor } from '@nestjs/platform-express';
-import { diskStorage } from 'multer';
-import envConfig from '../../../config.env';
+import {
+  Controller,
+  Delete,
+  Get,
+  NotFoundException,
+  Param,
+  Post,
+  Res,
+  UnprocessableEntityException,
+  UploadedFile,
+  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 { multerRandomFileName } from '../../../core/common/helpers/file.helper';
-import { CoreFileController } from '../../../core/modules/file/core-file.controller';
 import { FileService } from './file.service';
 
 /**
- * File controller
+ * File controller for
  */
-@Roles(RoleEnum.S_USER)
+@Roles(RoleEnum.ADMIN)
 @Controller('files')
-export class FileController extends CoreFileController {
+export class FileController {
   /**
-   * Include services
+   * Import services
    */
-  constructor(protected fileService: FileService) {
-    super(fileService);
-  }
+  constructor(private readonly fileService: FileService) {}
 
   /**
-   * Upload files via REST as an alternative to uploading via GraphQL (see file.resolver.ts)
+   * Upload file
    */
-  @Roles(RoleEnum.ADMIN)
   @Post('upload')
-  @UseInterceptors(
-    FilesInterceptor('files', null, {
-      // Automatic storage handling
-      // For configuration see https://github.com/expressjs/multer#storage
-      storage: diskStorage({
-        // Destination for uploaded file
-        // If destination is not set file will be buffered and can be processed
-        // in the method
-        destination: envConfig.staticAssets.path,
-
-        // Generated random file name
-        filename: multerRandomFileName(),
-      }),
-    })
-  )
-  uploadFiles(@UploadedFiles() files, @Body() fields: any) {
-    console.info('Saved file info', JSON.stringify({ files, fields }, null, 2));
+  @UseInterceptors(FileInterceptor('file'))
+  uploadFile(@UploadedFile() file: Express.Multer.File): any {
+    return file;
+  }
+
+  /**
+   * Download file
+   */
+  @Get(':id')
+  async getFile(@Param('id') id: string, @Res() res) {
+    if (!id) {
+      throw new UnprocessableEntityException();
+    }
+
+    let file;
+    try {
+      file = await this.fileService.getFileInfo(id);
+    } catch (e) {
+      console.error(e);
+    }
+
+    if (!file) {
+      throw new NotFoundException();
+    }
+    const filestream = await this.fileService.getFileStream(id);
+    res.header('Content-Type', file.contentType);
+    res.header('Content-Disposition', 'attachment; filename=' + file.filename);
+    res.header('Cache-Control', 'max-age=31536000');
+    return filestream.pipe(res);
+  }
+
+  /**
+   * Get file information
+   */
+  @Get('info/:id')
+  async getFileInfo(@Param('id') id: string) {
+    return await this.fileService.getFileInfo(id);
+  }
+
+  /**
+   * Delete file
+   */
+  @Delete(':id')
+  async deleteFile(@Param('id') id: string) {
+    if (!id) {
+      throw new UnprocessableEntityException();
+    }
+
+    return await this.fileService.deleteFile(id);
   }
 }

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

@@ -1,17 +1,23 @@
-import { Module } from '@nestjs/common';
-import { MongooseModule } from '@nestjs/mongoose';
-import { FileInfo, FileInfoSchema } from './file-info.model';
-import { FileController } from './file.controller';
+import { forwardRef, Module } from '@nestjs/common';
 import { FileResolver } from './file.resolver';
 import { FileService } from './file.service';
+import { FileController } from './file.controller';
+import { GridFsMulterConfigService } from './multer-config.service';
+import { MulterModule } from '@nestjs/platform-express';
+import { UserModule } from '../user/user.module';
 
 /**
  * File module
  */
 @Module({
-  imports: [MongooseModule.forFeature([{ name: FileInfo.name, schema: FileInfoSchema }])],
+  imports: [
+    MulterModule.registerAsync({
+      useClass: GridFsMulterConfigService,
+    } as any),
+    forwardRef(() => UserModule),
+  ],
   controllers: [FileController],
-  providers: [FileService, FileResolver],
-  exports: [MongooseModule, FileService],
+  providers: [GridFsMulterConfigService, FileService, FileResolver],
+  exports: [FileService],
 })
 export class FileModule {}

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

@@ -9,6 +9,15 @@ import { CoreFileService } from '../../../core/modules/file/core-file.service';
 @Injectable()
 export class FileService extends CoreFileService {
   constructor(@InjectConnection() protected readonly connection: Connection) {
-    super(connection, 'fs');
+    super(connection);
+  }
+
+  /**
+   * Duplicate file by name
+   */
+  async duplicate(fileName: string, newName: string): Promise<any> {
+    return new Promise(async (resolve, reject) => {
+      resolve(this.files.openDownloadStreamByName(fileName).pipe(this.files.openUploadStream(newName)));
+    });
   }
 }

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

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

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

@@ -1,7 +1,6 @@
 import { Module } from '@nestjs/common';
 import { MongooseModule } from '@nestjs/mongoose';
 import { PubSub } from 'graphql-subscriptions';
-import { JSON } from '../../../core/common/scalars/json.scalar';
 import { ConfigService } from '../../../core/common/services/config.service';
 import { AvatarController } from './avatar.controller';
 import { User, UserSchema } from './user.model';
@@ -15,7 +14,6 @@ import { UserService } from './user.service';
   imports: [MongooseModule.forFeature([{ name: User.name, schema: UserSchema }])],
   controllers: [AvatarController],
   providers: [
-    JSON,
     UserResolver,
     ConfigService,
     UserService,

package/src/server/server.module.ts

@@ -2,6 +2,9 @@ import { Module } from '@nestjs/common';
 import { ScheduleModule } from '@nestjs/schedule';
 import envConfig from '../config.env';
 import { CoreModule } from '../core.module';
+import { Any } from '../core/common/scalars/any.scalar';
+import { DateScalar } from '../core/common/scalars/date.scalar';
+import { JSON } from '../core/common/scalars/json.scalar';
 import { CoreAuthService } from '../core/modules/auth/services/core-auth.service';
 import { CronJobs } from './common/services/cron-jobs.service';
 import { AuthModule } from './modules/auth/auth.module';
@@ -31,7 +34,7 @@ import { ServerController } from './server.controller';
     FileModule,
   ],
 
-  providers: [CronJobs],
+  providers: [Any, CronJobs, DateScalar, JSON],
 
   // Include REST controllers
   controllers: [ServerController],

package/src/test/test.helper.ts

@@ -125,12 +125,13 @@ export interface TestGraphQLOptions {
  * Options for rest requests
  */
 export interface TestRestOptions {
+  attachments?: Record<string, string>;
   log?: boolean;
   logError?: boolean;
+  method?: 'GET' | 'POST' | 'PUT' | 'PATCH' | 'DELETE';
+  payload?: any;
   statusCode?: number;
   token?: string;
-  payload?: any;
-  method?: 'GET' | 'POST' | 'PUT' | 'PATCH' | 'DELETE';
 }
 
 /**
@@ -311,12 +312,12 @@ export class TestHelper {
       log: false,
       logError: false,
       payload: null,
-      method: 'GET',
+      method: options?.attachments ? 'POST' : 'GET',
       ...options,
     };
 
     // Init vars
-    const { token, statusCode, log, logError } = config;
+    const { token, statusCode, log, logError, attachments } = config;
 
     // Request configuration
     const requestConfig: LightMyRequest.InjectOptions = {
@@ -328,8 +329,11 @@ export class TestHelper {
     }
 
     // Process response
-    const response = await this.getResponse(token, requestConfig, statusCode, log, logError);
+    const response = await this.getResponse(token, requestConfig, statusCode, log, logError, null, attachments);
     let result = response.text;
+    if (response.text === '') {
+      return null;
+    }
     try {
       result = JSON.parse(response.text);
     } catch (e) {
@@ -427,7 +431,8 @@ export class TestHelper {
     statusCode: number,
     log: boolean,
     logError: boolean,
-    variables?: Record<string, TestGraphQLVariable>
+    variables?: Record<string, TestGraphQLVariable>,
+    attachments?: Record<string, string>
   ): Promise<any> {
     // Token
     if (token) {
@@ -461,16 +466,23 @@ export class TestHelper {
       request.set('Authorization', 'bearer ' + token);
     }
 
-    // Process variables
+    // Process variables (incl. attachments for GraphQL)
     if (variables) {
       request = this.processVariables(request, variables, (requestConfig.payload as any)?.query);
     }
 
+    // Process REST attachments
+    if (attachments) {
+      for (const [key, value] of Object.entries(attachments)) {
+        request.attach(key, value);
+      }
+    }
+
     // Response
     if (log) {
       console.info(requestConfig);
     }
-    const response = await (variables ? request : request.send(requestConfig.payload));
+    const response = await (variables || attachments ? request : request.send(requestConfig.payload));
     return this.processResponse(response, statusCode, log, logError);
   }