Simplify route guard

This commit is contained in:
Björn Fromme
2018-10-26 22:55:07 +02:00
parent b2a48bb656
commit dbd392a03a
@@ -8,17 +8,11 @@ const guard = (to, from, next) => {
if (store.state.loading) { if (store.state.loading) {
next(false); next(false);
} else if (store.state.loggedIn) { } else if (store.state.loggedIn) {
next(); if (to.meta.requiresTeamer && !store.state.teamer) {
} else {
next({ name: 'login' });
}
};
const guardTeamer = (to, from, next) => {
if (store.state.loading) {
next(false); next(false);
} else if (store.state.loggedIn && store.state.teamer) { } else {
next(); next();
}
} else { } else {
next({ name: 'login' }); next({ name: 'login' });
} }
@@ -66,7 +60,8 @@ export default new VueRouter({
name: 'teamer', name: 'teamer',
path: '/teamer', path: '/teamer',
component: Teamer, component: Teamer,
beforeEnter: guardTeamer meta: { requiresTeamer: true },
beforeEnter: guard
}, },
{ {
path: '*', path: '*',