From 7db85bf2eda31cce7d61627390c649fa14033150 Mon Sep 17 00:00:00 2001
From: XiaoSeS <87064762+XiaoSeS@users.noreply.github.com>
Date: Thu, 22 Oct 2026 17:25:34 +0800
Subject: [PATCH] fix(web): use notification email settings controller route

Signed-off-by: XiaoSeS <87064762+XiaoSeS@users.noreply.github.com>
---
 .../notification-email-api.test.ts            | 24 ++++++++++++++++++-
 .../notification/notification-email-api.ts    |  4 ++--
 2 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/web/src/features/notification/notification-email-api.test.ts b/web/src/features/notification/notification-email-api.test.ts
index 257ec14b0..0facda646 100644
--- a/web/src/features/notification/notification-email-api.test.ts
+++ b/web/src/features/notification/notification-email-api.test.ts
@@ -6,7 +6,7 @@ import { notificationEmailApi } from './notification-email-api'
 const fetchMock = vi.fn()
 function response(data: unknown, status = 200, code = 0) { return new Response(JSON.stringify({ code, msg: code ? 'rejected' : 'ok', data }), { status, headers: { 'Content-Type': 'application/json' } }) }
 describe('typed notification email API boundary', () => {
-  beforeEach(() => { vi.stubGlobal('fetch', fetchMock); fetchMock.mockResolvedValue(response(null)); document.cookie = 'XSRF-TOKEN=test-csrf' })
+  beforeEach(() => { vi.stubGlobal('fetch', fetchMock); fetchMock.mockImplementation(() => Promise.resolve(response(null))); document.cookie = 'XSRF-TOKEN=test-csrf' })
   afterEach(() => { vi.unstubAllGlobals(); fetchMock.mockReset(); document.cookie = 'XSRF-TOKEN=;max-age=0' })
   it('uses existing web API and envelope for current-user reads', async () => {
     const contact = { email: 'a***@example.test', verified: false, available: false, reason: 'UNVERIFIED', locale: 'en' }
@@ -40,4 +40,26 @@ describe('typed notification email API boundary', () => {
     expect(path).toBe('/api/web/admin/notification-email-deliveries/11/retry')
     expect(JSON.parse(init.body)).toEqual({ confirmDuplicateRisk: true })
   })
+  it('uses the controller real v1 route for email settings GET', async () => {
+    await notificationEmailApi.settings()
+    expect(fetchMock.mock.calls[0][0]).toBe('/api/v1/admin/system-config/notification/email')
+  })
+  it('uses the controller real v1 route, version and CSRF for settings PUT', async () => {
+    const settings = { enabled: true, digestWindowMinutes: 60, publicBaseUrl: 'https://example.test/sub', version: 4 }
+    await notificationEmailApi.updateSettings(settings)
+    const [path, init] = fetchMock.mock.calls[0]
+    expect(path).toBe('/api/v1/admin/system-config/notification/email')
+    expect(init.method).toBe('PUT')
+    expect(new Headers(init.headers).get('X-XSRF-TOKEN')).toBe('test-csrf')
+    expect(JSON.parse(init.body)).toEqual(settings)
+  })
+  it('prefixes settings GET and PUT with the runtime base exactly once', async () => {
+    window.__SKILLHUB_RUNTIME_CONFIG__ = { apiBaseUrl: '/skillhub' }
+    try {
+      await notificationEmailApi.settings()
+      await notificationEmailApi.updateSettings({ enabled: false, digestWindowMinutes: 60, publicBaseUrl: '', version: 1 })
+      for (const call of fetchMock.mock.calls) expect(call[0]).toBe('/skillhub/api/v1/admin/system-config/notification/email')
+    } finally { delete window.__SKILLHUB_RUNTIME_CONFIG__ }
+  })
+
 })
diff --git a/web/src/features/notification/notification-email-api.ts b/web/src/features/notification/notification-email-api.ts
index a4607db5c..38837dac3 100644
--- a/web/src/features/notification/notification-email-api.ts
+++ b/web/src/features/notification/notification-email-api.ts
@@ -20,8 +20,8 @@ export const notificationEmailApi = {
   verify: (code: string) => write<EmailContact>('/notification-email-contact/verify', 'POST', { code }),
   preferences: () => fetchJson<EmailPreferences>(`${WEB_API_PREFIX}/notification-email-preferences`),
   updatePreferences: (preferences: EmailPreferences) => write<EmailPreferences>('/notification-email-preferences', 'PUT', { preferences }),
-  settings: () => fetchJson<EmailSettings>(`${WEB_API_PREFIX}/admin/system-config/notification/email`),
-  updateSettings: (settings: Pick<EmailSettings, 'enabled' | 'digestWindowMinutes' | 'publicBaseUrl' | 'version'>) => write<EmailSettings>('/admin/system-config/notification/email', 'PUT', settings),
+  settings: () => fetchJson<EmailSettings>('/api/v1/admin/system-config/notification/email'),
+  updateSettings: (settings: Pick<EmailSettings, 'enabled' | 'digestWindowMinutes' | 'publicBaseUrl' | 'version'>) => fetchJson<EmailSettings>('/api/v1/admin/system-config/notification/email', { method: 'PUT', headers: getCsrfHeaders({ 'Content-Type': 'application/json' }), body: JSON.stringify(settings) }),
   batch: (id: string, cursor: string | null) => fetchJson<EmailBatch>(`${WEB_API_PREFIX}/notification-email-deliveries/${encodeURIComponent(id)}?size=20${cursor ? `&cursor=${encodeURIComponent(cursor)}` : ''}`),
   deliveries: (page: number, status: string) => fetchJson<EmailDeliveryPage>(`${WEB_API_PREFIX}/admin/notification-email-deliveries?page=${page}&size=20${status ? `&status=${encodeURIComponent(status)}` : ''}`),
   retry: (id: number, confirmDuplicateRisk: boolean) => write<null>(`/admin/notification-email-deliveries/${id}/retry`, 'POST', { confirmDuplicateRisk }),