Merge pull request #28 from fga-eps-mds/dev

[FIX] Adiciona atributo ID ao JWT (fga-eps-mds/2024.2-ARANDU-DOC#112)
fga-eps-mds · Jan 12, 2025 · 5e8b037 · 5e8b037
2 parents ce8d79c + e738c14
commit 5e8b037
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/src/auth/auth.service.ts b/src/auth/auth.service.ts
@@ -51,12 +51,13 @@ export class AuthService {
   async login(user: any) {
     const tokens = await this.generateTokens({
       userId: user._id,
+      id: user._id,
       name: user.name,
       email: user.email,
       role: user.role,
     });
     return {
-      userId: user._id,
+      id: user._id,
       name: user.name,
       email: user.email,
       ...tokens,
@@ -76,6 +77,7 @@ export class AuthService {
     }
     const token = await this.generateTokens({
       userId: user._id,
+      id: user._id,
       name: user.name,
       email: user.email,
       role: user.role,
@@ -84,9 +86,10 @@ export class AuthService {
     return { user, token };
   }
 
-  async generateTokens({ userId, name, email, role }) {
+  async generateTokens({ userId, id, name, email, role }) {
     const payload = {
       userId: userId,
+      id: id,
       name: name,
       email: email,
       sub: userId,
@@ -143,6 +146,7 @@ export class AuthService {
 
     return this.generateTokens({
       userId: user._id,
+      id: user._id,
       name: user.name,
       email: user.email,
       role: user.role,

diff --git a/test/auth.controller.spec.ts b/test/auth.controller.spec.ts
@@ -58,7 +58,7 @@ describe('AuthController', () => {
       const result = {
         accessToken: 'token',
         refreshToken: 'refresh-token',
-        userId: 1,
+        id: 1,
         name: 'Test User',
         email: '[email protected]',
       };

diff --git a/test/auth.service.spec.ts b/test/auth.service.spec.ts
@@ -90,7 +90,7 @@ describe('AuthService', () => {
 
       const result = await service.login(user);
       expect(result).toEqual({
-        userId: 'user-id',
+        id: 'user-id',
         name: 'Test User',
         email: '[email protected]',
         accessToken: 'access-token',
@@ -128,6 +128,7 @@ describe('AuthService', () => {
 
       const result = await service.generateTokens({
         userId: 'user-id',
+        id: 'user-id',
         name: 'Test User',
         email: '[email protected]',
         role: 'user',