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:
@@ -46,7 +46,7 @@ export const LoginView: React.FC<AdminViewProps> = ({ initPageResult, params, se
|
|||||||
const mappedAfterLogins = createMappedComponent(afterLogin, undefined, undefined, 'afterLogin')
|
const mappedAfterLogins = createMappedComponent(afterLogin, undefined, undefined, 'afterLogin')
|
||||||
|
|
||||||
if (user) {
|
if (user) {
|
||||||
redirect(admin)
|
redirect((searchParams.redirect as string) || admin)
|
||||||
}
|
}
|
||||||
|
|
||||||
const collectionConfig = collections.find(({ slug }) => slug === userSlug)
|
const collectionConfig = collections.find(({ slug }) => slug === userSlug)
|
||||||
|
|||||||
@@ -18,7 +18,8 @@ export const LogoutClient: React.FC<{
|
|||||||
}> = (props) => {
|
}> = (props) => {
|
||||||
const { adminRoute, inactivity, redirect } = 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 logOutSuccessRef = React.useRef(false)
|
||||||
const [loginRoute] = React.useState(() =>
|
const [loginRoute] = React.useState(() =>
|
||||||
formatAdminURL({
|
formatAdminURL({
|
||||||
@@ -30,7 +31,7 @@ export const LogoutClient: React.FC<{
|
|||||||
}`,
|
}`,
|
||||||
}),
|
}),
|
||||||
)
|
)
|
||||||
const { logOut } = useAuth()
|
|
||||||
const { t } = useTranslation()
|
const { t } = useTranslation()
|
||||||
const router = useRouter()
|
const router = useRouter()
|
||||||
|
|
||||||
|
|||||||
@@ -296,6 +296,7 @@ export function AuthProvider({
|
|||||||
|
|
||||||
forceLogOut = setTimeout(() => {
|
forceLogOut = setTimeout(() => {
|
||||||
setNewUser(null)
|
setNewUser(null)
|
||||||
|
redirectToInactivityRoute()
|
||||||
}, forceLogOutInTimeFromNow)
|
}, forceLogOutInTimeFromNow)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user