Simplify route guard

2018-10-26 22:55:07 +02:00
parent b2a48bb656
commit dbd392a03a
1 changed files with 7 additions and 12 deletions
@@ -8,17 +8,11 @@ const guard = (to, from, next) => {
    if (store.state.loading) {
        next(false);
    } else if (store.state.loggedIn) {
-        next();
-    } else {
-        next({ name: 'login' });
-    }
-};
-
-const guardTeamer = (to, from, next) => {
-    if (store.state.loading) {
-        next(false);
-    } else if (store.state.loggedIn && store.state.teamer) {
-        next();
+        if (to.meta.requiresTeamer && !store.state.teamer) {
+            next(false);
+        } else {
+            next();
+        }
    } else {
        next({ name: 'login' });
    }
@@ -66,7 +60,8 @@ export default new VueRouter({
            name: 'teamer',
            path: '/teamer',
            component: Teamer,
-            beforeEnter: guardTeamer
+            meta: { requiresTeamer: true },
+            beforeEnter: guard
        },
        {
            path: '*',