♻️ Send token response on email verification

staart · Nov 16, 2020 · 70c5328 · 70c5328
1 parent 3f9bbae
commit 70c5328
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 5 deletions.
diff --git a/src/modules/auth/auth.controller.ts b/src/modules/auth/auth.controller.ts
@@ -102,8 +102,12 @@ export class AuthController {
   }
 
   @Post('verify-email')
-  async verifyEmail(@Body() data: VerifyEmailDto) {
-    return this.authService.verifyEmail(data.token);
+  async verifyEmail(
+    @Ip() ip: string,
+    @Headers('User-Agent') userAgent: string,
+    @Body() data: VerifyEmailDto,
+  ): Promise<TokenResponse> {
+    return this.authService.verifyEmail(ip, userAgent, data.token);
   }
 
   @Post('forgot-password')
@@ -126,7 +130,7 @@ export class AuthController {
     @Ip() ip: string,
     @Headers('User-Agent') userAgent: string,
     @Body() data: ResetPasswordDto,
-  ) {
+  ): Promise<TokenResponse> {
     return this.authService.resetPassword(
       ip,
       userAgent,

diff --git a/src/modules/auth/auth.service.ts b/src/modules/auth/auth.service.ts
@@ -388,7 +388,11 @@ export class AuthService {
     return this.loginResponse(ipAddress, userAgent, user);
   }
 
-  async verifyEmail(token: string): Promise<Expose<emails>> {
+  async verifyEmail(
+    ipAddress: string,
+    userAgent: string,
+    token: string,
+  ): Promise<TokenResponse> {
     const { id } = this.tokensService.verify<{ id: number }>(
       EMAIL_VERIFY_TOKEN,
       token,
@@ -427,7 +431,7 @@ export class AuthService {
         },
       });
     }
-    return this.prisma.expose<emails>(result);
+    return this.loginResponse(ipAddress, userAgent, result.user);
   }
 
   getOneTimePassword(secret: string): string {