Merge pull request #412 from engaging-computing/dev

v2.0.1 | Token Timeout Fix
engaging-computing · Jul 20, 2020 · 03241cc · 03241cc
2 parents dd76b99 + 75e654d
commit 03241cc
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 4 deletions.
diff --git a/src/actions/authActions.js b/src/actions/authActions.js
@@ -20,7 +20,12 @@ export function logout() {
     return { type: types.LOGOUT };
 }
 
+export function refreshToken(token) {
+    return { type: types.REFRESH_TOKEN, token };
+}
+
 export default {
     login,
-    logout
+    logout,
+    refreshToken
 };
diff --git a/src/components/structural/header/Header.js b/src/components/structural/header/Header.js
@@ -58,7 +58,8 @@ class Header extends Component {
             updateCollection: false,
             fetchCollection: false,
             socket: sockets(),
-            savedSettings: []
+            savedSettings: [],
+            googleUser: undefined
         };
 
         this.state.socket.on("update", () => {
@@ -200,10 +201,27 @@ class Header extends Component {
         //googleAuth.getAuthResponse().id_token;
         googleAuth.profileObj["uid"] = googleAuth.getAuthResponse().id_token;
         this.props.logging.login(googleAuth.profileObj);
-        this.setState({ logMenuOpen: false });
+        this.setState({ logMenuOpen: false, googleUser: googleAuth });
 
         this.props.projectActions.asyncUserProj(this.props.user.uid);
         this.props.collectionActions.asyncCollections(this.props.user.uid);
+        this.setRefreshTime(googleAuth.tokenObj.expires_at);
+    }
+
+    setRefreshTime = (time) => {
+        const oneMinute = 60*1000;
+        let expiryTime = Math.max(
+            oneMinute*5, //Default of 5 minutes
+            time - Date.now() - oneMinute*5 // give 5 mins of breathing room
+        );
+        setTimeout(this.refreshToken, expiryTime);
+    }
+
+    refreshToken = () => {
+        this.state.googleUser.reloadAuthResponse().then((authResponse) => {
+            this.props.logging.refreshToken(authResponse.id_token);
+            this.setRefreshTime(authResponse.expires_at);
+        });
     }
 
     /**
@@ -399,7 +417,7 @@ class Header extends Component {
                 if(!this.state.viewOnly) {
                     this.props.actions.refresh(text, this.props.user ? this.props.user.uid : "anon");
                 }
-                this.setState({spinnerOpen: false});
+                this.setState({spinnerOpen: false, saveOpen: false});
                 this.state.socket.emit("save");
                 return true;
             });

diff --git a/src/constants/ActionTypes.js b/src/constants/ActionTypes.js
@@ -1,5 +1,6 @@
 export const LOGIN = "LOGIN";
 export const LOGOUT = "LOGOUT";
+export const REFRESH_TOKEN = "REFRESH_TOKEN";
 
 export const SYNC_COURSES = "SYNC_COURSES";
 export const LOAD_COURSE = "LOAD_COURSE";

diff --git a/src/reducers/user.js b/src/reducers/user.js
@@ -14,6 +14,13 @@ export default function user(state = initial_state, action) {
             return {
                 user: null
             };
+        case types.REFRESH_TOKEN:
+            return {
+                user: {
+                    ...state,
+                    uid: action.token
+                }
+            };
         default:
             return state;
     }