ClaytonWWilson/CS307-Team24
1
0
Fork 0
mirror of https://github.com/ClaytonWWilson/CS307-Team24.git synced 2025-12-16 18:28:47 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #47 from ClaytonWWilson/block_topics

Browse Source 
Fix login page loop bug
This commit is contained in:
Clayton Wilson 2019-10-25 15:31:12 -04:00 committed by GitHub
commit 60f83da514
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
twistter-frontend/src/App.js
View File

@ -36,14 +36,19 @@ const theme = createMuiTheme(themeObject);
const token = localStorage.FBIdToken; const token = localStorage.FBIdToken;
if (token) { if (token) {
const decodedToken = jwtDecode(token); try {
if (decodedToken.exp * 1000 < Date.now()) { const decodedToken = jwtDecode(token);
store.dispatch(logoutUser); if (decodedToken.exp * 1000 < Date.now()) {
store.dispatch(logoutUser());
window.location.href = "/login";
} else {
store.dispatch({ type: SET_AUTHENTICATED });
axios.defaults.headers.common['Authorization'] = token;
store.dispatch(getUserData());
}
} catch (invalidTokenError) {
store.dispatch(logoutUser());
window.location.href = "/login"; window.location.href = "/login";
} else {
store.dispatch({ type: SET_AUTHENTICATED });
axios.defaults.headers.common['Authorization'] = token;
store.dispatch(getUserData());
} }
} }