Update frontend/src/contexts/AuthContext.jsx

frontend/src/contexts/AuthContext.jsx

@@ -1,5 +1,7 @@
 import React, { createContext, useContext, useState, useEffect } from "react";
-import { getCurrentUser, login, logout as apiLogout } from "@/services/auth";
+import { signInWithPopup, signOut as firebaseSignOut } from "firebase/auth";
+import { auth, googleProvider } from "@/config/firebase";
+import { getCurrentUser, firebaseLogin, requestOTP, verifyOTP, logout as apiLogout } from "@/services/auth";
 
 const AuthContext = createContext(null);
 
@@ -31,14 +33,47 @@ export function AuthProvider({ children }) {
     }
   };
 
-  const handleLogin = () => {
-    // Redirect to backend OAuth login
-    const apiUrl = import.meta.env.VITE_API_BASE_URL || "";
-    window.location.href = `${apiUrl}/api/auth/login`;
+  const handleFirebaseLogin = async () => {
+    try {
+      const result = await signInWithPopup(auth, googleProvider);
+      const idToken = await result.user.getIdToken();
+      const response = await firebaseLogin(idToken);
+      handleAuthCallback(response.token);
+    } catch (error) {
+      if (error.code === 'auth/popup-closed' || error.code === 'auth/cancelled-popup-request') {
+        // User closed popup or cancelled - don't show error
+        return;
+      }
+      console.error("Firebase login error:", error);
+      throw new Error(error.message || "Firebase authentication failed");
+    }
+  };
+
+  const handleOTPRequest = async (email) => {
+    try {
+      await requestOTP(email);
+    } catch (error) {
+      console.error("OTP request error:", error);
+      throw error;
+    }
+  };
+
+  const handleOTPVerify = async (email, otp) => {
+    try {
+      const response = await verifyOTP(email, otp);
+      handleAuthCallback(response.token);
+    } catch (error) {
+      console.error("OTP verify error:", error);
+      throw error;
+    }
   };
 
   const handleLogout = async () => {
     try {
+      // Sign out from Firebase if user was using Firebase auth
+      if (auth.currentUser) {
+        await firebaseSignOut(auth);
+      }
       await apiLogout();
     } catch (error) {
       console.error("Logout error:", error);
@@ -59,7 +94,9 @@ export function AuthProvider({ children }) {
     user,
     token,
     loading,
-    login: handleLogin,
+    firebaseLogin: handleFirebaseLogin,
+    requestOTP: handleOTPRequest,
+    verifyOTP: handleOTPVerify,
     logout: handleLogout,
     handleAuthCallback,
     isAuthenticated: !!user,