summaryrefslogtreecommitdiffstats
path: root/webapp/src/router.js
diff options
context:
space:
mode:
authorJannik Schönartz2019-02-23 03:46:58 +0100
committerJannik Schönartz2019-02-23 03:46:58 +0100
commit0d8c8a920752de91b575834dcbeecde65e9d2ad8 (patch)
treed3c068bd401314396057bd049d543cda5e7a46b2 /webapp/src/router.js
parent[webapp/datatable] remove filtering indicator (diff)
downloadbas-0d8c8a920752de91b575834dcbeecde65e9d2ad8.tar.gz
bas-0d8c8a920752de91b575834dcbeecde65e9d2ad8.tar.xz
bas-0d8c8a920752de91b575834dcbeecde65e9d2ad8.zip
[webapp/router] Fix forwarding bug while loggedout calling /
Diffstat (limited to 'webapp/src/router.js')
-rw-r--r--webapp/src/router.js10
1 files changed, 8 insertions, 2 deletions
diff --git a/webapp/src/router.js b/webapp/src/router.js
index 2af8d0d..65c3949 100644
--- a/webapp/src/router.js
+++ b/webapp/src/router.js
@@ -42,10 +42,16 @@ var router = new Router({
const registerRouterGuards = function (store) {
router.beforeEach((to, from, next) => {
const loggedIn = document.cookie.indexOf('jwt_hp') >= 0
- if (to.name === 'login' || to.name === 'start') {
+ if (to.name === 'login') {
if (loggedIn) next({ name: 'dashboard' })
else next()
- } else if (!loggedIn && to.name !== 'setup') {
+ } else if (to.name === 'start') {
+ if (loggedIn) next({ name: 'dashboard' })
+ else next({ name: 'login' })
+ } else if (to.name === 'setup') {
+ if (loggedIn) next({ name: 'dashboard' })
+ else next()
+ } else if (!loggedIn) {
store.commit('setLoginRedirect', to.fullPath)
next({ name: 'login' })
} else {