Revert "Phase2_Day1"

This reverts commit 51b954e.

Author: AdityaDRathore

frontend/src/api/auth.ts

@@ -1,20 +1,18 @@
 import apiClient, { ApiResponse, handleApiError } from './index';
 
-// Types for login request payload
+// Types for auth requests/responses
 export interface LoginRequest {
   email: string;
   password: string;
 }
 
-// Types for registration request payload
 export interface RegisterRequest {
   user_name: string;
   user_email: string;
   user_password: string;
-  organizationId?: string;  // Optional field
+  organizationId?: string;
 }
 
-// Types for authentication response from backend
 export interface AuthResponse {
   user: {
     id: string;
@@ -26,86 +24,67 @@ export interface AuthResponse {
 }
 
 /**
- * User login function
- * @param credentials - LoginRequest containing email and password
- * @returns Promise resolving to AuthResponse containing user info and token
- * Stores token in localStorage for subsequent requests
+ * User login
  */
 export const login = async (credentials: LoginRequest): Promise<AuthResponse> => {
   try {
-    // Call login API endpoint with user credentials
     const response = await apiClient.post<ApiResponse<AuthResponse>>('/auth/login', credentials);
     const { token, user } = response.data.data;
 
-    // Save token in localStorage for auth persistence
+    // Store token for future requests
     localStorage.setItem('accessToken', token);
 
     return { token, user };
   } catch (error) {
-    // Handle errors gracefully with helper function
     throw new Error(handleApiError(error));
   }
 };
 
 /**
- * User registration function
- * @param userData - RegisterRequest containing registration details
- * @returns Promise resolving to AuthResponse containing user info and token
- * Stores token in localStorage for subsequent requests
+ * User registration
  */
 export const register = async (userData: RegisterRequest): Promise<AuthResponse> => {
   try {
-    // Call register API endpoint with user data
     const response = await apiClient.post<ApiResponse<AuthResponse>>('/auth/register', userData);
     const { token, user } = response.data.data;
 
-    // Save token in localStorage for auth persistence
+    // Store token for future requests
     localStorage.setItem('accessToken', token);
 
     return { token, user };
   } catch (error) {
-    // Handle errors gracefully with helper function
     throw new Error(handleApiError(error));
   }
 };
 
 /**
- * User logout function
- * Calls logout API endpoint and removes token from localStorage
+ * User logout
  */
 export const logout = async (): Promise<void> => {
   try {
-    // Notify backend about logout
     await apiClient.post('/auth/logout');
-
-    // Remove token to clear authentication state on client
     localStorage.removeItem('accessToken');
   } catch (error) {
     throw new Error(handleApiError(error));
   }
 };
 
 /**
- * Request password reset email
- * @param email - User email to send reset link
+ * Request password reset
  */
 export const forgotPassword = async (email: string): Promise<void> => {
   try {
-    // Call forgot-password API with user email
     await apiClient.post('/auth/forgot-password', { email });
   } catch (error) {
     throw new Error(handleApiError(error));
   }
 };
 
 /**
- * Reset password with reset token and new password
- * @param token - Password reset token received via email
- * @param newPassword - New password string
+ * Reset password with token
  */
 export const resetPassword = async (token: string, newPassword: string): Promise<void> => {
   try {
-    // Call reset-password API with token and new password
     await apiClient.post('/auth/reset-password', { token, newPassword });
   } catch (error) {
     throw new Error(handleApiError(error));

frontend/src/api/index.ts

@@ -1,11 +1,32 @@
+/**
+ * Ensures all Promise rejections use proper Error objects
+ *
+ * This fix addresses a TypeScript error where Promise rejections were not
+ * guaranteed to be Error objects. The code now checks if the rejection reason
+ * is an Error instance and, if not, converts it to an Error object.
+ *
+ * Fixed in:
+ * - Request interceptor error handler
+ * - Response interceptor error handler
+ *
+ * This ensures type safety and better error handling throughout the application.
+ */
+/**
+ * TypeScript type declarations for Vite's import.meta.env
+ *
+ * These declarations extend the ImportMeta interface to include Vite-specific
+ * environment variables, resolving the TypeScript error:
+ * "Property 'env' does not exist on type 'ImportMeta'"
+ *
+ * @see https://vitejs.dev/guide/env-and-mode.html#env-files
+ */
 import axios, {
   AxiosError,
   AxiosInstance,
-  AxiosRequestConfig,
+  AxiosRequestConfig, // Import AxiosRequestConfig
   AxiosResponse,
   isAxiosError as axiosIsAxiosError,
 } from 'axios';
-import { useAuthStore } from '../state/authStore'; // Adjust path if needed
 
 // TypeScript declaration for Vite env
 declare global {
@@ -21,11 +42,11 @@ declare global {
 
 // API base URL - should match your backend
 const API_BASE_URL = import.meta.env.VITE_API_BASE_URL || 'http://localhost:3000/api';
-
 // Default timeout in milliseconds
 const DEFAULT_TIMEOUT = 15000;
 
-// Extend AxiosRequestConfig to add _retry flag for token refresh logic
+// Define an interface for the request config with retry flag
+// by extending the original AxiosRequestConfig
 interface ExtendedAxiosRequestConfig extends AxiosRequestConfig {
   _retry?: boolean;
 }
@@ -45,7 +66,7 @@ const createApiClient = (): AxiosInstance => {
 
   // Request interceptor - adds auth token to requests
   apiClient.interceptors.request.use(
-    (config) => {
+    config => {
       const token = localStorage.getItem('accessToken');
       if (token && config.headers) {
         config.headers.Authorization = `Bearer ${token}`;
@@ -55,65 +76,60 @@ const createApiClient = (): AxiosInstance => {
     (error: AxiosError) => Promise.reject(error)
   );
 
-  // Response interceptor - handle 401 errors and token refresh
+  // Response interceptor - handle common errors
   apiClient.interceptors.response.use(
     (response: AxiosResponse) => response,
     async (error: AxiosError) => {
+      // Cast error.config to the extended interface
       const originalRequest = error.config as ExtendedAxiosRequestConfig;
 
+      // Handle 401 Unauthorized errors (expired token)
       if (error.response?.status === 401 && originalRequest && !originalRequest._retry) {
         originalRequest._retry = true;
 
         try {
-          // Attempt to refresh token
+          // Call refresh token endpoint
           const refreshResponse = await axios.post(
             `${API_BASE_URL}/auth/refresh-token`,
             {},
-            { withCredentials: true }
+            {
+              withCredentials: true, // Needed for cookies
+            }
           );
 
           const newToken = refreshResponse.data.token;
           localStorage.setItem('accessToken', newToken);
 
+          // Retry the original request with new token
           if (originalRequest.headers) {
             originalRequest.headers.Authorization = `Bearer ${newToken}`;
           }
-
           return apiClient(originalRequest);
         } catch (refreshError) {
-          // Refresh token failed - logout user
+          // If refresh token fails, redirect to login
           localStorage.removeItem('accessToken');
-          const store = useAuthStore.getState();
-          store.logout();
-
+          // Ensure window is defined (for SSR or test environments)
           if (typeof window !== 'undefined') {
             window.location.href = '/login';
           }
 
+          // Ensure we reject with an Error object
           if (refreshError instanceof Error) {
             return Promise.reject(refreshError);
           } else if (typeof refreshError === 'string') {
             return Promise.reject(new Error(refreshError));
           } else {
+            // For other types, you might want to serialize or provide a generic message
             return Promise.reject(
               new Error(
                 `An unknown error occurred during token refresh: ${JSON.stringify(refreshError)}`
               )
             );
           }
         }
-      } else if (error.response?.status === 401) {
-        // Other 401 errors after retry or no retry - logout user
-        localStorage.removeItem('accessToken');
-        const store = useAuthStore.getState();
-        store.logout();
-
-        if (typeof window !== 'undefined') {
-          window.location.href = '/login';
-        }
       }
 
-      return Promise.reject(error);
+      return Promise.reject(error); // error here is AxiosError, which is an Error instance
     }
   );
 
@@ -132,7 +148,7 @@ export interface ApiResponse<T> {
   status: number;
 }
 
-// Common error handler function
+// Common error handler
 export const handleApiError = (error: unknown): string => {
   if (axiosIsAxiosError(error)) {
     const response = error.response;

frontend/src/api/labs.ts

@@ -64,5 +64,3 @@ export const deleteLab = async (labId: string): Promise<void> => {
     throw new Error(handleApiError(error));
   }
 };
-
-