Add new frontend - fix 8

frontend/src/api/services/authService.ts

@@ -1,5 +1,4 @@
-// File: frontend/src/api/services/authService.ts
-
+// frontend/src/api/services/authService.ts - UPDATED TO HANDLE TOKENS FROM REGISTRATION
 import { tokenManager } from '../auth/tokenManager';
 import { apiClient } from '../base/apiClient';
 
@@ -19,45 +18,66 @@ export interface UserProfile {
   id: string;
   email: string;
   full_name: string;
-  tenant_id: string;
-  role: string;
+  tenant_id?: string;
+  role?: string;
   is_active: boolean;
+  is_verified?: boolean;
   created_at: string;
 }
 
-class AuthService {
-  async login(credentials: LoginCredentials): Promise<UserProfile> {
-    // FIXED: Use correct endpoint and method
-    const response = await apiClient.post('/api/v1/auth/login', credentials);
-    
-    // Store tokens from login response
-    await tokenManager.storeTokens(response);
+export interface TokenResponse {
+  access_token: string;
+  refresh_token?: string;
+  token_type: string;
+  expires_in?: number;
+  user?: UserProfile;
+}
 
-    // Get user profile from the response or make separate call
+class AuthService {
+  async register(data: RegisterData): Promise<UserProfile> {
+    // NEW: Registration now returns tokens directly - no auto-login needed!
+    const response: TokenResponse = await apiClient.post('/api/v1/auth/register', data);
+    
+    // Store tokens immediately from registration response
+    await tokenManager.storeTokens(response);
+    
+    // Return user profile from registration response
     if (response.user) {
       return response.user;
     } else {
+      // Fallback: get user profile if not included in response
       return this.getCurrentUser();
     }
   }
 
-  async register(data: RegisterData): Promise<UserProfile> {
-    // FIXED: Use correct endpoint path
-    const response = await apiClient.post('/api/v1/auth/register', data);
+  async login(credentials: LoginCredentials): Promise<UserProfile> {
+    // UPDATED: Use correct endpoint and unified response handling
+    const response: TokenResponse = await apiClient.post('/api/v1/auth/login', credentials);
     
-    // Registration only returns user data, NOT tokens
-    // So we need to login separately to get tokens
-    await this.login({
-      email: data.email,
-      password: data.password
-    });
+    // Store tokens from login response
+    await tokenManager.storeTokens(response);
 
-    return response; // This is the user profile from registration
+    // Return user profile from login response
+    if (response.user) {
+      return response.user;
+    } else {
+      // Fallback: get user profile if not included in response
+      return this.getCurrentUser();
+    }
   }
 
   async logout(): Promise<void> {
     try {
-      await apiClient.post('/api/v1/auth/logout');
+      // Get refresh token for logout request
+      const refreshToken = tokenManager.getRefreshToken();
+      if (refreshToken) {
+        await apiClient.post('/api/v1/auth/logout', {
+          refresh_token: refreshToken
+        });
+      }
+    } catch (error) {
+      console.error('Logout API call failed:', error);
+      // Continue with local cleanup even if API fails
     } finally {
       tokenManager.clearTokens();
       window.location.href = '/login';
@@ -79,9 +99,19 @@ class AuthService {
     });
   }
 
+  async refreshToken(): Promise<void> {
+    await tokenManager.refreshAccessToken();
+  }
+
   isAuthenticated(): boolean {
     return tokenManager.isAuthenticated();
   }
+
+  getUser(): UserProfile | null {
+    // This method would need to be implemented to return cached user data
+    // For now, it returns null and components should use getCurrentUser()
+    return null;
+  }
 }
 
 export const authService = new AuthService();