diff --git a/client/src/components/home/layout.js b/client/src/components/home/layout.js index 5a7b0fb..896c7c5 100644 --- a/client/src/components/home/layout.js +++ b/client/src/components/home/layout.js @@ -32,7 +32,7 @@ function Layout() { - AuthService.logout()}>Logout + AuthService.logout(null, true)}>Logout diff --git a/client/src/services/AuthService.js b/client/src/services/AuthService.js index 1b78fec..cb529f7 100644 --- a/client/src/services/AuthService.js +++ b/client/src/services/AuthService.js @@ -4,10 +4,12 @@ const login = (data) => { return http.post('/auth/login', data); }; -const logout = (data) => { - localStorage.removeItem('user'); - localStorage.removeItem('token'); - window.location.href="/login"; +const logout = (data, shouldClearSession = false) => { + if (shouldClearSession) { + localStorage.removeItem('user'); + localStorage.removeItem('token'); + } + window.location.href = "/login"; }; const getCurrentUser = () => { diff --git a/client/src/services/setupInterceptor.js b/client/src/services/setupInterceptor.js index e433560..370ab69 100644 --- a/client/src/services/setupInterceptor.js +++ b/client/src/services/setupInterceptor.js @@ -19,7 +19,7 @@ const setup = () => { }, (error) => { console.log(error); if (error!= null && [401, 403].includes(error.response?.status)) { - AuthService.logout(); + AuthService.logout(null, true); window.location.href='/login'; } return Promise.reject(error);