From 0627199695f9fd64996551c00e8a418571cd5686 Mon Sep 17 00:00:00 2001
From: OrangeM21 <orangemtony@gmail.com>
Date: Tue, 19 May 2020 17:41:47 +0800
Subject: [PATCH] =?UTF-8?q?[fix]=E6=B7=BB=E5=8A=A0=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E5=92=8C=E7=AE=A1=E7=90=86=E5=91=98=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E5=88=87=E6=8D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/i18n/langs/cn.json                        |  1 +
 src/i18n/langs/en.json                        |  3 +-
 .../components/NavHeader/AccountDropdown.vue  | 30 ++++++++++++++++---
 src/permission.js                             | 22 ++++++++++++--
 src/router/index.js                           | 22 ++++++++++----
 src/store/getters.js                          |  3 +-
 src/userviews/assets/index.vue                | 13 ++++++++
 src/userviews/users/index.vue                 | 17 +++++++++++
 src/utils/auth.js                             | 13 ++++++++
 9 files changed, 111 insertions(+), 13 deletions(-)
 create mode 100644 src/userviews/assets/index.vue
 create mode 100644 src/userviews/users/index.vue

diff --git a/src/i18n/langs/cn.json b/src/i18n/langs/cn.json
index 6936b4157..fe3ecb95f 100644
--- a/src/i18n/langs/cn.json
+++ b/src/i18n/langs/cn.json
@@ -104,6 +104,7 @@
       "Help": "帮助",
       "Profile": "个人信息",
       "UserPage": "用户页面",
+      "AdminPage": "管理员页面",
       "APIKey": "API Key",
       "Logout": "退出",
       "Support": "支持"
diff --git a/src/i18n/langs/en.json b/src/i18n/langs/en.json
index 54d05e495..8b1978458 100644
--- a/src/i18n/langs/en.json
+++ b/src/i18n/langs/en.json
@@ -137,7 +137,8 @@
       "Profile": "Profile",
       "APIKey": "API Key",
       "Logout": "Logout",
