@lenne.tech/nest-server 3.2.1 → 3.3.3

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

@@ -16,4 +16,17 @@ export class Auth extends CoreAuthModel {
    */
   @Field((type) => User, { description: 'User who signed in' })
   user: User = undefined;
+
+  // ===================================================================================================================
+  // Properties
+  // ===================================================================================================================
+
+  /**
+   * Initialize instance with default values instead of undefined
+   */
+  init() {
+    super.init();
+    // Nothing more to initialize yet
+    return this;
+  }
 }

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

@@ -3,6 +3,10 @@ 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,6 +3,10 @@ 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,16 +1,16 @@
 import { Field, ObjectType } from '@nestjs/graphql';
 import { CoreUserModel } from '../../../core/modules/user/core-user.model';
 import { PersistenceModel } from '../../common/models/persistence.model';
-import { Prop, Schema, SchemaFactory } from '@nestjs/mongoose';
-import * as mongoose from 'mongoose';
+import { Prop, Schema as MongooseSchema, SchemaFactory } from '@nestjs/mongoose';
+import { Schema, Document } from 'mongoose';
 
 export type UserDocument = User & Document;
 
 /**
  * User schema
  */
-@Schema()
 @ObjectType({ description: 'User' })
+@MongooseSchema({ timestamps: true })
 export class User extends CoreUserModel implements PersistenceModel {
   // ===================================================================================================================
   // Properties
@@ -32,7 +32,7 @@ export class User extends CoreUserModel implements PersistenceModel {
     description: 'ID of the user who created the object',
     nullable: true,
   })
-  @Prop({ type: mongoose.Schema.Types.ObjectId, ref: 'User' })
+  @Prop({ type: Schema.Types.ObjectId, ref: 'User' })
   createdBy: User = undefined;
 
   /**
@@ -44,8 +44,21 @@ export class User extends CoreUserModel implements PersistenceModel {
     description: 'ID of the user who last updated the object',
     nullable: true,
   })
-  @Prop({ type: mongoose.Schema.Types.ObjectId, ref: 'User' })
+  @Prop({ type: Schema.Types.ObjectId, ref: 'User' })
   updatedBy: User = undefined;
+
+  // ===================================================================================================================
+  // Methods
+  // ===================================================================================================================
+
+  /**
+   * Initialize instance with default values instead of undefined
+   */
+  init() {
+    super.init();
+    // Nothing more to initialize yet
+    return this;
+  }
 }
 
 export const UserSchema = SchemaFactory.createForClass(User);

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

