(feat) Redirect users to the page they were on before being logged out (

#931) * save initialUrl in the sessionStorage before logging out
unstructuredstudio · Oct 20, 2023 · a558469 · a558469
1 parent 168945b
commit a558469
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/zubhub_frontend/zubhub/src/api/api.js b/zubhub_frontend/zubhub/src/api/api.js
@@ -124,6 +124,9 @@ class API {
    * @todo - describe method's signature
    */
   logout = token => {
+    const initialUrl = window.location.href
+    sessionStorage.setItem('initialUrl', initialUrl)
+
     const url = 'rest-auth/logout/';
     const method = 'POST';
     return this.request({ url, method, token }).then(res => res.json());

diff --git a/zubhub_frontend/zubhub/src/store/actions/authActions.js b/zubhub_frontend/zubhub/src/store/actions/authActions.js
@@ -37,7 +37,15 @@ export const login = args => {
           payload: { token: res.key },
         });
       })
-      .then(() => args.history.push('/'));
+      .then(() => {
+        const initialUrl = sessionStorage.getItem('initialUrl');
+        if (initialUrl) {
+          sessionStorage.removeItem('initialUrl')
+          window.location.href = initialUrl;
+        } else {
+          args.history.push('/');
+        }
+      });
   };
 };