@lenne.tech/nest-server 2.0.4 → 3.1.2

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

@@ -43,9 +43,33 @@ export class UserResolver {
     return await this.usersService.find(args, info);
   }
 
+  /**
+   * 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);
+  }
+
   // ===========================================================================
   // 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
+   */
+  @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);
+  }
+
   /**
    * Create new user
    */

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

@@ -42,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;
   }
 
@@ -55,12 +55,14 @@ 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));
+
     await this.emailService.sendMail(user.email, 'Welcome', {
       htmlTemplate: 'welcome',
-      templateData: user,
-      text,
+      templateData: { name: user.username, link: envConfig.email.verificationLink + '/' + user.verificationToken },
     });
 
     return user;

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,
         },