Merge pull request #44 from ProtocolONE/bugfix/ptah-integration-10

Moves call redirect to component from store
ProtocolONE · May 26, 2021 · c371e6d · c371e6d
2 parents 93df4a8 + 27b955f
commit c371e6d
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 19 deletions.
diff --git a/src/components/PaySuperAuthForm.vue b/src/components/PaySuperAuthForm.vue
@@ -40,11 +40,14 @@ export default {
       }
 
       this.$emit('loadingStart');
-      await this.authoriseWithLogin({
+      const url = await this.authoriseWithLogin({
         email: this.email,
         password: this.password,
         remember: true,
       });
+      if (url) {
+        this.$router.push(url);
+      }
       this.$emit('loadingEnd');
     },
   },

diff --git a/src/components/PaySuperAutoLoginForm.vue b/src/components/PaySuperAutoLoginForm.vue
@@ -28,7 +28,10 @@ export default {
       }
 
       this.$emit('loadingStart');
-      await this.autoLogin({ previousLogin: this.previousLogin });
+      const url = await this.autoLogin({ previousLogin: this.previousLogin });
+      if (url) {
+        this.$router.push(url);
+      }
       this.$emit('loadingEnd');
     },
   },

diff --git a/src/components/PaySuperRegisterForm.vue b/src/components/PaySuperRegisterForm.vue
@@ -54,11 +54,14 @@ export default {
 
       this.$emit('loadingStart');
 
-      await this.registerWithEmail({
+      const url = await this.registerWithEmail({
         email: this.email,
         password: this.password,
         remember: true,
       });
+      if (url) {
+        this.$router.push(url);
+      }
       this.$emit('loadingEnd');
     },
   },

diff --git a/src/store/AuthForm.js b/src/store/AuthForm.js
@@ -1,9 +1,9 @@
 import axios from 'axios';
-import { throttle } from 'lodash-es';
+// import { throttle } from 'lodash-es';
 
-function redirectToLogin(url) {
-  window.location.replace(url);
-}
+// function redirectToLogin(url) {
+//   window.location.replace(url);
+// }
 
 export default {
   namespaced: true,
@@ -28,15 +28,15 @@ export default {
           email,
           password,
           remember: (remember === '1'),
-        }, {
-          headers: { 'If-Unmodified-Since': (new Date()).toUTCString() },
         });
-        const throttled = throttle(redirectToLogin(data.url), 100);
-        throttled();
+        return data.url;
+        // const throttled = throttle(redirectToLogin(data.url), 100);
+        // throttled();
       } catch (error) {
         if (error.response) {
           commit('authError', error.response.data.error_message);
         }
+        return '';
       }
     },
 
@@ -47,12 +47,14 @@ export default {
           challenge: rootState.challenge,
           previousLogin,
         });
-        const throttled = throttle(redirectToLogin(data.url), 100);
-        throttled();
+        return data.url;
+        // const throttled = throttle(redirectToLogin(data.url), 100);
+        // throttled();
       } catch (error) {
         if (error.response) {
           commit('authError', error.response.data.error_message);
         }
+        return '';
       }
     },
 

diff --git a/src/store/RegisterForm.js b/src/store/RegisterForm.js
@@ -1,9 +1,9 @@
 import axios from 'axios';
-import { throttle } from 'lodash-es';
+// import { throttle } from 'lodash-es';
 
-function redirectToLogin(url) {
-  window.location.replace(url);
-}
+// function redirectToLogin(url) {
+//   window.location.replace(url);
+// }
 
 export default {
   namespaced: true,
@@ -31,12 +31,14 @@ export default {
           password,
           remember: (remember === '1'),
         });
-        const throttled = throttle(redirectToLogin(data.url), 100);
-        throttled();
+        return data.url;
+        // const throttled = throttle(redirectToLogin(data.url), 100);
+        // throttled();
       } catch (error) {
         if (error.response) {
           commit('registerError', error.response.data.error_message);
         }
+        return '';
       }
     },