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

Fix login page loop bug

Browse Source
This commit is contained in:
Clayton Wilson 2019-10-25 15:20:10 -04:00
parent 6335690046
commit 41bcc78c3a
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -19,7 +19,7 @@ import { logoutUser, getUserData } from './redux/actions/userActions';
// Components // Components
import AuthRoute from "./util/AuthRoute"; import AuthRoute from "./util/AuthRoute";
axios.defaults.baseURL = 'http://localhost:5006/twistter-e4649/us-central1/api'; // axios.defaults.baseURL = 'http://localhost:5006/twistter-e4649/us-central1/api';
// Pages // Pages
import home from './pages/Home'; import home from './pages/Home';
@ -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());
} }
} }