Audit table with better data

water-api/src/services/auth.service.ts

@@ -78,15 +78,15 @@ export async function login(
     throw new Error('Invalid email or password');
   }
 
-  // Generate tokens
   const accessToken = generateAccessToken({
-    id: user.id,
+    userId: user.id,
     email: user.email,
-    role: user.role_name,
+    roleId: user.id,
+    roleName: user.role_name,
   });
 
   const refreshToken = generateRefreshToken({
-    id: user.id,
+    userId: user.id,
   });
 
   // Hash and store refresh token
@@ -136,7 +136,8 @@ export async function refresh(refreshToken: string): Promise<{ accessToken: stri
   // Hash token to check against database
   const hashedToken = hashToken(refreshToken);
 
-  // Find token in database
+  const userId = (decoded as any).userId || (decoded as any).id;
+  
   const tokenResult = await query<{
     id: string;
     expires_at: Date;
@@ -144,7 +145,7 @@ export async function refresh(refreshToken: string): Promise<{ accessToken: stri
     `SELECT id, expires_at FROM refresh_tokens
      WHERE token_hash = $1 AND user_id = $2 AND revoked_at IS NULL
      LIMIT 1`,
-    [hashedToken, decoded.id]
+    [hashedToken, userId]
   );
 
   const storedToken = tokenResult.rows[0];
@@ -175,7 +176,7 @@ export async function refresh(refreshToken: string): Promise<{ accessToken: stri
      JOIN roles r ON u.role_id = r.id
      WHERE u.id = $1 AND u.is_active = true
      LIMIT 1`,
-    [decoded.id]
+    [userId]
   );
 
   const user = userResult.rows[0];
@@ -184,11 +185,11 @@ export async function refresh(refreshToken: string): Promise<{ accessToken: stri
     throw new Error('User not found');
   }
 
-  // Generate new access token
   const accessToken = generateAccessToken({
-    id: user.id,
+    userId: user.id,
     email: user.email,
-    role: user.role_name,
+    roleId: user.id,
+    roleName: user.role_name,
   });
 
   return { accessToken };