chore: correctly redirects after in-activity (#9070)

Issues: 
  - https://github.com/payloadcms/payload/issues/5009
  - https://github.com/payloadcms/payload/pull/8809
This commit is contained in:
Kendell Joseph
2024-11-08 13:20:44 -05:00
committed by GitHub
parent 721ae79716
commit 1f26237ba1
3 changed files with 5 additions and 3 deletions

View File

@@ -46,7 +46,7 @@ export const LoginView: React.FC<AdminViewProps> = ({ initPageResult, params, se
const mappedAfterLogins = createMappedComponent(afterLogin, undefined, undefined, 'afterLogin')
if (user) {
redirect(admin)
redirect((searchParams.redirect as string) || admin)
}
const collectionConfig = collections.find(({ slug }) => slug === userSlug)

View File

@@ -18,7 +18,8 @@ export const LogoutClient: React.FC<{
}> = (props) => {
const { adminRoute, inactivity, redirect } = props
const [isLoggedOut, setIsLoggedOut] = React.useState<boolean | undefined>(undefined)
const { logOut, user } = useAuth()
const [isLoggedOut, setIsLoggedOut] = React.useState<boolean>(!user)
const logOutSuccessRef = React.useRef(false)
const [loginRoute] = React.useState(() =>
formatAdminURL({
@@ -30,7 +31,7 @@ export const LogoutClient: React.FC<{
}`,
}),
)
const { logOut } = useAuth()
const { t } = useTranslation()
const router = useRouter()

View File

@@ -296,6 +296,7 @@ export function AuthProvider({
forceLogOut = setTimeout(() => {
setNewUser(null)
redirectToInactivityRoute()
}, forceLogOutInTimeFromNow)
}