fix: remove next path from auth guard

weni-ai · Apr 3, 2024 · 0c06a78 · 0c06a78
1 parent aae0acb
commit 0c06a78
Showing 1 changed file with 23 additions and 13 deletions.
diff --git a/src/router/index.js b/src/router/index.js
@@ -110,23 +110,33 @@ const router = createRouter({
       path: '/loginexternal/:token/:project/:flowOrg',
       name: 'externalLogin',
       component: null,
-      beforeEnter: [authGuard],
+      beforeEnter: (to, from, next) => {
+        const { token, project, flowOrg } = to.params;
+        auth_store().externalLogin({ token: token.replace('+', ' ') });
+        auth_store().selectedProject({ project });
+        auth_store().selectedFlowOrg({ flowOrg });
+        if (to.query.next) {
+          next(to.query.next);
+        } else {
+          next();
+        }
+      },
     },
   ],
 });
 
-function authGuard(to) {
-  const { token, project, flowOrg } = to.params;
-  auth_store().externalLogin({ token: token.replace('+', ' ') });
-  auth_store().selectedProject({ project });
-  auth_store().selectedFlowOrg({ flowOrg });
-  if (to.query.next) {
-    return { path: to.query.next };
-  } else {
-    // next({name: 'Discovery'});
-    return { path: '/apps/discovery' };
-  }
-}
+// function authGuard(to) {
+//   const { token, project, flowOrg } = to.params;
+//   auth_store().externalLogin({ token: token.replace('+', ' ') });
+//   auth_store().selectedProject({ project });
+//   auth_store().selectedFlowOrg({ flowOrg });
+//   if (to.query.next) {
+//     return { path: to.query.next };
+//   } else {
+//     // next({name: 'Discovery'});
+//     return { path: '/apps/discovery' };
+//   }
+// }
 
 router.afterEach(() => {
   window.parent.postMessage(