@lenne.tech/nest-server 2.0.3 → 3.1.1

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

@@ -1,4 +1,10 @@
-import { Inject, Injectable, UnauthorizedException, UnprocessableEntityException } from '@nestjs/common';
+import {
+  Inject,
+  Injectable,
+  NotFoundException,
+  UnauthorizedException,
+  UnprocessableEntityException,
+} from '@nestjs/common';
 import * as fs from 'fs';
 import { GraphQLResolveInfo } from 'graphql';
 import envConfig from '../../../config.env';
@@ -15,6 +21,8 @@ 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
@@ -55,17 +63,91 @@ export class UserService extends CoreUserService<User, UserInput, UserCreateInpu
    */
   async create(input: UserCreateInput, currentUser?: User, ...args: any[]): Promise<User> {
     const user = await super.create(input, currentUser);
-    const text = `Welcome ${user.firstName}, this is plain text from server.`;
+
+    await this.prepareOutput(user, args[0]);
+
     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: user,
-      text,
+      templateData: { name: user.username, link: envConfig.email.verificationLink + '/' + 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
    */

package/src/server/server.module.ts

@@ -4,7 +4,6 @@ import { CoreModule } from '../core.module';
 import { AuthModule } from './modules/auth/auth.module';
 import { FileController } from './modules/file/file.controller';
 import { ServerController } from './server.controller';
-import { PubSub } from 'graphql-subscriptions';
 
 /**
  * Server module (dynamic)

package/src/templates/password-reset.ejs

@@ -0,0 +1,3 @@
+<h1>Hello <%= name %>,</h1>
+<p>you requested a link for setting a new password. Here it is.</p><br />
+<a href="<%= link %>">Passwort zurücksetzten</a>

package/src/templates/welcome.ejs

@@ -1,2 +1,3 @@
-<h1>Welcome <%= firstName %></h1>
-<p>This is a EJS template from server.</p>
+<h1>Welcome <%= name %>,</h1>
+<p>please confirm your email address.</p>
+<a href="<%= link %>">E-Mail bestätigen</a>

package/src/test/test.helper.ts

@@ -113,7 +113,7 @@ export class TestHelper {
   /**
    * GraphQL request
    * @param graphql
-   * @param statusCode
+   * @param options
    */
   async graphQl(graphql: string | TestGraphQLConfig, options: TestGraphQLOptions = {}): Promise<any> {
     // Default options
@@ -148,7 +148,7 @@ export class TestHelper {
       graphql = Object.assign(
         {
           arguments: null,
-          fields: ['id'],
+          fields: [],
           name: null,
           type: TestGraphQLType.QUERY,
         },