-      "UserPage": "User page"
+      "UserPage": "User page",
+      "AdminPage": "Admin page"
     },
     "tree": {
       "addNode": "Add",
diff --git a/src/layout/components/NavHeader/AccountDropdown.vue b/src/layout/components/NavHeader/AccountDropdown.vue
index d4ffe3cad..68d749426 100644
--- a/src/layout/components/NavHeader/AccountDropdown.vue
+++ b/src/layout/components/NavHeader/AccountDropdown.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="header-tools header-profile">
-    <el-dropdown>
+    <el-dropdown @command="handleClick">
       <span class="el-dropdown-link">
         <el-avatar :src="avatarUrl" class="header-avatar" />
         {{ currentUser.name }}
@@ -8,7 +8,8 @@
       </span>
       <el-dropdown-menu slot="dropdown">
         <el-dropdown-item icon="el-icon-user" command="profile">{{ $t('common.nav.Profile') }}</el-dropdown-item>
-        <el-dropdown-item icon="el-icon-guide" command="changePage">{{ $t('common.nav.UserPage') }}</el-dropdown-item>
+        <el-dropdown-item v-if="CheckPermission && CheckRules " icon="el-icon-guide" command="UserPage">{{ $t('common.nav.UserPage') }}</el-dropdown-item>
+        <el-dropdown-item v-if="!CheckPermission && CheckRules " icon="el-icon-guide" command="AdminPage">{{ $t('common.nav.AdminPage') }}</el-dropdown-item>
         <el-dropdown-item icon="el-icon-key" command="apiKey">{{ $t('common.nav.APIKey') }}</el-dropdown-item>
         <el-dropdown-item divided command="logout">{{ $t('common.nav.Logout') }}</el-dropdown-item>
       </el-dropdown-menu>
@@ -18,6 +19,7 @@
 
 <script>
 import { mapGetters } from 'vuex'
+import { getPermission, setPermission } from '@/utils/auth'
 export default {
   name: 'AccountDropdown',
   data() {
@@ -26,11 +28,31 @@ export default {
     }
   },
   computed: {
+    CheckPermission() {
+      return getPermission() === 'Admin'
+    },
+    CheckRules() {
+      return this.getCurrentOrgRoles.includes('Admin')
+    },
     ...mapGetters([
-      'currentUser'
+      'currentUser',
+      'getCurrentOrgRoles'
     ])
+  },
+  methods: {
+    handleClick(val) {
+      switch (val) {
+        case 'AdminPage':
+          setPermission('Admin')
+          window.location.href = `/`
+          break
+        case 'UserPage':
+          setPermission('User')
+          window.location.href = `/`
+          break
+      }
+    }
   }
-
 }
 </script>
 
diff --git a/src/permission.js b/src/permission.js
index 111858710..8c147a566 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -4,7 +4,7 @@ import store from './store'
 import { Message } from 'element-ui'
 import NProgress from 'nprogress' // progress bar
 import 'nprogress/nprogress.css' // progress bar style
-import { getToken } from '@/utils/auth' // get token from cookie
+import { getToken, getPermission, setPermission } from '@/utils/auth'
 import getPageTitle from '@/utils/get-page-title'
 
 NProgress.configure({
@@ -57,7 +57,9 @@ router.beforeEach(async(to, from, next) => {
   try {
     // try get user profile
     // note: roles must be a object array! such as: ['admin'] or ,['developer','editor']
-    const { current_org_roles } = await store.dispatch('users/getProfile')
+    let { current_org_roles } = await store.dispatch('users/getProfile')
+
+    current_org_roles = checkRoules(current_org_roles)
 
     // generate accessible routes map based on roles
     const accessRoutes = await store.dispatch('permission/generateRoutes', current_org_roles)
@@ -85,3 +87,19 @@ router.afterEach(() => {
   // finish progress bar
   NProgress.done()
 })
+
+function checkRoules(val) {
+  let currentRule = getPermission()
+  if (currentRule) {
+    if (!val.includes(currentRule)) {
+      // TODO 异常注入处理
+      currentRule = val[0]
+      setPermission(currentRule)
+    }
+  } else {
+    // 设置默认路由
+    currentRule = val[0]
+    setPermission(currentRule)
+  }
+  return [currentRule]
+}
diff --git a/src/router/index.js b/src/router/index.js
index f7e853c01..f51385d47 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -153,13 +153,25 @@ export const userRoutes = [
   {
     path: '/',
     component: Layout,
-    redirect: '/dashboard',
+    redirect: '/assets',
     children: [
       {
-        path: 'dashboard',
-        name: 'dashboard',
-        component: () => import('@/views/dashboard/index'),
-        meta: { title: i18n.t('route.Dashboard'), icon: 'dashboard' }
+        path: 'assets',
+        name: 'assets',
+        component: () => import('@/userviews/assets/index'),
+        meta: { title: i18n.t('route.assets'), icon: 'assets' }
+      }
+    ]
+  },
+  {
+    path: '/users',
+    component: Layout,
+    children: [
+      {
+        path: '/users/profile',
+        name: 'profile',
+        component: () => import('@/userviews/users/index'),
+        meta: { title: i18n.t('route.assets'), icon: 'assets' }
       }
     ]
   },
diff --git a/src/store/getters.js b/src/store/getters.js
index 944276f40..bf8d4b5bf 100644
--- a/src/store/getters.js
+++ b/src/store/getters.js
@@ -8,6 +8,7 @@ const getters = {
   permission_routes: state => state.permission.routes,
   visitedViews: state => state.tagsView.visitedViews,
   cachedViews: state => state.tagsView.cachedViews,
-  publicSettings: state => state.settings.publicSettings
+  publicSettings: state => state.settings.publicSettings,
+  getCurrentOrgRoles: state => state.users.profile.current_org_roles
 }
 export default getters
diff --git a/src/userviews/assets/index.vue b/src/userviews/assets/index.vue
new file mode 100644
index 000000000..b62fe7d34
--- /dev/null
+++ b/src/userviews/assets/index.vue
@@ -0,0 +1,13 @@
+<template>
+
+</template>
+
+<script>
+  export default {
+    name: 'index.vue'
+  }
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/userviews/users/index.vue b/src/userviews/users/index.vue
new file mode 100644
index 000000000..231393f7a
--- /dev/null
+++ b/src/userviews/users/index.vue
@@ -0,0 +1,17 @@
+<template>
+    <div/>
+</template>
+
+<script>
+  export default {
+    name: '',
+    components: {},
+    data() {
+      return {}
+    }
+  }
+</script>
+
+<style lang='less' scoped>
+
+</style>
diff --git a/src/utils/auth.js b/src/utils/auth.js
index 1a094bb80..8825f7949 100644
--- a/src/utils/auth.js
+++ b/src/utils/auth.js
@@ -2,11 +2,24 @@ import Cookies from 'js-cookie'
 
 const TokenKey = 'csrftoken'
 const CurrentOrg = 'currentOrg'
+const Permission = 'currentRole'
 
 export function getToken() {
   return Cookies.get(TokenKey)
 }
 
+export function getPermission() {
+  return Cookies.get(Permission)
+}
+
+export function setPermission(token) {
+  return Cookies.set(Permission, token)
+}
+
+export function removePermission() {
+  return Cookies.remove(Permission)
+}
+
 export function setToken(token) {
   return Cookies.set(TokenKey, token)
 }