@@ -5509,7 +6134,12 @@ import type {
WebSearchProviderConfig,
WebSearchTestResult,
} from "@/api/admin/settings";
-import type { AdminGroup, Proxy, NotifyEmailEntry } from "@/types";
+import type {
+ AdminGroup,
+ LoginAgreementDocument,
+ NotifyEmailEntry,
+ Proxy,
+} from "@/types";
import type { ProviderInstance } from "@/types/payment";
import AppLayout from "@/components/layout/AppLayout.vue";
import Icon from "@/components/icons/Icon.vue";
@@ -5539,9 +6169,10 @@ import {
const { t, locale } = useI18n();
const appStore = useAppStore();
const adminSettingsStore = useAdminSettingsStore();
+const isZhLocale = computed(() => locale.value.startsWith("zh"));
function localText(zh: string, en: string): string {
- return locale.value.startsWith("zh") ? zh : en;
+ return isZhLocale.value ? zh : en;
}
const paymentGuideHref = computed(() =>
@@ -5558,6 +6189,7 @@ const paymentMethodsHref = computed(() =>
type SettingsTab =
| "general"
+ | "agreement"
| "features"
| "security"
| "users"
@@ -5568,6 +6200,7 @@ type SettingsTab =
const activeTab = ref("general");
const settingsTabs = [
{ key: "general" as SettingsTab, icon: "home" as const },
+ { key: "agreement" as SettingsTab, icon: "document" as const },
{ key: "features" as SettingsTab, icon: "bolt" as const },
{ key: "security" as SettingsTab, icon: "shield" as const },
{ key: "users" as SettingsTab, icon: "user" as const },
@@ -5605,6 +6238,14 @@ const overloadCooldownForm = reactive({
cooldown_minutes: 10,
});
+// Rate Limit Cooldown (429) 状态
+const rateLimit429CooldownLoading = ref(true);
+const rateLimit429CooldownSaving = ref(false);
+const rateLimit429CooldownForm = reactive({
+ enabled: true,
+ cooldown_seconds: 5,
+});
+
// Stream Timeout 状态
const streamTimeoutLoading = ref(true);
const streamTimeoutSaving = ref(false);
@@ -5654,6 +6295,49 @@ const tablePageSizeMin = 5;
const tablePageSizeMax = 1000;
const tablePageSizeDefault = 20;
+function defaultLoginAgreementDocuments(): LoginAgreementDocument[] {
+ return [
+ {
+ id: "terms",
+ title: "服务条款",
+ content_md: "",
+ },
+ {
+ id: "usage-policy",
+ title: "使用政策",
+ content_md: "",
+ },
+ {
+ id: "supported-regions",
+ title: "支持的国家和地区",
+ content_md: "",
+ },
+ {
+ id: "service-specific-terms",
+ title: "服务特定条款",
+ content_md: "",
+ },
+ ];
+}
+
+function normalizeLoginAgreementDocumentId(raw: string): string {
+ return raw
+ .trim()
+ .toLowerCase()
+ .replace(/[^a-z0-9_-]+/g, "-")
+ .replace(/[-_]{2,}/g, "-")
+ .replace(/^[-_]+|[-_]+$/g, "");
+}
+
+function loginAgreementRoutePath(
+ doc: LoginAgreementDocument,
+ index: number,
+): string {
+ const id =
+ normalizeLoginAgreementDocumentId(doc.id || doc.title) || `doc-${index + 1}`;
+ return `/legal/${id}`;
+}
+
interface DefaultSubscriptionGroupOption {
value: number;
label: string;
@@ -5681,6 +6365,8 @@ type SettingsForm = Omit<
wechat_connect_mp_enabled: boolean;
wechat_connect_mobile_enabled: boolean;
oidc_connect_client_secret: string;
+ github_oauth_client_secret: string;
+ google_oauth_client_secret: string;
force_email_on_third_party_signup: boolean;
openai_advanced_scheduler_enabled: boolean;
};
@@ -5694,6 +6380,10 @@ const form = reactive({
password_reset_enabled: false,
totp_enabled: false,
totp_encryption_key_configured: false,
+ login_agreement_enabled: false,
+ login_agreement_mode: "modal",
+ login_agreement_updated_at: "2026-03-31",
+ login_agreement_documents: defaultLoginAgreementDocuments(),
default_balance: 0,
affiliate_rebate_rate: 20,
affiliate_rebate_freeze_hours: 0,
@@ -5713,6 +6403,7 @@ const form = reactive({
backend_mode_enabled: false,
hide_ccs_import_button: false,
payment_enabled: false,
+ risk_control_enabled: false,
payment_min_amount: 1,
payment_max_amount: 10000,
payment_daily_limit: 50000,
@@ -5811,6 +6502,19 @@ const form = reactive({
oidc_connect_userinfo_email_path: "",
oidc_connect_userinfo_id_path: "",
oidc_connect_userinfo_username_path: "",
+ // GitHub / Google 邮箱快捷登录
+ github_oauth_enabled: false,
+ github_oauth_client_id: "",
+ github_oauth_client_secret: "",
+ github_oauth_client_secret_configured: false,
+ github_oauth_redirect_url: "",
+ github_oauth_frontend_redirect_url: "/auth/oauth/callback",
+ google_oauth_enabled: false,
+ google_oauth_client_id: "",
+ google_oauth_client_secret: "",
+ google_oauth_client_secret_configured: false,
+ google_oauth_redirect_url: "",
+ google_oauth_frontend_redirect_url: "/auth/oauth/callback",
// Model fallback
enable_model_fallback: false,
fallback_model_anthropic: "claude-3-5-sonnet-20241022",
@@ -5847,6 +6551,10 @@ const form = reactive({
channel_monitor_default_interval_seconds: 60,
// Available Channels feature switch
available_channels_enabled: false,
+ // Image Generation feature switch
+ image_generation_enabled: false,
+ // Chat Completion feature switch
+ chat_completion_enabled: false,
// Affiliate (邀请返利) feature switch
affiliate_enabled: false,
});
@@ -5876,6 +6584,22 @@ const authSourceDefaultsMeta = computed(() => [
title: t("admin.settings.authSourceDefaults.sources.wechat.title"),
description: t("admin.settings.authSourceDefaults.sources.wechat.description"),
},
+ {
+ source: "github" as AuthSourceType,
+ title: "GitHub",
+ description: localText(
+ "通过 GitHub 已验证邮箱首次注册或首次绑定时应用。",
+ "Applied on first signup or first bind through a verified GitHub email.",
+ ),
+ },
+ {
+ source: "google" as AuthSourceType,
+ title: "Google",
+ description: localText(
+ "通过 Google 已验证邮箱首次注册或首次绑定时应用。",
+ "Applied on first signup or first bind through a verified Google email.",
+ ),
+ },
]);
// Proxies for web search emulation ProxySelector
@@ -6183,6 +6907,42 @@ async function setAndCopyLinuxdoRedirectUrl() {
);
}
+type EmailOAuthProvider = "github" | "google";
+
+const githubOAuthRedirectUrlSuggestion = computed(() => {
+ if (typeof window === "undefined") return "";
+ const origin =
+ window.location.origin ||
+ `${window.location.protocol}//${window.location.host}`;
+ return `${origin}/api/v1/auth/oauth/github/callback`;
+});
+
+const googleOAuthRedirectUrlSuggestion = computed(() => {
+ if (typeof window === "undefined") return "";
+ const origin =
+ window.location.origin ||
+ `${window.location.protocol}//${window.location.host}`;
+ return `${origin}/api/v1/auth/oauth/google/callback`;
+});
+
+async function setAndCopyEmailOAuthRedirectUrl(provider: EmailOAuthProvider) {
+ const url =
+ provider === "github"
+ ? githubOAuthRedirectUrlSuggestion.value
+ : googleOAuthRedirectUrlSuggestion.value;
+ if (!url) return;
+
+ if (provider === "github") {
+ form.github_oauth_redirect_url = url;
+ } else {
+ form.google_oauth_redirect_url = url;
+ }
+ await copyToClipboard(
+ url,
+ localText("回调地址已写入并复制。", "Callback URL set and copied."),
+ );
+}
+
const wechatRedirectUrlSuggestion = computed(() => {
if (typeof window === "undefined") return "";
const origin =
@@ -6310,6 +7070,43 @@ function removeEndpoint(index: number) {
form.custom_endpoints.splice(index, 1);
}
+function addLoginAgreementDocument() {
+ form.login_agreement_documents.push({
+ id: `custom-${Date.now().toString(36)}`,
+ title: "",
+ content_md: "",
+ });
+}
+
+function removeLoginAgreementDocument(index: number) {
+ form.login_agreement_documents.splice(index, 1);
+}
+
+function normalizeLoginAgreementDocumentsForSave(): LoginAgreementDocument[] {
+ return form.login_agreement_documents
+ .map((doc, index) => ({
+ id:
+ normalizeLoginAgreementDocumentId(doc.id || doc.title) ||
+ `doc-${index + 1}`,
+ title: doc.title.trim(),
+ content_md: doc.content_md.trim(),
+ }))
+ .filter((doc) => doc.title || doc.content_md);
+}
+
+function findDuplicateLoginAgreementDocumentId(
+ documents: LoginAgreementDocument[],
+): string | null {
+ const seen = new Set();
+ for (const doc of documents) {
+ if (seen.has(doc.id)) {
+ return doc.id;
+ }
+ seen.add(doc.id);
+ }
+ return null;
+}
+
function formatTablePageSizeOptions(options: number[]): string {
return options.join(", ");
}
@@ -6354,6 +7151,19 @@ async function loadSettings() {
(form as Record)[key] = value;
}
}
+ form.login_agreement_mode =
+ settings.login_agreement_mode === "checkbox" ? "checkbox" : "modal";
+ form.login_agreement_updated_at =
+ settings.login_agreement_updated_at || "2026-03-31";
+ form.login_agreement_documents =
+ Array.isArray(settings.login_agreement_documents) &&
+ settings.login_agreement_documents.length > 0
+ ? settings.login_agreement_documents.map((doc) => ({
+ id: doc.id || "",
+ title: doc.title || "",
+ content_md: doc.content_md || "",
+ }))
+ : defaultLoginAgreementDocuments();
Object.assign(authSourceDefaults, buildAuthSourceDefaultsState(settings));
form.backend_mode_enabled = settings.backend_mode_enabled;
form.default_subscriptions = normalizeDefaultSubscriptionSettings(
@@ -6373,6 +7183,8 @@ async function loadSettings() {
smtpPasswordManuallyEdited.value = false;
form.turnstile_secret_key = "";
form.linuxdo_connect_client_secret = "";
+ form.github_oauth_client_secret = "";
+ form.google_oauth_client_secret = "";
form.wechat_connect_app_secret = "";
form.wechat_connect_open_app_secret = "";
form.wechat_connect_mp_app_secret = "";
@@ -6563,6 +7375,44 @@ async function saveSettings() {
form.table_default_page_size = normalizedTableDefaultPageSize;
form.table_page_size_options = normalizedTablePageSizeOptions;
+ const normalizedLoginAgreementDocuments =
+ normalizeLoginAgreementDocumentsForSave();
+ if (form.login_agreement_enabled && normalizedLoginAgreementDocuments.length === 0) {
+ appStore.showError(
+ localText(
+ "启用登录条款确认时，至少需要保留一份文档。",
+ "At least one document is required when login agreement is enabled.",
+ ),
+ );
+ return;
+ }
+ const emptyTitleDocument = normalizedLoginAgreementDocuments.find(
+ (doc) => !doc.title,
+ );
+ if (emptyTitleDocument) {
+ appStore.showError(
+ localText(
+ "登录条款文档名称不能为空。",
+ "Login agreement document title cannot be empty.",
+ ),
+ );
+ return;
+ }
+ const duplicateLoginAgreementDocumentId =
+ findDuplicateLoginAgreementDocumentId(normalizedLoginAgreementDocuments);
+ if (duplicateLoginAgreementDocumentId) {
+ appStore.showError(
+ localText(
+ `登录条款文档路由不能重复：/legal/${duplicateLoginAgreementDocumentId}`,
+ `Login agreement document routes cannot be duplicated: /legal/${duplicateLoginAgreementDocumentId}`,
+ ),
+ );
+ return;
+ }
+ form.login_agreement_mode =
+ form.login_agreement_mode === "checkbox" ? "checkbox" : "modal";
+ form.login_agreement_documents = normalizedLoginAgreementDocuments;
+
const normalizedDefaultSubscriptions = normalizeDefaultSubscriptionSettings(
form.default_subscriptions,
);
@@ -6640,6 +7490,10 @@ async function saveSettings() {
invitation_code_enabled: form.invitation_code_enabled,
password_reset_enabled: form.password_reset_enabled,
totp_enabled: form.totp_enabled,
+ login_agreement_enabled: form.login_agreement_enabled,
+ login_agreement_mode: form.login_agreement_mode,
+ login_agreement_updated_at: form.login_agreement_updated_at,
+ login_agreement_documents: form.login_agreement_documents,
default_balance: form.default_balance,
affiliate_rebate_rate: Math.min(
100,
@@ -6731,6 +7585,20 @@ async function saveSettings() {
oidc_connect_userinfo_id_path: form.oidc_connect_userinfo_id_path,
oidc_connect_userinfo_username_path:
form.oidc_connect_userinfo_username_path,
+ github_oauth_enabled: form.github_oauth_enabled,
+ github_oauth_client_id: form.github_oauth_client_id,
+ github_oauth_client_secret:
+ form.github_oauth_client_secret || undefined,
+ github_oauth_redirect_url: form.github_oauth_redirect_url,
+ github_oauth_frontend_redirect_url:
+ form.github_oauth_frontend_redirect_url,
+ google_oauth_enabled: form.google_oauth_enabled,
+ google_oauth_client_id: form.google_oauth_client_id,
+ google_oauth_client_secret:
+ form.google_oauth_client_secret || undefined,
+ google_oauth_redirect_url: form.google_oauth_redirect_url,
+ google_oauth_frontend_redirect_url:
+ form.google_oauth_frontend_redirect_url,
enable_model_fallback: form.enable_model_fallback,
fallback_model_anthropic: form.fallback_model_anthropic,
fallback_model_openai: form.fallback_model_openai,
@@ -6748,6 +7616,7 @@ async function saveSettings() {
form.enable_anthropic_cache_ttl_1h_injection,
// Payment configuration
payment_enabled: form.payment_enabled,
+ risk_control_enabled: form.risk_control_enabled,
payment_min_amount: Number(form.payment_min_amount) || 0,
payment_max_amount: Number(form.payment_max_amount) || 0,
payment_daily_limit: Number(form.payment_daily_limit) || 0,
@@ -6789,6 +7658,10 @@ async function saveSettings() {
Number(form.channel_monitor_default_interval_seconds) || 60,
// Available Channels feature switch
available_channels_enabled: form.available_channels_enabled,
+ // Image Generation feature switch
+ image_generation_enabled: form.image_generation_enabled,
+ // Chat Completion feature switch
+ chat_completion_enabled: form.chat_completion_enabled,
// Affiliate (邀请返利) feature switch
affiliate_enabled: form.affiliate_enabled,
};
@@ -6845,6 +7718,8 @@ async function saveSettings() {
smtpPasswordManuallyEdited.value = false;
form.turnstile_secret_key = "";
form.linuxdo_connect_client_secret = "";
+ form.github_oauth_client_secret = "";
+ form.google_oauth_client_secret = "";
form.wechat_connect_app_secret = "";
form.wechat_connect_open_app_secret = "";
form.wechat_connect_mp_app_secret = "";
@@ -7054,6 +7929,40 @@ async function saveOverloadCooldownSettings() {
}
}
+// Rate Limit Cooldown (429) 方法
+async function loadRateLimit429CooldownSettings() {
+ rateLimit429CooldownLoading.value = true;
+ try {
+ const settings = await adminAPI.settings.getRateLimit429CooldownSettings();
+ Object.assign(rateLimit429CooldownForm, settings);
+ } catch (_error: unknown) {
+ // Silent fail - settings will use defaults
+ } finally {
+ rateLimit429CooldownLoading.value = false;
+ }
+}
+
+async function saveRateLimit429CooldownSettings() {
+ rateLimit429CooldownSaving.value = true;
+ try {
+ const updated = await adminAPI.settings.updateRateLimit429CooldownSettings({
+ enabled: rateLimit429CooldownForm.enabled,
+ cooldown_seconds: rateLimit429CooldownForm.cooldown_seconds,
+ });
+ Object.assign(rateLimit429CooldownForm, updated);
+ appStore.showSuccess(t("admin.settings.rateLimit429Cooldown.saved"));
+ } catch (error: unknown) {
+ appStore.showError(
+ extractApiErrorMessage(
+ error,
+ t("admin.settings.rateLimit429Cooldown.saveFailed"),
+ ),
+ );
+ } finally {
+ rateLimit429CooldownSaving.value = false;
+ }
+}
+
// Stream Timeout 方法
async function loadStreamTimeoutSettings() {
streamTimeoutLoading.value = true;
@@ -7665,6 +8574,7 @@ onMounted(() => {
loadSubscriptionGroups();
loadAdminApiKey();
loadOverloadCooldownSettings();
+ loadRateLimit429CooldownSettings();
loadStreamTimeoutSettings();
loadRectifierSettings();
loadBetaPolicySettings();
diff --git a/frontend/src/views/admin/UsageView.vue b/frontend/src/views/admin/UsageView.vue
index 495ca7ad77c..355bde7b502 100644
--- a/frontend/src/views/admin/UsageView.vue
+++ b/frontend/src/views/admin/UsageView.vue
@@ -531,7 +531,9 @@ const allColumns = computed(() => [
{ key: 'group', label: t('admin.usage.group'), sortable: false },
{ key: 'stream', label: t('usage.type'), sortable: false },
{ key: 'billing_mode', label: t('admin.usage.billingMode'), sortable: false },
- { key: 'tokens', label: t('usage.tokens'), sortable: false },
+ { key: 'input_tokens', label: t('admin.usage.inputTokens'), sortable: false },
+ { key: 'output_tokens', label: t('admin.usage.outputTokens'), sortable: false },
+ { key: 'cache_rate', label: t('usage.cacheHitRate'), sortable: false },
{ key: 'cost', label: t('usage.cost'), sortable: false },
{ key: 'first_token', label: t('usage.firstToken'), sortable: false },
{ key: 'duration', label: t('usage.duration'), sortable: false },
diff --git a/frontend/src/views/admin/__tests__/SettingsView.spec.ts b/frontend/src/views/admin/__tests__/SettingsView.spec.ts
index 4ab475ad30c..ce787cac2ab 100644
--- a/frontend/src/views/admin/__tests__/SettingsView.spec.ts
+++ b/frontend/src/views/admin/__tests__/SettingsView.spec.ts
@@ -2,6 +2,17 @@ import { beforeEach, describe, expect, it, vi } from "vitest";
import { defineComponent, h } from "vue";
import { flushPromises, mount } from "@vue/test-utils";
+vi.hoisted(() => {
+ Object.defineProperty(globalThis, "localStorage", {
+ value: {
+ getItem: vi.fn(() => null),
+ setItem: vi.fn(),
+ removeItem: vi.fn(),
+ },
+ configurable: true,
+ });
+});
+
import SettingsView from "../SettingsView.vue";
const {
@@ -11,6 +22,8 @@ const {
updateWebSearchEmulationConfig,
getAdminApiKey,
getOverloadCooldownSettings,
+ getRateLimit429CooldownSettings,
+ updateRateLimit429CooldownSettings,
getStreamTimeoutSettings,
getRectifierSettings,
getBetaPolicySettings,
@@ -31,6 +44,8 @@ const {
updateWebSearchEmulationConfig: vi.fn(),
getAdminApiKey: vi.fn(),
getOverloadCooldownSettings: vi.fn(),
+ getRateLimit429CooldownSettings: vi.fn(),
+ updateRateLimit429CooldownSettings: vi.fn(),
getStreamTimeoutSettings: vi.fn(),
getRectifierSettings: vi.fn(),
getBetaPolicySettings: vi.fn(),
@@ -57,6 +72,8 @@ vi.mock("@/api", () => ({
updateWebSearchEmulationConfig,
getAdminApiKey,
getOverloadCooldownSettings,
+ getRateLimit429CooldownSettings,
+ updateRateLimit429CooldownSettings,
getStreamTimeoutSettings,
getRectifierSettings,
getBetaPolicySettings,
@@ -76,6 +93,31 @@ vi.mock("@/api", () => ({
},
}));
+vi.mock("@/api/admin/settings", () => ({
+ default: {},
+ appendAuthSourceDefaultsToUpdateRequest: vi.fn(),
+ buildAuthSourceDefaultsState: () => ({
+ email: { balance: 0, concurrency: 5, subscriptions: [], grant_on_signup: false, grant_on_first_bind: false },
+ linuxdo: { balance: 0, concurrency: 5, subscriptions: [], grant_on_signup: false, grant_on_first_bind: false },
+ oidc: { balance: 0, concurrency: 5, subscriptions: [], grant_on_signup: false, grant_on_first_bind: false },
+ wechat: { balance: 0, concurrency: 5, subscriptions: [], grant_on_signup: false, grant_on_first_bind: false },
+ }),
+ defaultWeChatConnectScopesForMode: () => '',
+ deriveWeChatConnectStoredMode: (_open: boolean, mp: boolean, mobile: boolean) =>
+ mobile ? 'mobile' : mp ? 'mp' : 'open',
+ normalizeDefaultSubscriptionSettings: (items: unknown[]) => items,
+ resolveWeChatConnectModeCapabilities: (openEnabled: boolean, mpEnabled: boolean, mobileEnabled: boolean) => ({
+ openEnabled,
+ mpEnabled,
+ mobileEnabled,
+ }),
+}));
+
+vi.mock("@/api/admin/affiliates", () => ({
+ default: {},
+ affiliatesAPI: {},
+}));
+
vi.mock("@/stores", () => ({
useAppStore: () => ({
showError,
@@ -153,6 +195,11 @@ vi.mock("vue-i18n", async () => {
"admin.settings.paymentVisibleMethods.sourceRequiredError": "{title} 已启用，请先选择支付来源。",
"admin.settings.payment.configGuide": "查看支付配置说明",
"admin.settings.payment.findProvider": "查看支持的支付方式",
+ "admin.settings.features.imageGeneration.title": "AI生图",
+ "admin.settings.features.imageGeneration.description": "控制用户侧AI生图工具入口是否展示。",
+ "admin.settings.features.imageGeneration.enabled": "启用AI生图入口",
+ "admin.settings.features.imageGeneration.enabledHint": "启用前请确认 OpenAI 分组、图片模型和渠道图片计费已配置。",
+ "admin.settings.features.imageGeneration.configureLink": "前往渠道定价",
"admin.settings.openaiExperimentalScheduler.title": "OpenAI 实验调度策略",
"admin.settings.openaiExperimentalScheduler.description": "默认关闭。开启后仅影响本网关在 OpenAI 账号间的实验性调度选择逻辑，不代表上游 OpenAI 官方能力。",
"admin.settings.site.uploadImage": "上传图片",
@@ -393,6 +440,7 @@ const baseSettingsResponse = {
balance_low_notify_recharge_url: "",
account_quota_notify_enabled: false,
account_quota_notify_emails: [],
+ image_generation_enabled: false,
};
function mountView() {
@@ -454,6 +502,8 @@ describe("admin SettingsView payment visible method controls", () => {
updateWebSearchEmulationConfig.mockReset();
getAdminApiKey.mockReset();
getOverloadCooldownSettings.mockReset();
+ getRateLimit429CooldownSettings.mockReset();
+ updateRateLimit429CooldownSettings.mockReset();
getStreamTimeoutSettings.mockReset();
getRectifierSettings.mockReset();
getBetaPolicySettings.mockReset();
@@ -490,6 +540,11 @@ describe("admin SettingsView payment visible method controls", () => {
enabled: true,
cooldown_minutes: 10,
});
+ getRateLimit429CooldownSettings.mockResolvedValue({
+ enabled: true,
+ cooldown_seconds: 5,
+ });
+ updateRateLimit429CooldownSettings.mockImplementation(async (payload) => payload);
getStreamTimeoutSettings.mockResolvedValue({
enabled: true,
action: "temp_unsched",
@@ -680,6 +735,7 @@ describe("admin SettingsView payment visible method controls", () => {
expect(paymentHelpImageUpload?.attributes("data-upload-label")).toBe("上传图片");
expect(paymentHelpImageUpload?.attributes("data-remove-label")).toBe("移除");
});
+
});
describe("admin SettingsView wechat connect controls", () => {
@@ -690,6 +746,8 @@ describe("admin SettingsView wechat connect controls", () => {
updateWebSearchEmulationConfig.mockReset();
getAdminApiKey.mockReset();
getOverloadCooldownSettings.mockReset();
+ getRateLimit429CooldownSettings.mockReset();
+ updateRateLimit429CooldownSettings.mockReset();
getStreamTimeoutSettings.mockReset();
getRectifierSettings.mockReset();
getBetaPolicySettings.mockReset();
@@ -729,6 +787,11 @@ describe("admin SettingsView wechat connect controls", () => {
enabled: true,
cooldown_minutes: 10,
});
+ getRateLimit429CooldownSettings.mockResolvedValue({
+ enabled: true,
+ cooldown_seconds: 5,
+ });
+ updateRateLimit429CooldownSettings.mockImplementation(async (payload) => payload);
getStreamTimeoutSettings.mockResolvedValue({
enabled: true,
action: "temp_unsched",
@@ -797,6 +860,24 @@ describe("admin SettingsView wechat connect controls", () => {
).toBe("/auth/wechat/callback");
});
+ it("links GitHub OAuth Apps guide to GitHub developer settings", async () => {
+ getSettings.mockResolvedValueOnce({
+ ...baseSettingsResponse,
+ github_oauth_enabled: true,
+ });
+
+ const wrapper = mountView();
+
+ await flushPromises();
+ await openSecurityTab(wrapper);
+
+ const link = wrapper.get('[data-testid="github-oauth-apps-guide-link"]');
+ expect(link.text()).toContain("OAuth Apps");
+ expect(link.attributes("href")).toBe("https://github.com/settings/developers");
+ expect(link.attributes("target")).toBe("_blank");
+ expect(link.attributes("rel")).toContain("noopener");
+ });
+
it("saves WeChat Connect fields using the backend contract and clears the secret after save", async () => {
const wrapper = mountView();
diff --git a/frontend/src/views/admin/__tests__/SettingsViewSource.spec.ts b/frontend/src/views/admin/__tests__/SettingsViewSource.spec.ts
new file mode 100644
index 00000000000..79f29ecb5ab
--- /dev/null
+++ b/frontend/src/views/admin/__tests__/SettingsViewSource.spec.ts
@@ -0,0 +1,25 @@
+import { readFileSync } from 'node:fs'
+import { dirname, resolve } from 'node:path'
+import { fileURLToPath } from 'node:url'
+
+import { describe, expect, it } from 'vitest'
+
+const viewPath = resolve(dirname(fileURLToPath(import.meta.url)), '../SettingsView.vue')
+const viewSource = readFileSync(viewPath, 'utf8')
+
+describe('SettingsView feature management source contract', () => {
+ it('renders and submits exactly one image generation feature switch', () => {
+ expect(viewSource.match(/admin\.settings\.features\.imageGeneration\.title/g)).toHaveLength(1)
+ expect(viewSource.match(/v-model="form\.image_generation_enabled"/g)).toHaveLength(1)
+ expect(viewSource.match(/image_generation_enabled: form\.image_generation_enabled/g)).toHaveLength(1)
+ })
+
+ it('places the chat completion feature switch below image generation', () => {
+ expect(viewSource.indexOf('admin.settings.features.imageGeneration.title')).toBeLessThan(
+ viewSource.indexOf('admin.settings.features.chatCompletion.title'),
+ )
+ expect(viewSource.indexOf('v-model="form.image_generation_enabled"')).toBeLessThan(
+ viewSource.indexOf('v-model="form.chat_completion_enabled"'),
+ )
+ })
+})
diff --git a/frontend/src/views/auth/LoginView.vue b/frontend/src/views/auth/LoginView.vue
index 78ba4b9d2db..3e89b079f2a 100644
--- a/frontend/src/views/auth/LoginView.vue
+++ b/frontend/src/views/auth/LoginView.vue
@@ -10,33 +10,6 @@
{{ t('auth.signInToAccount') }}
-
-
-
-
-
-
-
-
- {{ t('auth.oauthOrContinue') }}
-
-
-
-
-
@@ -180,15 +200,19 @@ import { AuthLayout } from '@/components/layout'
import LinuxDoOAuthSection from '@/components/auth/LinuxDoOAuthSection.vue'
import OidcOAuthSection from '@/components/auth/OidcOAuthSection.vue'
import WechatOAuthSection from '@/components/auth/WechatOAuthSection.vue'
+import EmailOAuthButtons from '@/components/auth/EmailOAuthButtons.vue'
+import LoginAgreementPrompt from '@/components/auth/LoginAgreementPrompt.vue'
import TotpLoginModal from '@/components/auth/TotpLoginModal.vue'
import Icon from '@/components/icons/Icon.vue'
import TurnstileWidget from '@/components/TurnstileWidget.vue'
import { useAuthStore, useAppStore } from '@/stores'
import { getPublicSettings, isTotp2FARequired, isWeChatWebOAuthEnabled } from '@/api/auth'
-import type { TotpLoginResponse } from '@/types'
+import type { LoginAgreementDocument, TotpLoginResponse } from '@/types'
+import { extractI18nErrorMessage } from '@/utils/apiError'
import { clearAllAffiliateReferralCodes } from '@/utils/oauthAffiliate'
const { t } = useI18n()
+const LOGIN_AGREEMENT_STORAGE_KEY = 'sub2api_login_agreement_consent'
// ==================== Router & Stores ====================
@@ -201,6 +225,7 @@ const appStore = useAppStore()
const isLoading = ref