fix(auth): only change router after account exists

InCuca · Mar 2, 2018 · 624fff2 · 624fff2
1 parent e1df64d
commit 624fff2
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/template/client/store/modules/auth/actions.js b/template/client/store/modules/auth/actions.js
@@ -7,15 +7,15 @@ import router from '@/router';
 export function syncToken({commit, dispatch}) {
   if (loopback.token) {
     commit('setAccessToken', loopback.token);
-    dispatch('loadAccount', loopback.token.userId);
+    return dispatch('loadAccount', loopback.token.userId);
   }
 }
 
 /**
  * Sync router for auth
  */
 export function syncRouter({state, dispatch}, myRouter) {
-  dispatch('syncToken');
+  const synced = dispatch('syncToken');
 
   myRouter.beforeEach((to, from, next) => {
     if (to.matched.some(record => record.meta.requiresAuth)) {
@@ -29,7 +29,7 @@ export function syncRouter({state, dispatch}, myRouter) {
           name: 'login',
         });
       } else {
-        next();
+        synced.then(next);
       }
     } else {
       next(); // make sure to always call next()!