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

static/js/chat.js

@@ -49,127 +49,130 @@ let currentAssistantText = '';
 let isSidebarOpen = window.innerWidth >= 768;
 let abortController = null;
 
-// Forcefully initialize chat view on load
-document.addEventListener('DOMContentLoaded', async () => {
-  AOS.init({
-    duration: 800,
-    easing: 'ease-out-cubic',
-    once: true,
-    offset: 50,
-  });
 
-  // Force chat view to be visible immediately
-  enterChatView(true);
 
-  const authResult = await checkAuth();
-  if (authResult.authenticated && currentConversationId) {
-    console.log('Authenticated user, loading conversation with ID:', currentConversationId);
-    await loadConversation(currentConversationId);
-    // عرض بيانات المستخدم في الواجهة
-    const userInfoElement = document.getElementById('user-info');
-    if (userInfoElement && authResult.user) {
-      userInfoElement.textContent = `Welcome, ${authResult.user.email}`;
-    }
-  } else if (!authResult.authenticated && conversationHistory.length > 0) {
-    console.log('Unauthenticated user, restoring conversation history from sessionStorage:', conversationHistory);
-    conversationHistory.forEach(msg => {
-      console.log('Adding message from history:', msg);
-      addMsg(msg.role, msg.content);
-    });
-    // عرض Anonymous لو مفيش مستخدم موثّق
-    const userInfoElement = document.getElementById('user-info');
-    if (userInfoElement) {
-      userInfoElement.textContent = 'Anonymous';
-    }
-  } else {
-    console.log('No conversation history or ID, starting fresh');
-    const userInfoElement = document.getElementById('user-info');
-    if (userInfoElement) {
-      userInfoElement.textContent = 'Anonymous';
-    }
-  }
 
-  autoResizeTextarea();
-  updateSendButtonState();
-  if (uiElements.swipeHint) {
-    setTimeout(() => {
-      uiElements.swipeHint.style.display = 'none';
-    }, 3000);
-  }
-  setupTouchGestures();
-});
 
