@lenne.tech/nest-server 3.1.1 → 3.1.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lenne.tech/nest-server",
-  "version": "3.1.1",
+  "version": "3.1.2",
   "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/modules/user/core-user.service.ts

@@ -15,6 +15,9 @@ import { CoreUserCreateInput } from './inputs/core-user-create.input';
 import { CoreUserInput } from './inputs/core-user.input';
 import { Model } from 'mongoose';
 import * as _ from 'lodash';
+import * as crypto from 'crypto';
+import envConfig from '../../../config.env';
+import { EmailService } from '../../common/services/email.service';
 
 // Subscription
 const pubSub = new PubSub();
@@ -27,7 +30,7 @@ export abstract class CoreUserService<
   TUserInput extends CoreUserInput,
   TUserCreateInput extends CoreUserCreateInput
 > extends CoreBasicUserService<TUser, TUserInput, TUserCreateInput> {
-  protected constructor(protected readonly userModel: Model<any>) {
+  protected constructor(protected readonly userModel: Model<any>, protected emailService: EmailService) {
     super(userModel);
   }
 
@@ -42,8 +45,11 @@ export abstract class CoreUserService<
     // Prepare input
     await this.prepareInput(input, currentUser, { create: true });
 
+    // Generate verification token
+    const newUser = { ...input, ...{ verificationToken: crypto.randomBytes(32).toString('hex') } };
+
     // Create new user
-    const createdUser = new this.userModel(this.model.map(input));
+    const createdUser = new this.userModel(this.model.map(newUser));
 
     try {
       // Save created user
@@ -115,6 +121,75 @@ export abstract class CoreUserService<
     );
   }
 
+  /**
+   * Verify user with token
+   *
+   * @param token
+   */
+  async verify(token: string): Promise<boolean> {
+    const user = await this.userModel.findOne({ verificationToken: token }).exec();
+
+    if (!user) {
+      throw new NotFoundException();
+    }
+
+    if (!user.verificationToken) {
+      throw new Error('User has no token');
+    }
+
+    if (user.verified) {
+      throw new Error('User already verified');
+    }
+
+    await this.userModel.findByIdAndUpdate(user.id, { $set: { verified: true, verificationToken: null } }).exec();
+
+    return true;
+  }
+
+  /**
+   * Set newpassword for user with token
+   *
+   * @param token
+   * @param newPassword
+   */
+  async resetPassword(token: string, newPassword: string): Promise<boolean> {
+    const user = await this.userModel.findOne({ passwordResetToken: token }).exec();
+
+    if (!user) {
+      throw new NotFoundException();
+    }
+
+    const cryptedPassword = await bcrypt.hash(newPassword, 10);
+    await this.userModel
+      .findByIdAndUpdate(user.id, { $set: { password: cryptedPassword, passwordResetToken: null } })
+      .exec();
+
+    return true;
+  }
+
+  /**
+   * Request email with password reset link
+   *
+   * @param email
+   */
+  async requestPasswordResetMail(email: string): Promise<boolean> {
+    const user = await this.userModel.findOne({ email }).exec();
+
+    if (!user) {
+      throw new NotFoundException();
+    }
+
+    const resetToken = crypto.randomBytes(32).toString('hex');
+    await this.userModel.findByIdAndUpdate(user.id, { $set: { passwordResetToken: resetToken } }).exec();
+
+    await this.emailService.sendMail(user.email, 'Password reset', {
+      htmlTemplate: 'password-reset',
+      templateData: { name: user.username, link: envConfig.email.passwordResetLink + '/' + resetToken },
+    });
+
+    return true;
+  }
+
   /**
    * Set roles for specified user
    */

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

@@ -43,14 +43,6 @@ export class UserResolver {
     return await this.usersService.find(args, info);
   }
 
-  /**
-   * Verify user with email
-   */
-  @Query((returns) => Boolean, { description: 'Verify user with email' })
-  async verifyUser(@Args('token') token: string) {
-    return await this.usersService.verify(token);
-  }
-
   /**
    * Request new password for user with email
    */
@@ -59,17 +51,25 @@ export class UserResolver {
     return await this.usersService.requestPasswordResetMail(email);
   }
 
+  // ===========================================================================
+  // Mutations
+  // ===========================================================================
+  /**
+   * Verify user with email
+   */
+  @Mutation((returns) => Boolean, { description: 'Verify user with email' })
+  async verifyUser(@Args('token') token: string) {
+    return await this.usersService.verify(token);
+  }
+
   /**
    * Set new password for user with token
    */
-  @Query((returns) => Boolean, { description: '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);
   }
 
-  // ===========================================================================
-  // Mutations
-  // ===========================================================================
   /**
    * Create new user
    */

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

@@ -1,10 +1,4 @@
-import {
-  Inject,
-  Injectable,
-  NotFoundException,
-  UnauthorizedException,
-  UnprocessableEntityException,
-} from '@nestjs/common';
+import { Inject, Injectable, UnauthorizedException, UnprocessableEntityException } from '@nestjs/common';
 import * as fs from 'fs';
 import { GraphQLResolveInfo } from 'graphql';
 import envConfig from '../../../config.env';
@@ -21,8 +15,6 @@ import { InjectModel } from '@nestjs/mongoose';
 import { Model } from 'mongoose';
 import { ICorePersistenceModel } from '../../../core/common/interfaces/core-persistence-model.interface';
 import { PubSub } from 'graphql-subscriptions';
-import * as crypto from 'crypto';
-import * as bcrypt from 'bcrypt';
 
 /**
  * User service
@@ -50,7 +42,7 @@ export class UserService extends CoreUserService<User, UserInput, UserCreateInpu
     @InjectModel('User') protected readonly userModel: Model<User>,
     @Inject('PUB_SUB') protected readonly pubSub: PubSub
   ) {
-    super(userModel);
+    super(userModel, emailService);
     this.model = User;
   }
 
@@ -68,86 +60,14 @@ export class UserService extends CoreUserService<User, UserInput, UserCreateInpu
 
     await this.pubSub.publish('userCreated', User.map(user));
 
-    const verificationToken = crypto.randomBytes(32).toString('hex');
-    await this.userModel.findByIdAndUpdate(user.id, { $set: { verificationToken } }).exec();
-
     await this.emailService.sendMail(user.email, 'Welcome', {
       htmlTemplate: 'welcome',
-      templateData: { name: user.username, link: envConfig.email.verificationLink + '/' + verificationToken },
+      templateData: { name: user.username, link: envConfig.email.verificationLink + '/' + user.verificationToken },
     });
 
     return user;
   }
 
-  /**
-   * Verify user with token
-   *
-   * @param token
-   */
-  async verify(token: string): Promise<boolean> {
-    const user = await this.userModel.findOne({ verificationToken: token }).exec();
-
-    if (!user) {
-      throw new NotFoundException();
-    }
-
-    if (!user.verificationToken) {
-      throw new Error('User has no token');
-    }
-
-    if (user.verified) {
-      throw new Error('User already verified');
-    }
-
-    await this.userModel.findByIdAndUpdate(user.id, { $set: { verified: true, verificationToken: null } }).exec();
-
-    return true;
-  }
-
-  /**
-   * Set newpassword for user with token
-   *
-   * @param token
-   * @param newPassword
-   */
-  async resetPassword(token: string, newPassword: string): Promise<boolean> {
-    const user = await this.userModel.findOne({ passwordResetToken: token }).exec();
-
-    if (!user) {
-      throw new NotFoundException();
-    }
-
-    const cryptedPassword = await bcrypt.hash(newPassword, 10);
-    await this.userModel
-      .findByIdAndUpdate(user.id, { $set: { password: cryptedPassword, passwordResetToken: null } })
-      .exec();
-
-    return true;
-  }
-
-  /**
-   * Request email with password reset link
-   *
-   * @param email
-   */
-  async requestPasswordResetMail(email: string): Promise<boolean> {
-    const user = await this.userModel.findOne({ email }).exec();
-
-    if (!user) {
-      throw new NotFoundException();
-    }
-
-    const resetToken = crypto.randomBytes(32).toString('hex');
-    await this.userModel.findByIdAndUpdate(user.id, { $set: { passwordResetToken: resetToken } }).exec();
-
-    await this.emailService.sendMail(user.email, 'Password reset', {
-      htmlTemplate: 'password-reset',
-      templateData: { name: user.username, link: envConfig.email.passwordResetLink + '/' + resetToken },
-    });
-
-    return true;
-  }
-
   /**
    * Get users via filter
    */