remove permission control

PanJiaChen · PanJiaChen · commit b6147d33f332 · 2019-04-19T21:27:47.000+08:00
diff --git a/src/layout/components/Sidebar/index.vue b/src/layout/components/Sidebar/index.vue
@@ -12,7 +12,7 @@
         :collapse-transition="false"
         mode="vertical"
       >
-        <sidebar-item v-for="route in permission_routes" :key="route.path" :item="route" :base-path="route.path" />
+        <sidebar-item v-for="route in routes" :key="route.path" :item="route" :base-path="route.path" />
       </el-menu>
     </el-scrollbar>
   </div>
@@ -28,9 +28,11 @@ export default {
   components: { SidebarItem, Logo },
   computed: {
     ...mapGetters([
-      'permission_routes',
       'sidebar'
     ]),
+    routes() {
+      return this.$router.options.routes
+    },
     activeMenu() {
       const route = this.$route
       const { meta, path } = route
diff --git a/src/permission.js b/src/permission.js
@@ -26,25 +26,15 @@ router.beforeEach(async(to, from, next) => {
       next({ path: '/' })
       NProgress.done()
     } else {
-      // determine whether the user has obtained his permission roles through getInfo
-      const hasRoles = store.getters.roles && store.getters.roles.length > 0
-      if (hasRoles) {
+      const hasGetUserInfo = store.getters.name
+      if (hasGetUserInfo) {
         next()
       } else {
         try {
           // get user info
-          // note: roles must be a object array! such as: ['admin'] or ,['developer','editor']
-          const { roles } = await store.dispatch('user/getInfo')
+          await store.dispatch('user/getInfo')
 
-          // generate accessible routes map based on roles
-          const accessRoutes = await store.dispatch('permission/generateRoutes', roles)
-
-          // dynamically add accessible routes
-          router.addRoutes(accessRoutes)
-
-          // hack method to ensure that addRoutes is complete
-          // set the replace: true, so the navigation will not leave a history record
-          next({ ...to, replace: true })
+          next()
         } catch (error) {
           // remove token and go to login page to re-login
           await store.dispatch('user/resetToken')
diff --git a/src/router/index.js b/src/router/index.js
@@ -88,14 +88,8 @@ export const constantRoutes = [
         meta: { title: 'Form', icon: 'form' }
       }
     ]
-  }
-]
+  },
 
-/**
- * asyncRoutes
- * the routes that need to be dynamically loaded based on user roles
- */
-export const asyncRoutes = [
   {
     path: '/nested',
     component: Layout,
diff --git a/src/store/getters.js b/src/store/getters.js
@@ -3,8 +3,6 @@ const getters = {
   device: state => state.app.device,
   token: state => state.user.token,
   avatar: state => state.user.avatar,
-  name: state => state.user.name,
-  roles: state => state.user.roles,
-  permission_routes: state => state.permission.routes
+  name: state => state.user.name
 }
 export default getters
diff --git a/src/store/index.js b/src/store/index.js
@@ -2,7 +2,6 @@ import Vue from 'vue'
 import Vuex from 'vuex'
 import getters from './getters'
 import app from './modules/app'
-import permission from './modules/permission'
 import settings from './modules/settings'
 import user from './modules/user'
 
@@ -11,7 +10,6 @@ Vue.use(Vuex)
 const store = new Vuex.Store({
   modules: {
     app,
-    permission,
     settings,
     user
   },
diff --git a/src/store/modules/permission.js b/src/store/modules/permission.js
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
@@ -5,8 +5,7 @@ import { resetRouter } from '@/router'
 const state = {
   token: getToken(),
   name: '',
-  avatar: '',
-  roles: []
+  avatar: ''
 }
 
 const mutations = {
@@ -18,9 +17,6 @@ const mutations = {
   },
   SET_AVATAR: (state, avatar) => {
     state.avatar = avatar
-  },
-  SET_ROLES: (state, roles) => {
-    state.roles = roles
   }
 }
 
@@ -50,14 +46,8 @@ const actions = {
           reject('Verification failed, please Login again.')
         }
 
-        const { roles, name, avatar } = data
-
-        // roles must be a non-empty array
-        if (!roles || roles.length <= 0) {
-          reject('getInfo: roles must be a non-null array!')
-        }
+        const { name, avatar } = data
 
-        commit('SET_ROLES', roles)
         commit('SET_NAME', name)
         commit('SET_AVATAR', avatar)
         resolve(data)
@@ -72,7 +62,6 @@ const actions = {
     return new Promise((resolve, reject) => {
       logout(state.token).then(() => {
         commit('SET_TOKEN', '')
-        commit('SET_ROLES', [])
         removeToken()
         resetRouter()
         resolve()
@@ -86,7 +75,6 @@ const actions = {
   resetToken({ commit }) {
     return new Promise(resolve => {
       commit('SET_TOKEN', '')
-      commit('SET_ROLES', [])
       removeToken()
       resolve()
     })
diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue
@@ -1,7 +1,6 @@
 <template>
   <div class="dashboard-container">
     <div class="dashboard-text">name: {{ name }}</div>
-    <div class="dashboard-text">roles: <span v-for="role in roles" :key="role">{{ role }}</span></div>
   </div>
 </template>
 
@@ -12,8 +11,7 @@ export default {
   name: 'Dashboard',
   computed: {
     ...mapGetters([
-      'name',
-      'roles'
+      'name'
     ])
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -88,14 +88,8 @@ export const constantRoutes = [`
`88`	`88`	`meta: { title: 'Form', icon: 'form' }`
`89`	`89`	`}`
`90`	`90`	`]`
`91`		`- }`
`92`		`-]`
	`91`	`+ },`
`93`	`92`
`94`		`-/**`
`95`		`- * asyncRoutes`
`96`		`- * the routes that need to be dynamically loaded based on user roles`
`97`		`- */`
`98`		`-export const asyncRoutes = [`
`99`	`93`	`{`
`100`	`94`	`path: '/nested',`
`101`	`95`	`component: Layout,`