Add isOnboarded field to JWT token

Author: evanyan13

backend/auth-service/src/app.service.ts

@@ -56,6 +56,7 @@ export class AppService {
       const tokens = await this.generateTokens({
         id: userId,
         email: newUser.email,
+        isOnboarded: newUser.isOnboarded,
         roles: newUser.roles,
       });
       await this.updateRefreshToken({
@@ -93,6 +94,7 @@ export class AppService {
       const tokens = await this.generateTokens({
         id: userId,
         email: user.email,
+        isOnboarded: user.isOnboarded,
         roles: user.roles,
       });
       await this.updateRefreshToken({
@@ -141,6 +143,7 @@ export class AppService {
       const tokens = await this.generateTokens({
         id: id,
         email: user.email,
+        isOnboarded: user.isOnboarded,
         roles: user.roles,
       });
       await this.updateRefreshToken({ id, refreshToken: tokens.refresh_token });
@@ -286,25 +289,23 @@ export class AppService {
 
   // Could include other fields like roles in the future
   private async generateTokens(payload: TokenPayload): Promise<Token> {
-    const { id, email, roles } = payload;
+    const { id, ...rest } = payload;
 
     const [accessToken, refreshToken] = await Promise.all([
       this.jwtService.signAsync(
-        {
-          sub: id,
-          email,
-          roles,
-        },
-        {
-          secret: process.env.JWT_SECRET,
-          expiresIn: '15m', // 15 minute
+      {
+        sub: id,
+        ...rest,
+      },
+      {
+        secret: process.env.JWT_SECRET,
+        expiresIn: '15m', // 15 minutes
         },
       ),
       this.jwtService.signAsync(
         {
           sub: id,
-          email,
-          roles,
+          ...rest,
         },
         {
           secret: process.env.JWT_REFRESH_SECRET,
@@ -365,6 +366,7 @@ export class AppService {
       const jwtTokens = await this.generateTokens({
         id: user._id.toString(),
         email: user.email,
+        isOnboarded: user.isOnboarded,
         roles: user.roles,
       });
 
@@ -467,6 +469,7 @@ export class AppService {
     const jwtTokens = await this.generateTokens({
       id: user._id.toString(),
       email: user.email,
+      isOnboarded: user.isOnboarded,
       roles: user.roles,
     });
 

backend/auth-service/src/interfaces/token-payload.interface.ts

@@ -1,5 +1,6 @@
 export interface TokenPayload {
   id: string;
   email: string;
+  isOnboarded: boolean;
   roles: string[];
 }

backend/gateway-service/src/modules/auth/auth.controller.ts

@@ -19,7 +19,7 @@ import {
 import { AuthDto, ResetPasswordDto, ResetPasswordRequestDto } from './dto';
 import { Token } from './interfaces';
 import { ClientProxy } from '@nestjs/microservices';
-import { first, firstValueFrom } from 'rxjs';
+import { firstValueFrom } from 'rxjs';
 import { RtAuthGuard } from '../../common/guards';
 import { GetCurrentUserId } from 'src/common/decorators/get-current-user-id.decorator';
 import { GetCurrentUser, Public } from 'src/common/decorators';