chore: fix login redirect by param

if the `redirect` param is set on the login page, navigate to the path specified
FlatTrackio · Nov 1, 2024 · 8054cc1 · 8054cc1
1 parent 18daebd
commit 8054cc1
Showing 1 changed file with 15 additions and 5 deletions.
diff --git a/web/src/router/routes.js b/web/src/router/routes.js
@@ -193,14 +193,24 @@ export default [
     name: 'Login',
     component: () => import('@/views/public/login.vue'),
     beforeEnter: (to, from, next) => {
-      var instanceRegistered
-      var hasAuthToken
-      var validAuthToken
-      var nextRoute
+      let instanceRegistered
+      let hasAuthToken
+      let validAuthToken
+      let nextRoute
 
       function handleRedirections () {
-        if (instanceRegistered && validAuthToken) {
+        if (
+          instanceRegistered &&
+          validAuthToken &&
+          to.query.redirect === null
+        ) {
           nextRoute = '/'
+        } else if (
+          instanceRegistered &&
+          validAuthToken &&
+          to.query.redirect !== null
+        ) {
+          nextRoute = to.query.redirect
         } else if (!instanceRegistered) {
           nextRoute = '/setup'
         } else if (!(hasAuthToken || validAuthToken)) {