-// Check authentication token
 async function checkAuth() {
-  // تحقق من وجود token في query parameters
-  const urlParams = new URLSearchParams(window.location.search);
-  const accessTokenFromUrl = urlParams.get('access_token');
-  if (accessTokenFromUrl) {
-    console.log('Access token found in URL, saving to localStorage');
-    localStorage.setItem('token', accessTokenFromUrl);
-    // إزالة الـ access_token من الـ URL عشان الأمان
-    window.history.replaceState({}, document.title, '/chat');
-  }
+    // تحقق من وجود access_token في query parameters
+    const urlParams = new URLSearchParams(window.location.search);
+    const accessTokenFromUrl = urlParams.get('access_token');
+    if (accessTokenFromUrl) {
+        console.log('Access token found in URL, saving to localStorage');
+        localStorage.setItem('token', accessTokenFromUrl);
+        // إزالة access_token من الـ URL عشان الأمان
+        window.history.replaceState({}, document.title, '/chat');
+    }
 
-  // تحقق من وجود token في localStorage
-  let token = localStorage.getItem('token');
+    // تحقق من وجود token في localStorage
+    let token = localStorage.getItem('token');
 
-  // لو مفيش token في localStorage، حاول استخرج الـ token من الـ cookie (اختياري)
-  if (!token && typeof Cookies !== 'undefined') {
-    token = Cookies.get('fastapiusersauth');
-    if (token) {
-      console.log('Access token found in cookie, saving to localStorage');
-      localStorage.setItem('token', token);
+    // لو مفيش token في localStorage، حاول استخرج الـ token من الـ cookie
+    if (!token && typeof Cookies !== 'undefined') {
+        token = Cookies.get('fastapiusersauth');
+        if (token) {
+            console.log('Access token found in cookie, saving to localStorage');
+            localStorage.setItem('token', token);
+        }
     }
-  }
-
-  if (!token) {
-    console.log('No auth token found in localStorage or cookie');
-    return { authenticated: false, user: null };
-  }
 
-  try {
-    const response = await fetch('/api/verify-token', {
-      method: 'GET',
-      headers: { 
-        'Authorization': `Bearer ${token}`,
-        'Accept': 'application/json'
-      }
-    });
-    const data = await response.json();
-    if (response.ok && data.status === 'valid') {
-      console.log('Auth token verified, user:', data.user);
-      return { authenticated: true, user: data.user };
-    } else {
-      console.log('Token verification failed:', data.detail || response.status);
-      localStorage.removeItem('token');
-      if (typeof Cookies !== 'undefined') {
-        Cookies.remove('fastapiusersauth');
-      }
-      return { authenticated: false, user: null };
+    if (!token) {
+        console.log('No auth token found in localStorage or cookie');
+        return { authenticated: false, user: null };
     }
-  } catch (error) {
-    console.error('Error verifying token:', error);
-    localStorage.removeItem('token');
-    if (typeof Cookies !== 'undefined') {
-      Cookies.remove('fastapiusersauth');
+
+    try {
+        const response = await fetch('/api/verify-token', {
+            method: 'GET',
+            headers: {
+                'Authorization': `Bearer ${token}`,
+                'Accept': 'application/json'
+            }
+        });
+        const data = await response.json();
+        if (response.ok && data.status === 'valid') {
+            console.log('Auth token verified, user:', data.user);
+            return { authenticated: true, user: data.user };
+        } else {
+            console.log('Token verification failed:', data.detail || 'Invalid token');
+            localStorage.removeItem('token');
+            if (typeof Cookies !== 'undefined') {
+                Cookies.remove('fastapiusersauth');
+            }
+            return { authenticated: false, user: null };
+        }
+    } catch (error) {
+        console.error('Error verifying token:', error);
+        localStorage.removeItem('token');
+        if (typeof Cookies !== 'undefined') {
+            Cookies.remove('fastapiusersauth');
+        }
+        return { authenticated: false, user: null };
     }
-    return { authenticated: false, user: null };
-  }
 }
-// Handle session for non-logged-in users
+
 async function handleSession() {
-  const sessionId = sessionStorage.getItem('session_id');
-  if (!sessionId) {
-    const newSessionId = crypto.randomUUID();
-    sessionStorage.setItem('session_id', newSessionId);
-    console.log('New session_id created:', newSessionId);
-    return newSessionId;
-  }
-  console.log('Existing session_id:', sessionId);
-  return sessionId;
+    const sessionId = sessionStorage.getItem('session_id');
+    if (!sessionId) {
+        const newSessionId = crypto.randomUUID();
+        sessionStorage.setItem('session_id', newSessionId);
+        console.log('New session_id created:', newSessionId);
+        return newSessionId;
+    }
+    console.log('Existing session_id:', sessionId);
+    return sessionId;
 }
 
+window.addEventListener('load', async () => {
+    console.log('Chat page loaded, checking authentication');
+    AOS.init({
+        duration: 800,
+        easing: 'ease-out-cubic',
+        once: true,
+        offset: 50,
+    });
+
+    // Force chat view to be visible immediately
+    enterChatView(true);
+
+    const authResult = await checkAuth();
+    const userInfoElement = document.getElementById('user-info');
+    if (authResult.authenticated) {
+        console.log('User authenticated:', authResult.user);
+        if (userInfoElement) {
+            userInfoElement.textContent = `Welcome, ${authResult.user.email}`;
+        }
+        if (currentConversationId) {
+            console.log('Authenticated user, loading conversation with ID:', currentConversationId);
+            await loadConversation(currentConversationId);
+        }
+    } else {
+        console.log('User not authenticated, handling as anonymous');
+        if (userInfoElement) {
+            userInfoElement.textContent = 'Anonymous';
+        }
+        await handleSession();
+        if (conversationHistory.length > 0) {
+            console.log('Restoring conversation history from sessionStorage:', conversationHistory);
+            conversationHistory.forEach(msg => {
+                console.log('Adding message from history:', msg);
+                addMsg(msg.role, msg.content);
+            });
+        } else {
+            console.log('No conversation history, starting fresh');
+        }
+    }
+
+    autoResizeTextarea();
+    updateSendButtonState();
+    if (uiElements.swipeHint) {
+        setTimeout(() => {
+            uiElements.swipeHint.style.display = 'none';
+        }, 3000);
+    }
+    setupTouchGestures();
+});
+
 // Update send button state
 function updateSendButtonState() {
   if (uiElements.sendBtn && uiElements.input && uiElements.fileInput && uiElements.audioInput) {

templates/chat.html

@@ -100,6 +100,9 @@
   <link rel="preload" href="/static/css/chat/style.css" as="style">
   <link rel="preload" href="/static/images/mg.svg" as="image">
   <link rel="preload" href="https://raw.githubusercontent.com/4gels/icons/refs/heads/main/splash-screen.png" as="image">
+  <script src="https://cdnjs.cloudflare.com/ajax/libs/js-cookie/3.0.1/js.cookie.min.js"></script>
+  <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.3/dist/js/bootstrap.bundle.min.js"></script>
+
 </head>
 
 <body class="min-h-screen flex flex-col bg-gradient-to-br from-gray-900 via-teal-900 to-emerald-900">
@@ -354,6 +357,7 @@
       </div>
       <form id="settingsForm" class="space-y-4">
         <div>
+        <div id="user-info">Loading...</div>
           <label for="display_name" class="block text-sm text-gray-300">Display Name</label>
           <input type="text" id="display_name" name="display_name" class="w-full p-2 bg-gray-700 text-white rounded">
         </div>
@@ -419,8 +423,8 @@
 
   <!-- Scripts -->
   <script src="/static/js/chat.js?v=1.2"></script>
-  <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.3/dist/js/bootstrap.bundle.min.js"></script>
-  <script src="https://cdnjs.cloudflare.com/ajax/libs/js-cookie/3.0.1/js.cookie.min.js"></script>
+
+
 
   <script>
     // تهيئة مكتبة AOS