feat(aurora): unify logout behaviour - remove logoutReason tracking (#1046)

* feat(aurora): simplify logout type - remove logoutReason tracking

* Potential fix for pull request finding

Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>

* feat(aurora): simplify logout type - remove logoutReason tracking

- Remove logoutReason from AuthContext interface
- Simplify logout() to take no parameters
- Always call router.invalidate() on logout
- Remove "Your session expired" message from login page
- Remove duplicate logout timer from SessionExpirationTimer (AuthProvider already handles expiry)

---------

Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>

Author: TilmanHaupt

.changeset/simplify-logout-type.md

@@ -0,0 +1,5 @@
+---
+"@cobaltcore-dev/aurora": patch
+---
+
+Simplify logout type - remove logoutReason tracking

packages/aurora/src/client/components/Auth/SessionExpirationTimer.tsx

@@ -2,11 +2,7 @@ import { useEffect, useState } from "react"
 import { cn } from "@/client/utils/cn"
 import { Trans } from "@lingui/react/macro"
 
-export function SessionExpirationTimer(props: {
-  className?: string
-  sessionExpired: Date
-  logout: () => Promise<void>
-}) {
+export function SessionExpirationTimer(props: { className?: string; sessionExpired: Date }) {
   const [timeLeft, setTimeLeft] = useState<string>("")
 
   useEffect(() => {
@@ -34,29 +30,10 @@ export function SessionExpirationTimer(props: {
     updateCountdown()
     const intervalId = setInterval(updateCountdown, 1000)
 
-    const delay = props.sessionExpired.getTime() - Date.now()
-
-    const handleExpiration = async () => {
-      try {
-        await props.logout()
-      } catch (error) {
-        console.error("Error during session expiration logout: ", error)
-      }
-    }
-
-    let logoutTimer: NodeJS.Timeout | undefined
-
-    if (delay <= 0) {
-      handleExpiration()
-    } else {
-      logoutTimer = setTimeout(handleExpiration, delay)
-    }
-
     return () => {
       clearInterval(intervalId)
-      if (logoutTimer) clearTimeout(logoutTimer)
     }
-  }, [props.sessionExpired, props.logout])
+  }, [props.sessionExpired])
 
   return (
     <div className={cn("text-theme-light pt-2 pb-2 text-xs", props.className)}>

packages/aurora/src/client/components/navigation/UserMenu.tsx

@@ -29,7 +29,7 @@ export function UserMenu() {
       console.error("Error logging out: ", error)
     } finally {
       try {
-        await logout("manual")
+        await logout()
       } catch (error) {
         console.error("Error during logout: ", error)
       }
@@ -59,7 +59,7 @@ export function UserMenu() {
               />
               {expiresAt && (
                 <PopupMenuSectionHeading>
-                  <SessionExpirationTimer sessionExpired={expiresAt} logout={() => logout("expired")} />
+                  <SessionExpirationTimer sessionExpired={expiresAt} />
                 </PopupMenuSectionHeading>
               )}
             </PopupMenuSection>

packages/aurora/src/client/routes/index.tsx

@@ -68,7 +68,7 @@ const textinputstyles = `
 `
 
 export function AuthLoginPage() {
-  const { isAuthenticated, login, logoutReason } = useAuth()
+  const { isAuthenticated, login } = useAuth()
   const isLoading = useRouterState({ select: (s) => s.isLoading })
   const navigate = Route.useNavigate()
   const search = Route.useSearch()
@@ -165,8 +165,6 @@ export function AuthLoginPage() {
 
   const isLoggingIn = isLoading || isSubmitting
 
-  const wasInactive = logoutReason === "inactive" || logoutReason === "expired"
-
   if (slots?.login && !isAuthenticated && !isLoading) {
     return (
       <div className="mt-8 flex justify-center">
@@ -192,13 +190,9 @@ export function AuthLoginPage() {
         <p className="mb-6 text-center">
           <Trans>Enter your credentials to access your account</Trans>
         </p>
-        {(search.redirect || wasInactive) && (
+        {search.redirect && (
           <p className="mb-4 text-center text-sm text-red-500">
-            {wasInactive ? (
-              <Trans>Your session expired. Please login again.</Trans>
-            ) : (
-              <Trans>You need to login to access this page.</Trans>
-            )}
+            <Trans>You need to login to access this page.</Trans>
           </p>
         )}
         <form

packages/aurora/src/client/store/AuthProvider.test.tsx

@@ -107,22 +107,22 @@ describe("AuthProvider", () => {
       })
 
       await act(async () => {
-        await result.current.logout("manual")
+        await result.current.logout()
       })
 
-      expect(result.current.logoutReason).toBe("manual")
+      expect(result.current.isAuthenticated).toBe(false)
 
       // Login again
       await act(async () => {
         await result.current.login(mockUser)
       })
 
-      expect(result.current.logoutReason).toBeUndefined()
+      expect(result.current.isAuthenticated).toBe(true)
     })
   })
 
   describe("Logout", () => {
-    it("should logout with manual reason and invalidate router", async () => {
+    it("should logout and invalidate router", async () => {
       const { result } = renderHook(() => useAuth(), { wrapper })
 
       const mockUser: AuthUser = {
@@ -137,16 +137,15 @@ describe("AuthProvider", () => {
       })
 
       await act(async () => {
-        await result.current.logout("manual")
+        await result.current.logout()
       })
 
       expect(result.current.isAuthenticated).toBe(false)
       expect(result.current.user).toBeNull()
-      expect(result.current.logoutReason).toBe("manual")
       expect(mockRouter.invalidate).toHaveBeenCalled()
     })
 
-    it("should navigate to login on inactive logout", async () => {
+    it("should navigate to login on logout", async () => {
       const { result } = renderHook(() => useAuth(), { wrapper })
 
       const mockUser: AuthUser = {
@@ -161,11 +160,10 @@ describe("AuthProvider", () => {
       })
 
       await act(async () => {
-        await result.current.logout("inactive")
+        await result.current.logout()
       })
 
       expect(result.current.isAuthenticated).toBe(false)
-      expect(result.current.logoutReason).toBe("inactive")
       expect(mockRouter.navigate).toHaveBeenCalledWith({
         to: "/",
         search: { redirect: "/dashboard" },
@@ -187,11 +185,10 @@ describe("AuthProvider", () => {
       })
 
       await act(async () => {
-        await result.current.logout("expired")
+        await result.current.logout()
       })
 
       expect(result.current.isAuthenticated).toBe(false)
-      expect(result.current.logoutReason).toBe("expired")
       expect(mockRouter.navigate).toHaveBeenCalledWith({
         to: "/",
         search: { redirect: "/dashboard" },
@@ -222,7 +219,6 @@ describe("AuthProvider", () => {
       })
 
       expect(result.current.isAuthenticated).toBe(true)
-      expect(result.current.logoutReason).toBeUndefined()
     })
 
     it("should NOT reset inactivity timer on user activity (timer removed)", async () => {
@@ -257,7 +253,6 @@ describe("AuthProvider", () => {
 
       // Should still be authenticated — inactivity timer removed
       expect(result.current.isAuthenticated).toBe(true)
-      expect(result.current.logoutReason).toBeUndefined()
     })
 
     it("should NOT detect various activity events (timer removed)", async () => {
@@ -306,7 +301,6 @@ describe("AuthProvider", () => {
 
       // Should remain unauthenticated without any logout reason
       expect(result.current.isAuthenticated).toBe(false)
-      expect(result.current.logoutReason).toBeUndefined()
     })
 
     it("should clear inactivity timer on manual logout", async () => {
@@ -330,16 +324,16 @@ describe("AuthProvider", () => {
 
       // Manual logout
       await act(async () => {
-        await result.current.logout("manual")
+        await result.current.logout()
       })
 
       // Advance past what would have been the inactivity timeout
       await act(async () => {
         vi.advanceTimersByTime(60 * 60 * 1000)
       })
 
-      // Should have logged out with manual reason, not inactive
-      expect(result.current.logoutReason).toBe("manual")
+      // Should have logged out
+      expect(result.current.isAuthenticated).toBe(false)
     })
   })
 
@@ -367,7 +361,6 @@ describe("AuthProvider", () => {
       })
 
       expect(result.current.isAuthenticated).toBe(false)
-      expect(result.current.logoutReason).toBe("expired")
       expect(mockRouter.navigate).toHaveBeenCalledWith({
         to: "/",
         search: { redirect: "/dashboard" },
@@ -390,7 +383,6 @@ describe("AuthProvider", () => {
       })
 
       expect(result.current.isAuthenticated).toBe(false)
-      expect(result.current.logoutReason).toBe("expired")
     })
 
     it("should clear logout timer on new login", async () => {
@@ -454,7 +446,7 @@ describe("AuthProvider", () => {
       })
 
       await act(async () => {
-        await result.current.logout("expired")
+        await result.current.logout()
       })
 
       expect(mockRouter.navigate).toHaveBeenCalledWith({
@@ -487,7 +479,7 @@ describe("AuthProvider", () => {
       })
 
       await act(async () => {
-        await result.current.logout("inactive")
+        await result.current.logout()
       })
 
       expect(mockRouter.navigate).toHaveBeenCalledWith({
@@ -498,7 +490,7 @@ describe("AuthProvider", () => {
   })
 
   describe("Edge Cases", () => {
-    it("should handle default logout reason", async () => {
+    it("should handle logout", async () => {
       const { result } = renderHook(() => useAuth(), { wrapper })
 
       const mockUser: AuthUser = {
@@ -516,7 +508,7 @@ describe("AuthProvider", () => {
         await result.current.logout()
       })
 
-      expect(result.current.logoutReason).toBe("manual")
+      expect(result.current.isAuthenticated).toBe(false)
     })
 
     it("should handle rapid login/logout cycles", async () => {
@@ -537,7 +529,7 @@ describe("AuthProvider", () => {
         expect(result.current.isAuthenticated).toBe(true)
 
         await act(async () => {
-          await result.current.logout("manual")
+          await result.current.logout()
         })
 
         expect(result.current.isAuthenticated).toBe(false)

packages/aurora/src/client/store/AuthProvider.tsx

@@ -6,10 +6,9 @@ export type User = TokenData["user"] | null
 export interface AuthContext {
   isAuthenticated: boolean
   login: (user: User, expires_at?: string) => Promise<void>
-  logout: (reason?: "inactive" | "expired" | "manual") => Promise<void>
+  logout: () => Promise<void>
   user?: User
   expiresAt?: Date
-  logoutReason?: "inactive" | "expired" | "manual"
 }
 
 interface RouterNavigation {
@@ -22,7 +21,6 @@ const AuthContext = React.createContext<AuthContext | null>(null)
 export function AuthProvider({ children, router }: { children: React.ReactNode; router: RouterNavigation }) {
   const [user, setUser] = React.useState<User | null>(null)
   const [expiresAt, setExpiresAt] = React.useState<Date | undefined>(undefined)
-  const [logoutReason, setLogoutReason] = React.useState<"inactive" | "expired" | "manual" | undefined>(undefined)
 
   const logoutTimerRef = useRef<NodeJS.Timeout | null>(null)
 
@@ -35,32 +33,25 @@ export function AuthProvider({ children, router }: { children: React.ReactNode;
     }
   }, [])
 
-  const logout = useCallback(
-    async (reason: "inactive" | "expired" | "manual" = "manual") => {
-      clearLogoutTimer()
+  const logout = useCallback(async () => {
+    clearLogoutTimer()
 
-      setUser(null)
-      setExpiresAt(undefined)
-      setLogoutReason(reason)
+    setUser(null)
+    setExpiresAt(undefined)
 
-      // Navigate to login page with redirect (only if not already on login page)
-      const currentPath = window.location.pathname !== "/" ? window.location.pathname + window.location.search : null
+    // Navigate to login page; include a redirect back to the current path when not already on "/"
+    const currentPath = window.location.pathname !== "/" ? window.location.pathname + window.location.search : null
 
-      router.navigate({
-        to: "/",
-        search: currentPath ? { redirect: currentPath } : undefined,
-      })
+    router.navigate({
+      to: "/",
+      search: currentPath ? { redirect: currentPath } : undefined,
+    })
 
-      if (reason === "manual") {
-        router.invalidate()
-      }
-    },
-    [router, clearLogoutTimer]
-  )
+    router.invalidate()
+  }, [router, clearLogoutTimer])
 
   const login = useCallback(async (user: User, expires_at?: string) => {
     setUser(user)
-    setLogoutReason(undefined)
 
     if (expires_at) {
       const expiration = new Date(expires_at)
@@ -77,12 +68,12 @@ export function AuthProvider({ children, router }: { children: React.ReactNode;
       const timeUntilExpiry = expiresAt.getTime() - Date.now()
 
       if (timeUntilExpiry <= 0) {
-        logout("expired")
+        logout()
         return
       }
 
       logoutTimerRef.current = setTimeout(() => {
-        logout("expired")
+        logout()
       }, timeUntilExpiry)
     }
 
@@ -99,7 +90,6 @@ export function AuthProvider({ children, router }: { children: React.ReactNode;
         login,
         logout,
         expiresAt,
-        logoutReason,
       }}
     >
       {children}

packages/aurora/src/locales/de/messages.po

@@ -3646,9 +3646,6 @@ msgstr ""
 msgid "Your S3 credentials are invalid or expired. Please try creating new credentials or contact your administrator."
 msgstr ""
 
-msgid "Your session expired. Please login again."
-msgstr "Ihre Sitzung ist abgelaufen. Bitte melden Sie sich erneut an."
-
 msgid "Your session has expired. Please log in again."
 msgstr "Ihre Sitzung ist abgelaufen. Bitte melden Sie sich erneut an."
 

packages/aurora/src/locales/de/messages.ts

@@ -3646,9 +3646,6 @@ msgstr "Your credentials are valid but you don't have permission to perform this
 msgid "Your S3 credentials are invalid or expired. Please try creating new credentials or contact your administrator."
 msgstr "Your S3 credentials are invalid or expired. Please try creating new credentials or contact your administrator."
 
-msgid "Your session expired. Please login again."
-msgstr "Your session expired. Please login again."
-
 msgid "Your session has expired. Please log in again."
 msgstr "Your session has expired. Please log in again."