Skip to content

fix: logout-inactivity route gets stuck on loading indicator when inactivity and isLoggedIn are true #14596

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Nov 14, 2025
Merged

fix: logout-inactivity route gets stuck on loading indicator when inactivity and isLoggedIn are true #14596

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cbcff3e
fix: logout loading gets stuck when inactivity and isLoggedIn are true
jessrynkar Nov 13, 2025
912073e
chore: move inactivity check before logout is called
jessrynkar Nov 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 6 additions & 7 deletions packages/next/src/views/Logout/LogoutClient.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,35 +45,34 @@ export const LogoutClient: React.FC<{
const [loginRoute] = React.useState(() =>
formatAdminURL({
adminRoute,
path: `/login${
inactivity && redirect && redirect.length > 0
path: `/login${inactivity && redirect && redirect.length > 0
? `?redirect=${encodeURIComponent(redirect)}`
: ''
}`,
}`,
}),
)

const { t } = useTranslation()
const router = useRouter()

const handleLogOut = React.useCallback(async () => {
if (!inactivity && !navigatingToLoginRef.current) {
if (!navigatingToLoginRef.current) {
navigatingToLoginRef.current = true
await logOut()
toast.success(t('authentication:loggedOutSuccessfully'))
startRouteTransition(() => router.push(loginRoute))
return
}
}, [inactivity, logOut, loginRoute, router, startRouteTransition, t])
}, [logOut, loginRoute, router, startRouteTransition, t])

useEffect(() => {
if (isLoggedIn) {
if (isLoggedIn && !inactivity) {
void handleLogOut()
} else if (!navigatingToLoginRef.current) {
navigatingToLoginRef.current = true
startRouteTransition(() => router.push(loginRoute))
}
}, [handleLogOut, isLoggedIn, loginRoute, router, startRouteTransition])
}, [handleLogOut, isLoggedIn, loginRoute, router, startRouteTransition, inactivity])

if (!isLoggedIn && inactivity) {
return (
Expand Down
Loading