diff --git a/frontend/frontend/src/pages/App/AppTrends.js b/frontend/frontend/src/pages/App/AppTrends.js index bbedee4c..1d971d81 100644 --- a/frontend/frontend/src/pages/App/AppTrends.js +++ b/frontend/frontend/src/pages/App/AppTrends.js @@ -67,7 +67,7 @@ function App() { if (userKey && userKey.length > 0) { const userAccess = await getUserMetadata(userKey); if (userAccess === null) { - dispatch(_logout()); + dispatch(_logout(userKey)); } else { setUserAccess(userAccess); } diff --git a/frontend/frontend/src/redux/actions/userActions.js b/frontend/frontend/src/redux/actions/userActions.js index 92d9094e..3740f76c 100644 --- a/frontend/frontend/src/redux/actions/userActions.js +++ b/frontend/frontend/src/redux/actions/userActions.js @@ -6,8 +6,8 @@ export function login(userId, userKey) { return { type: LOGIN, payload: { userId, userKey } }; } -export function logout() { - return { type: LOGOUT, payload: {} }; +export function logout(userKey = null) { + return { type: LOGOUT, payload: { userKey: userKey } }; } export function setUserAccess(token, privateAccess) { diff --git a/frontend/frontend/src/redux/reducers/user.js b/frontend/frontend/src/redux/reducers/user.js index de1ebc76..2a6b7e68 100644 --- a/frontend/frontend/src/redux/reducers/user.js +++ b/frontend/frontend/src/redux/reducers/user.js @@ -19,6 +19,12 @@ export default (state = initialState, action) => { userKey: action.payload.userKey, }; case types.LOGOUT: + if ( + action.payload.userKey === null || + action.payload.userKey !== localStorage.getItem('userKey') + ) { + return; + } localStorage.clear(); return { userId: null,