From 539fd8fd1402aa4ccbe27e9396c69cee2a75341a Mon Sep 17 00:00:00 2001
From: Ryan Wang <i@ryanc.cc>
Date: Thu, 22 Sep 2022 20:46:12 +0800
Subject: [PATCH] refactor: improve login-related logic (#617)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

#### What type of PR is this?

/kind improvement
/milestone 2.0

#### What this PR does / why we need it:

适配 https://github.com/halo-dev/halo/pull/2453

1. 将生产构建的 base url 更改为 console
2. 优化登录之后跳转的逻辑。

#### Which issue(s) this PR fixes:

#### Special notes for your reviewer:

/cc @halo-dev/sig-halo-admin

测试方式：

1. 在本地根据此 PR 构建生产版本（pnpm build）
2. 根据 https://github.com/halo-dev/halo/pull/2453#issue-1381947867 中的描述修改配置文件。
3. 访问 http://localhost:8090/console

#### Does this PR introduce a user-facing change?

```release-note
None
```
---
 .env.production                    |  2 +-
 src/main.ts                        |  3 +-
 src/modules/system/users/Login.vue | 52 +++++++-----------
 src/utils/api-client.ts            | 88 ++++++++++++++++--------------
 4 files changed, 70 insertions(+), 75 deletions(-)

diff --git a/.env.production b/.env.production
index c2660d7d..9eb2c608 100644
--- a/.env.production
+++ b/.env.production
@@ -1,2 +1,2 @@
 VITE_API_URL=
-VITE_BASE_URL=/admin/
+VITE_BASE_URL=/console/
diff --git a/src/main.ts b/src/main.ts
index 30769065..0d02194d 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -8,7 +8,7 @@ import type {
   MenuItemType,
   Plugin,
 } from "@halo-dev/admin-shared";
-import { apiClient, setApiUrl } from "@/utils/api-client";
+import { apiClient } from "@/utils/api-client";
 import { menus, minimenus, registerMenu } from "./router/menus.config";
 // setup
 import "./setup/setupStyles";
@@ -24,7 +24,6 @@ import { useRoleStore } from "@/stores/role";
 const app = createApp(App);
 
 setupComponents(app);
-setApiUrl(import.meta.env.VITE_API_URL);
 
 app.use(createPinia());
 
diff --git a/src/modules/system/users/Login.vue b/src/modules/system/users/Login.vue
index 36e4d7e4..cb2e2515 100644
--- a/src/modules/system/users/Login.vue
+++ b/src/modules/system/users/Login.vue
@@ -1,12 +1,8 @@
 <script lang="ts" setup>
-import {
-  IconShieldUser,
-  IconUserSettings,
-  VButton,
-} from "@halo-dev/components";
+import { IconShieldUser, IconUserLine, VButton } from "@halo-dev/components";
 import { v4 as uuid } from "uuid";
 import qs from "qs";
-import logo from "../../../assets/logo.svg";
+import logo from "@/assets/logo.svg";
 import { onMounted, ref } from "vue";
 import { submitForm } from "@formkit/vue";
 import router from "@/router";
@@ -17,30 +13,22 @@ interface LoginForm {
   password: string;
 }
 
-interface LoginFormState {
-  logging: boolean;
-  state: LoginForm;
-}
-
-const loginForm = ref<LoginFormState>({
-  logging: false,
-  state: {
-    _csrf: "",
-    username: "ryanwang",
-    password: "12345678",
-  },
+const loginForm = ref<LoginForm>({
+  _csrf: "",
+  username: "",
+  password: "",
 });
+const loading = ref(false);
 
 const handleGenerateToken = async () => {
   const token = uuid();
-  loginForm.value.state._csrf = token;
+  loginForm.value._csrf = token;
   document.cookie = `XSRF-TOKEN=${token}; Path=/;`;
 };
 
 const handleLogin = async () => {
   try {
-    loginForm.value.logging = true;
-
+    loading.value = true;
     await fetch(`${import.meta.env.VITE_API_URL}/login`, {
       method: "POST",
       headers: {
@@ -48,14 +36,14 @@ const handleLogin = async () => {
       },
       credentials: "include",
       redirect: "manual",
-      body: qs.stringify(loginForm.value.state),
+      body: qs.stringify(loginForm.value),
     });
     await router.push({ name: "Dashboard" });
     await router.go(0);
   } catch (e) {
-    console.error(e);
+    console.error("Failed to login", e);
   } finally {
-    loginForm.value.logging = false;
+    loading.value = false;
   }
 };
 
@@ -66,13 +54,15 @@ onMounted(() => {
 <template>
   <div class="flex h-screen flex-col items-center justify-center">
     <img :src="logo" alt="Logo" class="mb-8 w-20" />
-    <div class="login-form w-72">
+    <div class="login-form flex w-72 flex-col gap-4">
       <FormKit
-        id="login"
-        v-model="loginForm.state"
+        id="login-form"
+        v-model="loginForm"
         :actions="false"
         type="form"
+        :config="{ animation: 'none' }"
         @submit="handleLogin"
+        @keyup.enter="submitForm('login-form')"
       >
         <FormKit
           :validation-messages="{
@@ -84,7 +74,7 @@ onMounted(() => {
           validation="required"
         >
           <template #prefixIcon>
-            <IconUserSettings />
+            <IconUserLine />
           </template>
         </FormKit>
         <FormKit
@@ -100,10 +90,10 @@ onMounted(() => {
             <IconShieldUser />
           </template>
         </FormKit>
-        <VButton block type="secondary" @click="submitForm('login')">
-          登录
-        </VButton>
       </FormKit>
+      <VButton block type="secondary" @click="submitForm('login-form')">
+        登录
+      </VButton>
     </div>
   </div>
 </template>
diff --git a/src/utils/api-client.ts b/src/utils/api-client.ts
index 8fb046d8..2c7ec939 100644
--- a/src/utils/api-client.ts
+++ b/src/utils/api-client.ts
@@ -32,95 +32,101 @@ import {
 } from "@halo-dev/api-client";
 import type { AxiosInstance } from "axios";
 import axios from "axios";
+import router from "@/router";
+
+const baseURL = import.meta.env.VITE_API_URL;
 
-let apiUrl: string | undefined;
 const axiosInstance = axios.create({
+  baseURL,
   withCredentials: true,
 });
 
-let apiClient = setupApiClient(axiosInstance);
-
 axiosInstance.interceptors.response.use(
   (response) => {
     return response;
   },
   async (error) => {
-    console.log("error", error);
     if (error.response.status === 401) {
-      window.location.href = "/#/login";
+      router.push({
+        name: "Login",
+      });
     }
     return Promise.reject(error);
   }
 );
 
-const setApiUrl = (url: string) => {
-  axiosInstance.defaults.baseURL = url;
-  apiUrl = url;
-  apiClient = setupApiClient(axiosInstance);
-};
+const apiClient = setupApiClient(axiosInstance);
 
 function setupApiClient(axios: AxiosInstance) {
   return {
     extension: {
-      configMap: new V1alpha1ConfigMapApi(undefined, apiUrl, axios),
+      configMap: new V1alpha1ConfigMapApi(undefined, baseURL, axios),
       personalAccessToken: new V1alpha1PersonalAccessTokenApi(
         undefined,
-        apiUrl,
+        baseURL,
         axios
       ),
-      roleBinding: new V1alpha1RoleBindingApi(undefined, apiUrl, axios),
-      role: new V1alpha1RoleApi(undefined, apiUrl, axios),
-      setting: new V1alpha1SettingApi(undefined, apiUrl, axios),
+      roleBinding: new V1alpha1RoleBindingApi(undefined, baseURL, axios),
+      role: new V1alpha1RoleApi(undefined, baseURL, axios),
+      setting: new V1alpha1SettingApi(undefined, baseURL, axios),
       reverseProxy: new PluginHaloRunV1alpha1ReverseProxyApi(
         undefined,
-        apiUrl,
+        baseURL,
         axios
       ),
-      plugin: new PluginHaloRunV1alpha1PluginApi(undefined, apiUrl, axios),
-      user: new V1alpha1UserApi(undefined, apiUrl, axios),
-      theme: new ThemeHaloRunV1alpha1ThemeApi(undefined, apiUrl, axios),
-      menu: new V1alpha1MenuApi(undefined, apiUrl, axios),
-      menuItem: new V1alpha1MenuItemApi(undefined, apiUrl, axios),
-      post: new ContentHaloRunV1alpha1PostApi(undefined, apiUrl, axios),
+      plugin: new PluginHaloRunV1alpha1PluginApi(undefined, baseURL, axios),
+      user: new V1alpha1UserApi(undefined, baseURL, axios),
+      theme: new ThemeHaloRunV1alpha1ThemeApi(undefined, baseURL, axios),
+      menu: new V1alpha1MenuApi(undefined, baseURL, axios),
+      menuItem: new V1alpha1MenuItemApi(undefined, baseURL, axios),
+      post: new ContentHaloRunV1alpha1PostApi(undefined, baseURL, axios),
       singlePage: new ContentHaloRunV1alpha1SinglePageApi(
         undefined,
-        apiUrl,
+        baseURL,
         axios
       ),
-      category: new ContentHaloRunV1alpha1CategoryApi(undefined, apiUrl, axios),
-      tag: new ContentHaloRunV1alpha1TagApi(undefined, apiUrl, axios),
-      snapshot: new ContentHaloRunV1alpha1SnapshotApi(undefined, apiUrl, axios),
-      comment: new ContentHaloRunV1alpha1CommentApi(undefined, apiUrl, axios),
-      reply: new ContentHaloRunV1alpha1ReplyApi(undefined, apiUrl, axios),
+      category: new ContentHaloRunV1alpha1CategoryApi(
+        undefined,
+        baseURL,
+        axios
+      ),
+      tag: new ContentHaloRunV1alpha1TagApi(undefined, baseURL, axios),
+      snapshot: new ContentHaloRunV1alpha1SnapshotApi(
+        undefined,
+        baseURL,
+        axios
+      ),
+      comment: new ContentHaloRunV1alpha1CommentApi(undefined, baseURL, axios),
+      reply: new ContentHaloRunV1alpha1ReplyApi(undefined, baseURL, axios),
       storage: {
-        group: new StorageHaloRunV1alpha1GroupApi(undefined, apiUrl, axios),
+        group: new StorageHaloRunV1alpha1GroupApi(undefined, baseURL, axios),
         attachment: new StorageHaloRunV1alpha1AttachmentApi(
           undefined,
-          apiUrl,
+          baseURL,
           axios
         ),
-        policy: new StorageHaloRunV1alpha1PolicyApi(undefined, apiUrl, axios),
+        policy: new StorageHaloRunV1alpha1PolicyApi(undefined, baseURL, axios),
         policyTemplate: new StorageHaloRunV1alpha1PolicyTemplateApi(
           undefined,
-          apiUrl,
+          baseURL,
           axios
         ),
       },
     },
     // custom endpoints
-    user: new ApiConsoleHaloRunV1alpha1UserApi(undefined, apiUrl, axios),
-    plugin: new ApiConsoleHaloRunV1alpha1PluginApi(undefined, apiUrl, axios),
-    theme: new ApiConsoleHaloRunV1alpha1ThemeApi(undefined, apiUrl, axios),
-    post: new ApiConsoleHaloRunV1alpha1PostApi(undefined, apiUrl, axios),
+    user: new ApiConsoleHaloRunV1alpha1UserApi(undefined, baseURL, axios),
+    plugin: new ApiConsoleHaloRunV1alpha1PluginApi(undefined, baseURL, axios),
+    theme: new ApiConsoleHaloRunV1alpha1ThemeApi(undefined, baseURL, axios),
+    post: new ApiConsoleHaloRunV1alpha1PostApi(undefined, baseURL, axios),
     singlePage: new ApiConsoleHaloRunV1alpha1SinglePageApi(
       undefined,
-      apiUrl,
+      baseURL,
       axios
     ),
-    content: new ApiConsoleHaloRunV1alpha1ContentApi(undefined, apiUrl, axios),
-    comment: new ApiConsoleHaloRunV1alpha1CommentApi(undefined, apiUrl, axios),
-    reply: new ApiConsoleHaloRunV1alpha1ReplyApi(undefined, apiUrl, axios),
+    content: new ApiConsoleHaloRunV1alpha1ContentApi(undefined, baseURL, axios),
+    comment: new ApiConsoleHaloRunV1alpha1CommentApi(undefined, baseURL, axios),
+    reply: new ApiConsoleHaloRunV1alpha1ReplyApi(undefined, baseURL, axios),
   };
 }
 
-export { apiClient, setApiUrl };
+export { apiClient };