@@ -47,8 +47,8 @@ export class UserResolver {
    * Request new password for user with email
    */
   @Query((returns) => Boolean, { description: 'Request new password for user with email' })
-  async requestPasswordResetMail(@Args('email') email: string) {
-    return await this.usersService.requestPasswordResetMail(email);
+  async requestPasswordResetMail(@Args('email') email: string): Promise<boolean> {
+    return !!(await this.usersService.sendPasswordResetMail(email));
   }
 
   // ===========================================================================
@@ -58,28 +58,29 @@ export class UserResolver {
    * Verify user with email
    */
   @Mutation((returns) => Boolean, { description: 'Verify user with email' })
-  async verifyUser(@Args('token') token: string) {
-    return await this.usersService.verify(token);
+  async verifyUser(@Args('token') token: string): Promise<boolean> {
+    return !!(await this.usersService.verify(token));
   }
 
   /**
    * Set new password for user with token
    */
   @Mutation((returns) => Boolean, { description: 'Set new password for user with token' })
-  async resetPassword(@Args('token') token: string, @Args('password') password: string) {
-    return await this.usersService.resetPassword(token, password);
+  async resetPassword(@Args('token') token: string, @Args('password') password: string): Promise<boolean> {
+    return !!(await this.usersService.resetPassword(token, password));
   }
 
   /**
    * Create new user
    */
   @Mutation((returns) => User, { description: 'Create a new user' })
-  async createUser(
-    @Args('input') input: UserCreateInput,
-    @GraphQLUser() user: User,
-    @Info() info: GraphQLResolveInfo
-  ): Promise<User> {
-    return await this.usersService.create(input, user, info);
+  async createUser(@Args('input') input: UserCreateInput, @GraphQLUser() user: User): Promise<User> {
+    // Check input
+    // Hint: necessary as long as global CheckInputPipe can't access context for current user
+    // (see https://github.com/nestjs/graphql/issues/325)
+    input = await InputHelper.check(input, user, UserCreateInput);
+
+    return await this.usersService.create(input, user);
   }
 
   /**
@@ -87,19 +88,14 @@ export class UserResolver {
    */
   @Roles(RoleEnum.ADMIN, RoleEnum.OWNER)
   @Mutation((returns) => User, { description: 'Update existing user' })
-  async updateUser(
-    @Args('input', { type: () => UserInput }) input: UserInput,
-    @Args('id') id: string,
-    @GraphQLUser() user: User,
-    @Info() info: GraphQLResolveInfo
-  ): Promise<User> {
+  async updateUser(@Args('input') input: UserInput, @Args('id') id: string, @GraphQLUser() user: User): Promise<User> {
     // Check input
     // Hint: necessary as long as global CheckInputPipe can't access context for current user
     // (see https://github.com/nestjs/graphql/issues/325)
     input = await InputHelper.check(input, user, UserInput);
 
     // Update user
-    return await this.usersService.update(id, input, user, info);
+    return await this.usersService.update(id, input, user);
   }
 
   /**

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

@@ -1,6 +1,5 @@
 import { Inject, Injectable, UnauthorizedException, UnprocessableEntityException } from '@nestjs/common';
 import * as fs from 'fs';
-import { GraphQLResolveInfo } from 'graphql';
 import envConfig from '../../../config.env';
 import { FilterArgs } from '../../../core/common/args/filter.args';
 import { Filter } from '../../../core/common/helpers/filter.helper';
@@ -10,7 +9,7 @@ import { EmailService } from '../../../core/common/services/email.service';
 import { CoreUserService } from '../../../core/modules/user/core-user.service';
 import { UserCreateInput } from './inputs/user-create.input';
 import { UserInput } from './inputs/user.input';
-import { User } from './user.model';
+import { User, UserDocument } from './user.model';
 import { InjectModel } from '@nestjs/mongoose';
 import { Model } from 'mongoose';
 import { ICorePersistenceModel } from '../../../core/common/interfaces/core-persistence-model.interface';
@@ -39,7 +38,7 @@ export class UserService extends CoreUserService<User, UserInput, UserCreateInpu
   constructor(
     protected readonly configService: ConfigService,
     protected readonly emailService: EmailService,
-    @InjectModel('User') protected readonly userModel: Model<User>,
+    @InjectModel('User') protected readonly userModel: Model<UserDocument>,
     @Inject('PUB_SUB') protected readonly pubSub: PubSub
   ) {
     super(userModel, emailService);
@@ -53,10 +52,10 @@ export class UserService extends CoreUserService<User, UserInput, UserCreateInpu
   /**
    * Create new user and send welcome email
    */
-  async create(input: UserCreateInput, currentUser?: User, ...args: any[]): Promise<User> {
+  async create(input: UserCreateInput, currentUser?: User): Promise<User> {
     const user = await super.create(input, currentUser);
 
-    await this.prepareOutput(user, args[0]);
+    await this.prepareOutput(user);
 
     await this.pubSub.publish('userCreated', User.map(user));
 
@@ -82,15 +81,15 @@ export class UserService extends CoreUserService<User, UserInput, UserCreateInpu
    *
    * @param email
    */
-  async requestPasswordResetMail(email: string): Promise<boolean> {
-    const user = await super.sentResetPasswordMail(email);
+  async sendPasswordResetMail(email: string): Promise<User> {
+    const user = await super.setPasswordResetTokenForEmail(email);
 
     await this.emailService.sendMail(user.email, 'Password reset', {
       htmlTemplate: 'password-reset',
       templateData: { name: user.username, link: envConfig.email.passwordResetLink + '/' + user.passwordResetToken },
     });
 
-    return true;
+    return user;
   }
 
   /**
@@ -140,7 +139,7 @@ export class UserService extends CoreUserService<User, UserInput, UserCreateInpu
   /**
    * Prepare output before return
    */
-  protected async prepareOutput(user: User, info?: GraphQLResolveInfo) {
-    return ServiceHelper.prepareOutput(user, User, this);
+  protected async prepareOutput(user: User): Promise<User> {
+    return ServiceHelper.prepareOutput(user);
   }
 }

package/src/test/test.helper.ts

@@ -18,7 +18,7 @@ export enum TestGraphQLType {
  * GraphQL fields
  */
 export interface TestFieldObject {
-  [key: string]: boolean | string[] | TestFieldObject;
+  [key: string]: boolean | (string | TestFieldObject)[] | TestFieldObject;
 }
 
 /**

package/dist/core/common/pipes/map.pipe.d.ts

@@ -1,4 +0,0 @@
-import { PipeTransform, ArgumentMetadata } from '@nestjs/common';
-export declare class MapPipe implements PipeTransform {
-    transform(value: any, metadata: ArgumentMetadata): any;
-}

package/dist/core/common/pipes/map.pipe.js

@@ -1,25 +0,0 @@
-"use strict";
-var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
-    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
-    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
-    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
-    return c > 3 && r && Object.defineProperty(target, key, r), r;
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.MapPipe = void 0;
-const common_1 = require("@nestjs/common");
-let MapPipe = class MapPipe {
-    transform(value, metadata) {
-        var _a;
-        let result = value;
-        if ((_a = metadata.metatype) === null || _a === void 0 ? void 0 : _a.map) {
-            result = metadata.metatype.map(value);
-        }
-        return result;
-    }
-};
-MapPipe = __decorate([
-    (0, common_1.Injectable)()
-], MapPipe);
-exports.MapPipe = MapPipe;
-//# sourceMappingURL=map.pipe.js.map

package/dist/core/common/pipes/map.pipe.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"map.pipe.js","sourceRoot":"","sources":["../../../../src/core/common/pipes/map.pipe.ts"],"names":[],"mappings":";;;;;;;;;AAAA,2CAA6E;AAG7E,IAAa,OAAO,GAApB,MAAa,OAAO;IAClB,SAAS,CAAC,KAAU,EAAE,QAA0B;;QAC9C,IAAI,MAAM,GAAG,KAAK,CAAC;QAGnB,IAAI,MAAC,QAAQ,CAAC,QAAgB,0CAAE,GAAG,EAAE;YAEnC,MAAM,GAAI,QAAQ,CAAC,QAAgB,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;SAChD;QAED,OAAO,MAAM,CAAC;IAChB,CAAC;CACF,CAAA;AAZY,OAAO;IADnB,IAAA,mBAAU,GAAE;GACA,OAAO,CAYnB;AAZY,0BAAO"}

package/src/core/common/pipes/map.pipe.ts

@@ -1,16 +0,0 @@
-import { PipeTransform, Injectable, ArgumentMetadata } from '@nestjs/common';
-
-@Injectable()
-export class MapPipe implements PipeTransform {
-  transform(value: any, metadata: ArgumentMetadata) {
-    let result = value;
-
-    // Check map function is available
-    if ((metadata.metatype as any)?.map) {
-      // Map object to correct type
-      result = (metadata.metatype as any).map(value);
-    }
-
-    return result;
-  }
-}