External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-07 09:27:36 -02:30
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Wrap `setAuthRedirectTo` in useEffect.
This commit is contained in:
Kersom
2021-09-27 16:57:30 -04:00
committed by GitHub
parent 270f6c4abd 32651db4e9
commit 87105a654c
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
awx/ui/src/App.js
View File

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