From 03e484b8c698e19cd362a49cf0a93e54b8fcc507 Mon Sep 17 00:00:00 2001
From: Michelle <michelle.winkler@miichelle.moe>
Date: Tue, 10 Mar 2026 22:41:27 +0100
Subject: [PATCH] feat(auth): improve logout process to redirect to Keycloak
 before clearing user state

---
 src/contexts/AuthContext.jsx | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/contexts/AuthContext.jsx b/src/contexts/AuthContext.jsx
index df990c7..e95e325 100644
--- a/src/contexts/AuthContext.jsx
+++ b/src/contexts/AuthContext.jsx
@@ -41,18 +41,20 @@ export function AuthProvider({ children }) {
   }, []);
 
   const logout = useCallback(async () => {
+    let keycloakLogoutUrl = null;
     try {
       const res = await api.post('/auth/logout');
-      localStorage.removeItem('token');
-      setUser(null);
-      if (res.data?.keycloakLogoutUrl) {
-        window.location.href = res.data.keycloakLogoutUrl;
-        return;
-      }
+      keycloakLogoutUrl = res.data?.keycloakLogoutUrl || null;
     } catch {
       // ignore — token is removed locally regardless
     }
     localStorage.removeItem('token');
+    if (keycloakLogoutUrl) {
+      // Redirect to Keycloak BEFORE clearing React state to avoid
+      // flash-rendering the login page while the redirect is pending.
+      window.location.href = keycloakLogoutUrl;
+      return;
+    }
     setUser(null);
   }, []);