Skip to content

feat(ui,localizations,shared): add the organization Security page SSO overview#8813

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
iagodahlem merged 11 commits into from
Jun 15, 2026
Merged

feat(ui,localizations,shared): add the organization Security page SSO overview #8813

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
7460da3
refactor(ui): make ResetConnectionDialog context-free
iagodahlem Jun 10, 2026
33df3df
feat(localizations,shared): add Security page SSO overview localization
iagodahlem Jun 10, 2026
86addc4
feat(ui,shared): render the organization Security page SSO overview
iagodahlem Jun 10, 2026
1a6e0ec
refactor(ui): trim comments across the security page overview
iagodahlem Jun 10, 2026
87bd9f2
fix(ui): truncate long SSO detail values on the security page
iagodahlem Jun 10, 2026
9a31d34
feat(ui,localizations,shared): move security page SSO activation into…
iagodahlem Jun 12, 2026
e72710f
feat(ui,localizations,shared): unify the security page SSO copy and f…
iagodahlem Jun 12, 2026
33234fd
feat(ui,localizations,shared): label the security page connection rem…
iagodahlem Jun 15, 2026
7cc05e3
refactor(ui): drop optimistic activation and apply security page SSO …
iagodahlem Jun 15, 2026
d0b0186
refactor(ui): address security page review feedback
iagodahlem Jun 15, 2026
cbe883d
feat(localizations): update security page SSO description copy
iagodahlem Jun 15, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions .changeset/orange-pandas-shake.md
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
---
'@clerk/localizations': patch
'@clerk/shared': patch
'@clerk/ui': patch
---

