Merge pull request #119 from ReCodEx/reload-page-after-takeover

User switching enhancements

src/redux/modules/userSwitching.js

@@ -1,34 +1,54 @@
-import { handleActions } from 'redux-actions';
-import { actionTypes } from './auth';
+import { handleActions, createAction } from 'redux-actions';
+import { actionTypes as authActionTypes } from './auth';
 import { decode, isTokenValid } from '../helpers/token';
 import { addNotification } from './notifications';
 
+export const actionTypes = {
+  REMOVE_USER: 'recodex/userSwitching/REMOVE_USER'
+};
+
+export const removeUser = createAction(actionTypes.REMOVE_USER);
+
 export const switchUser = userId => (dispatch, getState) => {
   const state = getState().userSwitching;
-  const user = state[userId] ? state[userId] : null;
-  const decodedToken = decode(user.accessToken);
-  if (!user.accessToken || !isTokenValid(decodedToken)) {
-    dispatch(addNotification('The token has already expired.', false));
+  const { user, accessToken } = state[userId] ? state[userId] : null;
+  const decodedToken = decode(accessToken);
+  if (!accessToken || !isTokenValid(decodedToken)) {
+    dispatch(
+      addNotification(
+        `The token has already expired, you cannot switch to user ${user.fullName}. This account will be removed from the user switching panel.`,
+        false
+      )
+    );
+    dispatch(removeUser(userId));
   } else {
     dispatch({
-      type: actionTypes.LOGIN_SUCCESS,
-      payload: user,
+      type: authActionTypes.LOGIN_SUCCESS,
+      payload: { user, accessToken },
       meta: { service: 'takeover' }
     });
+
+    if (window && window.location && window.location.reload) {
+      window.location.reload(true);
+    }
   }
 };
 
 const initialState = {};
 
 const reducer = handleActions(
   {
-    [actionTypes.LOGIN_SUCCESS]: (state, { payload }) =>
+    [authActionTypes.LOGIN_SUCCESS]: (state, { payload }) =>
       state[payload.user.id]
         ? state
         : {
             ...state,
             [payload.user.id]: payload
-          }
+          },
+    [actionTypes.REMOVE_USER]: (state, { payload: userId }) =>
+      Object.keys(state)
+        .filter(id => id !== userId)
+        .reduce((acc, id) => ({ ...acc, [id]: state[id] }), {})
   },
   initialState
 );

src/redux/store.js

@@ -10,7 +10,8 @@ import apiMiddleware from './middleware/apiMiddleware';
 import createReducer from './reducer';
 import createEngine from 'redux-storage-engine-localstorage';
 import filter from 'redux-storage-decorator-filter';
-import { actionTypes } from './modules/auth';
+import { actionTypes as authActionTypes } from './modules/auth';
+import { actionTypes as switchingActionTypes } from './modules/userSwitching';
 
 const engine = filter(createEngine('recodex/store'), ['userSwitching']);
 
@@ -20,7 +21,11 @@ const getMiddleware = history => [
   promiseMiddleware(),
   thunkMiddleware,
   routerMiddleware(history),
-  storage.createMiddleware(engine, [], [actionTypes.LOGIN_SUCCESS])
+  storage.createMiddleware(
+    engine,
+    [],
+    [authActionTypes.LOGIN_SUCCESS, switchingActionTypes.REMOVE_USER]
+  )
 ];
 
 const dev = history =>