ClaytonWWilson/CS307-Team24
1
0
Fork 0
mirror of https://github.com/ClaytonWWilson/CS307-Team24.git synced 2026-03-10 21:25:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

merge changes

Browse Source
This commit is contained in:
Leon Liang
2019-10-27 13:24:53 -04:00
parent 13a1401759 e236ceeb4b
commit 97998a8f09
6 changed files with 109 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -19,7 +19,7 @@ import { logoutUser, getUserData } from "./redux/actions/userActions";
// Components
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
import home from "./pages/Home";
@@ -36,14 +36,19 @@ const theme = createMuiTheme(themeObject);
const token = localStorage.FBIdToken;
if (token) {
const decodedToken = jwtDecode(token);
if (decodedToken.exp * 1000 < Date.now()) {
try {
const decodedToken = jwtDecode(token);
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";
} else {
store.dispatch({ type: SET_AUTHENTICATED });
axios.defaults.headers.common["Authorization"] = token;
store.dispatch(getUserData());
}
}