@lenne.tech/nest-server 3.1.3 → 3.3.1

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') 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));
 
@@ -77,6 +76,22 @@ export class UserService extends CoreUserService<User, UserInput, UserCreateInpu
     return this.userModel.find(filterQuery[0], null, filterQuery[1]).exec();
   }
 
+  /**
+   * Request password reset mail
+   *
+   * @param 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 user;
+  }
+
   /**
    * Set avatar image
    */
@@ -124,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);
   }
 }