🐛 Fix login redirection (zenika-open-source#192)

loic5 · May 17, 2019 · 0e6babe · 0e6babe
1 parent c4ab193
commit 0e6babe
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/client/src/contexts/Auth/AuthProvider.jsx b/client/src/contexts/Auth/AuthProvider.jsx
@@ -70,7 +70,7 @@ class AuthProvider extends Component {
     try {
       const authResult = await auth.parseHash(hash)
 
-      const { redirectTo } = auth.popStateBeforeLogin()
+      const { redirectTo } = auth.getStateBeforeLogin()
 
       const { data } = await authQL(authResult.idToken)
 
@@ -87,6 +87,8 @@ class AuthProvider extends Component {
         }
       )
 
+      auth.clearStateBeforeLogin()
+
       history.push(redirectTo || '')
     } catch (err) {
       alert.pushError('Authentication failed: ' + JSON.stringify(err.message), err)

diff --git a/client/src/services/auth.js b/client/src/services/auth.js
@@ -81,10 +81,12 @@ class Auth {
     localStorage.state_before_login = JSON.stringify(state)
   }
 
-  popStateBeforeLogin() {
-    const state = JSON.parse(localStorage.state_before_login || '{}')
+  getStateBeforeLogin() {
+    return JSON.parse(localStorage.state_before_login || '{}')
+  }
+
+  clearStateBeforeLogin() {
     localStorage.removeItem('state_before_login')
-    return state
   }
 }