Update backend and server frontend for OAuth JSON response, client-side navigation, and add .gitignore

api/auth.py

@@ -4,7 +4,7 @@ from httpx_oauth.clients.google import GoogleOAuth2
 from httpx_oauth.clients.github import GitHubOAuth2
 from fastapi_users.manager import BaseUserManager, IntegerIDMixin
 from fastapi import Depends, Request, FastAPI, Response
-from fastapi.responses import JSONResponse
+from fastapi.responses import JSONResponse, RedirectResponse
 from sqlalchemy.ext.asyncio import AsyncSession
 from sqlalchemy import select
 from fastapi_users.models import UP
@@ -200,6 +200,7 @@ async def custom_oauth_callback(
     oauth_client=Depends(lambda: google_oauth_client),
     redirect_url: str = GOOGLE_REDIRECT_URL,
     response: Response = None,
+    request: Request = None,
 ):
     logger.debug(f"Processing Google callback with code: {code}, state: {state}")
     try:
@@ -246,10 +247,19 @@ async def custom_oauth_callback(
             secure=True,
         )
 
-        return JSONResponse(content={
-            "message": "Google login successful",
-            "access_token": token
-        }, status_code=200)
+        # تحقق إذا كان الطلب من التطبيق (Capacitor) أو الويب
+        is_app = request.headers.get("X-Capacitor-App", False)
+
+        if is_app:
+            # للتطبيق: إرجاع JSON مع الـ token
+            return JSONResponse(content={
+                "message": "Google login successful",
+                "access_token": token
+            }, status_code=200)
+        else:
+            # للويب: إرجاع redirect إلى /chat
+            return RedirectResponse(url="/chat", status_code=303)
+
     except Exception as e:
         logger.error(f"Error in Google OAuth callback: {str(e)}")
         return JSONResponse(content={"detail": str(e)}, status_code=400)
@@ -261,6 +271,7 @@ async def custom_github_oauth_callback(
     oauth_client=Depends(lambda: github_oauth_client),
     redirect_url: str = GITHUB_REDIRECT_URL,
     response: Response = None,
+    request: Request = None,
 ):
     logger.debug(f"Processing GitHub callback with code: {code}, state: {state}")
     try:
@@ -325,10 +336,19 @@ async def custom_github_oauth_callback(
             secure=True,
         )
 
-        return JSONResponse(content={
-            "message": "GitHub login successful",
-            "access_token": token
-        }, status_code=200)
+        # تحقق إذا كان الطلب من التطبيق (Capacitor) أو الويب
+        is_app = request.headers.get("X-Capacitor-App", False)
+
+        if is_app:
+            # للتطبيق: إرجاع JSON مع الـ token
+            return JSONResponse(content={
+                "message": "GitHub login successful",
+                "access_token": token
+            }, status_code=200)
+        else:
+            # للويب: إرجاع redirect إلى /chat
+            return RedirectResponse(url="/chat", status_code=303)
+
     except Exception as e:
         logger.error(f"Error in GitHub OAuth callback: {str(e)}")
         return JSONResponse(content={"detail": str(e)}, status_code=400)

requirements.txt

@@ -1,5 +1,6 @@
 fastapi==0.95.2
-fastapi-users[sqlalchemy,oauth2]==10.4.2
+
+fastapi-users[sqlalchemy,oauth2]==12.1.3
 pydantic==1.10.13
 email-validator==1.3.1
 sqlalchemy[asyncio]

templates/login.html

@@ -568,58 +568,62 @@
 
     // Check for OAuth callback on load
     window.addEventListener('load', async () => {
-        console.log('Page loaded, checking for auth status and OAuth callback');
-        if (!navigator.onLine) {
-            errorMsg.textContent = 'You are offline. Please connect to the internet and try again.';
-            errorMsg.classList.remove('hidden');
-            return;
-        }
-        const urlParams = new URLSearchParams(window.location.search);
-        const code = urlParams.get('code');
-        const error = urlParams.get('error');
-        if (error) {
-            errorMsg.textContent = decodeURIComponent(error);
-            errorMsg.classList.remove('hidden');
-            console.error('OAuth error from URL:', error);
-        } else if (code) {
-            console.log('OAuth code detected in URL, processing callback');
-            const provider = window.location.pathname.includes('google') ? 'google' : 'github';
-            try {
-                const response = await fetch(window.location.href, {
-                    method: 'GET',
-                    headers: { 'Accept': 'application/json' }
-                });
-                if (response.ok) {
-                    const data = await response.json();
-                    if (data.access_token) {
-                        localStorage.setItem('token', data.access_token);
-                        console.log(`${provider} login successful, token saved`);
-                        const isAuthenticated = await checkAuthStatus();
-                        if (isAuthenticated) {
-                            console.log('Redirecting to /chat');
-                            window.location.href = '/chat';
-                        } else {
-                            throw new Error('Authentication failed after receiving token');
-                        }
+    console.log('Page loaded, checking for auth status and OAuth callback');
+    if (!navigator.onLine) {
+        errorMsg.textContent = 'You are offline. Please connect to the internet and try again.';
+        errorMsg.classList.remove('hidden');
+        return;
+    }
+    const isAuthenticated = await checkAuthStatus();
+    if (isAuthenticated) {
+        console.log('User already authenticated, redirecting to /chat');
+        window.location.href = '/chat';
+        return;
+    }
+
+    const urlParams = new URLSearchParams(window.location.search);
+    const code = urlParams.get('code');
+    const error = urlParams.get('error');
+    if (error) {
+        errorMsg.textContent = decodeURIComponent(error);
+        errorMsg.classList.remove('hidden');
+        console.error('OAuth error from URL:', error);
+    } else if (code) {
+        console.log('OAuth code detected in URL, processing callback');
+        const provider = window.location.pathname.includes('google') ? 'google' : 'github';
+        try {
+            const response = await fetch(window.location.href, {
+                method: 'GET',
+                headers: { 'Accept': 'application/json' }
+            });
+            if (response.ok) {
+                const data = await response.json();
+                if (data.access_token) {
+                    localStorage.setItem('token', data.access_token);
+                    console.log(`${provider} login successful, token saved`);
+                    const isAuthenticated = await checkAuthStatus();
+                    if (isAuthenticated) {
+                        console.log('Redirecting to /chat');
+                        window.location.href = '/chat';
                     } else {
-                        throw new Error('No access token received');
+                        throw new Error('Authentication failed after receiving token');
                     }
                 } else {
-                    const errorData = await response.json();
-                    errorMsg.textContent = errorData.detail || `Failed to complete ${provider} login`;
-                    errorMsg.classList.remove('hidden');
-                    console.error(`Failed to complete ${provider} login:`, errorData);
+                    throw new Error('No access token received');
                 }
-            } catch (error) {
-                errorMsg.textContent = `Failed to process ${provider} login. Please try again.`;
+            } else {
+                const errorData = await response.json();
+                errorMsg.textContent = errorData.detail || `Failed to complete ${provider} login`;
                 errorMsg.classList.remove('hidden');
-                console.error(`Error processing ${provider} callback:`, error);
+                console.error(`Failed to complete ${provider} login:`, errorData);
             }
-        } else {
-            await checkAuthStatus();
+        } catch (error) {
+            errorMsg.textContent = `Failed to process ${provider} login. Please try again.`;
+            errorMsg.classList.remove('hidden');
+            console.error(`Error processing ${provider} callback:`, error);
         }
-    });
-
+    }
+});
     // Handle card details toggle
     function showCardDetails(cardId) {
         console.log('Showing card details:', cardId);