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
Verify SSO recovery only after its current inventory is read
pulse-triage[bot]5eafffbf94d4
diff --git a/frontend-modern/src/components/Settings/SSOProvidersPanel.tsx b/frontend-modern/src/components/Settings/SSOProvidersPanel.tsxindex ca452062d1..32d5f3514d 100644--- a/frontend-modern/src/components/Settings/SSOProvidersPanel.tsx+++ b/frontend-modern/src/components/Settings/SSOProvidersPanel.tsx@@ -156,12 +156,20 @@ export const SSOProvidersPanel: Component<SSOProvidersPanelProps> = (props) => {</Show><Show when={!loading() && loadError()}>- <InlineNotice role="alert" tone="danger" layout="banner" actionLabel="Retry" actionOnClick={() => void loadProviders()}>+ <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>+ <p role="status" class="text-sm text-muted">+ Loading provider details…+ </p></Show><Show when={!loading() && !loadError() && providers().length === 0}><EmptyState@@ -205,6 +213,7 @@ export const SSOProvidersPanel: Component<SSOProvidersPanelProps> = (props) => {<div class="flex items-center gap-2 self-end sm:self-auto"><Togglechecked={provider.enabled}+ ariaLabel={`${provider.enabled ? 'Disable' : 'Enable'} ${provider.name}`}onChange={() => handleToggleEnabled(provider)}disabled={!canEdit()}containerClass="items-center"@@ -307,7 +316,10 @@ export const SSOProvidersPanel: Component<SSOProvidersPanelProps> = (props) => {</h3></div>- <fieldset disabled={saving()} class="min-w-0 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}>@@ -395,7 +407,7 @@ export const SSOProvidersPanel: Component<SSOProvidersPanelProps> = (props) => {<Buttontype="button"onClick={testConnection}- disabled={testing() || !canTest()}+ disabled={testing() || loadingPreview() || !canTest()}variant="secondary"size="mdCompact"class="whitespace-nowrap"@@ -512,7 +524,7 @@ export const SSOProvidersPanel: Component<SSOProvidersPanelProps> = (props) => {<Buttontype="button"onClick={testConnection}- disabled={testing() || !canTest()}+ disabled={testing() || loadingPreview() || !canTest()}variant="secondary"size="mdCompact"class="flex-1 whitespace-nowrap sm:flex-none"@@ -524,7 +536,9 @@ export const SSOProvidersPanel: Component<SSOProvidersPanelProps> = (props) => {ref={metadataPreviewButton}type="button"onClick={fetchMetadataPreview}- disabled={loadingPreview() || !form.samlIdpMetadataUrl.trim()}+ disabled={+ loadingPreview() || testing() || !form.samlIdpMetadataUrl.trim()+ }variant="secondary"size="mdCompact"class="flex-1 gap-1 whitespace-nowrap sm:flex-none"diff --git a/frontend-modern/src/components/Settings/__tests__/SSOMetadataPreview.test.tsx b/frontend-modern/src/components/Settings/__tests__/SSOMetadataPreview.test.tsxindex c6fca3d5a2..cb1a4774cb 100644--- a/frontend-modern/src/components/Settings/__tests__/SSOMetadataPreview.test.tsx+++ b/frontend-modern/src/components/Settings/__tests__/SSOMetadataPreview.test.tsx@@ -138,9 +138,11 @@ describe.each([false, true])('SAML metadata preview recovery (editing=%s)', (edireturn json({ providers: editing ? [provider] : [] });});render(() => <SSOProvidersPanel />);- fireEvent.click(- await screen.findByRole('button', { name: editing ? 'Edit provider' : 'Add SAML' }),- );+ const editorOpener = await screen.findByRole('button', {+ name: editing ? 'Edit provider' : 'Add SAML',+ });+ await waitFor(() => expect(editorOpener).toBeEnabled());+ fireEvent.click(editorOpener);const editor = await screen.findByRole('dialog');const dialog = within(editor);const url = dialog.getByLabelText('IdP Metadata URL') as HTMLInputElement;@@ -197,9 +199,11 @@ describe.each([false, true])('SAML metadata preview recovery (editing=%s)', (edireturn json({ providers: editing ? [provider] : [] });});render(() => <SSOProvidersPanel />);- fireEvent.click(- await screen.findByRole('button', { name: editing ? 'Edit provider' : 'Add SAML' }),- );+ const editorOpener = await screen.findByRole('button', {+ name: editing ? 'Edit provider' : 'Add SAML',+ });+ await waitFor(() => expect(editorOpener).toBeEnabled());+ fireEvent.click(editorOpener);const editor = within(await screen.findByRole('dialog'));fireEvent.input(editor.getByLabelText('IdP Metadata URL'), {target: { value: 'https://idp.example.test/metadata' },@@ -224,9 +228,11 @@ describe.each([false, true])('SAML metadata preview recovery (editing=%s)', (ediurl.endsWith('/corp-saml') ? json(provider) : json({ providers: editing ? [provider] : [] }),);render(() => <SSOProvidersPanel />);- fireEvent.click(- await screen.findByRole('button', { name: editing ? 'Edit provider' : 'Add SAML' }),- );+ const editorOpener = await screen.findByRole('button', {+ name: editing ? 'Edit provider' : 'Add SAML',+ });+ await waitFor(() => expect(editorOpener).toBeEnabled());+ fireEvent.click(editorOpener);const dialog = within(await screen.findByRole('dialog'));fireEvent.input(dialog.getByLabelText('IdP Metadata URL'), { target: { value: ' ' } });expect(dialog.getByRole('button', { name: 'Preview' })).toBeDisabled();diff --git a/frontend-modern/src/components/Settings/__tests__/SSOProviderLifetimes.test.tsx b/frontend-modern/src/components/Settings/__tests__/SSOProviderLifetimes.test.tsxindex afaee394a4..4b2c650fdc 100644--- a/frontend-modern/src/components/Settings/__tests__/SSOProviderLifetimes.test.tsx+++ b/frontend-modern/src/components/Settings/__tests__/SSOProviderLifetimes.test.tsx@@ -8,29 +8,47 @@ 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 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; });+ 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,+ 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 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 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)); };+const settle = async () => {+ await new Promise((resolve) => setTimeout(resolve, 0));+};beforeEach(() => {vi.clearAllMocks();@@ -38,21 +56,34 @@ beforeEach(() => {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/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(); });+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) => {+ 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(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);@@ -80,10 +111,14 @@ describe('SSO provider read and editor ownership', () => {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));+ 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'));+ 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()));@@ -97,7 +132,9 @@ describe('SSO provider read and editor ownership', () => {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));+ 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' }));@@ -110,40 +147,58 @@ describe('SSO provider read and editor ownership', () => {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));+ 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.'));+ 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.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' } });+ 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');@@ -155,7 +210,8 @@ describe('SSO provider read and editor ownership', () => {fetchMock.mockReturnValueOnce(old.promise);render(() => <SSOProvidersPanel />);await waitFor(() => expect(listCalls()).toHaveLength(1));- setOrgID('sso-b'); eventBus.emit('org_switched', 'sso-b');+ setOrgID('sso-b');+ eventBus.emit('org_switched', 'sso-b');await screen.findByText('first provider');old.resolve(json({ providers: [provider('OBSOLETE')] }));await settle();@@ -164,39 +220,61 @@ describe('SSO provider read and editor ownership', () => {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.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));+ 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' } });+ 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();@@ -204,49 +282,65 @@ describe('SSO provider read and editor ownership', () => {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);+ 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 {- const toggle = screen.getAllByRole('switch')[0];- fireEvent.click(toggle); fireEvent.click(toggle);+ 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.getByRole('button', { name: 'Disable first provider' });+ 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');- });+ 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));+ 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();+ 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/__tests__/SSOProviderSaveErrors.test.tsx b/frontend-modern/src/components/Settings/__tests__/SSOProviderSaveErrors.test.tsxindex 8f64799f06..4a0842cedf 100644--- a/frontend-modern/src/components/Settings/__tests__/SSOProviderSaveErrors.test.tsx+++ b/frontend-modern/src/components/Settings/__tests__/SSOProviderSaveErrors.test.tsx@@ -125,11 +125,11 @@ describe.each(['oidc', 'saml'] as const)('SSO %s save error recovery', (type) =>return json({ providers: editing ? [provider] : [] });});render(() => <SSOProvidersPanel />);- fireEvent.click(- await screen.findByRole('button', {- name: editing ? 'Edit provider' : `Add ${type.toUpperCase()}`,- }),- );+ const opener = await screen.findByRole('button', {+ name: editing ? 'Edit provider' : `Add ${type.toUpperCase()}`,+ });+ await waitFor(() => expect(opener).toBeEnabled());+ fireEvent.click(opener);const dialog = within(await screen.findByRole('dialog'));const name = dialog.getByLabelText('Provider Name') as HTMLInputElement;fireEvent.input(name, { target: { value: 'Retained draft' } });diff --git a/frontend-modern/src/components/Settings/__tests__/SSOProvidersPanel.test.tsx b/frontend-modern/src/components/Settings/__tests__/SSOProvidersPanel.test.tsxindex 788e858ee6..072c7e89d8 100644--- a/frontend-modern/src/components/Settings/__tests__/SSOProvidersPanel.test.tsx+++ b/frontend-modern/src/components/Settings/__tests__/SSOProvidersPanel.test.tsx@@ -93,6 +93,7 @@ describe('SSOProvidersPanel OIDC scopes', () => {render(() => <SSOProvidersPanel />);const addButton = await screen.findByRole('button', { name: /Add OIDC/i });+ await waitFor(() => expect(addButton).toBeEnabled());fireEvent.click(addButton);const scopes = scopesInput();@@ -336,6 +337,7 @@ describe('SSOProvidersPanel IdP endpoint URLs', () => {render(() => <SSOProvidersPanel />);const addButton = await screen.findByRole('button', { name: /Add OIDC/i });+ await waitFor(() => expect(addButton).toBeEnabled());fireEvent.click(addButton);expect(@@ -479,7 +481,9 @@ describe('SSOProvidersPanel modal feedback and recovery', () => {: read(url, options),);render(() => <SSOProvidersPanel />);- fireEvent.click(await screen.findByRole('button', { name: 'Add SAML' }));+ const addButton = await screen.findByRole('button', { name: 'Add SAML' });+ await waitFor(() => expect(addButton).toBeEnabled());+ fireEvent.click(addButton);const dialog = within(screen.getByRole('dialog'));fireEvent.input(dialog.getByLabelText('IdP Metadata URL'), {target: { value: 'https://idp.example.com/metadata' },diff --git a/frontend-modern/src/components/Settings/__tests__/settingsArchitecture.test.ts b/frontend-modern/src/components/Settings/__tests__/settingsArchitecture.test.tsindex 0e4be08de2..1e49cd4723 100644--- a/frontend-modern/src/components/Settings/__tests__/settingsArchitecture.test.ts+++ b/frontend-modern/src/components/Settings/__tests__/settingsArchitecture.test.ts@@ -1206,7 +1206,17 @@ describe('settings architecture guardrails', () => {expect(previewLifecycle).toContain('getSSOMetadataFetchErrorMessage()');expect(previewLifecycle).toContain('setEditorFeedback');expect(ssoProvidersPanelSource).toContain('returnFocus={() => metadataPreviewButton}');- expect(previewLifecycle).toContain('retry: false');+ expect(previewLifecycle).toContain('...requestOptions(controller)');+ const requestPolicy = ssoProvidersStateSource.slice(+ ssoProvidersStateSource.indexOf('const requestOptions ='),+ ssoProvidersStateSource.indexOf('const clearPreviewAndTest ='),+ );+ expect(requestPolicy).toContain('retry: false');+ expect(requestPolicy).toContain('expectedOrgID: selectedOrg');+ expect(requestPolicy).toContain('signal: controller.signal');+ expect(settingsPanelRegistryContextSource).toMatch(+ /<SSOProvidersPanel\s+currentUser=\{currentUser\(\)\}/,+ );expect(previewLifecycle).not.toContain('response.text()');expect(previewLifecycle).not.toContain('String(error)');expect(previewLifecycle).not.toContain('notificationStore');diff --git a/frontend-modern/src/components/Settings/useSSOProvidersState.ts b/frontend-modern/src/components/Settings/useSSOProvidersState.tsindex 66e8128d64..b865c583f7 100644--- a/frontend-modern/src/components/Settings/useSSOProvidersState.ts+++ b/frontend-modern/src/components/Settings/useSSOProvidersState.ts@@ -57,7 +57,7 @@ export const useSSOProvidersState = (props: SSOProvidersPanelProps) => {const [publicUrl, setPublicUrl] = createSignal('');const [testing, setTesting] = createSignal(false);const [testResult, setTestResult] = createSignal<SSOProviderTestResult | null>(null);- const [showMetadataPreview, setShowMetadataPreview] = createSignal(false);+ const [showMetadataPreview, setShowMetadataPreviewValue] = createSignal(false);const [metadataPreview, setMetadataPreview] = createSignal<MetadataPreview | null>(null);const [loadingPreview, setLoadingPreview] = createSignal(false);@@ -81,13 +81,18 @@ export const useSSOProvidersState = (props: SSOProvidersPanelProps) => {let mutationController: AbortController | undefined;const contextIsCurrent = () =>- !disposed && selectedOrg === currentOrg() && selectedUser === authenticatedUser() &&+ !disposed &&+ selectedOrg === currentOrg() &&+ selectedUser === authenticatedUser() &&selectedManagement === managementAllowed();const canManage = () => contextIsCurrent() && managementAllowed();- const canEdit = () => canManage() && providersLoaded() && !loading() && !loadError() && !mutating();+ 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,+ signal: controller.signal,+ expectedOrgID: selectedOrg,+ retry: false,});const clearPreviewAndTest = () => {@@ -99,9 +104,13 @@ export const useSSOProvidersState = (props: SSOProvidersPanelProps) => {setTestResult(null);setLoadingPreview(false);setMetadataPreview(null);- setShowMetadataPreview(false);+ setShowMetadataPreviewValue(false);});};+ const setShowMetadataPreview = (open: boolean) => {+ setShowMetadataPreviewValue(open);+ if (!open) setMetadataPreview(null);+ };const clearEditor = () => {editorVersion += 1;detailController?.abort();@@ -128,16 +137,23 @@ export const useSSOProvidersState = (props: SSOProvidersPanelProps) => {};// 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 }));+ 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;+ const isCurrent = () =>+ contextIsCurrent() && version === contextVersion && readController === controller;readController = controller;setLoading(true);setLoadError(false);@@ -151,13 +167,25 @@ export const useSSOProvidersState = (props: SSOProvidersPanelProps) => {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');+ 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);@@ -166,9 +194,12 @@ export const useSSOProvidersState = (props: SSOProvidersPanelProps) => {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);+ if (isCurrent() && typeof status.publicUrl === 'string' && status.publicUrl)+ setPublicUrl(status.publicUrl);}- } catch { /* Keep the current origin when optional status is unavailable. */ }+ } catch {+ /* Keep the current origin when optional status is unavailable. */+ }} catch {if (!isCurrent()) return;setLoadError(true);@@ -229,15 +260,23 @@ export const useSSOProvidersState = (props: SSOProvidersPanelProps) => {const context = contextVersion;const controller = new AbortController();detailController = controller;- const isCurrent = () => canEdit() && version === editorVersion && context === contextVersion && detailController === controller;+ const isCurrent = () =>+ canEdit() &&+ version === editorVersion &&+ context === contextVersion &&+ detailController === controller;setLoadingDetails(true);try {- const response = await apiFetch(`/api/security/sso/providers/${encodeURIComponent(provider.id)}`, requestOptions(controller));+ 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');+ if (!data || data.id !== provider.id || data.type !== provider.type)+ throw new Error('Mismatched provider details');setForm(mapProviderDetailsToForm(data));setEditingProvider(provider);setShowModalValue(true);@@ -261,7 +300,8 @@ export const useSSOProvidersState = (props: SSOProvidersPanelProps) => {setMutating(true);return {options: requestOptions(controller),- isCurrent: () => contextIsCurrent() && context === contextVersion && mutationController === controller,+ isCurrent: () =>+ contextIsCurrent() && context === contextVersion && mutationController === controller,finish: () => {if (mutationController !== controller) return;mutationController = undefined;@@ -283,9 +323,15 @@ export const useSSOProvidersState = (props: SSOProvidersPanelProps) => {setSaving(true);try {const response = await apiFetch(- 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) },+ 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) {@@ -310,13 +356,21 @@ export const useSSOProvidersState = (props: SSOProvidersPanelProps) => {};const handleDelete = async (providerId: string) => {- if (deleteConfirm() !== providerId || !providers().some((provider) => provider.id === providerId)) return;+ if (+ deleteConfirm() !== providerId ||+ !providers().some((provider) => provider.id === providerId)+ )+ return;const mutation = beginMutation();if (!mutation) return;try {- const response = await apiFetch(`/api/security/sso/providers/${encodeURIComponent(providerId)}`, {- ...mutation.options, method: 'DELETE',- });+ const response = await apiFetch(+ `/api/security/sso/providers/${encodeURIComponent(providerId)}`,+ {+ ...mutation.options,+ method: 'DELETE',+ },+ );if (!mutation.isCurrent()) return;if (!response.ok) throw new Error('Provider deletion refused');notificationStore.success(getSSOProviderDeleteSuccessMessage());@@ -327,7 +381,9 @@ export const useSSOProvidersState = (props: SSOProvidersPanelProps) => {if (!mutation.isCurrent()) return;logger.error('[SSOProvidersPanel] Failed to delete provider.');notificationStore.error(getSSOProviderDeleteErrorMessage());- } finally { mutation.finish(); }+ } finally {+ mutation.finish();+ }};const handleToggleEnabled = async (provider: SSOProvider) => {@@ -337,16 +393,28 @@ export const useSSOProvidersState = (props: SSOProvidersPanelProps) => {clearEditor();try {// 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,- groupRoleMappings: provider.groupRoleMappings,- }),- });+ 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,+ groupRoleMappings: provider.groupRoleMappings,+ }),+ },+ );if (!mutation.isCurrent()) return;if (!response.ok) throw new Error('Provider update refused');notificationStore.success(getSSOProviderToggleSuccessMessage(!provider.enabled));@@ -356,14 +424,17 @@ export const useSSOProvidersState = (props: SSOProvidersPanelProps) => {if (!mutation.isCurrent()) return;logger.error('[SSOProvidersPanel] Failed to toggle provider.');notificationStore.error(getSSOProviderToggleErrorMessage());- } finally { mutation.finish(); }+ } 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;+ const isCurrent = () =>+ contextIsCurrent() && context === contextVersion && editor === editorVersion;try {await navigator.clipboard.writeText(text);if (!isCurrent()) return;@@ -395,15 +466,25 @@ export const useSSOProvidersState = (props: SSOProvidersPanelProps) => {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));+ const isCurrent = () =>+ canEdit() &&+ showModal() &&+ version === editorVersion &&+ context === contextVersion &&+ testController === controller &&+ payload === JSON.stringify(buildProviderTestPayload(form));setEditorFeedback(null);setTesting(true);setTestResult(null);try {const response = await apiFetch('/api/security/sso/providers/test', {- ...requestOptions(controller), method: 'POST', headers: { 'Content-Type': 'application/json' }, body: payload,+ ...requestOptions(controller),+ method: 'POST',+ headers: { 'Content-Type': 'application/json' },+ body: payload,});if (!isCurrent()) return;+ if (!response.ok) throw new Error('Connection test refused');const result = (await response.json()) as SSOProviderTestResult;if (isCurrent()) setTestResult(result);} catch {@@ -411,7 +492,10 @@ export const useSSOProvidersState = (props: SSOProvidersPanelProps) => {logger.error('[SSOProvidersPanel] Test connection failed.');setTestResult({ success: false, message: getSSOConnectionTestErrorMessage() });} finally {- if (testController === controller) { testController = undefined; setTesting(false); }+ if (testController === controller) {+ testController = undefined;+ setTesting(false);+ }}};@@ -432,7 +516,13 @@ export const useSSOProvidersState = (props: SSOProvidersPanelProps) => {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));+ const isCurrent = () =>+ canEdit() &&+ showModal() &&+ version === editorVersion &&+ context === contextVersion &&+ previewController === controller &&+ payload === JSON.stringify(buildMetadataPreviewPayload(form));setLoadingPreview(true);setMetadataPreview(null);@@ -462,7 +552,10 @@ export const useSSOProvidersState = (props: SSOProvidersPanelProps) => {logger.error('[SSOProvidersPanel] Metadata preview failed.');setEditorFeedback({ tone: 'error', message: getSSOMetadataFetchErrorMessage() });} finally {- if (previewController === controller) { previewController = undefined; setLoadingPreview(false); }+ if (previewController === controller) {+ previewController = undefined;+ setLoadingPreview(false);+ }}};