Add an overview to the organization profile Security page. The page now lands on a summary of the SSO connection — a status badge (Unconfigured, In Progress, Active, Inactive), the configuration details framed in a card (provider, domain, sign-on URL, issuer, certificate), and an actions menu with Edit, Activate / Deactivate, and Remove — and switches into the existing configuration flow on Start, Continue, or Edit.
32 changes: 32 additions & 0 deletions packages/localizations/src/en-US.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -1066,6 +1066,38 @@ export const enUS: LocalizationResource = {
successMessage: '{{domain}} has been removed.',
title: 'Remove domain',
},
securityPage: {
removeDialog: {
confirmButton: 'Remove connection',
subtitle:
'Are you sure you want to remove the connection? This action is irreversible and deletes the connection and all of its configuration.',
title: 'Remove SSO connection',
},
ssoSection: {
badge__active: 'Active',
badge__inactive: 'Inactive',
badge__inProgress: 'In Progress',
badge__unconfigured: 'Unconfigured',
certificateLabel: 'Certificate',
descriptionLine1:
'Require members to sign in through your identity provider using their domain email. Members without a matching domain are unaffected.',
descriptionLine2:
'Anyone who signs in will be automatically added to this organization. New members will be assigned to {{role}}.',
descriptionLine2__noRole: 'Anyone who signs in will be automatically added to this organization.',
domainLabel: 'Domain',
issuerLabel: 'Issuer',
menuAction__activate: 'Activate',
menuAction__deactivate: 'Deactivate',
menuAction__edit: 'Edit',
menuAction__remove: 'Remove',
primaryButton__continueConfiguration: 'Continue configuration',
primaryButton__startConfiguration: 'Start configuration',
providerLabel: 'Provider',
signOnUrlLabel: 'Sign on URL',
title: 'SSO',
},
title: 'Security',
},
start: {
headerTitle__general: 'General',
headerTitle__members: 'Members',
Expand Down
9 changes: 8 additions & 1 deletion packages/shared/src/types/elementIds.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -53,6 +53,7 @@ export type ProfileSectionId =
| 'manageVerifiedDomains'
| 'subscriptionsList'
| 'paymentMethods'
| 'sso'
| 'ssoStatus'
| 'enableSso'
| 'ssoDomain'
Expand All@@ -61,7 +62,13 @@ export type ProfileSectionId =
| 'resetSso'
| 'testSsoUrl'
| 'testResults';
export type ProfilePageId = 'account' | 'security' | 'organizationGeneral' | 'organizationMembers' | 'billing';
export type ProfilePageId =
| 'account'
| 'security'
| 'organizationGeneral'
| 'organizationMembers'
| 'organizationSecurity'
| 'billing';

export type UserPreviewId = 'userButton' | 'personalWorkspace';
export type OrganizationPreviewId =
Expand Down
29 changes: 29 additions & 0 deletions packages/shared/src/types/localization.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -1130,6 +1130,35 @@ export type __internal_LocalizationResource = {
messageLine2: LocalizationValue;
successMessage: LocalizationValue;
};
securityPage: {
title: LocalizationValue;
removeDialog: {
title: LocalizationValue;
subtitle: LocalizationValue;
confirmButton: LocalizationValue;
};
ssoSection: {
title: LocalizationValue;
badge__unconfigured: LocalizationValue;
badge__inProgress: LocalizationValue;
badge__active: LocalizationValue;
badge__inactive: LocalizationValue;
descriptionLine1: LocalizationValue;
descriptionLine2: LocalizationValue<'role'>;
descriptionLine2__noRole: LocalizationValue;
primaryButton__startConfiguration: LocalizationValue;
primaryButton__continueConfiguration: LocalizationValue;
providerLabel: LocalizationValue;
domainLabel: LocalizationValue;
signOnUrlLabel: LocalizationValue;
issuerLabel: LocalizationValue;
certificateLabel: LocalizationValue;
menuAction__edit: LocalizationValue;
menuAction__activate: LocalizationValue;
menuAction__deactivate: LocalizationValue;
menuAction__remove: LocalizationValue;
};
};
membersPage: {
detailsTitle__emptyRow: LocalizationValue;
action__invite: LocalizationValue;
Expand Down
36 changes: 18 additions & 18 deletions packages/ui/src/components/ConfigureSSO/ResetConnectionDialog.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
import type { LocalizationKey } from '@/customizables';
import { Col, descriptors, localizationKeys } from '@/customizables';
import { Card } from '@/elements/Card';
import { useCardState, withCardStateProvider } from '@/elements/contexts';
Expand All@@ -8,17 +9,19 @@ import { Modal } from '@/elements/Modal';
import { useFormControl } from '@/ui/utils/useFormControl';
import { handleError } from '@/utils/errorHandler';

import { useConfigureSSO } from './ConfigureSSOContext';

type ResetConnectionDialogProps = {
isOpen: boolean;
onClose: () => void;
confirmationValue: string;
onDelete: () => Promise<unknown>;
contentRef: React.RefObject<HTMLDivElement>;
/** Defaults to the Reset copy; overridden when the dialog is reused for the Remove action. */
title?: LocalizationKey;
subtitle?: LocalizationKey;
confirmButtonLabel?: LocalizationKey;
};

export const ResetConnectionDialog = (props: ResetConnectionDialogProps): JSX.Element | null => {
const { contentRef } = useConfigureSSO();

if (!props.isOpen) {
return null;
}
Expand All@@ -27,7 +30,7 @@ export const ResetConnectionDialog = (props: ResetConnectionDialogProps): JSX.El
<Modal
handleClose={props.onClose}
canCloseModal={false}
portalRoot={contentRef}
portalRoot={props.contentRef}
containerSx={t => ({
alignItems: 'center',
position: 'absolute',
Expand All@@ -44,9 +47,12 @@ export const ResetConnectionDialog = (props: ResetConnectionDialogProps): JSX.El
};

const ResetConnectionDialogContent = withCardStateProvider((props: ResetConnectionDialogProps) => {
const { onClose, confirmationValue } = props;
const { onClose, onDelete, confirmationValue } = props;
const title = props.title ?? localizationKeys('configureSSO.resetConnectionDialog.title');
const subtitle = props.subtitle ?? localizationKeys('configureSSO.resetConnectionDialog.subtitle');
const confirmButtonLabel =
props.confirmButtonLabel ?? localizationKeys('configureSSO.resetConnectionDialog.resetButton');
const card = useCardState();
const { enterpriseConnection, mutations } = useConfigureSSO();

const confirmationField = useFormControl('deleteConfirmation', '', {
type: 'text',
Expand All@@ -60,18 +66,12 @@ const ResetConnectionDialogContent = withCardStateProvider((props: ResetConnecti
const canSubmit = Boolean(confirmationValue && confirmationField.value === confirmationValue);

const onSubmit = async () => {
if (!enterpriseConnection || !canSubmit) {
if (!canSubmit) {
return;
}

try {
// Reset is a pure delete — no navigation. Dropping `hasConnection` breaks
// the active step's entry guard, so the wizard self-corrects to the
// furthest-reachable step. The mutation is already reverification-wrapped.
// No `useWizard()` here — that lets this dialog be triggered from ANY
// footer (including the nested SAML configure footers) without binding to
// a nested wizard.
await mutations.deleteConnection(enterpriseConnection.id);
await onDelete();
onClose();
} catch (err) {
handleError(err as Error, [confirmationField], card.setError);
Expand All@@ -85,8 +85,8 @@ const ResetConnectionDialogContent = withCardStateProvider((props: ResetConnecti
>
<Card.Content sx={t => ({ textAlign: 'start', padding: t.sizes.$5 })}>
<FormContainer
headerTitle={localizationKeys('configureSSO.resetConnectionDialog.title')}
headerSubtitle={localizationKeys('configureSSO.resetConnectionDialog.subtitle')}
headerTitle={title}
headerSubtitle={subtitle}
sx={t => ({ gap: t.space.$4 })}
>
<Form.Root onSubmit={onSubmit}>
Expand All@@ -104,7 +104,7 @@ const ResetConnectionDialogContent = withCardStateProvider((props: ResetConnecti
block={false}
colorScheme='danger'
isDisabled={!canSubmit}
localizationKey={localizationKeys('configureSSO.resetConnectionDialog.resetButton')}
localizationKey={confirmButtonLabel}
/>
<Form.ResetButton
elementDescriptor={descriptors.configureSSOResetConnectionDialogCancelButton}
Expand Down
60 changes: 35 additions & 25 deletions packages/ui/src/components/ConfigureSSO/__tests__/ResetConnectionDialog.test.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,26 @@
import type { EnterpriseConnectionResource } from '@clerk/shared/types';
import { describe, expect, it, vi } from 'vitest';

import { localizationKeys } from '@/customizables';
import { bindCreateFixtures } from '@/test/create-fixtures';
import { render, screen, waitFor } from '@/test/utils';
import { CardStateProvider } from '@/ui/elements/contexts';

// The dialog no longer touches the wizard. On confirm it calls the
// reverification-wrapped `mutations.deleteConnection(id)` directly — a pure
// delete, no navigation — and the wizard self-corrects to the
// furthest-reachable step once the active step's guard breaks. That lets the
// dialog be triggered from ANY footer (including nested SAML configure footers)
// without binding to a nested wizard.
const deleteConnection = vi.fn();

const connectionMockState = vi.hoisted(() => ({
current: { id: 'idn_connection_1' } as Partial<EnterpriseConnectionResource> | null,
}));

vi.mock('../ConfigureSSOContext', () => ({
useConfigureSSO: () => ({
enterpriseConnection: connectionMockState.current,
contentRef: { current: null },
// The dialog's confirm calls the reverification-wrapped `deleteConnection`
// mutation directly. No navigation — the wizard self-corrects.
mutations: { deleteConnection },
}),
}));

import { ResetConnectionDialog } from '../ResetConnectionDialog';

const deleteConnection = vi.fn();

const { createFixtures } = bindCreateFixtures('ConfigureSSO');

const renderDialog = (
wrapper: React.ComponentType<{ children?: React.ReactNode }>,
props: { isOpen?: boolean; onClose?: () => void; confirmationValue?: string } = {},
props: {
isOpen?: boolean;
onClose?: () => void;
confirmationValue?: string;
title?: ReturnType<typeof localizationKeys>;
subtitle?: ReturnType<typeof localizationKeys>;
confirmButtonLabel?: ReturnType<typeof localizationKeys>;
} = {},
) => {
const onClose = props.onClose ?? vi.fn();
const utils = render(
Expand All@@ -42,6 +29,11 @@ const renderDialog = (
isOpen={props.isOpen ?? true}
onClose={onClose}
confirmationValue={props.confirmationValue ?? 'Acme Inc'}
onDelete={() => deleteConnection('idn_connection_1')}
contentRef={{ current: null }}
title={props.title}
subtitle={props.subtitle}
confirmButtonLabel={props.confirmButtonLabel}
/>
</CardStateProvider>,
{ wrapper },
Expand All@@ -52,7 +44,6 @@ const renderDialog = (
const resetMocks = () => {
deleteConnection.mockReset();
deleteConnection.mockResolvedValue(undefined);
connectionMockState.current = { id: 'idn_connection_1' };
};

describe('ResetConnectionDialog', () => {
Expand DownExpand Up@@ -81,6 +72,25 @@ describe('ResetConnectionDialog', () => {
expect(screen.getByRole('button', { name: 'Cancel' })).toBeInTheDocument();
});

it('renders override copy when title, subtitle, and confirm label props are supplied', async () => {
resetMocks();
const { wrapper } = await createFixtures();
renderDialog(wrapper, {
confirmationValue: 'Acme Inc',
title: localizationKeys('organizationProfile.securityPage.removeDialog.title'),
subtitle: localizationKeys('organizationProfile.securityPage.removeDialog.subtitle'),
confirmButtonLabel: localizationKeys('organizationProfile.securityPage.removeDialog.confirmButton'),
});

expect(screen.getByRole('heading', { name: 'Remove SSO connection' })).toBeInTheDocument();
expect(screen.queryByRole('heading', { name: 'Reset connection' })).not.toBeInTheDocument();
expect(screen.getByText(/Are you sure you want to remove the connection\?/i)).toBeInTheDocument();
expect(screen.getByRole('button', { name: 'Remove connection' })).toBeInTheDocument();
expect(screen.queryByRole('button', { name: 'Reset connection' })).not.toBeInTheDocument();
// Type-to-confirm is unchanged by the override.
expect(screen.getByRole('button', { name: 'Cancel' })).toBeInTheDocument();
});

it('keeps Reset disabled while the input is empty', async () => {
resetMocks();
const { wrapper } = await createFixtures();
Expand Down
6 changes: 4 additions & 2 deletions packages/ui/src/components/ConfigureSSO/elements/Step.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -206,11 +206,11 @@ FooterContinue.displayName = 'Step.Footer.Continue';
* footer row, matching the prior destructive affordance.
*/
const FooterReset = (): JSX.Element | null => {
const { organizationEnterpriseConnection: c } = useConfigureSSO();
const { enterpriseConnection, mutations, contentRef } = useConfigureSSO();
const organization = __internal_useOrganizationBase();
const [isOpen, setIsOpen] = useState(false);

if (!c.hasConnection) {
if (!enterpriseConnection) {
return null;
}

Expand All@@ -229,6 +229,8 @@ const FooterReset = (): JSX.Element | null => {
isOpen={isOpen}
onClose={() => setIsOpen(false)}
confirmationValue={organization?.name ?? ''}
onDelete={() => mutations.deleteConnection(enterpriseConnection.id)}
contentRef={contentRef}
/>
</>
);
Expand Down
5 changes: 5 additions & 0 deletions packages/ui/src/components/ConfigureSSO/steps/ConfirmationStep.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -254,6 +254,7 @@ const ConfigurationDetailsSection = (): JSX.Element => {
};

const ResetConnectionSection = (): JSX.Element => {
const { enterpriseConnection, mutations, contentRef } = useConfigureSSO();
const { organization } = useOrganization();
const [isOpen, setIsOpen] = useState(false);

Expand All@@ -277,6 +278,10 @@ const ResetConnectionSection = (): JSX.Element => {
isOpen={isOpen}
onClose={() => setIsOpen(false)}
confirmationValue={organization?.name ?? ''}
// The confirmation step is only reachable with a connection, so the resource is set.
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
onDelete={() => mutations.deleteConnection(enterpriseConnection!.id)}
contentRef={contentRef}
/>
</ProfileSection.Root>
);
Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
feat(ui,localizations,shared): add the organization Security page SSO overview by iagodahlem · Pull Request #8813 · clerk/javascript · GitHub
Skip to content
feat(ui,localizations,shared): add the organization Security page SSO overview#8813

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

iagodahlem
merged 11 commits into

from

Jun 15, 2026
 Merged


feat(ui,localizations,shared): add the organization Security page SSO overview
#8813
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


11 commits


Select commit
Hold shift + click to select a range
7460da3

refactor(ui): make ResetConnectionDialog context-free


iagodahlem Jun 10, 2026
33df3df

feat(localizations,shared): add Security page SSO overview localization


iagodahlem Jun 10, 2026
86addc4

feat(ui,shared): render the organization Security page SSO overview


iagodahlem Jun 10, 2026
1a6e0ec

refactor(ui): trim comments across the security page overview


iagodahlem Jun 10, 2026
87bd9f2

fix(ui): truncate long SSO detail values on the security page


iagodahlem Jun 10, 2026
9a31d34

feat(ui,localizations,shared): move security page SSO activation into…


iagodahlem Jun 12, 2026
e72710f

feat(ui,localizations,shared): unify the security page SSO copy and f…


iagodahlem Jun 12, 2026
33234fd

feat(ui,localizations,shared): label the security page connection rem…


iagodahlem Jun 15, 2026
7cc05e3

refactor(ui): drop optimistic activation and apply security page SSO …


iagodahlem Jun 15, 2026
d0b0186

refactor(ui): address security page review feedback


iagodahlem Jun 15, 2026
cbe883d

feat(localizations): update security page SSO description copy


iagodahlem Jun 15, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


7 changes: 7 additions & 0 deletions
.changeset/orange-pandas-shake.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
---
'@clerk/localizations': patch
'@clerk/shared': patch
'@clerk/ui': patch
---

Add an overview to the organization profile Security page. The page now lands on a summary of the SSO connection — a status badge (Unconfigured, In Progress, Active, Inactive), the configuration details framed in a card (provider, domain, sign-on URL, issuer, certificate), and an actions menu with Edit, Activate / Deactivate, and Remove — and switches into the existing configuration flow on Start, Continue, or Edit.

32 changes: 32 additions & 0 deletions
packages/localizations/src/en-US.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1066,6 +1066,38 @@ export const enUS: LocalizationResource = {
 successMessage: '{{domain}} has been removed.',
 title: 'Remove domain',
 },
 securityPage: {
 removeDialog: {
 confirmButton: 'Remove connection',
 subtitle:
 'Are you sure you want to remove the connection? This action is irreversible and deletes the connection and all of its configuration.',
 title: 'Remove SSO connection',
 },
 ssoSection: {
 badge__active: 'Active',
 badge__inactive: 'Inactive',
 badge__inProgress: 'In Progress',
 badge__unconfigured: 'Unconfigured',
 certificateLabel: 'Certificate',
 descriptionLine1:
 'Require members to sign in through your identity provider using their domain email. Members without a matching domain are unaffected.',
 descriptionLine2:
 'Anyone who signs in will be automatically added to this organization. New members will be assigned to {{role}}.',
 descriptionLine2__noRole: 'Anyone who signs in will be automatically added to this organization.',
 domainLabel: 'Domain',
 issuerLabel: 'Issuer',
 menuAction__activate: 'Activate',
 menuAction__deactivate: 'Deactivate',
 menuAction__edit: 'Edit',
 menuAction__remove: 'Remove',
 primaryButton__continueConfiguration: 'Continue configuration',
 primaryButton__startConfiguration: 'Start configuration',
 providerLabel: 'Provider',
 signOnUrlLabel: 'Sign on URL',
 title: 'SSO',
 },
 title: 'Security',
 },
 start: {
 headerTitle__general: 'General',
 headerTitle__members: 'Members',
Expand Down

9 changes: 8 additions & 1 deletion
packages/shared/src/types/elementIds.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -53,6 +53,7 @@ export type ProfileSectionId =
 | 'manageVerifiedDomains'
 | 'subscriptionsList'
 | 'paymentMethods'
 | 'sso'
 | 'ssoStatus'
 | 'enableSso'
 | 'ssoDomain'
Expand All@@ -61,7 +62,13 @@ export type ProfileSectionId =
 | 'resetSso'
 | 'testSsoUrl'
 | 'testResults';
export type ProfilePageId = 'account' | 'security' | 'organizationGeneral' | 'organizationMembers' | 'billing';
export type ProfilePageId =
 | 'account'
 | 'security'
 | 'organizationGeneral'
 | 'organizationMembers'
 | 'organizationSecurity'
 | 'billing';

export type UserPreviewId = 'userButton' | 'personalWorkspace';
export type OrganizationPreviewId =
Expand Down

29 changes: 29 additions & 0 deletions
packages/shared/src/types/localization.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1130,6 +1130,35 @@ export type __internal_LocalizationResource = {
 messageLine2: LocalizationValue;
 successMessage: LocalizationValue;
 };
 securityPage: {
 title: LocalizationValue;
 removeDialog: {
 title: LocalizationValue;
 subtitle: LocalizationValue;
 confirmButton: LocalizationValue;
 };
 ssoSection: {
 title: LocalizationValue;
 badge__unconfigured: LocalizationValue;
 badge__inProgress: LocalizationValue;
 badge__active: LocalizationValue;
 badge__inactive: LocalizationValue;
 descriptionLine1: LocalizationValue;
 descriptionLine2: LocalizationValue<'role'>;
 descriptionLine2__noRole: LocalizationValue;
 primaryButton__startConfiguration: LocalizationValue;
 primaryButton__continueConfiguration: LocalizationValue;
 providerLabel: LocalizationValue;
 domainLabel: LocalizationValue;
 signOnUrlLabel: LocalizationValue;
 issuerLabel: LocalizationValue;
 certificateLabel: LocalizationValue;
 menuAction__edit: LocalizationValue;
 menuAction__activate: LocalizationValue;
 menuAction__deactivate: LocalizationValue;
 menuAction__remove: LocalizationValue;
 };
 };
 membersPage: {
 detailsTitle__emptyRow: LocalizationValue;
 action__invite: LocalizationValue;
Expand Down

36 changes: 18 additions & 18 deletions
packages/ui/src/components/ConfigureSSO/ResetConnectionDialog.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
import type { LocalizationKey } from '@/customizables';
import { Col, descriptors, localizationKeys } from '@/customizables';
import { Card } from '@/elements/Card';
import { useCardState, withCardStateProvider } from '@/elements/contexts';
Expand All@@ -8,17 +9,19 @@ import { Modal } from '@/elements/Modal';
import { useFormControl } from '@/ui/utils/useFormControl';
import { handleError } from '@/utils/errorHandler';

import { useConfigureSSO } from './ConfigureSSOContext';

type ResetConnectionDialogProps = {
 isOpen: boolean;
 onClose: () => void;
 confirmationValue: string;
 onDelete: () => Promise<unknown>;
 contentRef: React.RefObject<HTMLDivElement>;
 /** Defaults to the Reset copy; overridden when the dialog is reused for the Remove action. */
 title?: LocalizationKey;
 subtitle?: LocalizationKey;
 confirmButtonLabel?: LocalizationKey;
};

export const ResetConnectionDialog = (props: ResetConnectionDialogProps): JSX.Element | null => {
 const { contentRef } = useConfigureSSO();

 if (!props.isOpen) {
 return null;
 }
Expand All@@ -27,7 +30,7 @@ export const ResetConnectionDialog = (props: ResetConnectionDialogProps): JSX.El
 <Modal
 handleClose={props.onClose}
 canCloseModal={false}
 portalRoot={contentRef}
 portalRoot={props.contentRef}
 containerSx={t => ({
 alignItems: 'center',
 position: 'absolute',
Expand All@@ -44,9 +47,12 @@ export const ResetConnectionDialog = (props: ResetConnectionDialogProps): JSX.El
};

const ResetConnectionDialogContent = withCardStateProvider((props: ResetConnectionDialogProps) => {
 const { onClose, confirmationValue } = props;
 const { onClose, onDelete, confirmationValue } = props;
 const title = props.title ?? localizationKeys('configureSSO.resetConnectionDialog.title');
 const subtitle = props.subtitle ?? localizationKeys('configureSSO.resetConnectionDialog.subtitle');
 const confirmButtonLabel =
 props.confirmButtonLabel ?? localizationKeys('configureSSO.resetConnectionDialog.resetButton');
 const card = useCardState();
 const { enterpriseConnection, mutations } = useConfigureSSO();

 const confirmationField = useFormControl('deleteConfirmation', '', {
 type: 'text',
Expand All@@ -60,18 +66,12 @@ const ResetConnectionDialogContent = withCardStateProvider((props: ResetConnecti
 const canSubmit = Boolean(confirmationValue && confirmationField.value === confirmationValue);

 const onSubmit = async () => {
 if (!enterpriseConnection || !canSubmit) {
 if (!canSubmit) {
 return;
 }

 try {
 // Reset is a pure delete — no navigation. Dropping `hasConnection` breaks
 // the active step's entry guard, so the wizard self-corrects to the
 // furthest-reachable step. The mutation is already reverification-wrapped.
 // No `useWizard()` here — that lets this dialog be triggered from ANY
 // footer (including the nested SAML configure footers) without binding to
 // a nested wizard.
 await mutations.deleteConnection(enterpriseConnection.id);
 await onDelete();
 onClose();
 } catch (err) {
 handleError(err as Error, [confirmationField], card.setError);
Expand All@@ -85,8 +85,8 @@ const ResetConnectionDialogContent = withCardStateProvider((props: ResetConnecti
 >
 <Card.Content sx={t => ({ textAlign: 'start', padding: t.sizes.$5 })}>
 <FormContainer
 headerTitle={localizationKeys('configureSSO.resetConnectionDialog.title')}
 headerSubtitle={localizationKeys('configureSSO.resetConnectionDialog.subtitle')}
 headerTitle={title}
 headerSubtitle={subtitle}
 sx={t => ({ gap: t.space.$4 })}
 >
 <Form.Root onSubmit={onSubmit}>
Expand All@@ -104,7 +104,7 @@ const ResetConnectionDialogContent = withCardStateProvider((props: ResetConnecti
 block={false}
 colorScheme='danger'
 isDisabled={!canSubmit}
 localizationKey={localizationKeys('configureSSO.resetConnectionDialog.resetButton')}
 localizationKey={confirmButtonLabel}
 />
 <Form.ResetButton
 elementDescriptor={descriptors.configureSSOResetConnectionDialogCancelButton}
Expand Down

60 changes: 35 additions & 25 deletions
packages/ui/src/components/ConfigureSSO/__tests__/ResetConnectionDialog.test.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,39 +1,26 @@
import type { EnterpriseConnectionResource } from '@clerk/shared/types';
import { describe, expect, it, vi } from 'vitest';

import { localizationKeys } from '@/customizables';
import { bindCreateFixtures } from '@/test/create-fixtures';
import { render, screen, waitFor } from '@/test/utils';
import { CardStateProvider } from '@/ui/elements/contexts';

// The dialog no longer touches the wizard. On confirm it calls the
// reverification-wrapped `mutations.deleteConnection(id)` directly — a pure
// delete, no navigation — and the wizard self-corrects to the
// furthest-reachable step once the active step's guard breaks. That lets the
// dialog be triggered from ANY footer (including nested SAML configure footers)
// without binding to a nested wizard.
const deleteConnection = vi.fn();

const connectionMockState = vi.hoisted(() => ({
 current: { id: 'idn_connection_1' } as Partial<EnterpriseConnectionResource> | null,
}));

vi.mock('../ConfigureSSOContext', () => ({
 useConfigureSSO: () => ({
 enterpriseConnection: connectionMockState.current,
 contentRef: { current: null },
 // The dialog's confirm calls the reverification-wrapped `deleteConnection`
 // mutation directly. No navigation — the wizard self-corrects.
 mutations: { deleteConnection },
 }),
}));

import { ResetConnectionDialog } from '../ResetConnectionDialog';

const deleteConnection = vi.fn();

const { createFixtures } = bindCreateFixtures('ConfigureSSO');

const renderDialog = (
 wrapper: React.ComponentType<{ children?: React.ReactNode }>,
 props: { isOpen?: boolean; onClose?: () => void; confirmationValue?: string } = {},
 props: {
 isOpen?: boolean;
 onClose?: () => void;
 confirmationValue?: string;
 title?: ReturnType<typeof localizationKeys>;
 subtitle?: ReturnType<typeof localizationKeys>;
 confirmButtonLabel?: ReturnType<typeof localizationKeys>;
 } = {},
) => {
 const onClose = props.onClose ?? vi.fn();
 const utils = render(
Expand All@@ -42,6 +29,11 @@ const renderDialog = (
 isOpen={props.isOpen ?? true}
 onClose={onClose}
 confirmationValue={props.confirmationValue ?? 'Acme Inc'}
 onDelete={() => deleteConnection('idn_connection_1')}
 contentRef={{ current: null }}
 title={props.title}
 subtitle={props.subtitle}
 confirmButtonLabel={props.confirmButtonLabel}
 />
 </CardStateProvider>,
 { wrapper },
Expand All@@ -52,7 +44,6 @@ const renderDialog = (
const resetMocks = () => {
 deleteConnection.mockReset();
 deleteConnection.mockResolvedValue(undefined);
 connectionMockState.current = { id: 'idn_connection_1' };
};

describe('ResetConnectionDialog', () => {
Expand DownExpand Up@@ -81,6 +72,25 @@ describe('ResetConnectionDialog', () => {
 expect(screen.getByRole('button', { name: 'Cancel' })).toBeInTheDocument();
 });

 it('renders override copy when title, subtitle, and confirm label props are supplied', async () => {
 resetMocks();
 const { wrapper } = await createFixtures();
 renderDialog(wrapper, {
 confirmationValue: 'Acme Inc',
 title: localizationKeys('organizationProfile.securityPage.removeDialog.title'),
 subtitle: localizationKeys('organizationProfile.securityPage.removeDialog.subtitle'),
 confirmButtonLabel: localizationKeys('organizationProfile.securityPage.removeDialog.confirmButton'),
 });

 expect(screen.getByRole('heading', { name: 'Remove SSO connection' })).toBeInTheDocument();
 expect(screen.queryByRole('heading', { name: 'Reset connection' })).not.toBeInTheDocument();
 expect(screen.getByText(/Are you sure you want to remove the connection\?/i)).toBeInTheDocument();
 expect(screen.getByRole('button', { name: 'Remove connection' })).toBeInTheDocument();
 expect(screen.queryByRole('button', { name: 'Reset connection' })).not.toBeInTheDocument();
 // Type-to-confirm is unchanged by the override.
 expect(screen.getByRole('button', { name: 'Cancel' })).toBeInTheDocument();
 });

 it('keeps Reset disabled while the input is empty', async () => {
 resetMocks();
 const { wrapper } = await createFixtures();
Expand Down

6 changes: 4 additions & 2 deletions
packages/ui/src/components/ConfigureSSO/elements/Step.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -206,11 +206,11 @@ FooterContinue.displayName = 'Step.Footer.Continue';
 * footer row, matching the prior destructive affordance.
 */
const FooterReset = (): JSX.Element | null => {
 const { organizationEnterpriseConnection: c } = useConfigureSSO();
 const { enterpriseConnection, mutations, contentRef } = useConfigureSSO();
 const organization = __internal_useOrganizationBase();
 const [isOpen, setIsOpen] = useState(false);

 if (!c.hasConnection) {
 if (!enterpriseConnection) {
 return null;
 }

Expand All@@ -229,6 +229,8 @@ const FooterReset = (): JSX.Element | null => {
 isOpen={isOpen}
 onClose={() => setIsOpen(false)}
 confirmationValue={organization?.name ?? ''}
 onDelete={() => mutations.deleteConnection(enterpriseConnection.id)}
 contentRef={contentRef}
 />
 </>
 );
Expand Down

5 changes: 5 additions & 0 deletions
packages/ui/src/components/ConfigureSSO/steps/ConfirmationStep.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -254,6 +254,7 @@ const ConfigurationDetailsSection = (): JSX.Element => {
};

const ResetConnectionSection = (): JSX.Element => {
 const { enterpriseConnection, mutations, contentRef } = useConfigureSSO();
 const { organization } = useOrganization();
 const [isOpen, setIsOpen] = useState(false);

Expand All@@ -277,6 +278,10 @@ const ResetConnectionSection = (): JSX.Element => {
 isOpen={isOpen}
 onClose={() => setIsOpen(false)}
 confirmationValue={organization?.name ?? ''}
 // The confirmation step is only reachable with a connection, so the resource is set.
 // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
 onDelete={() => mutations.deleteConnection(enterpriseConnection!.id)}
 contentRef={contentRef}
 />
 </ProfileSection.Root>
 );
Expand Down
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Force GitHub README to respect dark mode
(function() {
var style = document.createElement('style');
style.textContent = '
.markdown-body {
color-scheme: dark light;
}
.markdown-body pre { background: #161b22 !important; }
.markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }
.markdown-body table th, .markdown-body table td { border-color: #30363d !important; }
.markdown-body img { background: #0d1117; }
.markdown-body blockquote { border-left-color: #8b949e; }
.markdown-body hr { border-color: #30363d; }
';
document.head.appendChild(style);
})();
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
feat(ui,localizations,shared): add the organization Security page SSO overview by iagodahlem · Pull Request #8813 · clerk/javascript · GitHub
Skip to content
feat(ui,localizations,shared): add the organization Security page SSO overview#8813

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

iagodahlem
merged 11 commits into

from

Jun 15, 2026
 Merged


feat(ui,localizations,shared): add the organization Security page SSO overview
#8813
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


11 commits


Select commit
Hold shift + click to select a range
7460da3

refactor(ui): make ResetConnectionDialog context-free


iagodahlem Jun 10, 2026
33df3df

feat(localizations,shared): add Security page SSO overview localization


iagodahlem Jun 10, 2026
86addc4

feat(ui,shared): render the organization Security page SSO overview


iagodahlem Jun 10, 2026
1a6e0ec

refactor(ui): trim comments across the security page overview


iagodahlem Jun 10, 2026
87bd9f2

fix(ui): truncate long SSO detail values on the security page


iagodahlem Jun 10, 2026
9a31d34

feat(ui,localizations,shared): move security page SSO activation into…


iagodahlem Jun 12, 2026
e72710f

feat(ui,localizations,shared): unify the security page SSO copy and f…


iagodahlem Jun 12, 2026
33234fd

feat(ui,localizations,shared): label the security page connection rem…


iagodahlem Jun 15, 2026
7cc05e3

refactor(ui): drop optimistic activation and apply security page SSO …


iagodahlem Jun 15, 2026
d0b0186

refactor(ui): address security page review feedback


iagodahlem Jun 15, 2026
cbe883d

feat(localizations): update security page SSO description copy


iagodahlem Jun 15, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


7 changes: 7 additions & 0 deletions
.changeset/orange-pandas-shake.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
---
'@clerk/localizations': patch
'@clerk/shared': patch
'@clerk/ui': patch
---

Add an overview to the organization profile Security page. The page now lands on a summary of the SSO connection — a status badge (Unconfigured, In Progress, Active, Inactive), the configuration details framed in a card (provider, domain, sign-on URL, issuer, certificate), and an actions menu with Edit, Activate / Deactivate, and Remove — and switches into the existing configuration flow on Start, Continue, or Edit.

32 changes: 32 additions & 0 deletions
packages/localizations/src/en-US.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1066,6 +1066,38 @@ export const enUS: LocalizationResource = {
 successMessage: '{{domain}} has been removed.',
 title: 'Remove domain',
 },
 securityPage: {
 removeDialog: {
 confirmButton: 'Remove connection',
 subtitle:
 'Are you sure you want to remove the connection? This action is irreversible and deletes the connection and all of its configuration.',
 title: 'Remove SSO connection',
 },
 ssoSection: {
 badge__active: 'Active',
 badge__inactive: 'Inactive',
 badge__inProgress: 'In Progress',
 badge__unconfigured: 'Unconfigured',
 certificateLabel: 'Certificate',
 descriptionLine1:
 'Require members to sign in through your identity provider using their domain email. Members without a matching domain are unaffected.',
 descriptionLine2:
 'Anyone who signs in will be automatically added to this organization. New members will be assigned to {{role}}.',
 descriptionLine2__noRole: 'Anyone who signs in will be automatically added to this organization.',
 domainLabel: 'Domain',
 issuerLabel: 'Issuer',
 menuAction__activate: 'Activate',
 menuAction__deactivate: 'Deactivate',
 menuAction__edit: 'Edit',
 menuAction__remove: 'Remove',
 primaryButton__continueConfiguration: 'Continue configuration',
 primaryButton__startConfiguration: 'Start configuration',
 providerLabel: 'Provider',
 signOnUrlLabel: 'Sign on URL',
 title: 'SSO',
 },
 title: 'Security',
 },
 start: {
 headerTitle__general: 'General',
 headerTitle__members: 'Members',
Expand Down

9 changes: 8 additions & 1 deletion
packages/shared/src/types/elementIds.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -53,6 +53,7 @@ export type ProfileSectionId =
 | 'manageVerifiedDomains'
 | 'subscriptionsList'
 | 'paymentMethods'
 | 'sso'
 | 'ssoStatus'
 | 'enableSso'
 | 'ssoDomain'
Expand All@@ -61,7 +62,13 @@ export type ProfileSectionId =
 | 'resetSso'
 | 'testSsoUrl'
 | 'testResults';
export type ProfilePageId = 'account' | 'security' | 'organizationGeneral' | 'organizationMembers' | 'billing';
export type ProfilePageId =
 | 'account'
 | 'security'
 | 'organizationGeneral'
 | 'organizationMembers'
 | 'organizationSecurity'
 | 'billing';

export type UserPreviewId = 'userButton' | 'personalWorkspace';
export type OrganizationPreviewId =
Expand Down

29 changes: 29 additions & 0 deletions
packages/shared/src/types/localization.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1130,6 +1130,35 @@ export type __internal_LocalizationResource = {
 messageLine2: LocalizationValue;
 successMessage: LocalizationValue;
 };
 securityPage: {
 title: LocalizationValue;
 removeDialog: {
 title: LocalizationValue;
 subtitle: LocalizationValue;
 confirmButton: LocalizationValue;
 };
 ssoSection: {
 title: LocalizationValue;
 badge__unconfigured: LocalizationValue;
 badge__inProgress: LocalizationValue;
 badge__active: LocalizationValue;
 badge__inactive: LocalizationValue;
 descriptionLine1: LocalizationValue;
 descriptionLine2: LocalizationValue<'role'>;
 descriptionLine2__noRole: LocalizationValue;
 primaryButton__startConfiguration: LocalizationValue;
 primaryButton__continueConfiguration: LocalizationValue;
 providerLabel: LocalizationValue;
 domainLabel: LocalizationValue;
 signOnUrlLabel: LocalizationValue;
 issuerLabel: LocalizationValue;
 certificateLabel: LocalizationValue;
 menuAction__edit: LocalizationValue;
 menuAction__activate: LocalizationValue;
 menuAction__deactivate: LocalizationValue;
 menuAction__remove: LocalizationValue;
 };
 };
 membersPage: {
 detailsTitle__emptyRow: LocalizationValue;
 action__invite: LocalizationValue;
Expand Down

36 changes: 18 additions & 18 deletions
packages/ui/src/components/ConfigureSSO/ResetConnectionDialog.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
import type { LocalizationKey } from '@/customizables';
import { Col, descriptors, localizationKeys } from '@/customizables';
import { Card } from '@/elements/Card';
import { useCardState, withCardStateProvider } from '@/elements/contexts';
Expand All@@ -8,17 +9,19 @@ import { Modal } from '@/elements/Modal';
import { useFormControl } from '@/ui/utils/useFormControl';
import { handleError } from '@/utils/errorHandler';

import { useConfigureSSO } from './ConfigureSSOContext';

type ResetConnectionDialogProps = {
 isOpen: boolean;
 onClose: () => void;
 confirmationValue: string;
 onDelete: () => Promise<unknown>;
 contentRef: React.RefObject<HTMLDivElement>;
 /** Defaults to the Reset copy; overridden when the dialog is reused for the Remove action. */
 title?: LocalizationKey;
 subtitle?: LocalizationKey;
 confirmButtonLabel?: LocalizationKey;
};

export const ResetConnectionDialog = (props: ResetConnectionDialogProps): JSX.Element | null => {
 const { contentRef } = useConfigureSSO();

 if (!props.isOpen) {
 return null;
 }
Expand All@@ -27,7 +30,7 @@ export const ResetConnectionDialog = (props: ResetConnectionDialogProps): JSX.El
 <Modal
 handleClose={props.onClose}
 canCloseModal={false}
 portalRoot={contentRef}
 portalRoot={props.contentRef}
 containerSx={t => ({
 alignItems: 'center',
 position: 'absolute',
Expand All@@ -44,9 +47,12 @@ export const ResetConnectionDialog = (props: ResetConnectionDialogProps): JSX.El
};

const ResetConnectionDialogContent = withCardStateProvider((props: ResetConnectionDialogProps) => {
 const { onClose, confirmationValue } = props;
 const { onClose, onDelete, confirmationValue } = props;
 const title = props.title ?? localizationKeys('configureSSO.resetConnectionDialog.title');
 const subtitle = props.subtitle ?? localizationKeys('configureSSO.resetConnectionDialog.subtitle');
 const confirmButtonLabel =
 props.confirmButtonLabel ?? localizationKeys('configureSSO.resetConnectionDialog.resetButton');
 const card = useCardState();
 const { enterpriseConnection, mutations } = useConfigureSSO();

 const confirmationField = useFormControl('deleteConfirmation', '', {
 type: 'text',
Expand All@@ -60,18 +66,12 @@ const ResetConnectionDialogContent = withCardStateProvider((props: ResetConnecti
 const canSubmit = Boolean(confirmationValue && confirmationField.value === confirmationValue);

 const onSubmit = async () => {
 if (!enterpriseConnection || !canSubmit) {
 if (!canSubmit) {
 return;
 }

 try {
 // Reset is a pure delete — no navigation. Dropping `hasConnection` breaks
 // the active step's entry guard, so the wizard self-corrects to the
 // furthest-reachable step. The mutation is already reverification-wrapped.
 // No `useWizard()` here — that lets this dialog be triggered from ANY
 // footer (including the nested SAML configure footers) without binding to
 // a nested wizard.
 await mutations.deleteConnection(enterpriseConnection.id);
 await onDelete();
 onClose();
 } catch (err) {
 handleError(err as Error, [confirmationField], card.setError);
Expand All@@ -85,8 +85,8 @@ const ResetConnectionDialogContent = withCardStateProvider((props: ResetConnecti
 >
 <Card.Content sx={t => ({ textAlign: 'start', padding: t.sizes.$5 })}>
 <FormContainer
 headerTitle={localizationKeys('configureSSO.resetConnectionDialog.title')}
 headerSubtitle={localizationKeys('configureSSO.resetConnectionDialog.subtitle')}
 headerTitle={title}
 headerSubtitle={subtitle}
 sx={t => ({ gap: t.space.$4 })}
 >
 <Form.Root onSubmit={onSubmit}>
Expand All@@ -104,7 +104,7 @@ const ResetConnectionDialogContent = withCardStateProvider((props: ResetConnecti
 block={false}
 colorScheme='danger'
 isDisabled={!canSubmit}
 localizationKey={localizationKeys('configureSSO.resetConnectionDialog.resetButton')}
 localizationKey={confirmButtonLabel}
 />
 <Form.ResetButton
 elementDescriptor={descriptors.configureSSOResetConnectionDialogCancelButton}
Expand Down

60 changes: 35 additions & 25 deletions
packages/ui/src/components/ConfigureSSO/__tests__/ResetConnectionDialog.test.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,39 +1,26 @@
import type { EnterpriseConnectionResource } from '@clerk/shared/types';
import { describe, expect, it, vi } from 'vitest';

import { localizationKeys } from '@/customizables';
import { bindCreateFixtures } from '@/test/create-fixtures';
import { render, screen, waitFor } from '@/test/utils';
import { CardStateProvider } from '@/ui/elements/contexts';

// The dialog no longer touches the wizard. On confirm it calls the
// reverification-wrapped `mutations.deleteConnection(id)` directly — a pure
// delete, no navigation — and the wizard self-corrects to the
// furthest-reachable step once the active step's guard breaks. That lets the
// dialog be triggered from ANY footer (including nested SAML configure footers)
// without binding to a nested wizard.
const deleteConnection = vi.fn();

const connectionMockState = vi.hoisted(() => ({
 current: { id: 'idn_connection_1' } as Partial<EnterpriseConnectionResource> | null,
}));

vi.mock('../ConfigureSSOContext', () => ({
 useConfigureSSO: () => ({
 enterpriseConnection: connectionMockState.current,
 contentRef: { current: null },
 // The dialog's confirm calls the reverification-wrapped `deleteConnection`
 // mutation directly. No navigation — the wizard self-corrects.
 mutations: { deleteConnection },
 }),
}));

import { ResetConnectionDialog } from '../ResetConnectionDialog';

const deleteConnection = vi.fn();

const { createFixtures } = bindCreateFixtures('ConfigureSSO');

const renderDialog = (
 wrapper: React.ComponentType<{ children?: React.ReactNode }>,
 props: { isOpen?: boolean; onClose?: () => void; confirmationValue?: string } = {},
 props: {
 isOpen?: boolean;
 onClose?: () => void;
 confirmationValue?: string;
 title?: ReturnType<typeof localizationKeys>;
 subtitle?: ReturnType<typeof localizationKeys>;
 confirmButtonLabel?: ReturnType<typeof localizationKeys>;
 } = {},
) => {
 const onClose = props.onClose ?? vi.fn();
 const utils = render(
Expand All@@ -42,6 +29,11 @@ const renderDialog = (
 isOpen={props.isOpen ?? true}
 onClose={onClose}
 confirmationValue={props.confirmationValue ?? 'Acme Inc'}
 onDelete={() => deleteConnection('idn_connection_1')}
 contentRef={{ current: null }}
 title={props.title}
 subtitle={props.subtitle}
 confirmButtonLabel={props.confirmButtonLabel}
 />
 </CardStateProvider>,
 { wrapper },
Expand All@@ -52,7 +44,6 @@ const renderDialog = (
const resetMocks = () => {
 deleteConnection.mockReset();
 deleteConnection.mockResolvedValue(undefined);
 connectionMockState.current = { id: 'idn_connection_1' };
};

describe('ResetConnectionDialog', () => {
Expand DownExpand Up@@ -81,6 +72,25 @@ describe('ResetConnectionDialog', () => {
 expect(screen.getByRole('button', { name: 'Cancel' })).toBeInTheDocument();
 });

 it('renders override copy when title, subtitle, and confirm label props are supplied', async () => {
 resetMocks();
 const { wrapper } = await createFixtures();
 renderDialog(wrapper, {
 confirmationValue: 'Acme Inc',
 title: localizationKeys('organizationProfile.securityPage.removeDialog.title'),
 subtitle: localizationKeys('organizationProfile.securityPage.removeDialog.subtitle'),
 confirmButtonLabel: localizationKeys('organizationProfile.securityPage.removeDialog.confirmButton'),
 });

 expect(screen.getByRole('heading', { name: 'Remove SSO connection' })).toBeInTheDocument();
 expect(screen.queryByRole('heading', { name: 'Reset connection' })).not.toBeInTheDocument();
 expect(screen.getByText(/Are you sure you want to remove the connection\?/i)).toBeInTheDocument();
 expect(screen.getByRole('button', { name: 'Remove connection' })).toBeInTheDocument();
 expect(screen.queryByRole('button', { name: 'Reset connection' })).not.toBeInTheDocument();
 // Type-to-confirm is unchanged by the override.
 expect(screen.getByRole('button', { name: 'Cancel' })).toBeInTheDocument();
 });

 it('keeps Reset disabled while the input is empty', async () => {
 resetMocks();
 const { wrapper } = await createFixtures();
Expand Down

6 changes: 4 additions & 2 deletions
packages/ui/src/components/ConfigureSSO/elements/Step.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -206,11 +206,11 @@ FooterContinue.displayName = 'Step.Footer.Continue';
 * footer row, matching the prior destructive affordance.
 */
const FooterReset = (): JSX.Element | null => {
 const { organizationEnterpriseConnection: c } = useConfigureSSO();
 const { enterpriseConnection, mutations, contentRef } = useConfigureSSO();
 const organization = __internal_useOrganizationBase();
 const [isOpen, setIsOpen] = useState(false);

 if (!c.hasConnection) {
 if (!enterpriseConnection) {
 return null;
 }

Expand All@@ -229,6 +229,8 @@ const FooterReset = (): JSX.Element | null => {
 isOpen={isOpen}
 onClose={() => setIsOpen(false)}
 confirmationValue={organization?.name ?? ''}
 onDelete={() => mutations.deleteConnection(enterpriseConnection.id)}
 contentRef={contentRef}
 />
 </>
 );
Expand Down

5 changes: 5 additions & 0 deletions
packages/ui/src/components/ConfigureSSO/steps/ConfirmationStep.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -254,6 +254,7 @@ const ConfigurationDetailsSection = (): JSX.Element => {
};

const ResetConnectionSection = (): JSX.Element => {
 const { enterpriseConnection, mutations, contentRef } = useConfigureSSO();
 const { organization } = useOrganization();
 const [isOpen, setIsOpen] = useState(false);

Expand All@@ -277,6 +278,10 @@ const ResetConnectionSection = (): JSX.Element => {
 isOpen={isOpen}
 onClose={() => setIsOpen(false)}
 confirmationValue={organization?.name ?? ''}
 // The confirmation step is only reachable with a connection, so the resource is set.
 // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
 onDelete={() => mutations.deleteConnection(enterpriseConnection!.id)}
 contentRef={contentRef}
 />
 </ProfileSection.Root>
 );
Expand Down
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Highlight search terms from Google/DuckDuckGo/Bing referrer
(function() {
var ref = document.referrer;
var terms = [];
if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {
var url = new URL(ref);
var q = url.searchParams.get('q') || url.searchParams.get('p');
if (q) {
terms = q.split(/\s+/).filter(function(t) { return t.length > 2; });
}
}
if (terms.length === 0) return;
var style = document.createElement('style');
style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';
document.head.appendChild(style);
function highlight(node) {
if (node.nodeType === 3) { // text node
var text = node.textContent;
var found = false;
terms.forEach(function(term) {
var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi');
if (regex.test(text)) {
found = true;
var frag = document.createDocumentFragment();
var parts = text.split(regex);
parts.forEach(function(part, i) {
if (i % 2 === 0) {
frag.appendChild(document.createTextNode(part));
} else {
var span = document.createElement('span');
span.className = 'userscript-highlight';
span.textContent = part;
frag.appendChild(span);
}
});
node.parentNode.replaceChild(frag, node);
}
});
} else if (node.nodeType === 1 && node.childNodes) { // element
var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];
if (!skipTags.includes(node.tagName)) {
Array.from(node.childNodes).forEach(highlight);
}
}
}
highlight(document.body);
// Re-highlight on dynamic content
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1 || node.nodeType === 3) highlight(node);
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
feat(ui,localizations,shared): add the organization Security page SSO overview by iagodahlem · Pull Request #8813 · clerk/javascript · GitHub
Skip to content
feat(ui,localizations,shared): add the organization Security page SSO overview#8813

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

iagodahlem
merged 11 commits into

from

Jun 15, 2026
 Merged


feat(ui,localizations,shared): add the organization Security page SSO overview
#8813
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


11 commits


Select commit
Hold shift + click to select a range
7460da3

refactor(ui): make ResetConnectionDialog context-free


iagodahlem Jun 10, 2026
33df3df

feat(localizations,shared): add Security page SSO overview localization


iagodahlem Jun 10, 2026
86addc4

feat(ui,shared): render the organization Security page SSO overview


iagodahlem Jun 10, 2026
1a6e0ec

refactor(ui): trim comments across the security page overview


iagodahlem Jun 10, 2026
87bd9f2

fix(ui): truncate long SSO detail values on the security page


iagodahlem Jun 10, 2026
9a31d34

feat(ui,localizations,shared): move security page SSO activation into…


iagodahlem Jun 12, 2026
e72710f

feat(ui,localizations,shared): unify the security page SSO copy and f…


iagodahlem Jun 12, 2026
33234fd

feat(ui,localizations,shared): label the security page connection rem…


iagodahlem Jun 15, 2026
7cc05e3

refactor(ui): drop optimistic activation and apply security page SSO …


iagodahlem Jun 15, 2026
d0b0186

refactor(ui): address security page review feedback


iagodahlem Jun 15, 2026
cbe883d

feat(localizations): update security page SSO description copy


iagodahlem Jun 15, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


7 changes: 7 additions & 0 deletions
.changeset/orange-pandas-shake.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
---
'@clerk/localizations': patch
'@clerk/shared': patch
'@clerk/ui': patch
---

Add an overview to the organization profile Security page. The page now lands on a summary of the SSO connection — a status badge (Unconfigured, In Progress, Active, Inactive), the configuration details framed in a card (provider, domain, sign-on URL, issuer, certificate), and an actions menu with Edit, Activate / Deactivate, and Remove — and switches into the existing configuration flow on Start, Continue, or Edit.

32 changes: 32 additions & 0 deletions
packages/localizations/src/en-US.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1066,6 +1066,38 @@ export const enUS: LocalizationResource = {
 successMessage: '{{domain}} has been removed.',
 title: 'Remove domain',
 },
 securityPage: {
 removeDialog: {
 confirmButton: 'Remove connection',
 subtitle:
 'Are you sure you want to remove the connection? This action is irreversible and deletes the connection and all of its configuration.',
 title: 'Remove SSO connection',
 },
 ssoSection: {
 badge__active: 'Active',
 badge__inactive: 'Inactive',
 badge__inProgress: 'In Progress',
 badge__unconfigured: 'Unconfigured',
 certificateLabel: 'Certificate',
 descriptionLine1:
 'Require members to sign in through your identity provider using their domain email. Members without a matching domain are unaffected.',
 descriptionLine2:
 'Anyone who signs in will be automatically added to this organization. New members will be assigned to {{role}}.',
 descriptionLine2__noRole: 'Anyone who signs in will be automatically added to this organization.',
 domainLabel: 'Domain',
 issuerLabel: 'Issuer',
 menuAction__activate: 'Activate',
 menuAction__deactivate: 'Deactivate',
 menuAction__edit: 'Edit',
 menuAction__remove: 'Remove',
 primaryButton__continueConfiguration: 'Continue configuration',
 primaryButton__startConfiguration: 'Start configuration',
 providerLabel: 'Provider',
 signOnUrlLabel: 'Sign on URL',
 title: 'SSO',
 },
 title: 'Security',
 },
 start: {
 headerTitle__general: 'General',
 headerTitle__members: 'Members',
Expand Down

9 changes: 8 additions & 1 deletion
packages/shared/src/types/elementIds.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -53,6 +53,7 @@ export type ProfileSectionId =
 | 'manageVerifiedDomains'
 | 'subscriptionsList'
 | 'paymentMethods'
 | 'sso'
 | 'ssoStatus'
 | 'enableSso'
 | 'ssoDomain'
Expand All@@ -61,7 +62,13 @@ export type ProfileSectionId =
 | 'resetSso'
 | 'testSsoUrl'
 | 'testResults';
export type ProfilePageId = 'account' | 'security' | 'organizationGeneral' | 'organizationMembers' | 'billing';
export type ProfilePageId =
 | 'account'
 | 'security'
 | 'organizationGeneral'
 | 'organizationMembers'
 | 'organizationSecurity'
 | 'billing';

export type UserPreviewId = 'userButton' | 'personalWorkspace';
export type OrganizationPreviewId =
Expand Down

29 changes: 29 additions & 0 deletions
packages/shared/src/types/localization.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1130,6 +1130,35 @@ export type __internal_LocalizationResource = {
 messageLine2: LocalizationValue;
 successMessage: LocalizationValue;
 };
 securityPage: {
 title: LocalizationValue;
 removeDialog: {
 title: LocalizationValue;
 subtitle: LocalizationValue;
 confirmButton: LocalizationValue;
 };
 ssoSection: {
 title: LocalizationValue;
 badge__unconfigured: LocalizationValue;
 badge__inProgress: LocalizationValue;
 badge__active: LocalizationValue;
 badge__inactive: LocalizationValue;
 descriptionLine1: LocalizationValue;
 descriptionLine2: LocalizationValue<'role'>;
 descriptionLine2__noRole: LocalizationValue;
 primaryButton__startConfiguration: LocalizationValue;
 primaryButton__continueConfiguration: LocalizationValue;
 providerLabel: LocalizationValue;
 domainLabel: LocalizationValue;
 signOnUrlLabel: LocalizationValue;
 issuerLabel: LocalizationValue;
 certificateLabel: LocalizationValue;
 menuAction__edit: LocalizationValue;
 menuAction__activate: LocalizationValue;
 menuAction__deactivate: LocalizationValue;
 menuAction__remove: LocalizationValue;
 };
 };
 membersPage: {
 detailsTitle__emptyRow: LocalizationValue;
 action__invite: LocalizationValue;
Expand Down

36 changes: 18 additions & 18 deletions
packages/ui/src/components/ConfigureSSO/ResetConnectionDialog.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
import type { LocalizationKey } from '@/customizables';
import { Col, descriptors, localizationKeys } from '@/customizables';
import { Card } from '@/elements/Card';
import { useCardState, withCardStateProvider } from '@/elements/contexts';
Expand All@@ -8,17 +9,19 @@ import { Modal } from '@/elements/Modal';
import { useFormControl } from '@/ui/utils/useFormControl';
import { handleError } from '@/utils/errorHandler';

import { useConfigureSSO } from './ConfigureSSOContext';

type ResetConnectionDialogProps = {
 isOpen: boolean;
 onClose: () => void;
 confirmationValue: string;
 onDelete: () => Promise<unknown>;
 contentRef: React.RefObject<HTMLDivElement>;
 /** Defaults to the Reset copy; overridden when the dialog is reused for the Remove action. */
 title?: LocalizationKey;
 subtitle?: LocalizationKey;
 confirmButtonLabel?: LocalizationKey;
};

export const ResetConnectionDialog = (props: ResetConnectionDialogProps): JSX.Element | null => {
 const { contentRef } = useConfigureSSO();

 if (!props.isOpen) {
 return null;
 }
Expand All@@ -27,7 +30,7 @@ export const ResetConnectionDialog = (props: ResetConnectionDialogProps): JSX.El
 <Modal
 handleClose={props.onClose}
 canCloseModal={false}
 portalRoot={contentRef}
 portalRoot={props.contentRef}
 containerSx={t => ({
 alignItems: 'center',
 position: 'absolute',
Expand All@@ -44,9 +47,12 @@ export const ResetConnectionDialog = (props: ResetConnectionDialogProps): JSX.El
};

const ResetConnectionDialogContent = withCardStateProvider((props: ResetConnectionDialogProps) => {
 const { onClose, confirmationValue } = props;
 const { onClose, onDelete, confirmationValue } = props;
 const title = props.title ?? localizationKeys('configureSSO.resetConnectionDialog.title');
 const subtitle = props.subtitle ?? localizationKeys('configureSSO.resetConnectionDialog.subtitle');
 const confirmButtonLabel =
 props.confirmButtonLabel ?? localizationKeys('configureSSO.resetConnectionDialog.resetButton');
 const card = useCardState();
 const { enterpriseConnection, mutations } = useConfigureSSO();

 const confirmationField = useFormControl('deleteConfirmation', '', {
 type: 'text',
Expand All@@ -60,18 +66,12 @@ const ResetConnectionDialogContent = withCardStateProvider((props: ResetConnecti
 const canSubmit = Boolean(confirmationValue && confirmationField.value === confirmationValue);

 const onSubmit = async () => {
 if (!enterpriseConnection || !canSubmit) {
 if (!canSubmit) {
 return;
 }

 try {
 // Reset is a pure delete — no navigation. Dropping `hasConnection` breaks
 // the active step's entry guard, so the wizard self-corrects to the
 // furthest-reachable step. The mutation is already reverification-wrapped.
 // No `useWizard()` here — that lets this dialog be triggered from ANY
 // footer (including the nested SAML configure footers) without binding to
 // a nested wizard.
 await mutations.deleteConnection(enterpriseConnection.id);
 await onDelete();
 onClose();
 } catch (err) {
 handleError(err as Error, [confirmationField], card.setError);
Expand All@@ -85,8 +85,8 @@ const ResetConnectionDialogContent = withCardStateProvider((props: ResetConnecti
 >
 <Card.Content sx={t => ({ textAlign: 'start', padding: t.sizes.$5 })}>
 <FormContainer
 headerTitle={localizationKeys('configureSSO.resetConnectionDialog.title')}
 headerSubtitle={localizationKeys('configureSSO.resetConnectionDialog.subtitle')}
 headerTitle={title}
 headerSubtitle={subtitle}
 sx={t => ({ gap: t.space.$4 })}
 >
 <Form.Root onSubmit={onSubmit}>
Expand All@@ -104,7 +104,7 @@ const ResetConnectionDialogContent = withCardStateProvider((props: ResetConnecti
 block={false}
 colorScheme='danger'
 isDisabled={!canSubmit}
 localizationKey={localizationKeys('configureSSO.resetConnectionDialog.resetButton')}
 localizationKey={confirmButtonLabel}
 />
 <Form.ResetButton
 elementDescriptor={descriptors.configureSSOResetConnectionDialogCancelButton}
Expand Down

60 changes: 35 additions & 25 deletions
packages/ui/src/components/ConfigureSSO/__tests__/ResetConnectionDialog.test.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,39 +1,26 @@
import type { EnterpriseConnectionResource } from '@clerk/shared/types';
import { describe, expect, it, vi } from 'vitest';

import { localizationKeys } from '@/customizables';
import { bindCreateFixtures } from '@/test/create-fixtures';
import { render, screen, waitFor } from '@/test/utils';
import { CardStateProvider } from '@/ui/elements/contexts';

// The dialog no longer touches the wizard. On confirm it calls the
// reverification-wrapped `mutations.deleteConnection(id)` directly — a pure
// delete, no navigation — and the wizard self-corrects to the
// furthest-reachable step once the active step's guard breaks. That lets the
// dialog be triggered from ANY footer (including nested SAML configure footers)
// without binding to a nested wizard.
const deleteConnection = vi.fn();

const connectionMockState = vi.hoisted(() => ({
 current: { id: 'idn_connection_1' } as Partial<EnterpriseConnectionResource> | null,
}));

vi.mock('../ConfigureSSOContext', () => ({
 useConfigureSSO: () => ({
 enterpriseConnection: connectionMockState.current,
 contentRef: { current: null },
 // The dialog's confirm calls the reverification-wrapped `deleteConnection`
 // mutation directly. No navigation — the wizard self-corrects.
 mutations: { deleteConnection },
 }),
}));

import { ResetConnectionDialog } from '../ResetConnectionDialog';

const deleteConnection = vi.fn();

const { createFixtures } = bindCreateFixtures('ConfigureSSO');

const renderDialog = (
 wrapper: React.ComponentType<{ children?: React.ReactNode }>,
 props: { isOpen?: boolean; onClose?: () => void; confirmationValue?: string } = {},
 props: {
 isOpen?: boolean;
 onClose?: () => void;
 confirmationValue?: string;
 title?: ReturnType<typeof localizationKeys>;
 subtitle?: ReturnType<typeof localizationKeys>;
 confirmButtonLabel?: ReturnType<typeof localizationKeys>;
 } = {},
) => {
 const onClose = props.onClose ?? vi.fn();
 const utils = render(
Expand All@@ -42,6 +29,11 @@ const renderDialog = (
 isOpen={props.isOpen ?? true}
 onClose={onClose}
 confirmationValue={props.confirmationValue ?? 'Acme Inc'}
 onDelete={() => deleteConnection('idn_connection_1')}
 contentRef={{ current: null }}
 title={props.title}
 subtitle={props.subtitle}
 confirmButtonLabel={props.confirmButtonLabel}
 />
 </CardStateProvider>,
 { wrapper },
Expand All@@ -52,7 +44,6 @@ const renderDialog = (
const resetMocks = () => {
 deleteConnection.mockReset();
 deleteConnection.mockResolvedValue(undefined);
 connectionMockState.current = { id: 'idn_connection_1' };
};

describe('ResetConnectionDialog', () => {
Expand DownExpand Up@@ -81,6 +72,25 @@ describe('ResetConnectionDialog', () => {
 expect(screen.getByRole('button', { name: 'Cancel' })).toBeInTheDocument();
 });

 it('renders override copy when title, subtitle, and confirm label props are supplied', async () => {
 resetMocks();
 const { wrapper } = await createFixtures();
 renderDialog(wrapper, {
 confirmationValue: 'Acme Inc',
 title: localizationKeys('organizationProfile.securityPage.removeDialog.title'),
 subtitle: localizationKeys('organizationProfile.securityPage.removeDialog.subtitle'),
 confirmButtonLabel: localizationKeys('organizationProfile.securityPage.removeDialog.confirmButton'),
 });

 expect(screen.getByRole('heading', { name: 'Remove SSO connection' })).toBeInTheDocument();
 expect(screen.queryByRole('heading', { name: 'Reset connection' })).not.toBeInTheDocument();
 expect(screen.getByText(/Are you sure you want to remove the connection\?/i)).toBeInTheDocument();
 expect(screen.getByRole('button', { name: 'Remove connection' })).toBeInTheDocument();
 expect(screen.queryByRole('button', { name: 'Reset connection' })).not.toBeInTheDocument();
 // Type-to-confirm is unchanged by the override.
 expect(screen.getByRole('button', { name: 'Cancel' })).toBeInTheDocument();
 });

 it('keeps Reset disabled while the input is empty', async () => {
 resetMocks();
 const { wrapper } = await createFixtures();
Expand Down

6 changes: 4 additions & 2 deletions
packages/ui/src/components/ConfigureSSO/elements/Step.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -206,11 +206,11 @@ FooterContinue.displayName = 'Step.Footer.Continue';
 * footer row, matching the prior destructive affordance.
 */
const FooterReset = (): JSX.Element | null => {
 const { organizationEnterpriseConnection: c } = useConfigureSSO();
 const { enterpriseConnection, mutations, contentRef } = useConfigureSSO();
 const organization = __internal_useOrganizationBase();
 const [isOpen, setIsOpen] = useState(false);

 if (!c.hasConnection) {
 if (!enterpriseConnection) {
 return null;
 }

Expand All@@ -229,6 +229,8 @@ const FooterReset = (): JSX.Element | null => {
 isOpen={isOpen}
 onClose={() => setIsOpen(false)}
 confirmationValue={organization?.name ?? ''}
 onDelete={() => mutations.deleteConnection(enterpriseConnection.id)}
 contentRef={contentRef}
 />
 </>
 );
Expand Down

5 changes: 5 additions & 0 deletions
packages/ui/src/components/ConfigureSSO/steps/ConfirmationStep.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -254,6 +254,7 @@ const ConfigurationDetailsSection = (): JSX.Element => {
};

const ResetConnectionSection = (): JSX.Element => {
 const { enterpriseConnection, mutations, contentRef } = useConfigureSSO();
 const { organization } = useOrganization();
 const [isOpen, setIsOpen] = useState(false);

Expand All@@ -277,6 +278,10 @@ const ResetConnectionSection = (): JSX.Element => {
 isOpen={isOpen}
 onClose={() => setIsOpen(false)}
 confirmationValue={organization?.name ?? ''}
 // The confirmation step is only reachable with a connection, so the resource is set.
 // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
 onDelete={() => mutations.deleteConnection(enterpriseConnection!.id)}
 contentRef={contentRef}
 />
 </ProfileSection.Root>
 );
Expand Down
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Strip utm_, fbclid, gclid, etc. from all links on page
(function() {
var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',
'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',
'ref', 'ref_src', 'source', 'medium', 'campaign'];
function cleanUrl(url) {
try {
var u = new URL(url, window.location.origin);
var changed = false;
trackingParams.forEach(function(p) {
if (u.searchParams.has(p)) {
u.searchParams.delete(p);
changed = true;
}
});
return changed ? u.toString() : url;
} catch (e) {
return url;
}
}
function cleanLinks() {
document.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
cleanLinks();
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1) {
if (node.tagName === 'A') cleanLinks();
node.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '
feat(ui,localizations,shared): add the organization Security page SSO overview by iagodahlem · Pull Request #8813 · clerk/javascript · GitHub
Skip to content
feat(ui,localizations,shared): add the organization Security page SSO overview#8813

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

iagodahlem
merged 11 commits into

from

Jun 15, 2026
 Merged


feat(ui,localizations,shared): add the organization Security page SSO overview
#8813
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


11 commits


Select commit
Hold shift + click to select a range
7460da3

refactor(ui): make ResetConnectionDialog context-free


iagodahlem Jun 10, 2026
33df3df

feat(localizations,shared): add Security page SSO overview localization


iagodahlem Jun 10, 2026
86addc4

feat(ui,shared): render the organization Security page SSO overview


iagodahlem Jun 10, 2026
1a6e0ec

refactor(ui): trim comments across the security page overview


iagodahlem Jun 10, 2026
87bd9f2

fix(ui): truncate long SSO detail values on the security page


iagodahlem Jun 10, 2026
9a31d34

feat(ui,localizations,shared): move security page SSO activation into…


iagodahlem Jun 12, 2026
e72710f

feat(ui,localizations,shared): unify the security page SSO copy and f…


iagodahlem Jun 12, 2026
33234fd

feat(ui,localizations,shared): label the security page connection rem…


iagodahlem Jun 15, 2026
7cc05e3

refactor(ui): drop optimistic activation and apply security page SSO …


iagodahlem Jun 15, 2026
d0b0186

refactor(ui): address security page review feedback


iagodahlem Jun 15, 2026
cbe883d

feat(localizations): update security page SSO description copy


iagodahlem Jun 15, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


7 changes: 7 additions & 0 deletions
.changeset/orange-pandas-shake.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
---
'@clerk/localizations': patch
'@clerk/shared': patch
'@clerk/ui': patch
---

Add an overview to the organization profile Security page. The page now lands on a summary of the SSO connection — a status badge (Unconfigured, In Progress, Active, Inactive), the configuration details framed in a card (provider, domain, sign-on URL, issuer, certificate), and an actions menu with Edit, Activate / Deactivate, and Remove — and switches into the existing configuration flow on Start, Continue, or Edit.

32 changes: 32 additions & 0 deletions
packages/localizations/src/en-US.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1066,6 +1066,38 @@ export const enUS: LocalizationResource = {
 successMessage: '{{domain}} has been removed.',
 title: 'Remove domain',
 },
 securityPage: {
 removeDialog: {
 confirmButton: 'Remove connection',
 subtitle:
 'Are you sure you want to remove the connection? This action is irreversible and deletes the connection and all of its configuration.',
 title: 'Remove SSO connection',
 },
 ssoSection: {
 badge__active: 'Active',
 badge__inactive: 'Inactive',
 badge__inProgress: 'In Progress',
 badge__unconfigured: 'Unconfigured',
 certificateLabel: 'Certificate',
 descriptionLine1:
 'Require members to sign in through your identity provider using their domain email. Members without a matching domain are unaffected.',
 descriptionLine2:
 'Anyone who signs in will be automatically added to this organization. New members will be assigned to {{role}}.',
 descriptionLine2__noRole: 'Anyone who signs in will be automatically added to this organization.',
 domainLabel: 'Domain',
 issuerLabel: 'Issuer',
 menuAction__activate: 'Activate',
 menuAction__deactivate: 'Deactivate',
 menuAction__edit: 'Edit',
 menuAction__remove: 'Remove',
 primaryButton__continueConfiguration: 'Continue configuration',
 primaryButton__startConfiguration: 'Start configuration',
 providerLabel: 'Provider',
 signOnUrlLabel: 'Sign on URL',
 title: 'SSO',
 },
 title: 'Security',
 },
 start: {
 headerTitle__general: 'General',
 headerTitle__members: 'Members',
Expand Down

9 changes: 8 additions & 1 deletion
packages/shared/src/types/elementIds.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -53,6 +53,7 @@ export type ProfileSectionId =
 | 'manageVerifiedDomains'
 | 'subscriptionsList'
 | 'paymentMethods'
 | 'sso'
 | 'ssoStatus'
 | 'enableSso'
 | 'ssoDomain'
Expand All@@ -61,7 +62,13 @@ export type ProfileSectionId =
 | 'resetSso'
 | 'testSsoUrl'
 | 'testResults';
export type ProfilePageId = 'account' | 'security' | 'organizationGeneral' | 'organizationMembers' | 'billing';
export type ProfilePageId =
 | 'account'
 | 'security'
 | 'organizationGeneral'
 | 'organizationMembers'
 | 'organizationSecurity'
 | 'billing';

export type UserPreviewId = 'userButton' | 'personalWorkspace';
export type OrganizationPreviewId =
Expand Down

29 changes: 29 additions & 0 deletions
packages/shared/src/types/localization.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1130,6 +1130,35 @@ export type __internal_LocalizationResource = {
 messageLine2: LocalizationValue;
 successMessage: LocalizationValue;
 };
 securityPage: {
 title: LocalizationValue;
 removeDialog: {
 title: LocalizationValue;
 subtitle: LocalizationValue;
 confirmButton: LocalizationValue;
 };
 ssoSection: {
 title: LocalizationValue;
 badge__unconfigured: LocalizationValue;
 badge__inProgress: LocalizationValue;
 badge__active: LocalizationValue;
 badge__inactive: LocalizationValue;
 descriptionLine1: LocalizationValue;
 descriptionLine2: LocalizationValue<'role'>;
 descriptionLine2__noRole: LocalizationValue;
 primaryButton__startConfiguration: LocalizationValue;
 primaryButton__continueConfiguration: LocalizationValue;
 providerLabel: LocalizationValue;
 domainLabel: LocalizationValue;
 signOnUrlLabel: LocalizationValue;
 issuerLabel: LocalizationValue;
 certificateLabel: LocalizationValue;
 menuAction__edit: LocalizationValue;
 menuAction__activate: LocalizationValue;
 menuAction__deactivate: LocalizationValue;
 menuAction__remove: LocalizationValue;
 };
 };
 membersPage: {
 detailsTitle__emptyRow: LocalizationValue;
 action__invite: LocalizationValue;
Expand Down

36 changes: 18 additions & 18 deletions
packages/ui/src/components/ConfigureSSO/ResetConnectionDialog.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
import type { LocalizationKey } from '@/customizables';
import { Col, descriptors, localizationKeys } from '@/customizables';
import { Card } from '@/elements/Card';
import { useCardState, withCardStateProvider } from '@/elements/contexts';
Expand All@@ -8,17 +9,19 @@ import { Modal } from '@/elements/Modal';
import { useFormControl } from '@/ui/utils/useFormControl';
import { handleError } from '@/utils/errorHandler';

import { useConfigureSSO } from './ConfigureSSOContext';

type ResetConnectionDialogProps = {
 isOpen: boolean;
 onClose: () => void;
 confirmationValue: string;
 onDelete: () => Promise<unknown>;
 contentRef: React.RefObject<HTMLDivElement>;
 /** Defaults to the Reset copy; overridden when the dialog is reused for the Remove action. */
 title?: LocalizationKey;
 subtitle?: LocalizationKey;
 confirmButtonLabel?: LocalizationKey;
};

export const ResetConnectionDialog = (props: ResetConnectionDialogProps): JSX.Element | null => {
 const { contentRef } = useConfigureSSO();

 if (!props.isOpen) {
 return null;
 }
Expand All@@ -27,7 +30,7 @@ export const ResetConnectionDialog = (props: ResetConnectionDialogProps): JSX.El
 <Modal
 handleClose={props.onClose}
 canCloseModal={false}
 portalRoot={contentRef}
 portalRoot={props.contentRef}
 containerSx={t => ({
 alignItems: 'center',
 position: 'absolute',
Expand All@@ -44,9 +47,12 @@ export const ResetConnectionDialog = (props: ResetConnectionDialogProps): JSX.El
};

const ResetConnectionDialogContent = withCardStateProvider((props: ResetConnectionDialogProps) => {
 const { onClose, confirmationValue } = props;
 const { onClose, onDelete, confirmationValue } = props;
 const title = props.title ?? localizationKeys('configureSSO.resetConnectionDialog.title');
 const subtitle = props.subtitle ?? localizationKeys('configureSSO.resetConnectionDialog.subtitle');
 const confirmButtonLabel =
 props.confirmButtonLabel ?? localizationKeys('configureSSO.resetConnectionDialog.resetButton');
 const card = useCardState();
 const { enterpriseConnection, mutations } = useConfigureSSO();

 const confirmationField = useFormControl('deleteConfirmation', '', {
 type: 'text',
Expand All@@ -60,18 +66,12 @@ const ResetConnectionDialogContent = withCardStateProvider((props: ResetConnecti
 const canSubmit = Boolean(confirmationValue && confirmationField.value === confirmationValue);

 const onSubmit = async () => {
 if (!enterpriseConnection || !canSubmit) {
 if (!canSubmit) {
 return;
 }

 try {
 // Reset is a pure delete — no navigation. Dropping `hasConnection` breaks
 // the active step's entry guard, so the wizard self-corrects to the
 // furthest-reachable step. The mutation is already reverification-wrapped.
 // No `useWizard()` here — that lets this dialog be triggered from ANY
 // footer (including the nested SAML configure footers) without binding to
 // a nested wizard.
 await mutations.deleteConnection(enterpriseConnection.id);
 await onDelete();
 onClose();
 } catch (err) {
 handleError(err as Error, [confirmationField], card.setError);
Expand All@@ -85,8 +85,8 @@ const ResetConnectionDialogContent = withCardStateProvider((props: ResetConnecti
 >
 <Card.Content sx={t => ({ textAlign: 'start', padding: t.sizes.$5 })}>
 <FormContainer
 headerTitle={localizationKeys('configureSSO.resetConnectionDialog.title')}
 headerSubtitle={localizationKeys('configureSSO.resetConnectionDialog.subtitle')}
 headerTitle={title}
 headerSubtitle={subtitle}
 sx={t => ({ gap: t.space.$4 })}
 >
 <Form.Root onSubmit={onSubmit}>
Expand All@@ -104,7 +104,7 @@ const ResetConnectionDialogContent = withCardStateProvider((props: ResetConnecti
 block={false}
 colorScheme='danger'
 isDisabled={!canSubmit}
 localizationKey={localizationKeys('configureSSO.resetConnectionDialog.resetButton')}
 localizationKey={confirmButtonLabel}
 />
 <Form.ResetButton
 elementDescriptor={descriptors.configureSSOResetConnectionDialogCancelButton}
Expand Down

60 changes: 35 additions & 25 deletions
packages/ui/src/components/ConfigureSSO/__tests__/ResetConnectionDialog.test.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,39 +1,26 @@
import type { EnterpriseConnectionResource } from '@clerk/shared/types';
import { describe, expect, it, vi } from 'vitest';

import { localizationKeys } from '@/customizables';
import { bindCreateFixtures } from '@/test/create-fixtures';
import { render, screen, waitFor } from '@/test/utils';
import { CardStateProvider } from '@/ui/elements/contexts';

// The dialog no longer touches the wizard. On confirm it calls the
// reverification-wrapped `mutations.deleteConnection(id)` directly — a pure
// delete, no navigation — and the wizard self-corrects to the
// furthest-reachable step once the active step's guard breaks. That lets the
// dialog be triggered from ANY footer (including nested SAML configure footers)
// without binding to a nested wizard.
const deleteConnection = vi.fn();

const connectionMockState = vi.hoisted(() => ({
 current: { id: 'idn_connection_1' } as Partial<EnterpriseConnectionResource> | null,
}));

vi.mock('../ConfigureSSOContext', () => ({
 useConfigureSSO: () => ({
 enterpriseConnection: connectionMockState.current,
 contentRef: { current: null },
 // The dialog's confirm calls the reverification-wrapped `deleteConnection`
 // mutation directly. No navigation — the wizard self-corrects.
 mutations: { deleteConnection },
 }),
}));

import { ResetConnectionDialog } from '../ResetConnectionDialog';

const deleteConnection = vi.fn();

const { createFixtures } = bindCreateFixtures('ConfigureSSO');

const renderDialog = (
 wrapper: React.ComponentType<{ children?: React.ReactNode }>,
 props: { isOpen?: boolean; onClose?: () => void; confirmationValue?: string } = {},
 props: {
 isOpen?: boolean;
 onClose?: () => void;
 confirmationValue?: string;
 title?: ReturnType<typeof localizationKeys>;
 subtitle?: ReturnType<typeof localizationKeys>;
 confirmButtonLabel?: ReturnType<typeof localizationKeys>;
 } = {},
) => {
 const onClose = props.onClose ?? vi.fn();
 const utils = render(
Expand All@@ -42,6 +29,11 @@ const renderDialog = (
 isOpen={props.isOpen ?? true}
 onClose={onClose}
 confirmationValue={props.confirmationValue ?? 'Acme Inc'}
 onDelete={() => deleteConnection('idn_connection_1')}
 contentRef={{ current: null }}
 title={props.title}
 subtitle={props.subtitle}
 confirmButtonLabel={props.confirmButtonLabel}
 />
 </CardStateProvider>,
 { wrapper },
Expand All@@ -52,7 +44,6 @@ const renderDialog = (
const resetMocks = () => {
 deleteConnection.mockReset();
 deleteConnection.mockResolvedValue(undefined);
 connectionMockState.current = { id: 'idn_connection_1' };
};

describe('ResetConnectionDialog', () => {
Expand DownExpand Up@@ -81,6 +72,25 @@ describe('ResetConnectionDialog', () => {
 expect(screen.getByRole('button', { name: 'Cancel' })).toBeInTheDocument();
 });

 it('renders override copy when title, subtitle, and confirm label props are supplied', async () => {
 resetMocks();
 const { wrapper } = await createFixtures();
 renderDialog(wrapper, {
 confirmationValue: 'Acme Inc',
 title: localizationKeys('organizationProfile.securityPage.removeDialog.title'),
 subtitle: localizationKeys('organizationProfile.securityPage.removeDialog.subtitle'),
 confirmButtonLabel: localizationKeys('organizationProfile.securityPage.removeDialog.confirmButton'),
 });

 expect(screen.getByRole('heading', { name: 'Remove SSO connection' })).toBeInTheDocument();
 expect(screen.queryByRole('heading', { name: 'Reset connection' })).not.toBeInTheDocument();
 expect(screen.getByText(/Are you sure you want to remove the connection\?/i)).toBeInTheDocument();
 expect(screen.getByRole('button', { name: 'Remove connection' })).toBeInTheDocument();
 expect(screen.queryByRole('button', { name: 'Reset connection' })).not.toBeInTheDocument();
 // Type-to-confirm is unchanged by the override.
 expect(screen.getByRole('button', { name: 'Cancel' })).toBeInTheDocument();
 });

 it('keeps Reset disabled while the input is empty', async () => {
 resetMocks();
 const { wrapper } = await createFixtures();
Expand Down

6 changes: 4 additions & 2 deletions
packages/ui/src/components/ConfigureSSO/elements/Step.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -206,11 +206,11 @@ FooterContinue.displayName = 'Step.Footer.Continue';
 * footer row, matching the prior destructive affordance.
 */
const FooterReset = (): JSX.Element | null => {
 const { organizationEnterpriseConnection: c } = useConfigureSSO();
 const { enterpriseConnection, mutations, contentRef } = useConfigureSSO();
 const organization = __internal_useOrganizationBase();
 const [isOpen, setIsOpen] = useState(false);

 if (!c.hasConnection) {
 if (!enterpriseConnection) {
 return null;
 }

Expand All@@ -229,6 +229,8 @@ const FooterReset = (): JSX.Element | null => {
 isOpen={isOpen}
 onClose={() => setIsOpen(false)}
 confirmationValue={organization?.name ?? ''}
 onDelete={() => mutations.deleteConnection(enterpriseConnection.id)}
 contentRef={contentRef}
 />
 </>
 );
Expand Down

5 changes: 5 additions & 0 deletions
packages/ui/src/components/ConfigureSSO/steps/ConfirmationStep.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -254,6 +254,7 @@ const ConfigurationDetailsSection = (): JSX.Element => {
};

const ResetConnectionSection = (): JSX.Element => {
 const { enterpriseConnection, mutations, contentRef } = useConfigureSSO();
 const { organization } = useOrganization();
 const [isOpen, setIsOpen] = useState(false);

Expand All@@ -277,6 +278,10 @@ const ResetConnectionSection = (): JSX.Element => {
 isOpen={isOpen}
 onClose={() => setIsOpen(false)}
 confirmationValue={organization?.name ?? ''}
 // The confirmation step is only reachable with a connection, so the resource is set.
 // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
 onDelete={() => mutations.deleteConnection(enterpriseConnection!.id)}
 contentRef={contentRef}
 />
 </ProfileSection.Root>
 );
Expand Down
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
feat(ui,localizations,shared): add the organization Security page SSO overview by iagodahlem · Pull Request #8813 · clerk/javascript · GitHub
Skip to content
feat(ui,localizations,shared): add the organization Security page SSO overview#8813

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

iagodahlem
merged 11 commits into

from

Jun 15, 2026
 Merged


feat(ui,localizations,shared): add the organization Security page SSO overview
#8813
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


11 commits


Select commit
Hold shift + click to select a range
7460da3

refactor(ui): make ResetConnectionDialog context-free


iagodahlem Jun 10, 2026
33df3df

feat(localizations,shared): add Security page SSO overview localization


iagodahlem Jun 10, 2026
86addc4

feat(ui,shared): render the organization Security page SSO overview


iagodahlem Jun 10, 2026
1a6e0ec

refactor(ui): trim comments across the security page overview


iagodahlem Jun 10, 2026
87bd9f2

fix(ui): truncate long SSO detail values on the security page


iagodahlem Jun 10, 2026
9a31d34

feat(ui,localizations,shared): move security page SSO activation into…


iagodahlem Jun 12, 2026
e72710f

feat(ui,localizations,shared): unify the security page SSO copy and f…


iagodahlem Jun 12, 2026
33234fd

feat(ui,localizations,shared): label the security page connection rem…


iagodahlem Jun 15, 2026
7cc05e3

refactor(ui): drop optimistic activation and apply security page SSO …


iagodahlem Jun 15, 2026
d0b0186

refactor(ui): address security page review feedback


iagodahlem Jun 15, 2026
cbe883d

feat(localizations): update security page SSO description copy


iagodahlem Jun 15, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


7 changes: 7 additions & 0 deletions
.changeset/orange-pandas-shake.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
---
'@clerk/localizations': patch
'@clerk/shared': patch
'@clerk/ui': patch
---

Add an overview to the organization profile Security page. The page now lands on a summary of the SSO connection — a status badge (Unconfigured, In Progress, Active, Inactive), the configuration details framed in a card (provider, domain, sign-on URL, issuer, certificate), and an actions menu with Edit, Activate / Deactivate, and Remove — and switches into the existing configuration flow on Start, Continue, or Edit.

32 changes: 32 additions & 0 deletions
packages/localizations/src/en-US.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1066,6 +1066,38 @@ export const enUS: LocalizationResource = {
 successMessage: '{{domain}} has been removed.',
 title: 'Remove domain',
 },
 securityPage: {
 removeDialog: {
 confirmButton: 'Remove connection',
 subtitle:
 'Are you sure you want to remove the connection? This action is irreversible and deletes the connection and all of its configuration.',
 title: 'Remove SSO connection',
 },
 ssoSection: {
 badge__active: 'Active',
 badge__inactive: 'Inactive',
 badge__inProgress: 'In Progress',
 badge__unconfigured: 'Unconfigured',
 certificateLabel: 'Certificate',
 descriptionLine1:
 'Require members to sign in through your identity provider using their domain email. Members without a matching domain are unaffected.',
 descriptionLine2:
 'Anyone who signs in will be automatically added to this organization. New members will be assigned to {{role}}.',
 descriptionLine2__noRole: 'Anyone who signs in will be automatically added to this organization.',
 domainLabel: 'Domain',
 issuerLabel: 'Issuer',
 menuAction__activate: 'Activate',
 menuAction__deactivate: 'Deactivate',
 menuAction__edit: 'Edit',
 menuAction__remove: 'Remove',
 primaryButton__continueConfiguration: 'Continue configuration',
 primaryButton__startConfiguration: 'Start configuration',
 providerLabel: 'Provider',
 signOnUrlLabel: 'Sign on URL',
 title: 'SSO',
 },
 title: 'Security',
 },
 start: {
 headerTitle__general: 'General',
 headerTitle__members: 'Members',
Expand Down

9 changes: 8 additions & 1 deletion
packages/shared/src/types/elementIds.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -53,6 +53,7 @@ export type ProfileSectionId =
 | 'manageVerifiedDomains'
 | 'subscriptionsList'
 | 'paymentMethods'
 | 'sso'
 | 'ssoStatus'
 | 'enableSso'
 | 'ssoDomain'
Expand All@@ -61,7 +62,13 @@ export type ProfileSectionId =
 | 'resetSso'
 | 'testSsoUrl'
 | 'testResults';
export type ProfilePageId = 'account' | 'security' | 'organizationGeneral' | 'organizationMembers' | 'billing';
export type ProfilePageId =
 | 'account'
 | 'security'
 | 'organizationGeneral'
 | 'organizationMembers'
 | 'organizationSecurity'
 | 'billing';

export type UserPreviewId = 'userButton' | 'personalWorkspace';
export type OrganizationPreviewId =
Expand Down

29 changes: 29 additions & 0 deletions
packages/shared/src/types/localization.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1130,6 +1130,35 @@ export type __internal_LocalizationResource = {
 messageLine2: LocalizationValue;
 successMessage: LocalizationValue;
 };
 securityPage: {
 title: LocalizationValue;
 removeDialog: {
 title: LocalizationValue;
 subtitle: LocalizationValue;
 confirmButton: LocalizationValue;
 };
 ssoSection: {
 title: LocalizationValue;
 badge__unconfigured: LocalizationValue;
 badge__inProgress: LocalizationValue;
 badge__active: LocalizationValue;
 badge__inactive: LocalizationValue;
 descriptionLine1: LocalizationValue;
 descriptionLine2: LocalizationValue<'role'>;
 descriptionLine2__noRole: LocalizationValue;
 primaryButton__startConfiguration: LocalizationValue;
 primaryButton__continueConfiguration: LocalizationValue;
 providerLabel: LocalizationValue;
 domainLabel: LocalizationValue;
 signOnUrlLabel: LocalizationValue;
 issuerLabel: LocalizationValue;
 certificateLabel: LocalizationValue;
 menuAction__edit: LocalizationValue;
 menuAction__activate: LocalizationValue;
 menuAction__deactivate: LocalizationValue;
 menuAction__remove: LocalizationValue;
 };
 };
 membersPage: {
 detailsTitle__emptyRow: LocalizationValue;
 action__invite: LocalizationValue;
Expand Down

36 changes: 18 additions & 18 deletions
packages/ui/src/components/ConfigureSSO/ResetConnectionDialog.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
import type { LocalizationKey } from '@/customizables';
import { Col, descriptors, localizationKeys } from '@/customizables';
import { Card } from '@/elements/Card';
import { useCardState, withCardStateProvider } from '@/elements/contexts';
Expand All@@ -8,17 +9,19 @@ import { Modal } from '@/elements/Modal';
import { useFormControl } from '@/ui/utils/useFormControl';
import { handleError } from '@/utils/errorHandler';

import { useConfigureSSO } from './ConfigureSSOContext';

type ResetConnectionDialogProps = {
 isOpen: boolean;
 onClose: () => void;
 confirmationValue: string;
 onDelete: () => Promise<unknown>;
 contentRef: React.RefObject<HTMLDivElement>;
 /** Defaults to the Reset copy; overridden when the dialog is reused for the Remove action. */
 title?: LocalizationKey;
 subtitle?: LocalizationKey;
 confirmButtonLabel?: LocalizationKey;
};

export const ResetConnectionDialog = (props: ResetConnectionDialogProps): JSX.Element | null => {
 const { contentRef } = useConfigureSSO();

 if (!props.isOpen) {
 return null;
 }
Expand All@@ -27,7 +30,7 @@ export const ResetConnectionDialog = (props: ResetConnectionDialogProps): JSX.El
 <Modal
 handleClose={props.onClose}
 canCloseModal={false}
 portalRoot={contentRef}
 portalRoot={props.contentRef}
 containerSx={t => ({
 alignItems: 'center',
 position: 'absolute',
Expand All@@ -44,9 +47,12 @@ export const ResetConnectionDialog = (props: ResetConnectionDialogProps): JSX.El
};

const ResetConnectionDialogContent = withCardStateProvider((props: ResetConnectionDialogProps) => {
 const { onClose, confirmationValue } = props;
 const { onClose, onDelete, confirmationValue } = props;
 const title = props.title ?? localizationKeys('configureSSO.resetConnectionDialog.title');
 const subtitle = props.subtitle ?? localizationKeys('configureSSO.resetConnectionDialog.subtitle');
 const confirmButtonLabel =
 props.confirmButtonLabel ?? localizationKeys('configureSSO.resetConnectionDialog.resetButton');
 const card = useCardState();
 const { enterpriseConnection, mutations } = useConfigureSSO();

 const confirmationField = useFormControl('deleteConfirmation', '', {
 type: 'text',
Expand All@@ -60,18 +66,12 @@ const ResetConnectionDialogContent = withCardStateProvider((props: ResetConnecti
 const canSubmit = Boolean(confirmationValue && confirmationField.value === confirmationValue);

 const onSubmit = async () => {
 if (!enterpriseConnection || !canSubmit) {
 if (!canSubmit) {
 return;
 }

 try {
 // Reset is a pure delete — no navigation. Dropping `hasConnection` breaks
 // the active step's entry guard, so the wizard self-corrects to the
 // furthest-reachable step. The mutation is already reverification-wrapped.
 // No `useWizard()` here — that lets this dialog be triggered from ANY
 // footer (including the nested SAML configure footers) without binding to
 // a nested wizard.
 await mutations.deleteConnection(enterpriseConnection.id);
 await onDelete();
 onClose();
 } catch (err) {
 handleError(err as Error, [confirmationField], card.setError);
Expand All@@ -85,8 +85,8 @@ const ResetConnectionDialogContent = withCardStateProvider((props: ResetConnecti
 >
 <Card.Content sx={t => ({ textAlign: 'start', padding: t.sizes.$5 })}>
 <FormContainer
 headerTitle={localizationKeys('configureSSO.resetConnectionDialog.title')}
 headerSubtitle={localizationKeys('configureSSO.resetConnectionDialog.subtitle')}
 headerTitle={title}
 headerSubtitle={subtitle}
 sx={t => ({ gap: t.space.$4 })}
 >
 <Form.Root onSubmit={onSubmit}>
Expand All@@ -104,7 +104,7 @@ const ResetConnectionDialogContent = withCardStateProvider((props: ResetConnecti
 block={false}
 colorScheme='danger'
 isDisabled={!canSubmit}
 localizationKey={localizationKeys('configureSSO.resetConnectionDialog.resetButton')}
 localizationKey={confirmButtonLabel}
 />
 <Form.ResetButton
 elementDescriptor={descriptors.configureSSOResetConnectionDialogCancelButton}
Expand Down

60 changes: 35 additions & 25 deletions
packages/ui/src/components/ConfigureSSO/__tests__/ResetConnectionDialog.test.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,39 +1,26 @@
import type { EnterpriseConnectionResource } from '@clerk/shared/types';
import { describe, expect, it, vi } from 'vitest';

import { localizationKeys } from '@/customizables';
import { bindCreateFixtures } from '@/test/create-fixtures';
import { render, screen, waitFor } from '@/test/utils';
import { CardStateProvider } from '@/ui/elements/contexts';

// The dialog no longer touches the wizard. On confirm it calls the
// reverification-wrapped `mutations.deleteConnection(id)` directly — a pure
// delete, no navigation — and the wizard self-corrects to the
// furthest-reachable step once the active step's guard breaks. That lets the
// dialog be triggered from ANY footer (including nested SAML configure footers)
// without binding to a nested wizard.
const deleteConnection = vi.fn();

const connectionMockState = vi.hoisted(() => ({
 current: { id: 'idn_connection_1' } as Partial<EnterpriseConnectionResource> | null,
}));

vi.mock('../ConfigureSSOContext', () => ({
 useConfigureSSO: () => ({
 enterpriseConnection: connectionMockState.current,
 contentRef: { current: null },
 // The dialog's confirm calls the reverification-wrapped `deleteConnection`
 // mutation directly. No navigation — the wizard self-corrects.
 mutations: { deleteConnection },
 }),
}));

import { ResetConnectionDialog } from '../ResetConnectionDialog';

const deleteConnection = vi.fn();

const { createFixtures } = bindCreateFixtures('ConfigureSSO');

const renderDialog = (
 wrapper: React.ComponentType<{ children?: React.ReactNode }>,
 props: { isOpen?: boolean; onClose?: () => void; confirmationValue?: string } = {},
 props: {
 isOpen?: boolean;
 onClose?: () => void;
 confirmationValue?: string;
 title?: ReturnType<typeof localizationKeys>;
 subtitle?: ReturnType<typeof localizationKeys>;
 confirmButtonLabel?: ReturnType<typeof localizationKeys>;
 } = {},
) => {
 const onClose = props.onClose ?? vi.fn();
 const utils = render(
Expand All@@ -42,6 +29,11 @@ const renderDialog = (
 isOpen={props.isOpen ?? true}
 onClose={onClose}
 confirmationValue={props.confirmationValue ?? 'Acme Inc'}
 onDelete={() => deleteConnection('idn_connection_1')}
 contentRef={{ current: null }}
 title={props.title}
 subtitle={props.subtitle}
 confirmButtonLabel={props.confirmButtonLabel}
 />
 </CardStateProvider>,
 { wrapper },
Expand All@@ -52,7 +44,6 @@ const renderDialog = (
const resetMocks = () => {
 deleteConnection.mockReset();
 deleteConnection.mockResolvedValue(undefined);
 connectionMockState.current = { id: 'idn_connection_1' };
};

describe('ResetConnectionDialog', () => {
Expand DownExpand Up@@ -81,6 +72,25 @@ describe('ResetConnectionDialog', () => {
 expect(screen.getByRole('button', { name: 'Cancel' })).toBeInTheDocument();
 });

 it('renders override copy when title, subtitle, and confirm label props are supplied', async () => {
 resetMocks();
 const { wrapper } = await createFixtures();
 renderDialog(wrapper, {
 confirmationValue: 'Acme Inc',
 title: localizationKeys('organizationProfile.securityPage.removeDialog.title'),
 subtitle: localizationKeys('organizationProfile.securityPage.removeDialog.subtitle'),
 confirmButtonLabel: localizationKeys('organizationProfile.securityPage.removeDialog.confirmButton'),
 });

 expect(screen.getByRole('heading', { name: 'Remove SSO connection' })).toBeInTheDocument();
 expect(screen.queryByRole('heading', { name: 'Reset connection' })).not.toBeInTheDocument();
 expect(screen.getByText(/Are you sure you want to remove the connection\?/i)).toBeInTheDocument();
 expect(screen.getByRole('button', { name: 'Remove connection' })).toBeInTheDocument();
 expect(screen.queryByRole('button', { name: 'Reset connection' })).not.toBeInTheDocument();
 // Type-to-confirm is unchanged by the override.
 expect(screen.getByRole('button', { name: 'Cancel' })).toBeInTheDocument();
 });

 it('keeps Reset disabled while the input is empty', async () => {
 resetMocks();
 const { wrapper } = await createFixtures();
Expand Down

6 changes: 4 additions & 2 deletions
packages/ui/src/components/ConfigureSSO/elements/Step.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -206,11 +206,11 @@ FooterContinue.displayName = 'Step.Footer.Continue';
 * footer row, matching the prior destructive affordance.
 */
const FooterReset = (): JSX.Element | null => {
 const { organizationEnterpriseConnection: c } = useConfigureSSO();
 const { enterpriseConnection, mutations, contentRef } = useConfigureSSO();
 const organization = __internal_useOrganizationBase();
 const [isOpen, setIsOpen] = useState(false);

 if (!c.hasConnection) {
 if (!enterpriseConnection) {
 return null;
 }

Expand All@@ -229,6 +229,8 @@ const FooterReset = (): JSX.Element | null => {
 isOpen={isOpen}
 onClose={() => setIsOpen(false)}
 confirmationValue={organization?.name ?? ''}
 onDelete={() => mutations.deleteConnection(enterpriseConnection.id)}
 contentRef={contentRef}
 />
 </>
 );
Expand Down

5 changes: 5 additions & 0 deletions
packages/ui/src/components/ConfigureSSO/steps/ConfirmationStep.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -254,6 +254,7 @@ const ConfigurationDetailsSection = (): JSX.Element => {
};

const ResetConnectionSection = (): JSX.Element => {
 const { enterpriseConnection, mutations, contentRef } = useConfigureSSO();
 const { organization } = useOrganization();
 const [isOpen, setIsOpen] = useState(false);

Expand All@@ -277,6 +278,10 @@ const ResetConnectionSection = (): JSX.Element => {
 isOpen={isOpen}
 onClose={() => setIsOpen(false)}
 confirmationValue={organization?.name ?? ''}
 // The confirmation step is only reachable with a connection, so the resource is set.
 // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
 onDelete={() => mutations.deleteConnection(enterpriseConnection!.id)}
 contentRef={contentRef}
 />
 </ProfileSection.Root>
 );
Expand Down
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
feat(ui,localizations,shared): add the organization Security page SSO overview by iagodahlem · Pull Request #8813 · clerk/javascript · GitHub
Skip to content
feat(ui,localizations,shared): add the organization Security page SSO overview#8813

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

iagodahlem
merged 11 commits into

from

Jun 15, 2026
 Merged


feat(ui,localizations,shared): add the organization Security page SSO overview
#8813
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


11 commits


Select commit
Hold shift + click to select a range
7460da3

refactor(ui): make ResetConnectionDialog context-free


iagodahlem Jun 10, 2026
33df3df

feat(localizations,shared): add Security page SSO overview localization


iagodahlem Jun 10, 2026
86addc4

feat(ui,shared): render the organization Security page SSO overview


iagodahlem Jun 10, 2026
1a6e0ec

refactor(ui): trim comments across the security page overview


iagodahlem Jun 10, 2026
87bd9f2

fix(ui): truncate long SSO detail values on the security page


iagodahlem Jun 10, 2026
9a31d34

feat(ui,localizations,shared): move security page SSO activation into…


iagodahlem Jun 12, 2026
e72710f

feat(ui,localizations,shared): unify the security page SSO copy and f…


iagodahlem Jun 12, 2026
33234fd

feat(ui,localizations,shared): label the security page connection rem…


iagodahlem Jun 15, 2026
7cc05e3

refactor(ui): drop optimistic activation and apply security page SSO …


iagodahlem Jun 15, 2026
d0b0186

refactor(ui): address security page review feedback


iagodahlem Jun 15, 2026
cbe883d

feat(localizations): update security page SSO description copy


iagodahlem Jun 15, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


7 changes: 7 additions & 0 deletions
.changeset/orange-pandas-shake.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
---
'@clerk/localizations': patch
'@clerk/shared': patch
'@clerk/ui': patch
---

Add an overview to the organization profile Security page. The page now lands on a summary of the SSO connection — a status badge (Unconfigured, In Progress, Active, Inactive), the configuration details framed in a card (provider, domain, sign-on URL, issuer, certificate), and an actions menu with Edit, Activate / Deactivate, and Remove — and switches into the existing configuration flow on Start, Continue, or Edit.

32 changes: 32 additions & 0 deletions
packages/localizations/src/en-US.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1066,6 +1066,38 @@ export const enUS: LocalizationResource = {
 successMessage: '{{domain}} has been removed.',
 title: 'Remove domain',
 },
 securityPage: {
 removeDialog: {
 confirmButton: 'Remove connection',
 subtitle:
 'Are you sure you want to remove the connection? This action is irreversible and deletes the connection and all of its configuration.',
 title: 'Remove SSO connection',
 },
 ssoSection: {
 badge__active: 'Active',
 badge__inactive: 'Inactive',
 badge__inProgress: 'In Progress',
 badge__unconfigured: 'Unconfigured',
 certificateLabel: 'Certificate',
 descriptionLine1:
 'Require members to sign in through your identity provider using their domain email. Members without a matching domain are unaffected.',
 descriptionLine2:
 'Anyone who signs in will be automatically added to this organization. New members will be assigned to {{role}}.',
 descriptionLine2__noRole: 'Anyone who signs in will be automatically added to this organization.',
 domainLabel: 'Domain',
 issuerLabel: 'Issuer',
 menuAction__activate: 'Activate',
 menuAction__deactivate: 'Deactivate',
 menuAction__edit: 'Edit',
 menuAction__remove: 'Remove',
 primaryButton__continueConfiguration: 'Continue configuration',
 primaryButton__startConfiguration: 'Start configuration',
 providerLabel: 'Provider',
 signOnUrlLabel: 'Sign on URL',
 title: 'SSO',
 },
 title: 'Security',
 },
 start: {
 headerTitle__general: 'General',
 headerTitle__members: 'Members',
Expand Down

9 changes: 8 additions & 1 deletion
packages/shared/src/types/elementIds.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -53,6 +53,7 @@ export type ProfileSectionId =
 | 'manageVerifiedDomains'
 | 'subscriptionsList'
 | 'paymentMethods'
 | 'sso'
 | 'ssoStatus'
 | 'enableSso'
 | 'ssoDomain'
Expand All@@ -61,7 +62,13 @@ export type ProfileSectionId =
 | 'resetSso'
 | 'testSsoUrl'
 | 'testResults';
export type ProfilePageId = 'account' | 'security' | 'organizationGeneral' | 'organizationMembers' | 'billing';
export type ProfilePageId =
 | 'account'
 | 'security'
 | 'organizationGeneral'
 | 'organizationMembers'
 | 'organizationSecurity'
 | 'billing';

export type UserPreviewId = 'userButton' | 'personalWorkspace';
export type OrganizationPreviewId =
Expand Down

29 changes: 29 additions & 0 deletions
packages/shared/src/types/localization.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1130,6 +1130,35 @@ export type __internal_LocalizationResource = {
 messageLine2: LocalizationValue;
 successMessage: LocalizationValue;
 };
 securityPage: {
 title: LocalizationValue;
 removeDialog: {
 title: LocalizationValue;
 subtitle: LocalizationValue;
 confirmButton: LocalizationValue;
 };
 ssoSection: {
 title: LocalizationValue;
 badge__unconfigured: LocalizationValue;
 badge__inProgress: LocalizationValue;
 badge__active: LocalizationValue;
 badge__inactive: LocalizationValue;
 descriptionLine1: LocalizationValue;
 descriptionLine2: LocalizationValue<'role'>;
 descriptionLine2__noRole: LocalizationValue;
 primaryButton__startConfiguration: LocalizationValue;
 primaryButton__continueConfiguration: LocalizationValue;
 providerLabel: LocalizationValue;
 domainLabel: LocalizationValue;
 signOnUrlLabel: LocalizationValue;
 issuerLabel: LocalizationValue;
 certificateLabel: LocalizationValue;
 menuAction__edit: LocalizationValue;
 menuAction__activate: LocalizationValue;
 menuAction__deactivate: LocalizationValue;
 menuAction__remove: LocalizationValue;
 };
 };
 membersPage: {
 detailsTitle__emptyRow: LocalizationValue;
 action__invite: LocalizationValue;
Expand Down

36 changes: 18 additions & 18 deletions
packages/ui/src/components/ConfigureSSO/ResetConnectionDialog.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
import type { LocalizationKey } from '@/customizables';
import { Col, descriptors, localizationKeys } from '@/customizables';
import { Card } from '@/elements/Card';
import { useCardState, withCardStateProvider } from '@/elements/contexts';
Expand All@@ -8,17 +9,19 @@ import { Modal } from '@/elements/Modal';
import { useFormControl } from '@/ui/utils/useFormControl';
import { handleError } from '@/utils/errorHandler';

import { useConfigureSSO } from './ConfigureSSOContext';

type ResetConnectionDialogProps = {
 isOpen: boolean;
 onClose: () => void;
 confirmationValue: string;
 onDelete: () => Promise<unknown>;
 contentRef: React.RefObject<HTMLDivElement>;
 /** Defaults to the Reset copy; overridden when the dialog is reused for the Remove action. */
 title?: LocalizationKey;
 subtitle?: LocalizationKey;
 confirmButtonLabel?: LocalizationKey;
};

export const ResetConnectionDialog = (props: ResetConnectionDialogProps): JSX.Element | null => {
 const { contentRef } = useConfigureSSO();

 if (!props.isOpen) {
 return null;
 }
Expand All@@ -27,7 +30,7 @@ export const ResetConnectionDialog = (props: ResetConnectionDialogProps): JSX.El
 <Modal
 handleClose={props.onClose}
 canCloseModal={false}
 portalRoot={contentRef}
 portalRoot={props.contentRef}
 containerSx={t => ({
 alignItems: 'center',
 position: 'absolute',
Expand All@@ -44,9 +47,12 @@ export const ResetConnectionDialog = (props: ResetConnectionDialogProps): JSX.El
};

const ResetConnectionDialogContent = withCardStateProvider((props: ResetConnectionDialogProps) => {
 const { onClose, confirmationValue } = props;
 const { onClose, onDelete, confirmationValue } = props;
 const title = props.title ?? localizationKeys('configureSSO.resetConnectionDialog.title');
 const subtitle = props.subtitle ?? localizationKeys('configureSSO.resetConnectionDialog.subtitle');
 const confirmButtonLabel =
 props.confirmButtonLabel ?? localizationKeys('configureSSO.resetConnectionDialog.resetButton');
 const card = useCardState();
 const { enterpriseConnection, mutations } = useConfigureSSO();

 const confirmationField = useFormControl('deleteConfirmation', '', {
 type: 'text',
Expand All@@ -60,18 +66,12 @@ const ResetConnectionDialogContent = withCardStateProvider((props: ResetConnecti
 const canSubmit = Boolean(confirmationValue && confirmationField.value === confirmationValue);

 const onSubmit = async () => {
 if (!enterpriseConnection || !canSubmit) {
 if (!canSubmit) {
 return;
 }

 try {
 // Reset is a pure delete — no navigation. Dropping `hasConnection` breaks
 // the active step's entry guard, so the wizard self-corrects to the
 // furthest-reachable step. The mutation is already reverification-wrapped.
 // No `useWizard()` here — that lets this dialog be triggered from ANY
 // footer (including the nested SAML configure footers) without binding to
 // a nested wizard.
 await mutations.deleteConnection(enterpriseConnection.id);
 await onDelete();
 onClose();
 } catch (err) {
 handleError(err as Error, [confirmationField], card.setError);
Expand All@@ -85,8 +85,8 @@ const ResetConnectionDialogContent = withCardStateProvider((props: ResetConnecti
 >
 <Card.Content sx={t => ({ textAlign: 'start', padding: t.sizes.$5 })}>
 <FormContainer
 headerTitle={localizationKeys('configureSSO.resetConnectionDialog.title')}
 headerSubtitle={localizationKeys('configureSSO.resetConnectionDialog.subtitle')}
 headerTitle={title}
 headerSubtitle={subtitle}
 sx={t => ({ gap: t.space.$4 })}
 >
 <Form.Root onSubmit={onSubmit}>
Expand All@@ -104,7 +104,7 @@ const ResetConnectionDialogContent = withCardStateProvider((props: ResetConnecti
 block={false}
 colorScheme='danger'
 isDisabled={!canSubmit}
 localizationKey={localizationKeys('configureSSO.resetConnectionDialog.resetButton')}
 localizationKey={confirmButtonLabel}
 />
 <Form.ResetButton
 elementDescriptor={descriptors.configureSSOResetConnectionDialogCancelButton}
Expand Down

60 changes: 35 additions & 25 deletions
packages/ui/src/components/ConfigureSSO/__tests__/ResetConnectionDialog.test.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,39 +1,26 @@
import type { EnterpriseConnectionResource } from '@clerk/shared/types';
import { describe, expect, it, vi } from 'vitest';

import { localizationKeys } from '@/customizables';
import { bindCreateFixtures } from '@/test/create-fixtures';
import { render, screen, waitFor } from '@/test/utils';
import { CardStateProvider } from '@/ui/elements/contexts';

// The dialog no longer touches the wizard. On confirm it calls the
// reverification-wrapped `mutations.deleteConnection(id)` directly — a pure
// delete, no navigation — and the wizard self-corrects to the
// furthest-reachable step once the active step's guard breaks. That lets the
// dialog be triggered from ANY footer (including nested SAML configure footers)
// without binding to a nested wizard.
const deleteConnection = vi.fn();

const connectionMockState = vi.hoisted(() => ({
 current: { id: 'idn_connection_1' } as Partial<EnterpriseConnectionResource> | null,
}));

vi.mock('../ConfigureSSOContext', () => ({
 useConfigureSSO: () => ({
 enterpriseConnection: connectionMockState.current,
 contentRef: { current: null },
 // The dialog's confirm calls the reverification-wrapped `deleteConnection`
 // mutation directly. No navigation — the wizard self-corrects.
 mutations: { deleteConnection },
 }),
}));

import { ResetConnectionDialog } from '../ResetConnectionDialog';

const deleteConnection = vi.fn();

const { createFixtures } = bindCreateFixtures('ConfigureSSO');

const renderDialog = (
 wrapper: React.ComponentType<{ children?: React.ReactNode }>,
 props: { isOpen?: boolean; onClose?: () => void; confirmationValue?: string } = {},
 props: {
 isOpen?: boolean;
 onClose?: () => void;
 confirmationValue?: string;
 title?: ReturnType<typeof localizationKeys>;
 subtitle?: ReturnType<typeof localizationKeys>;
 confirmButtonLabel?: ReturnType<typeof localizationKeys>;
 } = {},
) => {
 const onClose = props.onClose ?? vi.fn();
 const utils = render(
Expand All@@ -42,6 +29,11 @@ const renderDialog = (
 isOpen={props.isOpen ?? true}
 onClose={onClose}
 confirmationValue={props.confirmationValue ?? 'Acme Inc'}
 onDelete={() => deleteConnection('idn_connection_1')}
 contentRef={{ current: null }}
 title={props.title}
 subtitle={props.subtitle}
 confirmButtonLabel={props.confirmButtonLabel}
 />
 </CardStateProvider>,
 { wrapper },
Expand All@@ -52,7 +44,6 @@ const renderDialog = (
const resetMocks = () => {
 deleteConnection.mockReset();
 deleteConnection.mockResolvedValue(undefined);
 connectionMockState.current = { id: 'idn_connection_1' };
};

describe('ResetConnectionDialog', () => {
Expand DownExpand Up@@ -81,6 +72,25 @@ describe('ResetConnectionDialog', () => {
 expect(screen.getByRole('button', { name: 'Cancel' })).toBeInTheDocument();
 });

 it('renders override copy when title, subtitle, and confirm label props are supplied', async () => {
 resetMocks();
 const { wrapper } = await createFixtures();
 renderDialog(wrapper, {
 confirmationValue: 'Acme Inc',
 title: localizationKeys('organizationProfile.securityPage.removeDialog.title'),
 subtitle: localizationKeys('organizationProfile.securityPage.removeDialog.subtitle'),
 confirmButtonLabel: localizationKeys('organizationProfile.securityPage.removeDialog.confirmButton'),
 });

 expect(screen.getByRole('heading', { name: 'Remove SSO connection' })).toBeInTheDocument();
 expect(screen.queryByRole('heading', { name: 'Reset connection' })).not.toBeInTheDocument();
 expect(screen.getByText(/Are you sure you want to remove the connection\?/i)).toBeInTheDocument();
 expect(screen.getByRole('button', { name: 'Remove connection' })).toBeInTheDocument();
 expect(screen.queryByRole('button', { name: 'Reset connection' })).not.toBeInTheDocument();
 // Type-to-confirm is unchanged by the override.
 expect(screen.getByRole('button', { name: 'Cancel' })).toBeInTheDocument();
 });

 it('keeps Reset disabled while the input is empty', async () => {
 resetMocks();
 const { wrapper } = await createFixtures();
Expand Down

6 changes: 4 additions & 2 deletions
packages/ui/src/components/ConfigureSSO/elements/Step.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -206,11 +206,11 @@ FooterContinue.displayName = 'Step.Footer.Continue';
 * footer row, matching the prior destructive affordance.
 */
const FooterReset = (): JSX.Element | null => {
 const { organizationEnterpriseConnection: c } = useConfigureSSO();
 const { enterpriseConnection, mutations, contentRef } = useConfigureSSO();
 const organization = __internal_useOrganizationBase();
 const [isOpen, setIsOpen] = useState(false);

 if (!c.hasConnection) {
 if (!enterpriseConnection) {
 return null;
 }

Expand All@@ -229,6 +229,8 @@ const FooterReset = (): JSX.Element | null => {
 isOpen={isOpen}
 onClose={() => setIsOpen(false)}
 confirmationValue={organization?.name ?? ''}
 onDelete={() => mutations.deleteConnection(enterpriseConnection.id)}
 contentRef={contentRef}
 />
 </>
 );
Expand Down

5 changes: 5 additions & 0 deletions
packages/ui/src/components/ConfigureSSO/steps/ConfirmationStep.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -254,6 +254,7 @@ const ConfigurationDetailsSection = (): JSX.Element => {
};

const ResetConnectionSection = (): JSX.Element => {
 const { enterpriseConnection, mutations, contentRef } = useConfigureSSO();
 const { organization } = useOrganization();
 const [isOpen, setIsOpen] = useState(false);

Expand All@@ -277,6 +278,10 @@ const ResetConnectionSection = (): JSX.Element => {
 isOpen={isOpen}
 onClose={() => setIsOpen(false)}
 confirmationValue={organization?.name ?? ''}
 // The confirmation step is only reachable with a connection, so the resource is set.
 // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
 onDelete={() => mutations.deleteConnection(enterpriseConnection!.id)}
 contentRef={contentRef}
 />
 </ProfileSection.Root>
 );
Expand Down
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Universal Dark Mode - works on any site
(function() {
var enabled = true;
function applyDarkMode() {
if (!enabled) return;
// Create style element if it doesn't exist
var style = document.getElementById('universal-dark-mode-style');
if (!style) {
style = document.createElement('style');
style.id = 'universal-dark-mode-style';
document.head.appendChild(style);
}
// Dark mode CSS - inverts colors but preserves images/video
style.textContent = '
/* Invert everything except media */
html {
filter: invert(1) hue-rotate(180deg) !important;
background: #1a1a2e !important;
}
/* Restore images, videos, iframes, canvas */
img, video, iframe, canvas, svg, picture, [style*="background-image"] {
filter: invert(1) hue-rotate(180deg) !important;
}
/* Preserve specific elements that should not be inverted */
.no-dark-mode, .no-dark-mode *,
[data-theme="light"], [data-theme="light"],
.ace_editor, .ace_editor *,
.CodeMirror, .CodeMirror *,
.monaco-editor, .monaco-editor *,
.markdown-body pre, .markdown-body pre *,
.highlight, .highlight *,
pre code, pre code * {
filter: none !important;
}
/* Fix common UI elements */
.modal, .popup, .dropdown-menu, .tooltip, .popover {
filter: invert(1) hue-rotate(180deg) !important;
background: #2d2d44 !important;
border-color: #444 !important;
}
/* Scrollbars */
::-webkit-scrollbar { background: #1a1a2e !important; }
::-webkit-scrollbar-thumb { background: #444 !important; }
::-webkit-scrollbar-thumb:hover { background: #555 !important; }
/* Selection */
::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
';
}
function removeDarkMode() {
var style = document.getElementById('universal-dark-mode-style');
if (style) style.remove();
}
// Toggle with Alt+Shift+D
document.addEventListener('keydown', function(e) {
if (e.altKey && e.shiftKey && e.key === 'D') {
e.preventDefault();
enabled = !enabled;
if (enabled) {
applyDarkMode();
console.log('[Universal Dark Mode] Enabled');
} else {
removeDarkMode();
console.log('[Universal Dark Mode] Disabled');
}
}
});
// Apply on load
applyDarkMode();
// Re-apply on dynamic content
var observer = new MutationObserver(function(mutations) {
if (enabled && !document.getElementById('universal-dark-mode-style')) {
applyDarkMode();
}
});
observer.observe(document.head, { childList: true });
console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');
})();
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();
feat(ui,localizations,shared): add the organization Security page SSO overview by iagodahlem · Pull Request #8813 · clerk/javascript · GitHub
Skip to content
feat(ui,localizations,shared): add the organization Security page SSO overview#8813

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

iagodahlem
merged 11 commits into

from

Jun 15, 2026
 Merged


feat(ui,localizations,shared): add the organization Security page SSO overview
#8813
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


11 commits


Select commit
Hold shift + click to select a range
7460da3

refactor(ui): make ResetConnectionDialog context-free


iagodahlem Jun 10, 2026
33df3df

feat(localizations,shared): add Security page SSO overview localization


iagodahlem Jun 10, 2026
86addc4

feat(ui,shared): render the organization Security page SSO overview


iagodahlem Jun 10, 2026
1a6e0ec

refactor(ui): trim comments across the security page overview


iagodahlem Jun 10, 2026
87bd9f2

fix(ui): truncate long SSO detail values on the security page


iagodahlem Jun 10, 2026
9a31d34

feat(ui,localizations,shared): move security page SSO activation into…


iagodahlem Jun 12, 2026
e72710f

feat(ui,localizations,shared): unify the security page SSO copy and f…


iagodahlem Jun 12, 2026
33234fd

feat(ui,localizations,shared): label the security page connection rem…


iagodahlem Jun 15, 2026
7cc05e3

refactor(ui): drop optimistic activation and apply security page SSO …


iagodahlem Jun 15, 2026
d0b0186

refactor(ui): address security page review feedback


iagodahlem Jun 15, 2026
cbe883d

feat(localizations): update security page SSO description copy


iagodahlem Jun 15, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


7 changes: 7 additions & 0 deletions
.changeset/orange-pandas-shake.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
---
'@clerk/localizations': patch
'@clerk/shared': patch
'@clerk/ui': patch
---

Add an overview to the organization profile Security page. The page now lands on a summary of the SSO connection — a status badge (Unconfigured, In Progress, Active, Inactive), the configuration details framed in a card (provider, domain, sign-on URL, issuer, certificate), and an actions menu with Edit, Activate / Deactivate, and Remove — and switches into the existing configuration flow on Start, Continue, or Edit.

32 changes: 32 additions & 0 deletions
packages/localizations/src/en-US.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1066,6 +1066,38 @@ export const enUS: LocalizationResource = {
 successMessage: '{{domain}} has been removed.',
 title: 'Remove domain',
 },
 securityPage: {
 removeDialog: {
 confirmButton: 'Remove connection',
 subtitle:
 'Are you sure you want to remove the connection? This action is irreversible and deletes the connection and all of its configuration.',
 title: 'Remove SSO connection',
 },
 ssoSection: {
 badge__active: 'Active',
 badge__inactive: 'Inactive',
 badge__inProgress: 'In Progress',
 badge__unconfigured: 'Unconfigured',
 certificateLabel: 'Certificate',
 descriptionLine1:
 'Require members to sign in through your identity provider using their domain email. Members without a matching domain are unaffected.',
 descriptionLine2:
 'Anyone who signs in will be automatically added to this organization. New members will be assigned to {{role}}.',
 descriptionLine2__noRole: 'Anyone who signs in will be automatically added to this organization.',
 domainLabel: 'Domain',
 issuerLabel: 'Issuer',
 menuAction__activate: 'Activate',
 menuAction__deactivate: 'Deactivate',
 menuAction__edit: 'Edit',
 menuAction__remove: 'Remove',
 primaryButton__continueConfiguration: 'Continue configuration',
 primaryButton__startConfiguration: 'Start configuration',
 providerLabel: 'Provider',
 signOnUrlLabel: 'Sign on URL',
 title: 'SSO',
 },
 title: 'Security',
 },
 start: {
 headerTitle__general: 'General',
 headerTitle__members: 'Members',
Expand Down

9 changes: 8 additions & 1 deletion
packages/shared/src/types/elementIds.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -53,6 +53,7 @@ export type ProfileSectionId =
 | 'manageVerifiedDomains'
 | 'subscriptionsList'
 | 'paymentMethods'
 | 'sso'
 | 'ssoStatus'
 | 'enableSso'
 | 'ssoDomain'
Expand All@@ -61,7 +62,13 @@ export type ProfileSectionId =
 | 'resetSso'
 | 'testSsoUrl'
 | 'testResults';
export type ProfilePageId = 'account' | 'security' | 'organizationGeneral' | 'organizationMembers' | 'billing';
export type ProfilePageId =
 | 'account'
 | 'security'
 | 'organizationGeneral'
 | 'organizationMembers'
 | 'organizationSecurity'
 | 'billing';

export type UserPreviewId = 'userButton' | 'personalWorkspace';
export type OrganizationPreviewId =
Expand Down

29 changes: 29 additions & 0 deletions
packages/shared/src/types/localization.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1130,6 +1130,35 @@ export type __internal_LocalizationResource = {
 messageLine2: LocalizationValue;
 successMessage: LocalizationValue;
 };
 securityPage: {
 title: LocalizationValue;
 removeDialog: {
 title: LocalizationValue;
 subtitle: LocalizationValue;
 confirmButton: LocalizationValue;
 };
 ssoSection: {
 title: LocalizationValue;
 badge__unconfigured: LocalizationValue;
 badge__inProgress: LocalizationValue;
 badge__active: LocalizationValue;
 badge__inactive: LocalizationValue;
 descriptionLine1: LocalizationValue;
 descriptionLine2: LocalizationValue<'role'>;
 descriptionLine2__noRole: LocalizationValue;
 primaryButton__startConfiguration: LocalizationValue;
 primaryButton__continueConfiguration: LocalizationValue;
 providerLabel: LocalizationValue;
 domainLabel: LocalizationValue;
 signOnUrlLabel: LocalizationValue;
 issuerLabel: LocalizationValue;
 certificateLabel: LocalizationValue;
 menuAction__edit: LocalizationValue;
 menuAction__activate: LocalizationValue;
 menuAction__deactivate: LocalizationValue;
 menuAction__remove: LocalizationValue;
 };
 };
 membersPage: {
 detailsTitle__emptyRow: LocalizationValue;
 action__invite: LocalizationValue;
Expand Down

36 changes: 18 additions & 18 deletions
packages/ui/src/components/ConfigureSSO/ResetConnectionDialog.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
import type { LocalizationKey } from '@/customizables';
import { Col, descriptors, localizationKeys } from '@/customizables';
import { Card } from '@/elements/Card';
import { useCardState, withCardStateProvider } from '@/elements/contexts';
Expand All@@ -8,17 +9,19 @@ import { Modal } from '@/elements/Modal';
import { useFormControl } from '@/ui/utils/useFormControl';
import { handleError } from '@/utils/errorHandler';

import { useConfigureSSO } from './ConfigureSSOContext';

type ResetConnectionDialogProps = {
 isOpen: boolean;
 onClose: () => void;
 confirmationValue: string;
 onDelete: () => Promise<unknown>;
 contentRef: React.RefObject<HTMLDivElement>;
 /** Defaults to the Reset copy; overridden when the dialog is reused for the Remove action. */
 title?: LocalizationKey;
 subtitle?: LocalizationKey;
 confirmButtonLabel?: LocalizationKey;
};

export const ResetConnectionDialog = (props: ResetConnectionDialogProps): JSX.Element | null => {
 const { contentRef } = useConfigureSSO();

 if (!props.isOpen) {
 return null;
 }
Expand All@@ -27,7 +30,7 @@ export const ResetConnectionDialog = (props: ResetConnectionDialogProps): JSX.El
 <Modal
 handleClose={props.onClose}
 canCloseModal={false}
 portalRoot={contentRef}
 portalRoot={props.contentRef}
 containerSx={t => ({
 alignItems: 'center',
 position: 'absolute',
Expand All@@ -44,9 +47,12 @@ export const ResetConnectionDialog = (props: ResetConnectionDialogProps): JSX.El
};

const ResetConnectionDialogContent = withCardStateProvider((props: ResetConnectionDialogProps) => {
 const { onClose, confirmationValue } = props;
 const { onClose, onDelete, confirmationValue } = props;
 const title = props.title ?? localizationKeys('configureSSO.resetConnectionDialog.title');
 const subtitle = props.subtitle ?? localizationKeys('configureSSO.resetConnectionDialog.subtitle');
 const confirmButtonLabel =
 props.confirmButtonLabel ?? localizationKeys('configureSSO.resetConnectionDialog.resetButton');
 const card = useCardState();
 const { enterpriseConnection, mutations } = useConfigureSSO();

 const confirmationField = useFormControl('deleteConfirmation', '', {
 type: 'text',
Expand All@@ -60,18 +66,12 @@ const ResetConnectionDialogContent = withCardStateProvider((props: ResetConnecti
 const canSubmit = Boolean(confirmationValue && confirmationField.value === confirmationValue);

 const onSubmit = async () => {
 if (!enterpriseConnection || !canSubmit) {
 if (!canSubmit) {
 return;
 }

 try {
 // Reset is a pure delete — no navigation. Dropping `hasConnection` breaks
 // the active step's entry guard, so the wizard self-corrects to the
 // furthest-reachable step. The mutation is already reverification-wrapped.
 // No `useWizard()` here — that lets this dialog be triggered from ANY
 // footer (including the nested SAML configure footers) without binding to
 // a nested wizard.
 await mutations.deleteConnection(enterpriseConnection.id);
 await onDelete();
 onClose();
 } catch (err) {
 handleError(err as Error, [confirmationField], card.setError);
Expand All@@ -85,8 +85,8 @@ const ResetConnectionDialogContent = withCardStateProvider((props: ResetConnecti
 >
 <Card.Content sx={t => ({ textAlign: 'start', padding: t.sizes.$5 })}>
 <FormContainer
 headerTitle={localizationKeys('configureSSO.resetConnectionDialog.title')}
 headerSubtitle={localizationKeys('configureSSO.resetConnectionDialog.subtitle')}
 headerTitle={title}
 headerSubtitle={subtitle}
 sx={t => ({ gap: t.space.$4 })}
 >
 <Form.Root onSubmit={onSubmit}>
Expand All@@ -104,7 +104,7 @@ const ResetConnectionDialogContent = withCardStateProvider((props: ResetConnecti
 block={false}
 colorScheme='danger'
 isDisabled={!canSubmit}
 localizationKey={localizationKeys('configureSSO.resetConnectionDialog.resetButton')}
 localizationKey={confirmButtonLabel}
 />
 <Form.ResetButton
 elementDescriptor={descriptors.configureSSOResetConnectionDialogCancelButton}
Expand Down

60 changes: 35 additions & 25 deletions
packages/ui/src/components/ConfigureSSO/__tests__/ResetConnectionDialog.test.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,39 +1,26 @@
import type { EnterpriseConnectionResource } from '@clerk/shared/types';
import { describe, expect, it, vi } from 'vitest';

import { localizationKeys } from '@/customizables';
import { bindCreateFixtures } from '@/test/create-fixtures';
import { render, screen, waitFor } from '@/test/utils';
import { CardStateProvider } from '@/ui/elements/contexts';

// The dialog no longer touches the wizard. On confirm it calls the
// reverification-wrapped `mutations.deleteConnection(id)` directly — a pure
// delete, no navigation — and the wizard self-corrects to the
// furthest-reachable step once the active step's guard breaks. That lets the
// dialog be triggered from ANY footer (including nested SAML configure footers)
// without binding to a nested wizard.
const deleteConnection = vi.fn();

const connectionMockState = vi.hoisted(() => ({
 current: { id: 'idn_connection_1' } as Partial<EnterpriseConnectionResource> | null,
}));

vi.mock('../ConfigureSSOContext', () => ({
 useConfigureSSO: () => ({
 enterpriseConnection: connectionMockState.current,
 contentRef: { current: null },
 // The dialog's confirm calls the reverification-wrapped `deleteConnection`
 // mutation directly. No navigation — the wizard self-corrects.
 mutations: { deleteConnection },
 }),
}));

import { ResetConnectionDialog } from '../ResetConnectionDialog';

const deleteConnection = vi.fn();

const { createFixtures } = bindCreateFixtures('ConfigureSSO');

const renderDialog = (
 wrapper: React.ComponentType<{ children?: React.ReactNode }>,
 props: { isOpen?: boolean; onClose?: () => void; confirmationValue?: string } = {},
 props: {
 isOpen?: boolean;
 onClose?: () => void;
 confirmationValue?: string;
 title?: ReturnType<typeof localizationKeys>;
 subtitle?: ReturnType<typeof localizationKeys>;
 confirmButtonLabel?: ReturnType<typeof localizationKeys>;
 } = {},
) => {
 const onClose = props.onClose ?? vi.fn();
 const utils = render(
Expand All@@ -42,6 +29,11 @@ const renderDialog = (
 isOpen={props.isOpen ?? true}
 onClose={onClose}
 confirmationValue={props.confirmationValue ?? 'Acme Inc'}
 onDelete={() => deleteConnection('idn_connection_1')}
 contentRef={{ current: null }}
 title={props.title}
 subtitle={props.subtitle}
 confirmButtonLabel={props.confirmButtonLabel}
 />
 </CardStateProvider>,
 { wrapper },
Expand All@@ -52,7 +44,6 @@ const renderDialog = (
const resetMocks = () => {
 deleteConnection.mockReset();
 deleteConnection.mockResolvedValue(undefined);
 connectionMockState.current = { id: 'idn_connection_1' };
};

describe('ResetConnectionDialog', () => {
Expand DownExpand Up@@ -81,6 +72,25 @@ describe('ResetConnectionDialog', () => {
 expect(screen.getByRole('button', { name: 'Cancel' })).toBeInTheDocument();
 });

 it('renders override copy when title, subtitle, and confirm label props are supplied', async () => {
 resetMocks();
 const { wrapper } = await createFixtures();
 renderDialog(wrapper, {
 confirmationValue: 'Acme Inc',
 title: localizationKeys('organizationProfile.securityPage.removeDialog.title'),
 subtitle: localizationKeys('organizationProfile.securityPage.removeDialog.subtitle'),
 confirmButtonLabel: localizationKeys('organizationProfile.securityPage.removeDialog.confirmButton'),
 });

 expect(screen.getByRole('heading', { name: 'Remove SSO connection' })).toBeInTheDocument();
 expect(screen.queryByRole('heading', { name: 'Reset connection' })).not.toBeInTheDocument();
 expect(screen.getByText(/Are you sure you want to remove the connection\?/i)).toBeInTheDocument();
 expect(screen.getByRole('button', { name: 'Remove connection' })).toBeInTheDocument();
 expect(screen.queryByRole('button', { name: 'Reset connection' })).not.toBeInTheDocument();
 // Type-to-confirm is unchanged by the override.
 expect(screen.getByRole('button', { name: 'Cancel' })).toBeInTheDocument();
 });

 it('keeps Reset disabled while the input is empty', async () => {
 resetMocks();
 const { wrapper } = await createFixtures();
Expand Down

6 changes: 4 additions & 2 deletions
packages/ui/src/components/ConfigureSSO/elements/Step.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -206,11 +206,11 @@ FooterContinue.displayName = 'Step.Footer.Continue';
 * footer row, matching the prior destructive affordance.
 */
const FooterReset = (): JSX.Element | null => {
 const { organizationEnterpriseConnection: c } = useConfigureSSO();
 const { enterpriseConnection, mutations, contentRef } = useConfigureSSO();
 const organization = __internal_useOrganizationBase();
 const [isOpen, setIsOpen] = useState(false);

 if (!c.hasConnection) {
 if (!enterpriseConnection) {
 return null;
 }

Expand All@@ -229,6 +229,8 @@ const FooterReset = (): JSX.Element | null => {
 isOpen={isOpen}
 onClose={() => setIsOpen(false)}
 confirmationValue={organization?.name ?? ''}
 onDelete={() => mutations.deleteConnection(enterpriseConnection.id)}
 contentRef={contentRef}
 />
 </>
 );
Expand Down

5 changes: 5 additions & 0 deletions
packages/ui/src/components/ConfigureSSO/steps/ConfirmationStep.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -254,6 +254,7 @@ const ConfigurationDetailsSection = (): JSX.Element => {
};

const ResetConnectionSection = (): JSX.Element => {
 const { enterpriseConnection, mutations, contentRef } = useConfigureSSO();
 const { organization } = useOrganization();
 const [isOpen, setIsOpen] = useState(false);

Expand All@@ -277,6 +278,10 @@ const ResetConnectionSection = (): JSX.Element => {
 isOpen={isOpen}
 onClose={() => setIsOpen(false)}
 confirmationValue={organization?.name ?? ''}
 // The confirmation step is only reachable with a connection, so the resource is set.
 // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
 onDelete={() => mutations.deleteConnection(enterpriseConnection!.id)}
 contentRef={contentRef}
 />
 </ProfileSection.Root>
 );
Expand Down
Loading
Loading