From ad5ff4cfe08886dfe23be562b69f6c3713605dd1 Mon Sep 17 00:00:00 2001 From: Henrique Dias Date: Mon, 9 Oct 2017 08:14:17 +0100 Subject: [PATCH] Close #248 Former-commit-id: af79c3515a4a6a6d5b72da1193b888b7cd03b286 [formerly bb0e1f8e966e238feacf3013eccf9b5e711f7061] [formerly 0f38f0df6f964f88310fde0e59f6b3a79b9c103c [formerly 90c2de44c3d22056d739ccb3c90035cbd512b39a]] Former-commit-id: ac03a781bce6530b0512b014c38e8d8c77d8ec01 [formerly 5469e2322432fd1991229f909e69d70966fe8f9e] Former-commit-id: d17517418e68671237ad845df93b62840038d8d7 --- assets/src/router/index.js | 18 +++++++++++------- rice-box.go.REMOVED.git-id | 1 - 2 files changed, 11 insertions(+), 8 deletions(-) delete mode 100644 rice-box.go.REMOVED.git-id diff --git a/assets/src/router/index.js b/assets/src/router/index.js index 01ec3256..cbc0e1e3 100644 --- a/assets/src/router/index.js +++ b/assets/src/router/index.js @@ -54,6 +54,9 @@ const router = new Router({ redirect: { path: '/settings/profile' }, + meta: { + disableOnNoAuth: true + }, children: [ { path: '/settings/profile', @@ -127,16 +130,17 @@ router.beforeEach((to, from, next) => { auth.loggedIn() .then(() => { if (to.matched.some(record => record.meta.requiresAdmin)) { - if (store.state.user.admin) { - next() + if (!store.state.user.admin) { + next({ path: '/403' }) return } + } - next({ - path: '/403' - }) - - return + if (to.matched.some(record => record.meta.disableOnNoAuth)) { + if (store.state.noAuth) { + next({ path: '/403' }) + return + } } next() diff --git a/rice-box.go.REMOVED.git-id b/rice-box.go.REMOVED.git-id deleted file mode 100644 index 636c900d..00000000 --- a/rice-box.go.REMOVED.git-id +++ /dev/null @@ -1 +0,0 @@ -fb04f17b945f280665365cf87b85c4f8c936b31a \ No newline at end of file