feat: update user and team service response handling and cache management

Author: JasonKrik

services/frontend/src/router/index.ts

@@ -69,7 +69,7 @@ const routes = [
   },
   {
     path: '/admin',
-    meta: { 
+    meta: {
       requiresSetup: true,
       requiresRole: 'global_admin'
     },
@@ -101,19 +101,37 @@ const router = createRouter({
 // Navigation guard to check database setup
 router.beforeEach(async (to, from, next) => {
   const databaseStore = useDatabaseStore()
-  
+
   // Define public routes that don't need user authentication checks
   const publicRoutes = ['Setup', 'Login', 'Register']
   const isPublicRoute = publicRoutes.includes(to.name as string)
-  
+
+  // Attempt to get current user status early
+  let currentUser: any = null;
+  try {
+    // Avoid force refreshing cache here unless necessary, to use existing session info
+    currentUser = await UserService.getCurrentUser();
+  } catch (error) {
+    console.error('Failed to get current user in guard:', error);
+    // currentUser remains null, proceed as unauthenticated for safety
+  }
+
+  // If user is logged in and trying to access Login or Register, redirect to Dashboard
+  if (currentUser && (to.name === 'Login' || to.name === 'Register')) {
+    next('/dashboard');
+    return;
+  }
+
   // Skip setup check for the setup route itself
   if (to.name === 'Setup') {
     next()
     return
   }
 
-  // For public routes (Login/Register), only check database setup, skip user checks
+  // For public routes (Login/Register) that are NOT being accessed by an already logged-in user
   if (isPublicRoute) {
+    // This block is now for genuinely unauthenticated users accessing Login/Register
+    // or for the Setup page (though Setup is handled above, this keeps structure)
     // Check if route requires setup
     if (to.meta.requiresSetup !== false) {
       try {
@@ -132,27 +150,20 @@ router.beforeEach(async (to, from, next) => {
         return
       }
     }
-    
-    // For public routes, proceed without user checks
+
+    // For public routes, proceed without further user checks if not already redirected
     next()
     return
   }
 
-  // For protected routes, check user authentication (single call)
-  let currentUser: any = null
-  try {
-    currentUser = await UserService.getCurrentUser()
-  } catch (error) {
-    console.error('Failed to get current user:', error)
-  }
-
-  // If user is logged in and trying to access Login or Register, redirect to Dashboard
-  if (currentUser && (to.name === 'Login' || to.name === 'Register')) {
-    next('/dashboard')
-    return
+  // For protected routes (user is not null or trying to access login/register when logged in)
+  // If not logged in and trying to access a protected route, redirect to login
+  if (!currentUser && !isPublicRoute && to.name !== 'Setup') {
+    next('/login');
+    return;
   }
 
-  // Check if route requires setup
+  // Check if route requires setup (for protected routes, currentUser should exist here)
   if (to.meta.requiresSetup !== false) {
     try {
       // Check database status (use cache for performance)
@@ -173,8 +184,9 @@ router.beforeEach(async (to, from, next) => {
 
   // Check role requirements (reuse the currentUser from above)
   if (to.meta.requiresRole) {
+    // currentUser should be valid here due to the redirect above if null
     if (!currentUser || currentUser.role_id !== to.meta.requiresRole) {
-      next({ name: 'NotFound' })
+      next({ name: 'NotFound' }) // Or redirect to an 'Unauthorized' page
       return
     }
   }

services/frontend/src/services/teamService.ts

@@ -11,8 +11,8 @@ export interface Team {
 }
 
 export interface TeamResponse {
-  success: boolean
-  data: Team[]
+  success: boolean;
+  teams: Team[]; // Changed 'data' to 'teams'
 }
 
 interface TeamCacheEntry {
@@ -71,16 +71,16 @@ export class TeamService {
 
     // Make the API call
     this.pendingUserTeamsRequest = this.fetchUserTeams();
-    
+
     try {
       const result = await this.pendingUserTeamsRequest;
-      
+
       // Cache the result
       this.userTeamsCache = {
         data: result,
         timestamp: Date.now()
       };
-      
+
       return result;
     } finally {
       // Clear pending request
@@ -112,8 +112,8 @@ export class TeamService {
 
       const data: TeamResponse = await response.json()
 
-      if (data.success && Array.isArray(data.data)) {
-        return data.data
+      if (data.success && Array.isArray(data.teams)) { // Changed 'data.data' to 'data.teams'
+        return data.teams // Changed 'data.data' to 'data.teams'
       } else {
         throw new Error('Invalid response format')
       }
@@ -129,7 +129,7 @@ export class TeamService {
   static async createTeam(teamData: Partial<Team>): Promise<Team> {
     try {
       const apiUrl = this.getApiUrl();
-      
+
       const response = await fetch(`${apiUrl}/api/teams`, {
         method: 'POST',
         headers: {
@@ -144,10 +144,10 @@ export class TeamService {
       }
 
       const data = await response.json();
-      
+
       // Clear cache on successful team creation
       this.clearUserTeamsCache();
-      
+
       return data.data;
     } catch (error) {
       console.error('Error creating team:', error);
@@ -161,7 +161,7 @@ export class TeamService {
   static async updateTeam(teamId: string, teamData: Partial<Team>): Promise<Team> {
     try {
       const apiUrl = this.getApiUrl();
-      
+
       const response = await fetch(`${apiUrl}/api/teams/${teamId}`, {
         method: 'PUT',
         headers: {
@@ -176,10 +176,10 @@ export class TeamService {
       }
 
       const data = await response.json();
-      
+
       // Clear cache on successful team update
       this.clearUserTeamsCache();
-      
+
       return data.data;
     } catch (error) {
       console.error('Error updating team:', error);
@@ -193,7 +193,7 @@ export class TeamService {
   static async deleteTeam(teamId: string): Promise<void> {
     try {
       const apiUrl = this.getApiUrl();
-      
+
       const response = await fetch(`${apiUrl}/api/teams/${teamId}`, {
         method: 'DELETE',
         headers: {
@@ -205,7 +205,7 @@ export class TeamService {
       if (!response.ok) {
         throw new Error(`Failed to delete team: ${response.status}`);
       }
-      
+
       // Clear cache on successful team deletion
       this.clearUserTeamsCache();
     } catch (error) {

services/frontend/src/services/userService.ts

@@ -70,16 +70,16 @@ export class UserService {
 
     // Make the API call
     this.pendingRequest = this.fetchCurrentUser();
-    
+
     try {
       const result = await this.pendingRequest;
-      
+
       // Cache the result
       this.cache = {
         data: result,
         timestamp: Date.now()
       };
-      
+
       return result;
     } finally {
       // Clear pending request
@@ -102,11 +102,13 @@ export class UserService {
       });
 
       if (response.ok) {
-        const data = await response.json();
-        if (data.success && data.data) {
-          return data.data as User;
+        const userData = await response.json();
+        // The /api/users/me endpoint returns the user object directly
+        // Ensure it's not an error structure like { success: false, error: '...' }
+        if (userData && typeof userData.id === 'string') {
+          return userData as User;
         }
-        // If success is false or data is missing, treat as not logged in for this check
+        // If it's not a valid user object (e.g., an error response still got 200 OK somehow, or empty)
         return null;
       }