Real-time monitoring dashboard for Proxmox VE, PBS, Docker, Kubernetes, TrueNAS and vSphere. Self-hosted, with alerts for failed backups, full disks, unhealthy containers and offline nodes.
Go aialertsdashboarddockerdocker-monitoringgohomelabinfrastructure-monitoringkubernetesmonitoringmspproxmoxproxmox-backup-serverproxmox-mail-gatewayproxmox-veself-hostedtruenastypescriptvspherewebhooks
Keep SSO settings results within their current reader
pulse-triage[bot]11c6fb1190f6
diff --git a/docs/release-control/v6/internal/subsystems/security-privacy.md b/docs/release-control/v6/internal/subsystems/security-privacy.mdindex 2601b533c0..e9767af073 100644--- a/docs/release-control/v6/internal/subsystems/security-privacy.md+++ b/docs/release-control/v6/internal/subsystems/security-privacy.md@@ -18,6 +18,26 @@## Purpose+### SSO settings results remain with their current reader++The existing SSO provider inventory, provider-detail editor, connection test and+SAML metadata preview belong to the mounted observed principal, organisation+and write-capability lifetime. Withdrawal or disposal cancels their requests+and discards late results, drafts and preview payloads. A replacement dialog or+edited draft cannot inherit an earlier test/preview. Equal-principal status+refreshes preserve the active draft. Read-only accounts can still recover the+permitted inventory. Unread, denied or malformed lists are unknown, never an+empty configured-provider claim; explicit Retry performs only the existing read.++Provider mutations are serialised and bound to the confirmed organisation; they+use cancellation and no automatic retry, without changing backend admission,+OIDC/SAML payloads, stored-secret preservation or Community availability. Local+cancellation cannot undo a server-applied write or an already requested clipboard+operation. The registered `SSOProviderLifetimes.test.tsx` covers superseded reads,+reader changes, disposal, malformed/refused inventory, dialog/draft replacement+and stale mutation completions alongside the existing save/preview recovery tests.+Synthetic source/browser checks do not establish native IdP/admin recovery.+### Dashboard sockets do not retain withdrawn token authorityThe existing `/ws` route keeps its initial authentication, monitoring-read,diff --git a/frontend-modern/src/components/Settings/SSOProvidersPanel.tsx b/frontend-modern/src/components/Settings/SSOProvidersPanel.tsxindex 9c73e3a327..ca452062d1 100644--- a/frontend-modern/src/components/Settings/SSOProvidersPanel.tsx+++ b/frontend-modern/src/components/Settings/SSOProvidersPanel.tsx@@ -1,5 +1,6 @@import { Component, For, Show } from 'solid-js';import { ActionIconButton, Button, CopyValueButton } from '@/components/shared/Button';+import { InlineNotice } from '@/components/shared/InlineNotice';import { EmptyState } from '@/components/shared/EmptyState';import SettingsPanel from '@/components/shared/SettingsPanel';import { Toggle } from '@/components/shared/Toggle';@@ -26,6 +27,7 @@ import {getSSOProvidersLoadingState,getSSOProviderModalTitle,getSSOProviderSummary,+ getSSOProvidersLoadErrorMessage,getSSOProviderTypeBadgeClass,getSSOProviderTypeLabel,} from '@/utils/ssoProviderPresentation';@@ -60,12 +62,18 @@ const SSOEndpoint: Component<{interface SSOProvidersPanelProps {onConfigUpdated?: () => void;canManage?: boolean;+ currentUser?: string;}export const SSOProvidersPanel: Component<SSOProvidersPanelProps> = (props) => {const {providers,loading,+ loadError,+ loadProviders,+ loadingDetails,+ canEdit,+ mutating,saving,editorFeedback,showModal,@@ -109,7 +117,7 @@ export const SSOProvidersPanel: Component<SSOProvidersPanelProps> = (props) => {<Buttontype="button"onClick={() => openAddModal('oidc')}- disabled={!canManage()}+ disabled={!canEdit()}variant="primary"size="settingsAction"class="gap-1.5"@@ -120,7 +128,7 @@ export const SSOProvidersPanel: Component<SSOProvidersPanelProps> = (props) => {<Buttontype="button"onClick={() => openAddModal('saml')}- disabled={!canManage()}+ disabled={!canEdit()}variant="outline"size="settingsAction"class="gap-1.5"@@ -147,7 +155,15 @@ export const SSOProvidersPanel: Component<SSOProvidersPanelProps> = (props) => {</div></Show>- <Show when={!loading() && providers().length === 0}>+ <Show when={!loading() && loadError()}>+ <InlineNotice role="alert" tone="danger" layout="banner" actionLabel="Retry" actionOnClick={() => void loadProviders()}>+ {getSSOProvidersLoadErrorMessage()} Configured providers are unknown.+ </InlineNotice>+ </Show>+ <Show when={loadingDetails()}>+ <p role="status" class="text-sm text-muted">Loading provider details…</p>+ </Show>+ <Show when={!loading() && !loadError() && providers().length === 0}><EmptyStatevariant="panel"icon={<Shield class="h-5 w-5" />}@@ -156,7 +172,7 @@ export const SSOProvidersPanel: Component<SSOProvidersPanelProps> = (props) => {/></Show>- <Show when={!loading() && providers().length > 0}>+ <Show when={!loading() && !loadError() && providers().length > 0}><div class="space-y-3"><For each={providers()}>{(provider) => (@@ -190,13 +206,13 @@ export const SSOProvidersPanel: Component<SSOProvidersPanelProps> = (props) => {<Togglechecked={provider.enabled}onChange={() => handleToggleEnabled(provider)}- disabled={!canManage()}+ disabled={!canEdit()}containerClass="items-center"/><ActionIconButtontype="button"onClick={() => openEditModal(provider)}- disabled={!canManage()}+ disabled={!canEdit()}label="Edit provider"tone="accent"size="md"@@ -206,7 +222,7 @@ export const SSOProvidersPanel: Component<SSOProvidersPanelProps> = (props) => {<ActionIconButtontype="button"onClick={() => setDeleteConfirm(provider.id)}- disabled={!canManage()}+ disabled={!canEdit()}label="Delete provider"tone="danger"size="md"@@ -291,7 +307,7 @@ export const SSOProvidersPanel: Component<SSOProvidersPanelProps> = (props) => {</h3></div>- <div class="min-h-0 flex-1 space-y-4 overflow-y-auto p-4 sm:p-6">+ <fieldset disabled={saving()} class="min-w-0 min-h-0 flex-1 space-y-4 overflow-y-auto p-4 sm:p-6">{/* Common fields */}<div class="grid grid-cols-1 md:grid-cols-2 gap-4"><div class={formField}>@@ -794,7 +810,7 @@ export const SSOProvidersPanel: Component<SSOProvidersPanelProps> = (props) => {</div></Show></div>- </div>+ </fieldset>{/* Keep feedback and recovery actions inside the active modal, clear of toasts. */}<div class="relative z-10 shrink-0 space-y-3 border-t border-border bg-surface p-4 sm:px-6">@@ -828,7 +844,7 @@ export const SSOProvidersPanel: Component<SSOProvidersPanelProps> = (props) => {variant="primary"size="md"isLoading={saving()}- disabled={saving()}+ disabled={saving() || testing() || loadingPreview()}>{saving() ? 'Saving...' : editingProvider() ? 'Save Changes' : 'Create Provider'}</Button>@@ -856,6 +872,7 @@ export const SSOProvidersPanel: Component<SSOProvidersPanelProps> = (props) => {<Buttontype="button"onClick={() => setDeleteConfirm(null)}+ disabled={mutating()}variant="outline"size="md">@@ -864,6 +881,7 @@ export const SSOProvidersPanel: Component<SSOProvidersPanelProps> = (props) => {<Buttontype="button"onClick={() => handleDelete(deleteConfirm()!)}+ disabled={mutating()}variant="danger"size="md">diff --git a/frontend-modern/src/components/Settings/__tests__/SSOProviderLifetimes.test.tsx b/frontend-modern/src/components/Settings/__tests__/SSOProviderLifetimes.test.tsxnew file mode 100644index 0000000000..afaee394a4--- /dev/null+++ b/frontend-modern/src/components/Settings/__tests__/SSOProviderLifetimes.test.tsx@@ -0,0 +1,253 @@+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';+import { cleanup, fireEvent, render, screen, waitFor, within } from '@solidjs/testing-library';+import { createSignal } from 'solid-js';+import { SSOProvidersPanel } from '../SSOProvidersPanel';+import { eventBus } from '@/stores/events';+import { setOrgID } from '@/utils/apiClient';++const notices = vi.hoisted(() => ({ success: vi.fn(), error: vi.fn() }));+vi.mock('@/stores/notifications', () => ({ notificationStore: notices }));+vi.mock('@/utils/logger', () => ({ logger: { error: vi.fn(), warn: vi.fn() } }));+const json = (body: unknown, status = 200) => new Response(JSON.stringify(body), {+ status, headers: { 'Content-Type': 'application/json' },+});+const deferred = () => {+ let resolve!: (response: Response) => void;+ const promise = new Promise<Response>((done) => { resolve = done; });+ return { promise, resolve };+};+const provider = (id = 'first') => ({+ id, name: `${id} provider`, type: 'oidc' as const, enabled: true, priority: 0,+ oidcCallbackUrl: `https://pulse.example.test/api/oidc/${id}/callback`,+});+const details = (id = 'first') => ({ ...provider(id), oidc: {+ issuerUrl: `https://${id}.example.test`, clientId: 'pulse',+} });+const fetchMock = vi.fn();+const listCalls = () => fetchMock.mock.calls.filter(([url, options]) => url === '/api/security/sso/providers' && !options?.method);+const writes = () => fetchMock.mock.calls.filter(([, options]) => options?.method && options.method !== 'GET');+const edit = async (index = 0) => {+ fireEvent.click((await screen.findAllByRole('button', { name: 'Edit provider' }))[index]);+ return within(await screen.findByRole('dialog', { name: 'Edit OIDC provider' }));+};+const settle = async () => { await new Promise((resolve) => setTimeout(resolve, 0)); };++beforeEach(() => {+ vi.clearAllMocks();+ vi.stubGlobal('fetch', fetchMock);+ document.cookie = 'pulse_csrf=synthetic-sso-csrf';+ setOrgID('sso-a');+ fetchMock.mockImplementation(async (url: string) => {+ if (url === '/api/security/sso/providers') return json({ providers: [provider(), provider('second')] });+ if (url === '/api/security/status') return json({ publicUrl: 'https://pulse.example.test' });+ if (url.endsWith('/first')) return json(details());+ if (url.endsWith('/second')) return json(details('second'));+ return json({});+ });+});+afterEach(() => { cleanup(); setOrgID(null); vi.unstubAllGlobals(); });++describe('SSO provider read and editor ownership', () => {+ it.each([{}, { providers: null }, { providers: [provider(), provider()] }, { providers: [{ id: 'incomplete' }] }])(+ 'keeps malformed inventory unknown and recovers only with an explicit read: %j', async (body) => {+ fetchMock.mockResolvedValueOnce(json(body));+ render(() => <SSOProvidersPanel />);+ expect(await screen.findByRole('alert')).toHaveTextContent('Configured providers are unknown');+ expect(screen.queryByText('No SSO providers configured')).toBeNull();+ expect(screen.getByRole('button', { name: 'Add OIDC' })).toBeDisabled();+ expect(listCalls()).toHaveLength(1);+ fireEvent.click(screen.getByRole('button', { name: 'Retry' }));+ await screen.findAllByText('first provider');+ expect(listCalls()).toHaveLength(2);+ expect(writes()).toHaveLength(0);+ expect(screen.queryByRole('alert')).toBeNull();+ },+ );++ it('reports refused inventory without private text or a false empty state, including read-only recovery', async () => {+ fetchMock.mockResolvedValueOnce(json({ error: 'PRIVATE_SSO_CANARY' }, 403));+ render(() => <SSOProvidersPanel canManage={false} />);+ expect(await screen.findByRole('alert')).toHaveTextContent('Configured providers are unknown');+ expect(document.body).not.toHaveTextContent('PRIVATE_SSO_CANARY');+ expect(screen.queryByText('No SSO providers configured')).toBeNull();+ fireEvent.click(screen.getByRole('button', { name: 'Retry' }));+ await screen.findByText('first provider');+ expect(screen.getAllByRole('button', { name: 'Edit provider' })[0]).toBeDisabled();+ expect(listCalls()).toHaveLength(2);+ expect(writes()).toHaveLength(0);+ });++ it('accepts only the latest requested provider details, even if aborted fetch completes', async () => {+ const old = deferred();+ const base = fetchMock.getMockImplementation()!;+ fetchMock.mockImplementation((url: string, options?: RequestInit) => url.endsWith('/first') ? old.promise : base(url, options));+ render(() => <SSOProvidersPanel />);+ fireEvent.click((await screen.findAllByRole('button', { name: 'Edit provider' }))[0]);+ await waitFor(() => expect(screen.getByRole('status')).toHaveTextContent('Loading provider details'));+ const dialog = await edit(1);+ expect(dialog.getByLabelText('Provider Name')).toHaveValue('second provider');+ old.resolve(json(details()));+ await settle();+ expect(dialog.getByLabelText('Provider Name')).toHaveValue('second provider');+ const request = fetchMock.mock.calls.find(([url]) => url.endsWith('/first'))!;+ expect(request[1].signal.aborted).toBe(true);+ expect(writes()).toHaveLength(0);+ });++ it('does not reopen an old detail read over a newly chosen create dialog', async () => {+ const old = deferred();+ const base = fetchMock.getMockImplementation()!;+ fetchMock.mockImplementation((url: string, options?: RequestInit) => url.endsWith('/first') ? old.promise : base(url, options));+ render(() => <SSOProvidersPanel />);+ fireEvent.click((await screen.findAllByRole('button', { name: 'Edit provider' }))[0]);+ fireEvent.click(screen.getByRole('button', { name: 'Add SAML' }));+ old.resolve(json(details()));+ await settle();+ const dialog = screen.getByRole('dialog', { name: 'Add SAML provider' });+ expect(within(dialog).getByLabelText('Provider Name')).toHaveValue('');+ expect(screen.queryByRole('dialog', { name: 'Edit OIDC provider' })).toBeNull();+ });++ it('rejects a response for another provider rather than editing it under the selected id', async () => {+ const base = fetchMock.getMockImplementation()!;+ fetchMock.mockImplementation((url: string, options?: RequestInit) => url.endsWith('/first') ? json(details('second')) : base(url, options));+ render(() => <SSOProvidersPanel />);+ fireEvent.click((await screen.findAllByRole('button', { name: 'Edit provider' }))[0]);+ await waitFor(() => expect(notices.error).toHaveBeenCalledWith('Unable to load SSO provider details.'));+ expect(screen.queryByRole('dialog')).toBeNull();+ });++ it.each(['user', 'organisation', 'permission'] as const)('withdraws stale detail and drafts on a %s change, without replay', async (change) => {+ const pending = deferred();+ const base = fetchMock.getMockImplementation()!;+ fetchMock.mockImplementation((url: string, options?: RequestInit) => url.endsWith('/first') ? pending.promise : base(url, options));+ const [user, setUser] = createSignal('admin-a');+ const [manage, setManage] = createSignal(true);+ render(() => <SSOProvidersPanel currentUser={user()} canManage={manage()} />);+ fireEvent.click((await screen.findAllByRole('button', { name: 'Edit provider' }))[0]);+ await waitFor(() => expect(fetchMock.mock.calls.some(([url]) => url.endsWith('/first'))).toBe(true));+ if (change === 'user') setUser('admin-b');+ else if (change === 'permission') setManage(false);+ else { setOrgID('sso-b'); eventBus.emit('org_switched', 'sso-b'); }+ await waitFor(() => expect(listCalls()).toHaveLength(2));+ pending.resolve(json(details()));+ await settle();+ expect(screen.queryByRole('dialog')).toBeNull();+ expect(notices.success).not.toHaveBeenCalled();+ expect(notices.error).not.toHaveBeenCalled();+ expect(writes()).toHaveLength(0);+ expect(listCalls()[1][1].headers['X-Pulse-Org-ID']).toBe(change === 'organisation' ? 'sso-b' : 'sso-a');+ });++ it('does not reset the draft for an unchanged current principal and capability refresh', async () => {+ const [status, setStatus] = createSignal({ user: 'admin-a', manage: true });+ render(() => <SSOProvidersPanel currentUser={status().user} canManage={status().manage} />);+ const dialog = await edit();+ fireEvent.input(dialog.getByLabelText('Client Secret'), { target: { value: 'SYNTHETIC_DRAFT_ONLY' } });+ setStatus({ user: 'admin-a', manage: true });+ await settle();+ expect(dialog.getByLabelText('Client Secret')).toHaveValue('SYNTHETIC_DRAFT_ONLY');+ expect(listCalls()).toHaveLength(1);+ });++ it('discards an older inventory after organisation switch, even if its fetch ignores abort', async () => {+ const old = deferred();+ fetchMock.mockReturnValueOnce(old.promise);+ render(() => <SSOProvidersPanel />);+ await waitFor(() => expect(listCalls()).toHaveLength(1));+ setOrgID('sso-b'); eventBus.emit('org_switched', 'sso-b');+ await screen.findByText('first provider');+ old.resolve(json({ providers: [provider('OBSOLETE')] }));+ await settle();+ expect(screen.queryByText('OBSOLETE provider')).toBeNull();+ expect(screen.getByText('first provider')).toBeInTheDocument();+ expect(listCalls()[0][1].signal.aborted).toBe(true);+ });++ it.each(['test', 'preview'] as const)('drops late %s output after dialog close and releases private draft fields', async (kind) => {+ const pending = deferred();+ const endpoint = kind === 'test' ? '/test' : '/metadata/preview';+ const base = fetchMock.getMockImplementation()!;+ fetchMock.mockImplementation((url: string, options?: RequestInit) => url.endsWith(endpoint) ? pending.promise : base(url, options));+ render(() => <SSOProvidersPanel />);+ await screen.findByText('first provider');+ fireEvent.click(screen.getByRole('button', { name: kind === 'test' ? 'Add OIDC' : 'Add SAML' }));+ const dialog = within(screen.getByRole('dialog'));+ fireEvent.input(dialog.getByLabelText(kind === 'test' ? 'Issuer URL' : 'IdP Metadata URL'), { target: { value: 'https://idp.example.test/metadata' } });+ if (kind === 'test') fireEvent.input(dialog.getByLabelText('Client Secret'), { target: { value: 'SYNTHETIC_SECRET' } });+ fireEvent.click(dialog.getByRole('button', { name: kind === 'test' ? 'Test' : 'Preview' }));+ await waitFor(() => expect(writes()).toHaveLength(1));+ fireEvent.click(dialog.getByRole('button', { name: 'Cancel' }));+ fireEvent.click(screen.getByRole('button', { name: 'Add OIDC' }));+ pending.resolve(json(kind === 'test' ? { success: true, message: 'OBSOLETE_TEST' } : { xml: 'OBSOLETE_XML', parsed: { entityId: 'OBSOLETE' } }));+ await settle();+ expect(screen.getAllByRole('dialog')).toHaveLength(1);+ expect(document.body).not.toHaveTextContent('OBSOLETE');+ expect(screen.getByLabelText('Client Secret')).toHaveValue('');+ expect(writes()[0][1].signal.aborted).toBe(true);+ expect(notices.success).not.toHaveBeenCalled();+ });++ it('clears a test result and aborts a pending test when the submitted draft changes', async () => {+ const pending = deferred();+ const base = fetchMock.getMockImplementation()!;+ fetchMock.mockImplementation((url: string, options?: RequestInit) => url.endsWith('/test') ? pending.promise : base(url, options));+ render(() => <SSOProvidersPanel />);+ const dialog = await edit();+ fireEvent.click(dialog.getByRole('button', { name: 'Test' }));+ await waitFor(() => expect(writes()).toHaveLength(1));+ fireEvent.input(dialog.getByLabelText('Issuer URL'), { target: { value: 'https://changed.example.test' } });+ expect(writes()[0][1].signal.aborted).toBe(true);+ pending.resolve(json({ success: true, message: 'STALE_TEST' }));+ await settle();+ expect(document.body).not.toHaveTextContent('STALE_TEST');+ expect(dialog.getByRole('button', { name: 'Test' })).toBeEnabled();+ });++ it.each(['save', 'toggle', 'delete'] as const)('serialises %s writes and ignores completion after withdrawal', async (kind) => {+ const pending = deferred();+ const base = fetchMock.getMockImplementation()!;+ fetchMock.mockImplementation((url: string, options?: RequestInit) => options?.method && options.method !== 'GET' ? pending.promise : base(url, options));+ const changed = vi.fn();+ const [manage, setManage] = createSignal(true);+ render(() => <SSOProvidersPanel canManage={manage()} onConfigUpdated={changed} />);+ if (kind === 'save') {+ const dialog = await edit();+ const form = dialog.getByRole('button', { name: 'Save Changes' }).closest('form')!;+ fireEvent.submit(form); fireEvent.submit(form);+ } else {+ await screen.findByText('first provider');+ if (kind === 'delete') {+ fireEvent.click(screen.getAllByRole('button', { name: 'Delete provider' })[0]);+ const confirm = within(screen.getByRole('dialog')).getByRole('button', { name: 'Delete Provider' });+ fireEvent.click(confirm); fireEvent.click(confirm);+ } else {+ const toggle = screen.getAllByRole('switch')[0];+ fireEvent.click(toggle); fireEvent.click(toggle);+ }+ }+ await waitFor(() => expect(writes()).toHaveLength(1));+ setManage(false);+ await waitFor(() => expect(screen.queryByRole('dialog')).toBeNull());+ pending.resolve(json({}));+ await settle();+ expect(notices.success).not.toHaveBeenCalled();+ expect(notices.error).not.toHaveBeenCalled();+ expect(changed).not.toHaveBeenCalled();+ expect(writes()).toHaveLength(1);+ expect(writes()[0][1].signal.aborted).toBe(true);+ expect(writes()[0][1].headers['X-Pulse-Org-ID']).toBe('sso-a');+ });++ it('aborts pending detail on unmount without a late notification', async () => {+ const pending = deferred();+ const base = fetchMock.getMockImplementation()!;+ fetchMock.mockImplementation((url: string, options?: RequestInit) => url.endsWith('/first') ? pending.promise : base(url, options));+ const { unmount } = render(() => <SSOProvidersPanel />);+ fireEvent.click((await screen.findAllByRole('button', { name: 'Edit provider' }))[0]);+ await waitFor(() => expect(fetchMock.mock.calls.some(([url]) => url.endsWith('/first'))).toBe(true));+ unmount(); pending.resolve(json(details())); await settle();+ expect(screen.queryByRole('dialog')).toBeNull();+ expect(notices.error).not.toHaveBeenCalled();+ });+});diff --git a/frontend-modern/src/components/Settings/settingsPanelRegistryContext.tsx b/frontend-modern/src/components/Settings/settingsPanelRegistryContext.tsxindex dc5aba8663..d4469363ef 100644--- a/frontend-modern/src/components/Settings/settingsPanelRegistryContext.tsx+++ b/frontend-modern/src/components/Settings/settingsPanelRegistryContext.tsx@@ -60,6 +60,7 @@ export function buildSettingsPanelRegistryContext(const securitySsoPanel: Component = () => (<div class="space-y-6"><SSOProvidersPanel+ currentUser={currentUser()}onConfigUpdated={params.loadSecurityStatus}canManage={settingsCapabilities()?.singleSignOnWrite === true}/>diff --git a/frontend-modern/src/components/Settings/useSSOProvidersState.ts b/frontend-modern/src/components/Settings/useSSOProvidersState.tsindex 6a3c6345c5..66e8128d64 100644--- a/frontend-modern/src/components/Settings/useSSOProvidersState.ts+++ b/frontend-modern/src/components/Settings/useSSOProvidersState.ts@@ -1,4 +1,6 @@-import { createMemo, createSignal, onMount } from 'solid-js';+import { batch, createEffect, createMemo, createSignal, on, onCleanup, onMount } from 'solid-js';+import { apiFetch, apiErrorFromResponse, getOrgID } from '@/utils/apiClient';+import { eventBus } from '@/stores/events';import { createStore } from 'solid-js/store';import { notificationStore } from '@/stores/notifications';import { logger } from '@/utils/logger';@@ -15,7 +17,6 @@ import {getSSOProviderSaveSuccessMessage,getSSOProviderToggleErrorMessage,getSSOProviderToggleSuccessMessage,- getSSOProvidersLoadErrorMessage,getSSOTestResultPresentation,} from '@/utils/ssoProviderPresentation';import type {@@ -37,6 +38,7 @@ import {interface SSOProvidersPanelProps {onConfigUpdated?: () => void;canManage?: boolean;+ currentUser?: string;}export const useSSOProvidersState = (props: SSOProvidersPanelProps) => {@@ -47,11 +49,11 @@ export const useSSOProvidersState = (props: SSOProvidersPanelProps) => {tone: 'success' | 'error';message: string;} | null>(null);- const [showModal, setShowModal] = createSignal(false);+ const [showModal, setShowModalValue] = createSignal(false);const [editingProvider, setEditingProvider] = createSignal<SSOProvider | null>(null);const [form, setForm] = createStore<ProviderForm>(createEmptyProviderForm());const [advancedOpen, setAdvancedOpen] = createSignal(false);- const [deleteConfirm, setDeleteConfirm] = createSignal<string | null>(null);+ const [deleteConfirm, setDeleteConfirmValue] = createSignal<string | null>(null);const [publicUrl, setPublicUrl] = createSignal('');const [testing, setTesting] = createSignal(false);const [testResult, setTestResult] = createSignal<SSOProviderTestResult | null>(null);@@ -59,185 +61,312 @@ export const useSSOProvidersState = (props: SSOProvidersPanelProps) => {const [metadataPreview, setMetadataPreview] = createSignal<MetadataPreview | null>(null);const [loadingPreview, setLoadingPreview] = createSignal(false);- const canManage = () => props.canManage !== false;+ const [loadError, setLoadError] = createSignal(false);+ const [providersLoaded, setProvidersLoaded] = createSignal(false);+ const [loadingDetails, setLoadingDetails] = createSignal(false);+ const [mutating, setMutating] = createSignal(false);+ const managementAllowed = createMemo(() => props.canManage !== false);+ const authenticatedUser = createMemo(() => props.currentUser);+ const currentOrg = () => getOrgID() || 'default';+ let selectedOrg = currentOrg();+ let selectedUser = authenticatedUser();+ let selectedManagement = managementAllowed();+ let disposed = false;+ let contextVersion = 0;+ let editorVersion = 0;+ let readController: AbortController | undefined;+ let detailController: AbortController | undefined;+ let testController: AbortController | undefined;+ let previewController: AbortController | undefined;+ let mutationController: AbortController | undefined;++ const contextIsCurrent = () =>+ !disposed && selectedOrg === currentOrg() && selectedUser === authenticatedUser() &&+ selectedManagement === managementAllowed();+ const canManage = () => contextIsCurrent() && managementAllowed();+ const canEdit = () => canManage() && providersLoaded() && !loading() && !loadError() && !mutating();+ const isCurrentProvider = (provider: SSOProvider) => providers().includes(provider);+ const requestOptions = (controller: AbortController) => ({+ signal: controller.signal, expectedOrgID: selectedOrg, retry: false,+ });++ const clearPreviewAndTest = () => {+ testController?.abort();+ previewController?.abort();+ testController = previewController = undefined;+ batch(() => {+ setTesting(false);+ setTestResult(null);+ setLoadingPreview(false);+ setMetadataPreview(null);+ setShowMetadataPreview(false);+ });+ };+ const clearEditor = () => {+ editorVersion += 1;+ detailController?.abort();+ detailController = undefined;+ clearPreviewAndTest();+ batch(() => {+ setLoadingDetails(false);+ setShowModalValue(false);+ setEditingProvider(null);+ setEditorFeedback(null);+ setForm(createEmptyProviderForm());+ setAdvancedOpen(false);+ });+ };+ const setShowModal = (open: boolean) => {+ if (!open && !mutating()) clearEditor();+ };+ const setDeleteConfirm = (id: string | null) => {+ if (mutating()) return;+ if (id === null || (canEdit() && providers().some((provider) => provider.id === id))) {+ clearEditor();+ setDeleteConfirmValue(id);+ }+ };+ // A test/preview describes exactly the submitted draft, not later edits in+ // the same dialog. Closing/replacing that dialog also releases its payload.+ createEffect(on(() => JSON.stringify(form), () => {+ clearPreviewAndTest();+ setEditorFeedback(null);+ }, { defer: true }));const loadProviders = async () => {+ if (!contextIsCurrent() || readController) return;+ const version = contextVersion;+ const controller = new AbortController();+ const isCurrent = () => contextIsCurrent() && version === contextVersion && readController === controller;+ readController = controller;setLoading(true);+ setLoadError(false);+ setProvidersLoaded(false);+ setProviders([]);try {- const { apiFetch } = await import('@/utils/apiClient');- const response = await apiFetch('/api/security/sso/providers');- if (!response.ok) {- throw new Error(`Failed to load SSO providers (${response.status})`);- }+ const response = await apiFetch('/api/security/sso/providers', requestOptions(controller));+ if (!isCurrent()) return;+ if (!response.ok) throw new Error('Provider read refused');const data = (await response.json()) as SSOProvidersResponse;- setProviders(data.providers || []);-- const statusResponse = await apiFetch('/api/security/status');- if (statusResponse.ok) {- const status = (await statusResponse.json()) as { publicUrl?: string };- setPublicUrl(status.publicUrl || window.location.origin);- }- } catch (error) {- logger.error('[SSOProvidersPanel] Failed to load providers:', error);- notificationStore.error(getSSOProvidersLoadErrorMessage());+ if (!isCurrent()) return;+ const ids = new Set<string>();+ // A missing or malformed list is unknown, not an empty configuration.+ if (!data || !Array.isArray(data.providers) || data.providers.some((provider) => {+ if (!provider || typeof provider.id !== 'string' || !provider.id.trim() ||+ ids.has(provider.id) || typeof provider.name !== 'string' ||+ !['oidc', 'saml'].includes(provider.type) || typeof provider.enabled !== 'boolean') return true;+ ids.add(provider.id);+ return false;+ })) throw new Error('Invalid provider inventory');+ setProviders(data.providers);+ setProvidersLoaded(true);+ setPublicUrl(window.location.origin);+ // The optional public URL is not evidence that a provider read failed.+ try {+ const statusResponse = await apiFetch('/api/security/status', requestOptions(controller));+ if (statusResponse.ok) {+ const status = (await statusResponse.json()) as { publicUrl?: string };+ if (isCurrent() && typeof status.publicUrl === 'string' && status.publicUrl) setPublicUrl(status.publicUrl);+ }+ } catch { /* Keep the current origin when optional status is unavailable. */ }+ } catch {+ if (!isCurrent()) return;+ setLoadError(true);+ logger.error('[SSOProvidersPanel] Failed to load providers.');} finally {- setLoading(false);+ if (isCurrent()) {+ readController = undefined;+ setLoading(false);+ }}};- onMount(() => {+ const resetContext = () => {+ contextVersion += 1;+ readController?.abort();+ mutationController?.abort();+ readController = mutationController = undefined;+ selectedOrg = currentOrg();+ selectedUser = authenticatedUser();+ selectedManagement = managementAllowed();+ batch(() => {+ clearEditor();+ setProviders([]);+ setProvidersLoaded(false);+ setPublicUrl('');+ setDeleteConfirmValue(null);+ setSaving(false);+ setMutating(false);+ });void loadProviders();+ };+ createEffect(on([managementAllowed, authenticatedUser], resetContext, { defer: true }));+ const unsubscribeOrg = eventBus.on('org_switched', resetContext);+ onMount(() => void loadProviders());+ onCleanup(() => {+ disposed = true;+ contextVersion += 1;+ readController?.abort();+ mutationController?.abort();+ clearEditor();+ setProviders([]);+ unsubscribeOrg();});const openAddModal = (type: 'oidc' | 'saml') => {- if (!canManage()) {- return;- }- setEditorFeedback(null);- setTestResult(null);- setEditingProvider(null);- setForm(createEmptyProviderForm());+ if (!canEdit()) return;+ clearEditor();+ setDeleteConfirmValue(null);setForm('type', type);- setAdvancedOpen(false);- setShowModal(true);+ setShowModalValue(true);};const openEditModal = async (provider: SSOProvider) => {- if (!canManage()) {- return;- }- setEditorFeedback(null);- setTestResult(null);- setEditingProvider(provider);+ if (!canEdit() || !isCurrentProvider(provider)) return;+ clearEditor();+ setDeleteConfirmValue(null);+ const version = editorVersion;+ const context = contextVersion;+ const controller = new AbortController();+ detailController = controller;+ const isCurrent = () => canEdit() && version === editorVersion && context === contextVersion && detailController === controller;+ setLoadingDetails(true);try {- const { apiFetch } = await import('@/utils/apiClient');- const response = await apiFetch(`/api/security/sso/providers/${provider.id}`);- if (!response.ok) {- throw new Error('Failed to load provider details');- }- setForm(mapProviderDetailsToForm(await response.json()));- setAdvancedOpen(false);- setShowModal(true);- } catch (error) {- logger.error('[SSOProvidersPanel] Failed to load provider for editing:', error);+ const response = await apiFetch(`/api/security/sso/providers/${encodeURIComponent(provider.id)}`, requestOptions(controller));+ if (!isCurrent()) return;+ if (!response.ok) throw new Error('Provider details refused');+ const data = await response.json();+ if (!isCurrent()) return;+ if (!data || data.id !== provider.id || data.type !== provider.type) throw new Error('Mismatched provider details');+ setForm(mapProviderDetailsToForm(data));+ setEditingProvider(provider);+ setShowModalValue(true);+ } catch {+ if (!isCurrent()) return;+ logger.error('[SSOProvidersPanel] Failed to load provider details.');notificationStore.error(getSSOProviderDetailsLoadErrorMessage());+ } finally {+ if (detailController === controller) {+ detailController = undefined;+ setLoadingDetails(false);+ }}};+ const beginMutation = () => {+ if (!canEdit()) return;+ const context = contextVersion;+ const controller = new AbortController();+ mutationController = controller;+ setMutating(true);+ return {+ options: requestOptions(controller),+ isCurrent: () => contextIsCurrent() && context === contextVersion && mutationController === controller,+ finish: () => {+ if (mutationController !== controller) return;+ mutationController = undefined;+ setMutating(false);+ setSaving(false);+ },+ };+ };+const handleSave = async (event?: Event) => {event?.preventDefault();- if (!canManage() || saving()) {- return;- }+ if (!showModal() || testing() || loadingPreview()) return;+ const mutation = beginMutation();+ if (!mutation) return;+ const isEdit = Boolean(editingProvider());+ const providerId = editingProvider()?.id;+ const payload = buildProviderPayload(form);setEditorFeedback(null);setSaving(true);-try {- const { apiFetch, apiErrorFromResponse } = await import('@/utils/apiClient');- const isEdit = Boolean(editingProvider());const response = await apiFetch(- isEdit- ? `/api/security/sso/providers/${editingProvider()!.id}`- : '/api/security/sso/providers',- {- method: isEdit ? 'PUT' : 'POST',- // Keep failed configuration writes in this draft until an explicit retry.- retry: false,- headers: { 'Content-Type': 'application/json' },- body: JSON.stringify(buildProviderPayload(form)),- },+ isEdit ? `/api/security/sso/providers/${encodeURIComponent(providerId!)}` : '/api/security/sso/providers',+ { ...mutation.options, method: isEdit ? 'PUT' : 'POST',+ headers: { 'Content-Type': 'application/json' }, body: JSON.stringify(payload) },);-+ if (!mutation.isCurrent()) return;if (!response.ok) {const error = await apiErrorFromResponse(response);+ if (!mutation.isCurrent()) return;setEditorFeedback({ tone: 'error', message: getSSOProviderSaveErrorMessage(error) });- // Envelope details and upstream bodies can contain private provider data.logger.error('[SSOProvidersPanel] Failed to save provider.', { status: response.status });return;}-notificationStore.success(getSSOProviderSaveSuccessMessage(isEdit));- setShowModal(false);+ clearEditor();await loadProviders();- props.onConfigUpdated?.();+ if (mutation.isCurrent()) props.onConfigUpdated?.();} catch {+ if (!mutation.isCurrent()) return;// A lost response cannot establish whether the server saved the change.logger.error('[SSOProvidersPanel] Failed to save provider.');setEditorFeedback({ tone: 'error', message: getSSOProviderSaveErrorMessage() });} finally {- setSaving(false);+ mutation.finish();}};const handleDelete = async (providerId: string) => {- if (!canManage()) {- return;- }+ if (deleteConfirm() !== providerId || !providers().some((provider) => provider.id === providerId)) return;+ const mutation = beginMutation();+ if (!mutation) return;try {- const { apiFetch } = await import('@/utils/apiClient');- const response = await apiFetch(`/api/security/sso/providers/${providerId}`, {- method: 'DELETE',+ const response = await apiFetch(`/api/security/sso/providers/${encodeURIComponent(providerId)}`, {+ ...mutation.options, method: 'DELETE',});-- if (!response.ok) {- throw new Error(`Failed to delete provider (${response.status})`);- }-+ if (!mutation.isCurrent()) return;+ if (!response.ok) throw new Error('Provider deletion refused');notificationStore.success(getSSOProviderDeleteSuccessMessage());- setDeleteConfirm(null);+ setDeleteConfirmValue(null);await loadProviders();- props.onConfigUpdated?.();- } catch (error) {- logger.error('[SSOProvidersPanel] Failed to delete provider:', error);+ if (mutation.isCurrent()) props.onConfigUpdated?.();+ } catch {+ if (!mutation.isCurrent()) return;+ logger.error('[SSOProvidersPanel] Failed to delete provider.');notificationStore.error(getSSOProviderDeleteErrorMessage());- }+ } finally { mutation.finish(); }};const handleToggleEnabled = async (provider: SSOProvider) => {- if (!canManage()) {- return;- }+ if (!isCurrentProvider(provider)) return;+ const mutation = beginMutation();+ if (!mutation) return;+ clearEditor();try {- const { apiFetch } = await import('@/utils/apiClient');- // Send only writable provider fields: the list item also carries- // computed response fields (oidcLoginUrl, samlAcsUrl, ...) that the- // strict PUT decoder rejects. Nested oidc/saml config and the client- // secret are intentionally absent; the backend preserves them.- const response = await apiFetch(`/api/security/sso/providers/${provider.id}`, {- method: 'PUT',- headers: { 'Content-Type': 'application/json' },+ // Only writable fields; omitted nested configuration and secret are preserved.+ const response = await apiFetch(`/api/security/sso/providers/${encodeURIComponent(provider.id)}`, {+ ...mutation.options, method: 'PUT', headers: { 'Content-Type': 'application/json' },body: JSON.stringify({- id: provider.id,- name: provider.name,- type: provider.type,- enabled: !provider.enabled,- displayName: provider.displayName,- iconUrl: provider.iconUrl,- priority: provider.priority,- allowedGroups: provider.allowedGroups ?? [],- allowedDomains: provider.allowedDomains ?? [],- allowedEmails: provider.allowedEmails ?? [],- groupsClaim: provider.groupsClaim,+ id: provider.id, name: provider.name, type: provider.type, enabled: !provider.enabled,+ displayName: provider.displayName, iconUrl: provider.iconUrl, priority: provider.priority,+ allowedGroups: provider.allowedGroups ?? [], allowedDomains: provider.allowedDomains ?? [],+ allowedEmails: provider.allowedEmails ?? [], groupsClaim: provider.groupsClaim,groupRoleMappings: provider.groupRoleMappings,}),});-- if (!response.ok) {- throw new Error(`Failed to update provider (${response.status})`);- }-+ if (!mutation.isCurrent()) return;+ if (!response.ok) throw new Error('Provider update refused');notificationStore.success(getSSOProviderToggleSuccessMessage(!provider.enabled));await loadProviders();- props.onConfigUpdated?.();- } catch (error) {- logger.error('[SSOProvidersPanel] Failed to toggle provider:', error);+ if (mutation.isCurrent()) props.onConfigUpdated?.();+ } catch {+ if (!mutation.isCurrent()) return;+ logger.error('[SSOProvidersPanel] Failed to toggle provider.');notificationStore.error(getSSOProviderToggleErrorMessage());- }+ } finally { mutation.finish(); }};const copyToClipboard = async (text: string, label: string) => {+ if (!contextIsCurrent()) return;+ const context = contextVersion;+ const editor = editorVersion;+ const isCurrent = () => contextIsCurrent() && context === contextVersion && editor === editorVersion;try {await navigator.clipboard.writeText(text);+ if (!isCurrent()) return;const message = getSSOCopySuccessMessage(label);if (showModal()) {setEditorFeedback({ tone: 'success', message });@@ -245,6 +374,7 @@ export const useSSOProvidersState = (props: SSOProvidersPanelProps) => {notificationStore.success(message);}} catch {+ if (!isCurrent()) return;const message = getSSOCopyErrorMessage(label);if (showModal()) {setEditorFeedback({ tone: 'error', message });@@ -259,38 +389,36 @@ export const useSSOProvidersState = (props: SSOProvidersPanelProps) => {);const testConnection = async () => {+ if (!canEdit() || !showModal() || !canTest() || testing() || loadingPreview()) return;+ const controller = new AbortController();+ testController = controller;+ const version = editorVersion;+ const context = contextVersion;+ const payload = JSON.stringify(buildProviderTestPayload(form));+ const isCurrent = () => canEdit() && showModal() && version === editorVersion && context === contextVersion && testController === controller && payload === JSON.stringify(buildProviderTestPayload(form));setEditorFeedback(null);setTesting(true);setTestResult(null);-try {- const { apiFetch } = await import('@/utils/apiClient');const response = await apiFetch('/api/security/sso/providers/test', {- method: 'POST',- headers: { 'Content-Type': 'application/json' },- body: JSON.stringify(buildProviderTestPayload(form)),+ ...requestOptions(controller), method: 'POST', headers: { 'Content-Type': 'application/json' }, body: payload,});-+ if (!isCurrent()) return;const result = (await response.json()) as SSOProviderTestResult;- setTestResult(result);-- // The result belongs to the active dialog, not its inert background toast.- } catch (error) {- logger.error('[SSOProvidersPanel] Test connection error:', error);- setTestResult({- success: false,- message: getSSOConnectionTestErrorMessage(),- error: String(error),- });+ if (isCurrent()) setTestResult(result);+ } catch {+ if (!isCurrent()) return;+ logger.error('[SSOProvidersPanel] Test connection failed.');+ setTestResult({ success: false, message: getSSOConnectionTestErrorMessage() });} finally {- setTesting(false);+ if (testController === controller) { testController = undefined; setTesting(false); }}};const canTest = () => canTestProviderForm(form);const fetchMetadataPreview = async () => {- if (!canManage() || loadingPreview()) {+ if (!canEdit() || !showModal() || testing() || loadingPreview()) {return;}setEditorFeedback(null);@@ -299,38 +427,53 @@ export const useSSOProvidersState = (props: SSOProvidersPanelProps) => {return;}+ const controller = new AbortController();+ previewController = controller;+ const version = editorVersion;+ const context = contextVersion;+ const payload = JSON.stringify(buildMetadataPreviewPayload(form));+ const isCurrent = () => canEdit() && showModal() && version === editorVersion && context === contextVersion && previewController === controller && payload === JSON.stringify(buildMetadataPreviewPayload(form));setLoadingPreview(true);setMetadataPreview(null);try {- const { apiFetch, apiErrorFromResponse } = await import('@/utils/apiClient');const response = await apiFetch('/api/security/sso/providers/metadata/preview', {+ ...requestOptions(controller),method: 'POST',- retry: false,headers: { 'Content-Type': 'application/json' },- body: JSON.stringify(buildMetadataPreviewPayload(form)),+ body: payload,});+ if (!isCurrent()) return;if (!response.ok) {const error = await apiErrorFromResponse(response);+ if (!isCurrent()) return;setEditorFeedback({ tone: 'error', message: getSSOMetadataFetchErrorMessage(error) });logger.error('[SSOProvidersPanel] Metadata preview failed.', { status: response.status });return;}- setMetadataPreview((await response.json()) as MetadataPreview);+ const preview = (await response.json()) as MetadataPreview;+ if (!isCurrent()) return;+ setMetadataPreview(preview);setShowMetadataPreview(true);} catch {+ if (!isCurrent()) return;logger.error('[SSOProvidersPanel] Metadata preview failed.');setEditorFeedback({ tone: 'error', message: getSSOMetadataFetchErrorMessage() });} finally {- setLoadingPreview(false);+ if (previewController === controller) { previewController = undefined; setLoadingPreview(false); }}};return {providers,loading,+ loadError,+ loadProviders,+ loadingDetails,+ canEdit,+ mutating,saving,editorFeedback,showModal,