From b32427617321c042e239f930db7fdcb5c2438543 Mon Sep 17 00:00:00 2001
From: Leo Vasanko <leo@git>
Date: Tue, 2 Sep 2025 19:08:16 -0600
Subject: [PATCH] Cleaned up login/logout flows.

---
 frontend/src/App.vue                             |  8 ++++++--
 frontend/src/components/LoginView.vue            |  6 +++---
 frontend/src/components/PermissionDeniedView.vue |  1 -
 frontend/src/components/ProfileView.vue          |  1 -
 frontend/src/stores/auth.js                      |  9 +++++----
 passkey/fastapi/admin.py                         | 12 +++++++++---
 passkey/fastapi/authz.py                         | 14 ++++++++++++++
 passkey/fastapi/mainapp.py                       | 13 +++++++++----
 8 files changed, 46 insertions(+), 18 deletions(-)

diff --git a/frontend/src/App.vue b/frontend/src/App.vue
index d99223f..e7cdcf8 100644
--- a/frontend/src/App.vue
+++ b/frontend/src/App.vue
@@ -22,8 +22,12 @@ import PermissionDeniedView from '@/components/PermissionDeniedView.vue'
 const store = useAuthStore()
 
 onMounted(async () => {
-  // Detect restricted mode: any path not starting with /auth/
-  if (!location.pathname.startsWith('/auth/')) {
+  // Detect restricted mode:
+  // We only allow full functionality on the exact /auth/ (or /auth) path.
+  // Any other path (including /, /foo, /auth/admin, etc.) is treated as restricted
+  // so the app will only show login or permission denied views.
+  const path = location.pathname
+  if (!(path === '/auth/' || path === '/auth')) {
     store.setRestrictedMode(true)
   }
   // Load branding / settings first (non-blocking for auth flow)
diff --git a/frontend/src/components/LoginView.vue b/frontend/src/components/LoginView.vue
index 1bbf848..5579b8c 100644
--- a/frontend/src/components/LoginView.vue
+++ b/frontend/src/components/LoginView.vue
@@ -27,9 +27,9 @@ const handleLogin = async () => {
     await authStore.authenticate()
     authStore.showMessage('Authentication successful!', 'success', 2000)
     if (authStore.restrictedMode) {
-      // In restricted mode after successful auth show permission denied (no profile outside /auth/)
-      authStore.currentView = 'permission-denied'
-    } else if (location.pathname.startsWith('/auth/')) {
+      // Restricted mode: reload so the app re-mounts and selectView() applies (will become permission denied)
+      location.reload()
+    } else if (location.pathname === '/auth/') {
       authStore.currentView = 'profile'
     } else {
       location.reload()
diff --git a/frontend/src/components/PermissionDeniedView.vue b/frontend/src/components/PermissionDeniedView.vue
index a68bbce..ba5764c 100644
--- a/frontend/src/components/PermissionDeniedView.vue
+++ b/frontend/src/components/PermissionDeniedView.vue
@@ -32,7 +32,6 @@ function back() {
 }
 async function logout() {
   await authStore.logout()
-  authStore.currentView = 'login'
 }
 </script>
 <style scoped>
diff --git a/frontend/src/components/ProfileView.vue b/frontend/src/components/ProfileView.vue
index a128e57..992d134 100644
--- a/frontend/src/components/ProfileView.vue
+++ b/frontend/src/components/ProfileView.vue
@@ -144,7 +144,6 @@ const deleteCredential = async (credentialId) => {
 
 const logout = async () => {
   await authStore.logout()
-  authStore.currentView = 'login'
 }
 
 const isAdmin = computed(() => !!(authStore.userInfo?.is_global_admin || authStore.userInfo?.is_org_admin))
diff --git a/frontend/src/stores/auth.js b/frontend/src/stores/auth.js
index c32b086..76c8782 100644
--- a/frontend/src/stores/auth.js
+++ b/frontend/src/stores/auth.js
@@ -8,7 +8,7 @@ export const useAuthStore = defineStore('auth', {
     settings: null, // Server provided settings (/auth/settings)
     isLoading: false,
     resetToken: null, // transient reset token
-    restrictedMode: false, // If true, app loaded outside /auth/ and should restrict to login or permission denied
+    restrictedMode: false, // Anywhere other than /auth/: restrict to login or permission denied
 
     // UI State
     currentView: 'login',
@@ -129,12 +129,13 @@ export const useAuthStore = defineStore('auth', {
     },
     async logout() {
       try {
-  await fetch('/auth/api/logout', {method: 'POST'})
+        await fetch('/auth/api/logout', {method: 'POST'})
+        this.userInfo = null
+        if (this.restrictedMode) location.reload()
       } catch (error) {
         console.error('Logout error:', error)
+        this.showMessage(error.message, 'error')
       }
-
-      this.userInfo = null
     },
   }
 })
diff --git a/passkey/fastapi/admin.py b/passkey/fastapi/admin.py
index 0cb119b..666082e 100644
--- a/passkey/fastapi/admin.py
+++ b/passkey/fastapi/admin.py
@@ -1,8 +1,8 @@
 import logging
 from uuid import UUID, uuid4
 
-from fastapi import Body, Cookie, FastAPI, HTTPException
-from fastapi.responses import FileResponse, JSONResponse
+from fastapi import Body, Cookie, FastAPI, HTTPException, Request
+from fastapi.responses import FileResponse, JSONResponse, RedirectResponse
 
 from ..authsession import expires
 from ..globals import db
@@ -24,8 +24,14 @@ async def general_exception_handler(_request, exc: Exception):
     return JSONResponse(status_code=500, content={"detail": "Internal server error"})
 
 
+@app.get("")
+def adminapp_slashmissing(request: Request):
+    print("HERE")
+    return RedirectResponse(url=request.url_for("adminapp"))
+
+
 @app.get("/")
-async def admin_frontend(auth=Cookie(None)):
+async def adminapp(auth=Cookie(None)):
     try:
         await authz.verify(auth, ["auth:admin", "auth:org:*"], match=permutil.has_any)
         return FileResponse(frontend.file("admin/index.html"))
diff --git a/passkey/fastapi/authz.py b/passkey/fastapi/authz.py
index 719755f..bbdd83d 100644
--- a/passkey/fastapi/authz.py
+++ b/passkey/fastapi/authz.py
@@ -1,7 +1,11 @@
+import logging
+
 from fastapi import HTTPException
 
 from ..util import permutil
 
+logger = logging.getLogger(__name__)
+
 
 async def verify(auth: str | None, perm: list[str], match=permutil.has_all):
     """Validate session token and optional list of required permissions.
@@ -20,6 +24,16 @@ async def verify(auth: str | None, perm: list[str], match=permutil.has_all):
         raise HTTPException(status_code=401, detail="Session not found")
 
     if not match(ctx, perm):
+        # Determine which permissions are missing for clearer diagnostics
+        missing = sorted(set(perm) - set(ctx.role.permissions))
+        logger.warning(
+            "Permission denied: user=%s role=%s missing=%s required=%s granted=%s",  # noqa: E501
+            getattr(ctx.user, "uuid", "?"),
+            getattr(ctx.role, "display_name", "?"),
+            missing,
+            perm,
+            ctx.role.permissions,
+        )
         raise HTTPException(status_code=403, detail="Permission required")
 
     return ctx
diff --git a/passkey/fastapi/mainapp.py b/passkey/fastapi/mainapp.py
index a18df35..d24db93 100644
--- a/passkey/fastapi/mainapp.py
+++ b/passkey/fastapi/mainapp.py
@@ -46,10 +46,12 @@ async def lifespan(app: FastAPI):  # pragma: no cover - startup path
 
 
 app = FastAPI(lifespan=lifespan)
-app.mount("/auth/admin", admin.app)
-app.mount("/auth/api", api.app)
-app.mount("/auth/ws", ws.app)
-app.mount("/auth/assets", StaticFiles(directory=frontend.file("assets")), name="assets")
+app.mount("/auth/admin/", admin.app)
+app.mount("/auth/api/", api.app)
+app.mount("/auth/ws/", ws.app)
+app.mount(
+    "/auth/assets/", StaticFiles(directory=frontend.file("assets")), name="assets"
+)
 
 
 @app.get("/auth/")
@@ -61,6 +63,9 @@ async def frontapp():
 @app.get("/auth/{reset}")
 async def reset_link(request: Request, reset: str):
     """Pretty URL for reset links."""
+    if reset == "admin":
+        # Admin app missing trailing slash lands here, be friendly to user
+        return RedirectResponse(request.url_for("adminapp"), status_code=303)
     if not passphrase.is_well_formed(reset):
         raise HTTPException(status_code=404)
     url = request.url_for("frontapp").include_query_params(reset=reset)