Merge pull request #11147 from kialam/fix-logout-react-console-error

Wrap `setAuthRedirectTo` in useEffect.
This commit is contained in:
Kersom
2021-09-27 16:57:30 -04:00
committed by GitHub

View File

@@ -102,6 +102,10 @@ const ProtectedRoute = ({ children, ...rest }) => {
const { authRedirectTo, setAuthRedirectTo } = useSession();
const { pathname } = useLocation();
useEffect(() => {
setAuthRedirectTo(authRedirectTo === '/logout' ? '/' : pathname);
});
if (isAuthenticated(document.cookie)) {
return (
<Route {...rest}>
@@ -112,8 +116,6 @@ const ProtectedRoute = ({ children, ...rest }) => {
);
}
setAuthRedirectTo(authRedirectTo === '/logout' ? '/' : pathname);
return <Redirect to="/login" />;
};