Merge pull request #233 from jpdillingham/develop

Refactor handling of session refresh
jpdillingham · Aug 18, 2018 · a565b3e · a565b3e
2 parents ff09d01 + 7053d05
commit a565b3e
Show file tree

Hide file tree

Showing 6 changed files with 43 additions and 19 deletions.
diff --git a/web/src/api.js b/web/src/api.js
@@ -1,11 +1,11 @@
 import axios from 'axios';
 import { store } from './index';
-import { ensureSession } from './components/security/SecurityActions';
+import { refreshSession, logout } from './components/security/SecurityActions';
 
 const api = axios.create();
 
 api.interceptors.request.use(config => {
-        return store.dispatch(ensureSession()).then(() => {
+        return store.dispatch(() => {
             config.headers.Authorization = store.getState().security.session.idToken.jwtToken;
 
             return Promise.resolve(config);
@@ -17,4 +17,26 @@ api.interceptors.request.use(config => {
     }
 );
 
+api.interceptors.response.use(config => {
+    return config;
+}, error => {
+    let request = error.config;
+    let status = error.response.status;
+    let refreshToken = store.getState().security.session.refreshToken.token;
+
+    if (status === 401 || status === 403) {
+        if (refreshToken) {
+            return store.dispatch(refreshSession())
+                .then(response => {
+                    request.headers.Authorization = store.getState().security.session.idToken.jwtToken;
+                    return axios(request);
+                }
+            );
+        }
+        else {
+            store.dispatch(logout());
+        }
+    } 
+});
+
 export default api;
diff --git a/web/src/components/exercises/ExercisesActions.js b/web/src/components/exercises/ExercisesActions.js
@@ -51,7 +51,7 @@ export const addExercise = (exercise) => (dispatch, getState) => {
                 reject('Unknown POST response code (expected 201, received ' + response.status + ').');
             }
         }, error => {
-            reject(error.response.message);
+            reject(error);
         });
     });
 };
@@ -68,7 +68,7 @@ export const updateExercise = (exercise) => (dispatch, getState) => {
                 reject('Unknown PUT response code (expected 200, received ' + response.status + ').');
             }
         }, error => {
-            reject(error.response.message);
+            reject(error);
         });
     });
 };
@@ -85,7 +85,7 @@ export const deleteExercise = (id) => (dispatch, getState) => {
                 reject('Unknown DELETE response code (expected 204, received ' + response.status + ').');
             }
         }, error => {
-            reject(error.response.message);
+            reject(error);
         });
     });
 };
diff --git a/web/src/components/routines/RoutinesActions.js b/web/src/components/routines/RoutinesActions.js
@@ -30,7 +30,7 @@ export const fetchRoutines = () => (dispatch, getState) => {
             dispatch(routinesGet(response.data));
             resolve(response);
         }, error => {
-            reject(error.response.message);
+            reject(error);
         });    
     });
 };
@@ -47,7 +47,7 @@ export const addRoutine = (routine) => (dispatch, getState) => {
                 reject('Unknown POST response code (expected 201, received ' + response.status + ').');
             }            
         }, error => {
-            reject(error.response.message);
+            reject(error);
         });
     });
 };
@@ -64,7 +64,7 @@ export const updateRoutine = (routine) => (dispatch, getState) => {
                 reject('Unknown PUT response code (expected 200, received ' + response.status + ').');
             }            
         }, error => {
-            reject(error.response.message);
+            reject(error);
         });
     });
 };
@@ -81,7 +81,7 @@ export const deleteRoutine = (id) => (dispatch, getState) => {
                 reject('Unknown DELETE response code (expected 204, received ' + response.status + ').');
             } 
         }, error => {
-            reject(error.response.message);
+            reject(error);
         });
     });
 };
diff --git a/web/src/components/security/SecurityActions.js b/web/src/components/security/SecurityActions.js
@@ -98,7 +98,10 @@ export const logout = () => (dispatch, getState) => {
     let cognitoUser = getCognitoUser(getState().security.user);
 
     return new Promise((resolve, reject) => {
-        cognitoUser.signOut();
+        if (cognitoUser) {
+            cognitoUser.signOut();
+        }
+
         dispatch(logoutAction());
         resolve();
     });

diff --git a/web/src/components/workouts/WorkoutsActions.js b/web/src/components/workouts/WorkoutsActions.js
@@ -30,7 +30,7 @@ export const fetchWorkouts = () => (dispatch, getState) => {
             dispatch(workoutsGet(response.data));
             resolve(response);
         }, error => {
-            reject(error.response.message);
+            reject(error);
         });    
     });
 };
@@ -47,7 +47,7 @@ export const addWorkout = (workout) => (dispatch, getState) => {
                 reject("Unknown POST response code (expected 201, received " + response.status + ").");
             }            
         }, error => {
-            reject(error.response.message);
+            reject(error);
         });
     });
 };
@@ -67,7 +67,7 @@ export const updateWorkout = (workout) => (dispatch, getState) => {
                 reject("API error: Unknown PUT response code (expected 200, received " + response.status + ").");
             }            
         }, error => {
-            reject(error.response.message);
+            reject(error);
         });
     });
 };
@@ -84,7 +84,7 @@ export const deleteWorkout = (id) => (dispatch, getState) => {
                 reject("Unknown DELETE response code (expected 204, received " + response.status + ").");
             } 
         }, error => {
-            reject(error.response.message);
+            reject(error);
         });
     });
 };
diff --git a/web/src/components/workouts/history/WorkoutsHistoryActions.js b/web/src/components/workouts/history/WorkoutsHistoryActions.js
@@ -51,7 +51,7 @@ export const fetchWorkoutsHistory = (filters) => (dispatch, getState) => {
             dispatch(workoutsHistoryGet(response.data, totalCount));
             resolve(response);
         }, error => {
-            reject(error.response.message);
+            reject(error);
         });    
     });
 };
@@ -70,8 +70,7 @@ export const fetchWorkoutHistory = (id) => (dispatch, getState) => {
             dispatch(workoutHistoryGet(response.data));
             resolve(response);        
         }, error => {
-            console.log(error.response);
-            reject(error.response.data || error.response.status);
+            reject(error);
         });
     });
 };
@@ -90,7 +89,7 @@ export const updateWorkoutHistory = (workout) => (dispatch, getState) => {
             dispatch(workoutHistoryPut(response.data));
             resolve(response);
         }, error => {
-            reject(error.response.data || error.response.status);
+            reject(error);
         });
     });
 };
@@ -107,7 +106,7 @@ export const deleteWorkoutHistory = (id) => (dispatch, getState) => {
                 reject("Unknown DELETE response code (expected 204, received " + response.status + ").");
             } 
         }, error => {
-            reject(error.response.message);
+            reject(error);
         });
     });
 };