@lenne.tech/nest-server 8.6.9 → 8.6.12

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lenne.tech/nest-server",
-  "version": "8.6.9",
+  "version": "8.6.12",
   "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",

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

@@ -543,7 +543,7 @@ export function removeIds(source: any[], ids: StringOrObjectId | StringOrObjectI
  */
 export async function setPopulates<T = Query<any, any> | Document>(
   queryOrDocument: T,
-  populateOptions: PopulateOptions[],
+  populateOptions: string[] | PopulateOptions[] | (string | PopulateOptions)[],
   modelSchemaPaths?: { [key: string]: SchemaType }
 ): Promise<T> {
   // Check parameters
@@ -553,8 +553,12 @@ export async function setPopulates<T = Query<any, any> | Document>(
 
   // Filter populate options via model schema paths
   if (modelSchemaPaths) {
-    populateOptions = populateOptions.filter((options) => {
-      return Object.keys(modelSchemaPaths).includes(options.path);
+    populateOptions = populateOptions.filter((option: string | PopulateOptions) => {
+      let key: string = option as string;
+      if ((option as PopulateOptions)?.path) {
+        key = (option as PopulateOptions)?.path;
+      }
+      return Object.keys(modelSchemaPaths).includes(key);
     });
   }
 

package/src/core/common/interfaces/service-options.interface.ts

@@ -35,7 +35,7 @@ export interface ServiceOptions {
   outputType?: new (...params: any[]) => any;
 
   // Alias for fieldSelection (if both are set fieldSelection is overwritten by populate)
-  populate?: PopulateOptions | (PopulateOptions | string)[];
+  populate?: string | PopulateOptions | (PopulateOptions | string)[];
 
   // Process field selection
   // If {} or not set, then the field selection runs with defaults

package/src/core/common/types/field-selection.type.ts

@@ -5,4 +5,9 @@ import { ResolveSelector } from '../interfaces/resolve-selector.interface';
 /**
  * Field selection to set fields of (populated) result
  */
-export type FieldSelection = PopulateOptions | (PopulateOptions | string)[] | SelectionNode[] | ResolveSelector;
+export type FieldSelection =
+  | string
+  | PopulateOptions
+  | (PopulateOptions | string)[]
+  | SelectionNode[]
+  | ResolveSelector;

package/src/core/modules/auth/core-auth.model.ts

@@ -17,7 +17,7 @@ export class CoreAuthModel extends CoreModel {
   token: string = undefined;
 
   // ===================================================================================================================
-  // Properties
+  // Methods
   // ===================================================================================================================
 
   /**
@@ -28,4 +28,14 @@ export class CoreAuthModel extends CoreModel {
     // Nothing more to initialize yet
     return this;
   }
+
+  /**
+   * Map input
+   */
+  map(input) {
+    super.map(input);
+    // There is nothing to map yet. Non-primitive variables should always be mapped.
+    // If something comes up, you can use `mapClasses` / `mapClassesAsync` from ModelHelper.
+    return this;
+  }
 }

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

@@ -122,4 +122,14 @@ export abstract class CoreUserModel extends CorePersistenceModel {
     this.roles = this.roles === undefined ? [] : this.roles;
     return this;
   }
+
+  /**
+   * Map input
+   */
+  map(input) {
+    super.map(input);
+    // There is nothing to map yet. Non-primitive variables should always be mapped.
+    // If something comes up, you can use `mapClasses` / `mapClassesAsync` from ModelHelper.
+    return this;
+  }
 }

package/src/core.module.ts

@@ -79,8 +79,7 @@ export class CoreModule implements NestModule {
                         const { connectionParams, extra } = context;
                         if (config.graphQl.enableSubscriptionAuth) {
                           // get authToken from authorization header
-                          const authToken: string =
-                            'Authorization' in connectionParams && connectionParams?.Authorization?.split(' ')[1];
+                          const authToken: string = connectionParams?.Authorization?.split(' ')[1];
                           if (authToken) {
                             // verify authToken/getJwtPayLoad
                             const payload = authService.decodeJwt(authToken);

package/src/index.ts

@@ -78,6 +78,15 @@ export * from './core/modules/auth/core-auth.module';
 export * from './core/modules/auth/core-auth.resolver';
 export * from './core/modules/auth/jwt.strategy';
 
+// =====================================================================================================================
+// Core - Modules - File
+// =====================================================================================================================
+
+export * from './core/modules/file/interfaces/file-service-options.interface';
+export * from './core/modules/file/interfaces/file-upload.interface';
+export * from './core/modules/file/core-file.service';
+export * from './core/modules/file/file-info.output';
+
 // =====================================================================================================================
 // Core - Modules - User
 // =====================================================================================================================

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

@@ -15,33 +15,37 @@ import { User } from '../../modules/user/user.model';
   isAbstract: true,
 })
 export abstract class PersistenceModel extends CorePersistenceModel {
+  // ===================================================================================================================
+  // Properties
+  // ===================================================================================================================
+
   /**
-   * User who created the object
+   * ID of the user who created the object
    *
    * Not set when created by system
    */
-  @Field((type) => User, {
-    description: 'User who created the object',
+  @Field(() => User, {
+    description: 'ID of the user who created the object',
     nullable: true,
   })
   @Prop({ type: mongoose.Schema.Types.ObjectId, ref: 'User' })
-  createdBy?: Types.ObjectId | User = undefined;
+  createdBy?: Types.ObjectId | string = undefined;
 
   /**
-   * User who last updated the object
+   * ID of the user who updated the object
    *
    * Not set when updated by system
    */
-  @Field((type) => User, {
-    description: 'User who last updated the object',
+  @Field(() => User, {
+    description: 'ID of the user who updated the object',
     nullable: true,
   })
   @Prop({ type: mongoose.Schema.Types.ObjectId, ref: 'User' })
-  updatedBy?: Types.ObjectId | User = undefined;
+  updatedBy?: Types.ObjectId | string = undefined;
 
-  // ===========================================================================
-  // Properties
-  // ===========================================================================
+  // ===================================================================================================================
+  // Methods
+  // ===================================================================================================================
 
   /**
    * Initialize instance with default values instead of undefined
@@ -51,4 +55,14 @@ export abstract class PersistenceModel extends CorePersistenceModel {
     // Nothing more to initialize yet
     return this;
   }
+
+  /**
+   * Map input
+   */
+  map(input) {
+    super.map(input);
+    // There is nothing to map yet. Non-primitive variables should always be mapped.
+    // If something comes up, you can use `mapClasses` / `mapClassesAsync` from ModelHelper.
+    return this;
+  }
 }

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';
 
@@ -29,4 +30,12 @@ export class Auth extends CoreAuthModel {
     // Nothing more to initialize yet
     return this;
   }
+
+  /**
+   * Map input
+   */
+  map(input) {
+    super.map(input);
+    return mapClasses(input, { user: User }, this);
+  }
 }

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

@@ -21,7 +21,7 @@ import { User } from '../user/user.model';
 import { FileService } from './file.service';
 
 /**
- * File controller for
+ * File controller
  */
 @Controller('files')
 export class FileController {
@@ -51,7 +51,7 @@ export class FileController {
     })
   )
   uploadFiles(@UploadedFiles() files, @Body() fields: any) {
-    console.log(JSON.stringify({ files, fields }, null, 2));
+    console.log('Saved file info', JSON.stringify({ files, fields }, null, 2));
   }
 
   /**

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

@@ -3,10 +3,6 @@ import { CoreUserCreateInput } from '../../../../core/modules/user/inputs/core-u
 
 /**
  * User input to create a new user
- *
- * HINT: All properties (in this class and all classes that extend this class) must be initialized with undefined,
- * otherwise the property will not be recognized via Object.keys (this is necessary for mapping) or will be initialized
- * with a default value that may overwrite an existing value in the DB.
  */
 @InputType({ description: 'User input to create a new user' })
 export class UserCreateInput extends CoreUserCreateInput {

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

@@ -3,10 +3,6 @@ import { CoreUserInput } from '../../../../core/modules/user/inputs/core-user.in
 
 /**
  * User input to update a user
- *
- * HINT: All properties (in this class and all classes that extend this class) must be initialized with undefined,
- * otherwise the property will not be recognized via Object.keys (this is necessary for mapping) or will be initialized
- * with a default value that may overwrite an existing value in the DB.
  */
 @InputType({ description: 'User input' })
 export class UserInput extends CoreUserInput {

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

@@ -1,6 +1,6 @@
 import { Field, ObjectType } from '@nestjs/graphql';
 import { Prop, Schema as MongooseSchema, SchemaFactory } from '@nestjs/mongoose';
-import { Document, Schema } from 'mongoose';
+import { Document, Schema, Types } from 'mongoose';
 import { mapClasses } from '../../../core/common/helpers/model.helper';
 import { CoreUserModel } from '../../../core/modules/user/core-user.model';
 import { PersistenceModel } from '../../common/models/persistence.model';
@@ -8,7 +8,7 @@ import { PersistenceModel } from '../../common/models/persistence.model';
 export type UserDocument = User & Document;
 
 /**
- * User schema
+ * User model
  */
 @ObjectType({ description: 'User' })
 @MongooseSchema({ timestamps: true })
@@ -25,28 +25,28 @@ export class User extends CoreUserModel implements PersistenceModel {
   avatar: string = undefined;
 
   /**
-   * Editor who created the object
+   * ID of the user who created the object
    *
    * Not set when created by system
    */
-  @Field((type) => User, {
+  @Field(() => String, {
     description: 'ID of the user who created the object',
     nullable: true,
   })
   @Prop({ type: Schema.Types.ObjectId, ref: 'User' })
-  createdBy: User = undefined;
+  createdBy: Types.ObjectId | string = undefined;
 
   /**
-   * Editor who last updated the object
+   * ID of the user who updated the object
    *
    * Not set when updated by system
    */
-  @Field((type) => User, {
+  @Field(() => String, {
     description: 'ID of the user who last updated the object',
     nullable: true,
   })
   @Prop({ type: Schema.Types.ObjectId, ref: 'User' })
-  updatedBy: User = undefined;
+  updatedBy: Types.ObjectId | string = undefined;
 
   // ===================================================================================================================
   // Methods

package/src/test/test.helper.ts

@@ -4,6 +4,7 @@ import * as fs from 'fs';
 import { createClient } from 'graphql-ws';
 import { jsonToGraphQLQuery } from 'json-to-graphql-query';
 import * as LightMyRequest from 'light-my-request';
+import * as superagent from 'superagent';
 import * as supertest from 'supertest';
 import * as util from 'util';
 import * as ws from 'ws';
@@ -146,8 +147,9 @@ export class TestHelper {
 
   /**
    * Download file from URL
+   * @return Superagent response with additional data field containing the content of the file
    */
-  download(url: string, token?: string) {
+  download(url: string, token?: string): Promise<superagent.Response & { data: string }> {
     return new Promise((resolve, reject) => {
       const request = supertest((this.app as INestApplication).getHttpServer()).get(url);
       if (token) {
@@ -166,9 +168,9 @@ export class TestHelper {
             err ? reject(err) : callback(null, null);
           });
         })
-        .end((err, res: unknown) => {
-          (res as Response & { data: string }).data = new Buffer(data, 'binary').toString();
-          err ? reject(err) : resolve(res);
+        .end((err, res: superagent.Response) => {
+          (res as superagent.Response & { data: string }).data = Buffer.from(data, 'binary').toString();
+          err ? reject(err) : resolve(res as superagent.Response & { data: string });
         });
     });
   }
@@ -480,7 +482,7 @@ export class TestHelper {
   processResponse(response, statusCode, log, logError) {
     // Log response
     if (log) {
-      console.log(JSON.stringify(response, null, 2));
+      console.log('Response', JSON.stringify(response, null, 2));
     }
 
     // Log error