fix(ui): redirects to main when auth is disabled (#854)

* fix(ui): redirects to main when auth is disabled * fix: fix redirects
zwave-js · Mar 9, 2021 · 8f4f181 · 8f4f181
1 parent b555724
commit 8f4f181
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/src/App.vue b/src/App.vue
@@ -497,7 +497,8 @@ export default {
           }
 
           if (!newAuth && this.$route.path === Routes.login) {
-            this.$router.push(Routes.main)
+            this.$router.push(localStorage.getItem('nextUrl') || Routes.main)
+            localStorage.removeItem('nextUrl')
           }
           this.startSocket()
         }

diff --git a/src/router/index.js b/src/router/index.js
@@ -107,6 +107,10 @@ router.beforeEach(async (to, from, next) => {
     return
   }
 
+  if (store.state.auth === undefined && to.path !== Routes.login) {
+    localStorage.setItem('nextUrl', to.path)
+  }
+
   if (store.state.auth === false) {
     if (to.path === Routes.login) {
       next({