From 2e8055f7f37b675e37562c43b1a90fc85b609b51 Mon Sep 17 00:00:00 2001
From: "Captain.B" <bin@fit2cloud.com>
Date: Fri, 28 Feb 2020 17:50:05 +0800
Subject: [PATCH] use localStorage

---
 frontend/package.json                                 |  3 +--
 frontend/src/login/Login.vue                          |  3 +--
 frontend/src/performance/components/HeaderUser.vue    | 11 +++++------
 .../performance/components/settings/CurrentUser.vue   |  3 +--
 .../src/performance/components/settings/Member.vue    |  3 +--
 .../components/settings/OrganizationMember.vue        |  4 ++--
 .../components/settings/OrganizationWorkspace.vue     |  3 +--
 .../performance/components/settings/PersonSetting.vue |  5 ++---
 frontend/src/performance/permission.js                |  3 +--
 9 files changed, 15 insertions(+), 23 deletions(-)

diff --git a/frontend/package.json b/frontend/package.json
index 1ada55b2b7..dd0c28d277 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -18,8 +18,7 @@
     "vue": "^2.6.10",
     "vue-i18n": "^8.15.3",
     "vue-router": "^3.1.3",
-    "vuex": "^3.1.2",
-    "js-cookie": "^2.2.0"
+    "vuex": "^3.1.2"
   },
   "devDependencies": {
     "@vue/cli-plugin-babel": "^4.1.0",
diff --git a/frontend/src/login/Login.vue b/frontend/src/login/Login.vue
index 6b395cc0db..ba90cffe75 100644
--- a/frontend/src/login/Login.vue
+++ b/frontend/src/login/Login.vue
@@ -43,7 +43,6 @@
 </template>
 
 <script>
-  import Cookies from 'js-cookie';
   import {TokenKey} from '../common/constants';
 
 
@@ -109,7 +108,7 @@
           if (valid) {
             this.$post("signin", this.form, (response) => {
               // 登录信息保存 cookie
-              Cookies.set(TokenKey, response.data);
+              localStorage.setItem(TokenKey, JSON.stringify(response.data));
               let rolesArray = response.data.roles;
               let roles = rolesArray.map(r => r.id);
               // 保存角色
diff --git a/frontend/src/performance/components/HeaderUser.vue b/frontend/src/performance/components/HeaderUser.vue
index be7b59075c..aff60aa9e9 100644
--- a/frontend/src/performance/components/HeaderUser.vue
+++ b/frontend/src/performance/components/HeaderUser.vue
@@ -42,7 +42,6 @@
 </template>
 
 <script>
-  import Cookies from 'js-cookie';
   import {ROLE_ORG_ADMIN, ROLE_TEST_MANAGER, ROLE_TEST_USER, ROLE_TEST_VIEWER, TokenKey} from '../../common/constants';
 
   export default {
@@ -60,7 +59,7 @@
           {index: '2-1', name: '无工作空间'},
         ],
         currentUserInfo: {},
-        currentUserId: JSON.parse(Cookies.get(TokenKey)).id,
+        currentUserId: JSON.parse(localStorage.getItem(TokenKey)).id,
         workspaceIds: [],
         currentOrganizationName: '选择组织',
         currentWorkspaceName: '选择工作空间'
@@ -68,7 +67,7 @@
     },
     computed: {
       currentUser: () => {
-        let user = Cookies.get(TokenKey);
+        let user = localStorage.getItem(TokenKey);
         // window.console.log(user);
         return JSON.parse(user);
       }
@@ -81,7 +80,7 @@
             break;
           case "logout":
             this.$get("/signout", function () {
-              Cookies.remove(TokenKey);
+              localStorage.removeItem(TokenKey);
               window.location.href = "/login";
             });
             break;
@@ -129,7 +128,7 @@
         let orgId = data.id;
         let sign = "organization";
         this.$post("/user/switch/source/" + sign + "/"  + orgId, {}, response => {
-          Cookies.set(TokenKey, response.data);
+          localStorage.setItem(TokenKey, JSON.stringify(response.data));
           window.location.reload();
         })
       },
@@ -141,7 +140,7 @@
           return false;
         }
         this.$post("/user/switch/source/" + sign + "/" + workspaceId, {}, response => {
-          Cookies.set(TokenKey, response.data);
+          localStorage.setItem(TokenKey, JSON.stringify(response.data));
           window.location.reload();
         })
       }
diff --git a/frontend/src/performance/components/settings/CurrentUser.vue b/frontend/src/performance/components/settings/CurrentUser.vue
index d69758242a..8bb6b13c57 100644
--- a/frontend/src/performance/components/settings/CurrentUser.vue
+++ b/frontend/src/performance/components/settings/CurrentUser.vue
@@ -21,7 +21,6 @@
 </template>
 
 <script>
-  import Cookies from 'js-cookie';
   import {TokenKey} from "../../../common/constants";
 
   export default {
@@ -46,7 +45,7 @@
     },
     computed: {
       currentUser: () => {
-        let user = Cookies.get(TokenKey);
+        let user = localStorage.getItem(TokenKey);
         return JSON.parse(user);
       }
     }
diff --git a/frontend/src/performance/components/settings/Member.vue b/frontend/src/performance/components/settings/Member.vue
index 16cdb25d16..00a74d5c84 100644
--- a/frontend/src/performance/components/settings/Member.vue
+++ b/frontend/src/performance/components/settings/Member.vue
@@ -114,7 +114,6 @@
 
 <script>
   import MsCreateBox from "./CreateBox";
-  import Cookies from 'js-cookie';
   import {TokenKey} from "../../../common/constants";
 
   export default {
@@ -149,7 +148,7 @@
     },
     methods: {
       currentUser: () => {
-        let user = Cookies.get(TokenKey);
+        let user = localStorage.getItem(TokenKey);
         return JSON.parse(user);
       },
       initTableData() {
diff --git a/frontend/src/performance/components/settings/OrganizationMember.vue b/frontend/src/performance/components/settings/OrganizationMember.vue
index 42a8d29058..4c5c74288d 100644
--- a/frontend/src/performance/components/settings/OrganizationMember.vue
+++ b/frontend/src/performance/components/settings/OrganizationMember.vue
@@ -113,8 +113,8 @@
 
 <script>
   import MsCreateBox from "./CreateBox";
-  import Cookies from 'js-cookie';
   import {TokenKey} from "../../../common/constants";
+
   export default {
     name: "MsOrganizationMember",
     components: {MsCreateBox},
@@ -147,7 +147,7 @@
     },
     methods: {
       currentUser: () => {
-        let user = Cookies.get(TokenKey);
+        let user = localStorage.getItem(TokenKey);
         return JSON.parse(user);
       },
       initTableData() {
diff --git a/frontend/src/performance/components/settings/OrganizationWorkspace.vue b/frontend/src/performance/components/settings/OrganizationWorkspace.vue
index d3c6b47154..258f910222 100644
--- a/frontend/src/performance/components/settings/OrganizationWorkspace.vue
+++ b/frontend/src/performance/components/settings/OrganizationWorkspace.vue
@@ -60,7 +60,6 @@
 
 <script>
   import MsCreateBox from "./CreateBox";
-  import Cookies from 'js-cookie';
   import {Message} from "element-ui";
   import {TokenKey} from "../../../common/constants";
 
@@ -72,7 +71,7 @@
     },
     computed: {
       currentUser: () => {
-        let user = Cookies.get(TokenKey);
+        let user = localStorage.getItem(TokenKey);
         window.console.log(user);
         return JSON.parse(user);
       }
diff --git a/frontend/src/performance/components/settings/PersonSetting.vue b/frontend/src/performance/components/settings/PersonSetting.vue
index 25789fbead..ebfb5604a4 100644
--- a/frontend/src/performance/components/settings/PersonSetting.vue
+++ b/frontend/src/performance/components/settings/PersonSetting.vue
@@ -50,7 +50,6 @@
 </template>
 
 <script>
-  import Cookies from 'js-cookie';
   import {TokenKey} from "../../../common/constants";
 
   export default {
@@ -98,7 +97,7 @@
     },
     methods: {
       currentUser: () => {
-        let user = Cookies.get(TokenKey);
+        let user = localStorage.getItem(TokenKey);
         return JSON.parse(user);
       },
       edit(row) {
@@ -113,7 +112,7 @@
                 type: 'success',
                 message: '修改成功!'
               });
-              Cookies.set(TokenKey, response.data);
+              localStorage.setItem(TokenKey, JSON.stringify(response.data));
               this.updateVisible = false;
               this.initTableData();
               window.location.reload();
diff --git a/frontend/src/performance/permission.js b/frontend/src/performance/permission.js
index 07e52ca0c2..5f5abb6d5c 100644
--- a/frontend/src/performance/permission.js
+++ b/frontend/src/performance/permission.js
@@ -1,5 +1,4 @@
 import router from './components/router/router'
-import Cookies from 'js-cookie' // get token from cookie
 import {TokenKey} from '../common/constants';
 
 const whiteList = ['/login']; // no redirect whitelist
@@ -26,7 +25,7 @@ export const permission = {
 router.beforeEach(async (to, from, next) => {
 
   // determine whether the user has logged in
-  const user = JSON.parse(Cookies.get(TokenKey));
+  const user = JSON.parse(localStorage.getItem(TokenKey));
 
   if (user) {
     if (to.path === '/login') {