feat(portal): remove InactivityModal and redirect directly to login (#1041)

* feat(aurora): remove InactivityModal and redirect directly to login

- Removed InactivityModal component and test file
- Updated AuthProvider to navigate directly to "/" on session expiration
- Removed showInactivityModal, closeInactivityModal, and redirectAfterModal from AuthContext
- All logout reasons (inactive, expired, manual) now redirect immediately
- Updated all tests to reflect new behavior

* fix(aurora): prevent redirect loop and double navigation on session expiration

- Check pathname only (not pathname+search) to avoid redirect loops
- Remove duplicate navigation from SessionExpirationTimer (logout() now handles it)
- Single source of truth for session expiration navigation

Author: TilmanHaupt

.changeset/remove-inactivity-modal.md

@@ -0,0 +1,5 @@
+---
+"@cobaltcore-dev/aurora": minor
+---
+
+Remove InactivityModal and redirect directly to login on session expiration

packages/aurora/src/client/components/Auth/InactivityModal.test.tsx

@@ -1,5 +1,4 @@
 import { useEffect, useState } from "react"
-import { useNavigate, useRouterState } from "@tanstack/react-router"
 import { cn } from "@/client/utils/cn"
 import { Trans } from "@lingui/react/macro"
 
@@ -9,8 +8,6 @@ export function SessionExpirationTimer(props: {
   logout: () => Promise<void>
 }) {
   const [timeLeft, setTimeLeft] = useState<string>("")
-  const navigate = useNavigate()
-  const pathname = useRouterState({ select: (s) => s.location.pathname })
 
   useEffect(() => {
     const updateCountdown = () => {
@@ -45,16 +42,6 @@ export function SessionExpirationTimer(props: {
       } catch (error) {
         console.error("Error during session expiration logout: ", error)
       }
-
-      // Only navigate if not already on login page
-      if (pathname !== "/") {
-        navigate({
-          to: "/",
-          search: {
-            redirect: pathname || undefined,
-          },
-        })
-      }
     }
 
     let logoutTimer: NodeJS.Timeout | undefined
@@ -69,7 +56,7 @@ export function SessionExpirationTimer(props: {
       clearInterval(intervalId)
       if (logoutTimer) clearTimeout(logoutTimer)
     }
-  }, [props.sessionExpired, props.logout, navigate, pathname])
+  }, [props.sessionExpired, props.logout])
 
   return (
     <div className={cn("text-theme-light pt-2 pb-2 text-xs", props.className)}>

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

@@ -6,7 +6,6 @@ import { AuthContext } from "../store/AuthProvider"
 import { NavigationItem } from "../components/navigation/types"
 import type { Slots, OnTrackEventCallback } from "../AuroraApp"
 import styles from "../index.css?inline"
-import { InactivityModal } from "../components/Auth/InactivityModal"
 import { RouteError } from "../components/Error/RouteError"
 import { useLingui } from "@lingui/react/macro"
 import { StatusError } from "../components/Error/StatusError"
@@ -46,7 +45,6 @@ function AuroraLayout({ children }: { children: React.ReactNode }) {
         pageFooter={slots?.pageFooter ? <Slot component={slots.pageFooter} useShadowDOM={false} /> : undefined}
         fullWidthContent
       >
-        <InactivityModal />
         {children}
       </AppShell>
     </>

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

@@ -45,7 +45,6 @@ describe("AuthProvider", () => {
 
       expect(result.current.isAuthenticated).toBe(false)
       expect(result.current.user).toBeNull()
-      expect(result.current.showInactivityModal).toBe(false)
     })
 
     it("should throw error when used outside provider", () => {
@@ -147,7 +146,7 @@ describe("AuthProvider", () => {
       expect(mockRouter.invalidate).toHaveBeenCalled()
     })
 
-    it("should invalidate router on inactive logout (no modal)", async () => {
+    it("should navigate to login on inactive logout", async () => {
       const { result } = renderHook(() => useAuth(), { wrapper })
 
       const mockUser: AuthUser = {
@@ -167,11 +166,13 @@ describe("AuthProvider", () => {
 
       expect(result.current.isAuthenticated).toBe(false)
       expect(result.current.logoutReason).toBe("inactive")
-      expect(result.current.showInactivityModal).toBe(false)
-      expect(mockRouter.invalidate).toHaveBeenCalled()
+      expect(mockRouter.navigate).toHaveBeenCalledWith({
+        to: "/",
+        search: { redirect: "/dashboard" },
+      })
     })
 
-    it("should show modal on expired logout", async () => {
+    it("should navigate to login on expired logout", async () => {
       const { result } = renderHook(() => useAuth(), { wrapper })
 
       const mockUser: AuthUser = {
@@ -189,8 +190,12 @@ describe("AuthProvider", () => {
         await result.current.logout("expired")
       })
 
-      expect(result.current.showInactivityModal).toBe(true)
+      expect(result.current.isAuthenticated).toBe(false)
       expect(result.current.logoutReason).toBe("expired")
+      expect(mockRouter.navigate).toHaveBeenCalledWith({
+        to: "/",
+        search: { redirect: "/dashboard" },
+      })
     })
   })
 
@@ -363,7 +368,10 @@ describe("AuthProvider", () => {
 
       expect(result.current.isAuthenticated).toBe(false)
       expect(result.current.logoutReason).toBe("expired")
-      expect(result.current.showInactivityModal).toBe(true)
+      expect(mockRouter.navigate).toHaveBeenCalledWith({
+        to: "/",
+        search: { redirect: "/dashboard" },
+      })
     })
 
     it("should logout immediately if token is already expired", async () => {
@@ -430,8 +438,8 @@ describe("AuthProvider", () => {
     })
   })
 
-  describe("Inactivity Modal", () => {
-    it("should close modal and navigate to login (expired logout only)", async () => {
+  describe("Navigation on logout", () => {
+    it("should navigate to login with redirect on expired logout", async () => {
       const { result } = renderHook(() => useAuth(), { wrapper })
 
       const mockUser: AuthUser = {
@@ -449,23 +457,16 @@ describe("AuthProvider", () => {
         await result.current.logout("expired")
       })
 
-      expect(result.current.showInactivityModal).toBe(true)
-
-      act(() => {
-        result.current.closeInactivityModal()
-      })
-
-      expect(result.current.showInactivityModal).toBe(false)
       expect(mockRouter.navigate).toHaveBeenCalledWith({
         to: "/",
         search: { redirect: "/dashboard" },
       })
     })
 
-    it("should navigate without redirect if no path", async () => {
+    it("should navigate without redirect if on login page", async () => {
       Object.defineProperty(window, "location", {
         value: {
-          pathname: "",
+          pathname: "/",
           search: "",
         },
         writable: true,
@@ -489,10 +490,6 @@ describe("AuthProvider", () => {
         await result.current.logout("inactive")
       })
 
-      act(() => {
-        result.current.closeInactivityModal()
-      })
-
       expect(mockRouter.navigate).toHaveBeenCalledWith({
         to: "/",
         search: undefined,