update

src/modules/auth/interfaces/IToken-payload.ts

@@ -1,9 +1,5 @@
-import { RoleEnum } from "../../users/enums/role.enum";
-
 export interface ILocalTokenPayload {
   id: string;
-  role: RoleEnum;
-  wildduckUserId: string;
 }
 
 export interface IConsoleTokenPayload {

src/modules/auth/services/auth.service.ts

@@ -55,7 +55,7 @@ export class AuthService {
 
     const user = await this.userService.findOrCreateByPhone(phone);
 
-    const accessToken = await this.issueToken(user.id.toString(), AuthEntityType.USER);
+    const accessToken = await this.issueToken(user.id, AuthEntityType.USER);
 
     return { success: true, message: 'User registered successfully!', accessToken };
   }

src/modules/auth/services/tokens.service.ts

@@ -24,7 +24,6 @@ export class TokensService {
     return this.generateAccessAndRefreshToken(
       {
         id: user.id,
-        role: user.role.name,
       },
       em,
     );
@@ -96,21 +95,21 @@ export class TokensService {
         RefreshToken,
         { token: oldRefreshToken },
         {
-          populate: ['user', 'user.role'],
+          populate: ['user'],
         },
       );
 
       if (!token) throw new UnauthorizedException(AuthMessage.INVALID_REFRESH_TOKEN);
 
       if (dayjs(token.expiresAt).isBefore(dayjs())) {
-        await entityManager.remove(token);
+        entityManager.remove(token);
         await entityManager.flush();
         await entityManager.commit();
         throw new UnauthorizedException(AuthMessage.REFRESH_TOKEN_EXPIRED);
       }
 
       // Remove the old token
-      await entityManager.remove(token);
+      entityManager.remove(token);
 
       // Generate new tokens within the same transaction
       const tokens = await this.generateTokens(token.user, entityManager);
@@ -148,7 +147,7 @@ export class TokensService {
     }
   }
 
-  private async generateRefreshToken() {
+  private generateRefreshToken() {
     return randomBytes(32).toString('hex');
   }
 }