From 4691114f9b8cc3924f71e7fb15ae53f74aa51049 Mon Sep 17 00:00:00 2001
From: SunWuyuan <sun@wuyuan.dev>
Date: Sun, 18 May 2025 15:09:10 +0800
Subject: [PATCH] Refactor axios.js and Vue components to conditionally handle
 namespace settings based on server provider. Update request headers in
 axios.js to include site key and namespace password only for specific
 providers. Enhance NamespaceAccess and NamespaceSettingsCard components to
 show/hide based on provider, and streamline password management
 functionality.

---
 src/axios/axios.js                            | 24 +++---
 src/components/NamespaceAccess.vue            | 22 ++++--
 .../settings/cards/NamespaceSettingsCard.vue  | 37 ++++++++-
 src/pages/settings.vue                        | 15 ++--
 src/utils/api.js                              | 79 +++++++++++++++++++
 5 files changed, 153 insertions(+), 24 deletions(-)
 create mode 100644 src/utils/api.js

diff --git a/src/axios/axios.js b/src/axios/axios.js
index 06a2fad..13f7160 100644
--- a/src/axios/axios.js
+++ b/src/axios/axios.js
@@ -13,17 +13,21 @@ const axiosInstance = axios.create({
 // 请求拦截器
 axiosInstance.interceptors.request.use(
   (requestConfig) => {
-    // 确保每次请求时都获取最新的 siteKey
-    const siteKey = getSetting("server.siteKey");
-    if (siteKey) {
-      requestConfig.headers["x-site-key"] = Base64.encode(siteKey);
-    }
+    const provider = getSetting("server.provider");
 
-    // 自动添加命名空间密码
-    const namespacePassword = getSetting("namespace.password");
-    if (namespacePassword) {
-      requestConfig.headers["x-namespace-password"] =
-        Base64.encode(namespacePassword);
+    // 只有在 kv-server 或 classworkscloud 模式下才添加请求头
+    if (provider === "kv-server" || provider === "classworkscloud") {
+      // 确保每次请求时都获取最新的 siteKey
+      const siteKey = getSetting("server.siteKey");
+      if (siteKey) {
+        requestConfig.headers["x-site-key"] = Base64.encode(siteKey);
+      }
+
+      // 自动添加命名空间密码
+      const namespacePassword = getSetting("namespace.password");
+      if (namespacePassword) {
+        requestConfig.headers["x-namespace-password"] = Base64.encode(namespacePassword);
+      }
     }
 
     return requestConfig;
diff --git a/src/components/NamespaceAccess.vue b/src/components/NamespaceAccess.vue
index b856c9b..d92bcff 100644
--- a/src/components/NamespaceAccess.vue
+++ b/src/components/NamespaceAccess.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="namespace-access">
+  <div class="namespace-access" v-if="shouldShowAccess">
     <!-- 只读状态显示 -->
     <v-chip
       v-if="isReadOnly"
@@ -13,7 +13,7 @@
     <v-btn
       v-if="isReadOnly"
       color="primary"
-      size="small"
+      class="rounded-xl"
       prepend-icon="mdi-lock-open-variant"
       @click="openPasswordDialog"
       :disabled="loading"
@@ -23,7 +23,7 @@
 
     <!-- 密码输入对话框 -->
     <v-dialog v-model="dialog" max-width="400" persistent>
-      <v-card>
+      <v-card class="rounded-xl" border hover>
         <v-card-title class="text-h6">输入访问密码</v-card-title>
         <v-card-text>
           <div v-if="passwordHint" class="text-body-2 mb-4">
@@ -37,7 +37,6 @@
             :error="!!error"
             :error-messages="error"
             @keyup.enter="checkPassword"
-            :append-inner-icon="showPassword ? 'mdi-eye-off' : 'mdi-eye'"
             @click:append-inner="showPassword = !showPassword"
             :disabled="loading"
             autofocus
@@ -85,11 +84,23 @@ export default {
       passwordHint: null, // 密码提示
     };
   },
+  computed: {
+    shouldShowAccess() {
+      const provider = getSetting("server.provider");
+      return provider === "kv-server" || provider === "classworkscloud";
+    }
+  },
   async created() {
-    await this.checkAccess();
+    if (this.shouldShowAccess) {
+      await this.checkAccess();
+    }
   },
   methods: {
     async checkAccess() {
+      if (!this.shouldShowAccess) {
+        return;
+      }
+
       try {
         // 获取命名空间访问类型
         const response = await axios.get(
@@ -105,7 +116,6 @@ export default {
           // 保存密码提示
           this.passwordHint = response.data.passwordHint || null;
         } else {
-          //this.$router.push("/settings");
           return;
         }
 
diff --git a/src/components/settings/cards/NamespaceSettingsCard.vue b/src/components/settings/cards/NamespaceSettingsCard.vue
index c3f902c..fd381e1 100644
--- a/src/components/settings/cards/NamespaceSettingsCard.vue
+++ b/src/components/settings/cards/NamespaceSettingsCard.vue
@@ -1,9 +1,11 @@
 <template>
   <settings-card
+    v-if="shouldShowCard"
     title="命名空间设置"
     icon="mdi-database-lock"
     :loading="loading"
   >
+    <namespace-access ref="namespaceAccess" />
     <!-- 命名空间标识符 -->
     <v-card variant="tonal" class="rounded-lg mb-4">
       <v-card-item>
@@ -178,12 +180,23 @@
                 variant="tonal"
                 :loading="hintLoading"
                 @click="openHintDialog"
+                class="mr-2"
               >
                 设置密码提示
                 <template #prepend>
                   <v-icon icon="mdi-lightbulb-outline" />
                 </template>
               </v-btn>
+              <v-btn
+                color="primary"
+                variant="tonal"
+                @click="modifyLocalPassword"
+              >
+                修改本地密码
+                <template #prepend>
+                  <v-icon icon="mdi-key-variant" />
+                </template>
+              </v-btn>
             </div>
 
             <v-btn
@@ -352,6 +365,7 @@
 
 <script>
 import SettingsCard from "@/components/SettingsCard.vue";
+import NamespaceAccess from "@/components/NamespaceAccess.vue";
 import { kvServerProvider } from "@/utils/providers/kvServerProvider";
 import { getSetting } from "@/utils/settings";
 import axios from "@/axios/axios";
@@ -374,7 +388,10 @@ const getHeaders = () => {
 
 export default {
   name: "NamespaceSettingsCard",
-  components: { SettingsCard },
+  components: {
+    SettingsCard,
+    NamespaceAccess
+  },
 
   data() {
     return {
@@ -438,6 +455,10 @@ export default {
   },
 
   computed: {
+    shouldShowCard() {
+      const provider = getSetting("server.provider");
+      return provider === "kv-server" || provider === "classworkscloud";
+    },
     deviceUuid() {
       return this.namespaceInfo.uuid;
     },
@@ -460,8 +481,10 @@ export default {
   },
 
   async created() {
-    await this.loadNamespaceInfo();
-    await this.loadPasswordHint();
+    if (this.shouldShowCard) {
+      await this.loadNamespaceInfo();
+      await this.loadPasswordHint();
+    }
   },
 
   methods: {
@@ -693,6 +716,14 @@ export default {
       this.snackbarText = message;
       this.showSnackbar = true;
     },
+
+    modifyLocalPassword() {
+      // 获取NamespaceAccess组件实例并调用方法
+      const namespaceAccess = this.$refs.namespaceAccess;
+      if (namespaceAccess) {
+        namespaceAccess.openPasswordDialog();
+      }
+    },
   },
 };
 </script>
diff --git a/src/pages/settings.vue b/src/pages/settings.vue
index f099515..8ba2f6e 100644
--- a/src/pages/settings.vue
+++ b/src/pages/settings.vue
@@ -254,6 +254,9 @@ export default {
     return { isMobile: mobile };
   },
   data() {
+    const provider = getSetting("server.provider");
+    const showNamespaceSettings = provider === "kv-server" || provider === "classworkscloud";
+
     const settings = {
       server: {
         domain: getSetting("server.domain"),
@@ -337,11 +340,13 @@ export default {
           icon: "mdi-server",
           value: "server",
         },
-        {
-          title: "命名空间",
-          icon: "mdi-database-lock",
-          value: "namespace",
-        },
+        ...(showNamespaceSettings ? [
+          {
+            title: "命名空间",
+            icon: "mdi-database-lock",
+            value: "namespace",
+          }
+        ] : []),
         {
           title: "分享设置",
           icon: "mdi-share",
diff --git a/src/utils/api.js b/src/utils/api.js
new file mode 100644
index 0000000..e28decb
--- /dev/null
+++ b/src/utils/api.js
@@ -0,0 +1,79 @@
+import axios from "@/axios/axios";
+import { getSetting } from "@/utils/settings";
+
+// Helper function to check if provider is valid for API calls
+const isValidProvider = () => {
+  const provider = getSetting("server.provider");
+  return provider === "kv-server" || provider === "classworkscloud";
+};
+
+// Helper function to get request headers with site key and namespace password
+const getHeaders = () => {
+  const headers = { Accept: "application/json" };
+  const siteKey = getSetting("server.siteKey");
+  const namespacePassword = getSetting("namespace.password");
+
+  if (siteKey) {
+    headers["x-site-key"] = siteKey;
+  }
+  if (namespacePassword) {
+    headers["x-namespace-password"] = namespacePassword;
+  }
+
+  return headers;
+};
+
+/**
+ * Get namespace info from the server
+ * @returns {Promise<Object>} Response data containing namespace info
+ */
+export const getNamespaceInfo = async () => {
+  if (!isValidProvider()) {
+    throw new Error("当前数据提供者不支持此操作");
+  }
+
+  const serverUrl = getSetting("server.domain");
+  const machineId = getSetting("device.uuid");
+
+  try {
+    const response = await axios.get(`${serverUrl}/${machineId}/_info`, {
+      headers: getHeaders(),
+    });
+
+    return response.data;
+  } catch (error) {
+    throw new Error(error.response?.data?.message || "获取命名空间信息失败");
+  }
+};
+
+/**
+ * Update namespace password
+ * @param {string} oldPassword - Current password (if exists)
+ * @param {string} newPassword - New password to set
+ * @returns {Promise<Object>} Response data
+ */
+export const updateNamespacePassword = async (oldPassword, newPassword) => {
+  if (!isValidProvider()) {
+    throw new Error("当前数据提供者不支持此操作");
+  }
+
+  const serverUrl = getSetting("server.domain");
+  const machineId = getSetting("device.uuid");
+
+  try {
+    const response = await axios.put(
+      `${serverUrl}/${machineId}/_infopassword`,
+      {
+        oldPassword,
+        newPassword,
+      },
+      {
+        headers: getHeaders(),
+      }
+    );
+
+    return response.data;
+  } catch (error) {
+    throw new Error(error.response?.data?.message || "更新命名空间密码失败");
+  }
+};
\ No newline at end of file