From 16f89d7d523d1b37645f0dfc000100b0b3e8eb35 Mon Sep 17 00:00:00 2001
From: Gzx1999 <guozhengxin@kylinos.cn>
Date: Fri, 24 Nov 2023 14:15:31 +0800
Subject: [PATCH] refactory cookie module and clear cookie when logout

---
 frontend/src/global/defines.ts     |  7 -------
 frontend/src/module/cookie.ts      | 14 ++++++++++++++
 frontend/src/views/Home/Home.vue   |  5 +++--
 frontend/src/views/Login/Login.vue |  8 ++++----
 4 files changed, 21 insertions(+), 13 deletions(-)
 delete mode 100644 frontend/src/global/defines.ts
 create mode 100644 frontend/src/module/cookie.ts

diff --git a/frontend/src/global/defines.ts b/frontend/src/global/defines.ts
deleted file mode 100644
index 2a64f5f..0000000
--- a/frontend/src/global/defines.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-
-// cookie定义
-// TODO: use simple token name
-// export const CookieAuthToken = "token"
-export const CookieAuthToken = "Admin-Token"
-
-
diff --git a/frontend/src/module/cookie.ts b/frontend/src/module/cookie.ts
new file mode 100644
index 0000000..d08a5bb
--- /dev/null
+++ b/frontend/src/module/cookie.ts
@@ -0,0 +1,14 @@
+import Cookies from 'js-cookie';
+
+// cookie定义
+// TODO: use simple token name
+// const CookieAuthToken = "token"
+const CookieAuthToken = "Admin-Token"
+
+export function setToken(token: string) {
+    Cookies.set(CookieAuthToken, token)
+}
+
+export function removeToken() {
+    Cookies.remove(CookieAuthToken)
+}
diff --git a/frontend/src/views/Home/Home.vue b/frontend/src/views/Home/Home.vue
index 9f0a625..5c3f802 100644
--- a/frontend/src/views/Home/Home.vue
+++ b/frontend/src/views/Home/Home.vue
@@ -95,15 +95,16 @@ function handleLogout() {
         }).catch((err) => {
             ElMessage.error("logout error: " + err)
         })
-        console.log("confirm")
     }).catch(() => {
-        console.log("catch")
+        // cancel logout
     })
 }
 
+import { removeToken } from "@/module/cookie";
 
 function doLogout() {
     userStore().$reset()
+    removeToken()
     directTo('/login')
 }
 
diff --git a/frontend/src/views/Login/Login.vue b/frontend/src/views/Login/Login.vue
index 5de619f..f47270a 100644
--- a/frontend/src/views/Login/Login.vue
+++ b/frontend/src/views/Login/Login.vue
@@ -31,13 +31,13 @@
 <script setup lang="ts">
 import { ref } from "vue";
 import { ElMessage } from 'element-plus';
-import Cookies from 'js-cookie';
+
 import { directTo } from '@/router/index';
 import { loginByEmail } from "@/request/user";
 import { RespCodeOK } from "@/request/request";
-import { CookieAuthToken } from "@/global/defines";
+import { setToken } from "@/module/cookie";
 import { checkEmail } from "./logic";
-import { userStore} from "@/stores/user";
+import { userStore } from "@/stores/user";
 
 const loginFormRef = ref()
 const loginData = ref({
@@ -77,7 +77,7 @@ function submitLogin() {
             loginByEmail(data).then((resp: any) => {
                 if (resp.code == RespCodeOK) {
                     // update cookie
-                    Cookies.set(CookieAuthToken, resp.data.token)
+                    setToken(resp.data.token)
 
                     // store user info
                     userStore().user = {
-- 
Gitee