Merge pull request tuandm#172 from tuandm/bugfix/issue-170-can-not-lo…

…gin-with-non-admin Issue 170: Can not login with non-admin account
ks-eddieHoo · Apr 22, 2020 · 4bbc195 · 4bbc195
2 parents aecfa1b + b709591
commit 4bbc195
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/resources/js/permission.js b/resources/js/permission.js
@@ -36,7 +36,7 @@ router.beforeEach(async(to, from, next) => {
           const { roles, permissions } = await store.dispatch('user/getInfo');
 
           // generate accessible routes map based on roles
-          const accessRoutes = await store.dispatch('permission/generateRoutes', roles, permissions);
+          const accessRoutes = await store.dispatch('permission/generateRoutes', { roles, permissions });
           router.addRoutes(accessRoutes);
           next({ ...to, replace: true });
         } catch (error) {

diff --git a/resources/js/store/modules/permission.js b/resources/js/store/modules/permission.js
@@ -68,7 +68,7 @@ const mutations = {
 };
 
 const actions = {
-  generateRoutes({ commit }, roles, permissions) {
+  generateRoutes({ commit }, { roles, permissions }) {
     return new Promise(resolve => {
       let accessedRoutes;
       if (roles.includes('admin')) {