update

2025-04-25 10:03:56 +08:00
parent 452922724d
commit 5c2a159792
18 changed files with 995 additions and 66 deletions
@@ -3,7 +3,6 @@ import apiClient from '../utils/apiClient'; // 使用统一的 apiClient
 import router from '../router'; // 引入 router 用于重定向
 import { setLocale } from '../i18n'; // 导入 setLocale

-// 扩展的用户信息接口，包含 2FA 状态
 // 扩展的用户信息接口，包含 2FA 状态和语言偏好
 interface UserInfo {
    id: number;
@@ -19,6 +18,14 @@ interface LoginPayload {
    rememberMe?: boolean; // 可选的“记住我”标志
 }

+// Public CAPTCHA Config Interface (mirrors backend public config)
+interface PublicCaptchaConfig {
+    enabled: boolean;
+    provider: 'hcaptcha' | 'recaptcha' | 'none';
+    hcaptchaSiteKey?: string;
+    recaptchaSiteKey?: string;
+}
+
 // Auth Store State 接口
 interface AuthState {
    isAuthenticated: boolean;
@@ -26,12 +33,13 @@ interface AuthState {
    isLoading: boolean;
    error: string | null;
    loginRequires2FA: boolean; // 新增状态：标记登录是否需要 2FA
-    // 新增：存储 IP 黑名单数据
+    // 新增：存储 IP 黑名单数据 (虽然 actions 在这里，但 state 结构保持)
    ipBlacklist: {
        entries: any[]; // TODO: Define a proper type for blacklist entries
        total: number;
    };
    needsSetup: boolean; // 新增：是否需要初始设置
+    publicCaptchaConfig: PublicCaptchaConfig | null; // NEW: Public CAPTCHA config
 }

 export const useAuthStore = defineStore('auth', {
@@ -43,20 +51,21 @@ export const useAuthStore = defineStore('auth', {
        loginRequires2FA: false, // 初始为不需要
        ipBlacklist: { entries: [], total: 0 }, // 初始化黑名单状态
        needsSetup: false, // 初始假设不需要设置
+        publicCaptchaConfig: null, // NEW: Initialize CAPTCHA config as null
    }),
    getters: {
        // 可以添加一些 getter，例如获取用户名
        loggedInUser: (state) => state.user?.username,
    },
    actions: {
-        // 登录 Action - 更新为接受 LoginPayload
-        async login(payload: LoginPayload) {
+        // 登录 Action - 更新为接受 LoginPayload + optional captchaToken
+        async login(payload: LoginPayload & { captchaToken?: string }) { // Add captchaToken to payload
            this.isLoading = true;
            this.error = null;
            this.loginRequires2FA = false; // 重置 2FA 状态
            try {
                // 后端可能返回 user 或 requiresTwoFactor
-                // 将完整的 payload (包含 rememberMe) 发送给后端
+                // 将完整的 payload (包含 rememberMe 和 captchaToken) 发送给后端
                const response = await apiClient.post<{ message: string; user?: UserInfo; requiresTwoFactor?: boolean }>('/auth/login', payload); // 使用 apiClient

                if (response.data.requiresTwoFactor) {
@@ -148,34 +157,6 @@ export const useAuthStore = defineStore('auth', {
            }
        },

-        // TODO: 添加检查登录状态的 Action (例如应用启动时调用)
-        // TODO: 添加检查登录状态的 Action (例如应用启动时调用)
-        // async checkAuthStatus() {
-        //     const token = localStorage.getItem('authToken'); // 假设 token 存储在 localStorage
-        //     if (token) {
-        //         try {
-        //             // 可选: 向后端发送请求验证 token 有效性
-        //             // const response = await axios.get('/api/v1/auth/me', { headers: { Authorization: `Bearer ${token}` } });
-        //             // this.isAuthenticated = true;
-        //             // this.user = response.data.user;
-        //
-        //             // 暂时只基于 localStorage 状态恢复
-        //             const storedAuth = localStorage.getItem('auth'); // pinia-plugin-persistedstate 默认 key
-        //             if (storedAuth) {
-        //                 const parsedAuth = JSON.parse(storedAuth);
-        //                 if (parsedAuth.isAuthenticated && parsedAuth.user) {
-        //                     this.isAuthenticated = true;
-        //                     this.user = parsedAuth.user;
-        //                     console.log('Auth status restored from localStorage');
-        //                 }
-        //             }
-        //         } catch (error) {
-        //             console.error('Failed to restore auth status:', error);
-        //             this.logout(); // 如果验证失败或出错，则登出
-        //         }
-        //     }
-        // }
-
        // 新增：检查并更新认证状态 Action
        async checkAuthStatus() {
            this.isLoading = true;
@@ -245,9 +226,9 @@ export const useAuthStore = defineStore('auth', {
                const response = await apiClient.get('/settings/ip-blacklist', { // 使用 apiClient
                    params: { limit, offset }
                });
-                // 注意：这里需要将获取到的数据存储在 state 中，
-                // 但当前 AuthState 没有定义相关字段。
-                // 暂时只返回数据，需要在 state 中添加 ipBlacklist 字段。
+                // 更新本地状态
+                this.ipBlacklist.entries = response.data.entries;
+                this.ipBlacklist.total = response.data.total;
                console.log('获取 IP 黑名单成功:', response.data);
                return response.data; // { entries: [], total: number }
            } catch (err: any) {
@@ -270,7 +251,9 @@ export const useAuthStore = defineStore('auth', {
            try {
                await apiClient.delete(`/settings/ip-blacklist/${encodeURIComponent(ip)}`); // 使用 apiClient
                console.log(`IP ${ip} 已从黑名单删除`);
-                // 成功后需要重新获取列表或从本地 state 中移除
+                // 从本地 state 中移除 (或者重新获取列表)
+                this.ipBlacklist.entries = this.ipBlacklist.entries.filter(entry => entry.ip !== ip);
+                this.ipBlacklist.total = Math.max(0, this.ipBlacklist.total - 1);
                return true;
            } catch (err: any) {
                console.error(`删除 IP ${ip} 失败:`, err);
@@ -297,6 +280,27 @@ export const useAuthStore = defineStore('auth', {
                return false;
            }
        },
+
+        // NEW: 获取公共 CAPTCHA 配置
+        async fetchCaptchaConfig() {
+            // Avoid refetching if already loaded
+            if (this.publicCaptchaConfig !== null) return;
+
+            // Don't set isLoading for this, it should be quick background fetch
+            try {
+                console.log('[AuthStore] Fetching public CAPTCHA config...');
+                const response = await apiClient.get<PublicCaptchaConfig>('/auth/captcha/config');
+                this.publicCaptchaConfig = response.data;
+                console.log('[AuthStore] Public CAPTCHA config loaded:', this.publicCaptchaConfig);
+            } catch (error: any) {
+                console.error('获取公共 CAPTCHA 配置失败:', error.response?.data?.message || error.message);
+                // Set a default disabled config on error to prevent blocking login UI
+                this.publicCaptchaConfig = {
+                    enabled: false,
+                    provider: 'none',
+                };
+            }
+        },
    },
-    persist: true, // 使用默认持久化配置 (localStorage, 持久化所有 state)
+    persist: true, // Revert to simple persistence to fix TS error for now
 });
@@ -3,6 +3,26 @@ import apiClient from '../utils/apiClient'; // 使用统一的 apiClient
 import { ref, computed } from 'vue'; // 移除 watch
 import i18n, { setLocale, defaultLng } from '../i18n'; // Import i18n instance and setLocale
 import type { PaneName } from './layout.store'; // +++ Import PaneName type +++
+// Import CAPTCHA types from backend (adjust path if needed, assuming types are mirrored or shared)
+// For now, let's assume they are available via a shared types definition or manually defined here
+// Assuming manual definition for now if no shared types exist:
+type CaptchaProvider = 'hcaptcha' | 'recaptcha' | 'none';
+interface CaptchaSettings {
+    enabled: boolean;
+    provider: CaptchaProvider;
+    hcaptchaSiteKey?: string;
+    hcaptchaSecretKey?: string; // Store locally but don't expose via getters easily
+    recaptchaSiteKey?: string;
+    recaptchaSecretKey?: string; // Store locally but don't expose via getters easily
+}
+interface UpdateCaptchaSettingsDto {
+    enabled?: boolean;
+    provider?: CaptchaProvider;
+    hcaptchaSiteKey?: string;
+    hcaptchaSecretKey?: string;
+    recaptchaSiteKey?: string;
+    recaptchaSecretKey?: string;
+}
 // 移除 ITheme 和默认主题定义，这些移到 appearance.store.ts

 // 定义通用设置状态类型
@@ -32,6 +52,7 @@ export const useSettingsStore = defineStore('settings', () => {
  const settings = ref<Partial<SettingsState>>({}); // 通用设置状态
  const parsedSidebarPaneWidths = ref<Record<string, string>>({}); // NEW: 解析后的侧边栏宽度对象
  const parsedFileManagerColWidths = ref<Record<string, number>>({}); // NEW: 解析后的文件管理器列宽对象
+  const captchaSettings = ref<CaptchaSettings | null>(null); // NEW: CAPTCHA 设置状态
  const isLoading = ref(false);
  const error = ref<string | null>(null);
  // 移除外观相关状态: isStyleCustomizerVisible, currentUiTheme, currentXtermTheme
@@ -350,6 +371,65 @@ export const useSettingsStore = defineStore('settings', () => {
    }
  }

+  // --- CAPTCHA Settings Actions ---
+
+  /**
+   * Fetches CAPTCHA settings from the backend.
+   * Should be called when the settings component mounts.
+   */
+  async function loadCaptchaSettings() {
+    // Avoid reloading if already loaded, unless forced
+    // if (captchaSettings.value !== null && !force) return;
+
+    isLoading.value = true;
+    error.value = null;
+    try {
+      console.log('[SettingsStore] 加载 CAPTCHA 设置...');
+      // Use the correct endpoint defined in the backend routes
+      const response = await apiClient.get<CaptchaSettings>('/settings/captcha');
+      captchaSettings.value = response.data;
+      console.log('[SettingsStore] CAPTCHA 设置加载完成:', { ...response.data, hcaptchaSecretKey: '***', recaptchaSecretKey: '***' }); // Mask secrets
+    } catch (err: any) {
+      console.error('加载 CAPTCHA 设置失败:', err);
+      error.value = err.response?.data?.message || err.message || '加载 CAPTCHA 设置失败';
+      captchaSettings.value = null; // Reset on error
+    } finally {
+      isLoading.value = false;
+    }
+  }
+
+  /**
+   * Updates CAPTCHA settings on the backend.
+   * @param updates - An object containing the CAPTCHA settings fields to update.
+   */
+  async function updateCaptchaSettings(updates: UpdateCaptchaSettingsDto) {
+    isLoading.value = true;
+    error.value = null;
+    try {
+      console.log('[SettingsStore] 更新 CAPTCHA 设置:', { ...updates, hcaptchaSecretKey: '***', recaptchaSecretKey: '***' }); // Mask secrets
+      // Use the correct endpoint defined in the backend routes
+      await apiClient.put('/settings/captcha', updates);
+
+      // Update local state after successful API call
+      // Merge updates into the existing state or reload
+      if (captchaSettings.value) {
+        captchaSettings.value = { ...captchaSettings.value, ...updates };
+      } else {
+        // If settings were null, reload them after update
+        await loadCaptchaSettings();
+      }
+      console.log('[SettingsStore] CAPTCHA 设置更新成功。');
+
+    } catch (err: any) {
+      console.error('更新 CAPTCHA 设置失败:', err);
+      error.value = err.response?.data?.message || err.message || '更新 CAPTCHA 设置失败';
+      throw error; // Re-throw to allow component to handle UI feedback
+    } finally {
+      isLoading.value = false;
+    }
+  }
+
+
  // 移除外观相关 actions: saveCustomThemes, resetCustomThemes, toggleStyleCustomizer

  // --- Getters ---
@@ -411,7 +491,14 @@ export const useSettingsStore = defineStore('settings', () => {
      return parsedFileManagerColWidths.value;
  });

-  return {
+  // --- CAPTCHA Getters (Public Only) ---
+  const isCaptchaEnabled = computed(() => captchaSettings.value?.enabled ?? false);
+  const captchaProvider = computed(() => captchaSettings.value?.provider ?? 'none');
+  const hcaptchaSiteKey = computed(() => captchaSettings.value?.hcaptchaSiteKey ?? '');
+  const recaptchaSiteKey = computed(() => captchaSettings.value?.recaptchaSiteKey ?? '');
+  // DO NOT expose secret keys via getters
+
+ return {
    settings, // 只包含通用设置
    isLoading,
    error,
@@ -426,6 +513,14 @@ export const useSettingsStore = defineStore('settings', () => {
    getSidebarPaneWidth, // +++ 暴露获取特定面板宽度的 getter +++
    fileManagerRowSizeMultiplierNumber, // +++ 暴露文件管理器行大小 getter +++
    fileManagerColWidthsObject, // +++ 暴露文件管理器列宽 getter +++
+    // CAPTCHA related exports
+    captchaSettings, // Expose the full (but reactive) object for the settings page v-model
+    isCaptchaEnabled,
+    captchaProvider,
+    hcaptchaSiteKey,
+    recaptchaSiteKey,
+    loadCaptchaSettings,
+    updateCaptchaSettings,
    // 移除外观相关的 getters 和 actions
    loadInitialSettings,
    updateSetting,