Make auth0 login and logout work

main.py

@@ -1,13 +1,12 @@
-# ------------------------------ main.py ------------------------------
-
 import os, base64
 from dotenv import load_dotenv
 from fastapi import FastAPI, Request
-from fastapi.responses import RedirectResponse
+from fastapi.responses import RedirectResponse, JSONResponse, FileResponse
+from fastapi.staticfiles import StaticFiles
 from starlette.middleware.sessions import SessionMiddleware
-from starlette.middleware.base import BaseHTTPMiddleware
 from authlib.integrations.starlette_client import OAuth
 import gradio as gr
+import requests
 from src.manager.manager import GeminiManager
 
 # 1. Load environment --------------------------------------------------
@@ -31,36 +30,72 @@ oauth.register(
 # 3. FastAPI app -------------------------------------------------------
 app = FastAPI()
 
-# 3a. *Inner* auth‑gate middleware (needs session already populated)
-class RequireAuthMiddleware(BaseHTTPMiddleware):
-    async def dispatch(self, request: Request, call_next):
-        public = ("/login", "/auth", "/logout", "/static", "/assets", "/favicon")
-        if any(request.url.path.startswith(p) for p in public):
-            return await call_next(request)
-        if "user" not in request.session:
-            return RedirectResponse("/login")
-        return await call_next(request)
+# Create static directory if it doesn't exist
+os.makedirs("static/fonts/ui-sans-serif", exist_ok=True)
+os.makedirs("static/fonts/system-ui", exist_ok=True)
+
+# Mount static files directory
+app.mount("/static", StaticFiles(directory="static"), name="static")
 
-app.add_middleware(RequireAuthMiddleware)   # Add **first** (inner)
-app.add_middleware(SessionMiddleware, secret_key=SESSION_SECRET_KEY)  # Add **second** (outer)
+# Add session middleware (no auth requirement)
+app.add_middleware(
+    SessionMiddleware,
+    secret_key=SESSION_SECRET_KEY,
+    session_cookie="session",
+    max_age=86400,
+    same_site="lax",
+    https_only=False
+)
 
 # 4. Auth routes -------------------------------------------------------
 @app.get("/login")
 async def login(request: Request):
-    return await oauth.auth0.authorize_redirect(request, request.url_for("auth"), audience=AUTH0_AUDIENCE)
+    print("Session cookie:", request.cookies.get("session"))
+    print("Session data:", dict(request.session))
+    return await oauth.auth0.authorize_redirect(request, request.url_for("auth"), audience=AUTH0_AUDIENCE, prompt="login")
 
 @app.get("/auth")
 async def auth(request: Request):
-    token = await oauth.auth0.authorize_access_token(request)
-    request.session["user"] = token["userinfo"]
-    return RedirectResponse("/")
+    try:
+        token = await oauth.auth0.authorize_access_token(request)
+        request.session["user"] = token["userinfo"]
+        return RedirectResponse("/")
+    except Exception as e:
+        return JSONResponse({"error": str(e)}, status_code=500)
 
 @app.get("/logout")
 async def logout(request: Request):
-    request.session.clear()
-    return RedirectResponse(
-        f"https://{AUTH0_DOMAIN}/v2/logout?client_id={AUTH0_CLIENT_ID}&returnTo=http://localhost:7860/"
+    auth0_logout_url = (
+        f"https://{AUTH0_DOMAIN}/v2/logout"
+        f"?client_id={AUTH0_CLIENT_ID}"
+        f"&returnTo=http://localhost:7860/post-logout"
+        f"&federated"
     )
+    return RedirectResponse(auth0_logout_url)
+
+@app.get("/post-logout")
+async def post_logout(request: Request):
+    request.session.clear()
+    return RedirectResponse("/")
+
+@app.get("/manifest.json")
+async def manifest():
+    return JSONResponse({
+        "name": "HASHIRU AI",
+        "short_name": "HASHIRU",
+        "icons": [],
+        "start_url": "/",
+        "display": "standalone"
+    })
+
+@app.get("/api/login-status")
+async def api_login_status(request: Request):
+    if "user" in request.session:
+        user_info = request.session["user"]
+        user_name = user_info.get("name", user_info.get("email", "User"))
+        return {"status": f"Logged in: {user_name}"}
+    else:
+        return {"status": "Logged out"}
 
 # 5. Gradio UI ---------------------------------------------------------
 _logo_b64 = base64.b64encode(open("HASHIRU_LOGO.png", "rb").read()).decode()
@@ -69,8 +104,74 @@ HEADER_HTML = f"""
   <img src='data:image/png;base64,{_logo_b64}' width='40' class='logo'/>
   <h1>HASHIRU AI</h1>
 </div>"""
-CSS = ".logo{margin-right:20px;}"
 
+CSS = """
+.logo {
+    margin-right: 20px;
+}
+.login-status {
+    font-weight: bold;
+    margin-right: 20px;
+    padding: 8px;
+    border-radius: 4px;
+    background-color: #f0f0f0;
+}
+#profile-name {
+    background-color: #f97316; /* Orange */
+    color: white;
+    font-weight: bold;
+    padding: 10px 14px;
+    border-radius: 6px;
+    cursor: pointer;
+    user-select: none;
+    display: inline-block;
+    position: relative;
+    z-index: 10;
+}
+/* Fix profile menu */
+#profile-menu {
+    position: absolute;
+    background: transparent;
+    border: 1px solid transparent;
+    border-radius: 8px;
+    padding: 10px;
+    z-index: 1000;
+    box-shadow: 0px 4px 8px rgba(0,0,0,0.1);
+    margin-top: 5px;
+}
+#profile-menu.hidden {
+    display: none;
+}
+#profile-menu button {
+    background-color: #f97316; /* Orange (Tailwind orange-500) */
+    border: none;
+    color: white;
+    font-size: 16px;
+    text-align: left;
+    width: 100%;
+    padding: 10px;
+    margin-bottom: 5px;
+    border-radius: 6px;
+    cursor: pointer;
+    transition: background-color 0.2s ease;
+}
+#profile-menu button:hover {
+    background-color: #ea580c; /* Darker orange on hover (Tailwind orange-600) */
+}
+
+
+/* Fix dropdown issues */
+input[type="text"], select {
+    color: black !important;
+}
+
+/* Optional: limit dropdown scroll if options are long */
+.gr-dropdown .gr-dropdown-options {
+    max-height: 200px;
+    overflow-y: auto;
+}
+
+"""
 
 def run_model(message, history):
     history.append({"role": "user", "content": message})
@@ -81,37 +182,76 @@ def run_model(message, history):
                 print("Summary:", m["content"])
         yield "", messages
 
-
 def update_model(name):
     print("Model changed to:", name)
 
-
 with gr.Blocks(css=CSS, fill_width=True, fill_height=True) as demo:
     model_manager = GeminiManager(gemini_model="gemini-2.0-flash")
+
+    with gr.Row():
+        gr.Markdown(HEADER_HTML)
+
+        with gr.Column(scale=1, min_width=250):
+            profile_html = gr.HTML(value="""
+            <div class="profile-container">
+                <div id="profile-name" class="profile-btn">Guest</div>
+                <div id="profile-menu" class="dropdown hidden">
+                    <button onclick="window.location.href='/login'">🔐 Login</button>
+                    <button onclick="window.location.href='/logout'">🚪 Logout</button>
+                </div>
+            </div>
+            """)
+
     with gr.Column():
-        with gr.Row():
-            gr.Markdown(HEADER_HTML)
-            model_dropdown = gr.Dropdown(
-                [
-                    "HASHIRU",
-                    "Static-HASHIRU",
-                    "Cloud-Only HASHIRU",
-                    "Local-Only HASHIRU",
-                    "No-Economy HASHIRU",
-                ],
-                value="HASHIRU",
-                interactive=True,
-            )
-            model_dropdown.change(update_model, model_dropdown)
-        with gr.Row():
-            chatbot = gr.Chatbot(
-                avatar_images=("HASHIRU_2.png", "HASHIRU.png"),
-                type="messages", show_copy_button=True, editable="user",
-                placeholder="Type your message here…",
-            )
-            gr.ChatInterface(run_model, type="messages", chatbot=chatbot, additional_outputs=[chatbot], save_history=True)
-
-# Mount at root
+        model_dropdown = gr.Dropdown(
+            [
+                "HASHIRU",
+                "Static-HASHIRU",
+                "Cloud-Only HASHIRU",
+                "Local-Only HASHIRU",
+                "No-Economy HASHIRU",
+            ],
+            value="HASHIRU",
+            interactive=True,
+        )
+        model_dropdown.change(update_model, model_dropdown)
+
+        chatbot = gr.Chatbot(
+            avatar_images=("HASHIRU_2.png", "HASHIRU.png"),
+            type="messages", show_copy_button=True, editable="user",
+            placeholder="Type your message here…",
+        )
+        gr.ChatInterface(run_model, type="messages", chatbot=chatbot, additional_outputs=[chatbot], save_history=True)
+
+    demo.load(None, None, None, js="""
+    async () => {
+        const profileBtn = document.getElementById("profile-name");
+        const profileMenu = document.getElementById("profile-menu");
+
+        // Toggle menu
+        profileBtn.onclick = () => {
+            profileMenu.classList.toggle("hidden");
+        }
+
+        try {
+            const res = await fetch('/api/login-status', { credentials: 'include' });
+            const data = await res.json();
+            const name = data.status.replace("Logged in: ", "");
+            if (!data.status.includes("Logged out")) {
+                profileBtn.innerText = name;
+                document.querySelector("#profile-menu button[onclick*='/login']").style.display = "none";
+                document.querySelector("#profile-menu button[onclick*='/logout']").style.display = "block";
+            } else {
+                profileBtn.innerText = "Guest";
+                document.querySelector("#profile-menu button[onclick*='/login']").style.display = "block";
+                document.querySelector("#profile-menu button[onclick*='/logout']").style.display = "none";
+            }
+        } catch {
+            profileBtn.innerText = "Login status unknown";
+        }
+    }
+    """)
+
 gr.mount_gradio_app(app, demo, path="/")
 
 # 6. Entrypoint --------------------------------------------------------