Skip to content

feat(ui): wire the Security page navigation into the ConfigureSSO wizard#8864

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 2 commits into from
Jun 16, 2026
Merged

feat(ui): wire the Security page navigation into the ConfigureSSO wizard #8864

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a71a77a
feat(ui): add onExit to ConfigureSSO context and host-rendered header…
iagodahlem Jun 16, 2026
88acd1b
feat(ui): add Security back control and first-step launch to the SSO …
iagodahlem Jun 16, 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
5 changes: 5 additions & 0 deletions .changeset/whole-parents-care.md
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
'@clerk/ui': patch
---

The Security page's SSO wizard now has a back-to-Security control, and Start/Edit open the wizard at the first step (Continue resumes where you left off).
5 changes: 5 additions & 0 deletions packages/ui/src/components/ConfigureSSO/ConfigureSSOContext.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -25,6 +25,7 @@ export interface ConfigureSSOData {
organizationEnterpriseConnection: OrganizationEnterpriseConnection;
testRuns: TestRunsView;
organizationDomains: OrganizationDomainResource[] | undefined;
onExit?: () => void;
}

interface ConfigureSSOProviderProps {
Expand All@@ -35,6 +36,7 @@ interface ConfigureSSOProviderProps {
contentRef: React.RefObject<HTMLDivElement>;
enterpriseConnectionMutations: EnterpriseConnectionMutations;
organizationDomainMutations: OrganizationDomainMutations;
onExit?: () => void;
}

const ConfigureSSOContext = React.createContext<ConfigureSSOData | null>(null);
Expand All@@ -48,6 +50,7 @@ export const ConfigureSSOProvider = ({
contentRef,
enterpriseConnectionMutations,
organizationDomainMutations,
onExit,
children,
}: PropsWithChildren<ConfigureSSOProviderProps>): JSX.Element => {
const value = React.useMemo<ConfigureSSOData>(
Expand All@@ -59,6 +62,7 @@ export const ConfigureSSOProvider = ({
organizationDomains,
enterpriseConnectionMutations,
organizationDomainMutations,
onExit,
}),
[
contentRef,
Expand All@@ -68,6 +72,7 @@ export const ConfigureSSOProvider = ({
testRuns,
organizationDomains,
enterpriseConnection,
onExit,
],
);

Expand Down
65 changes: 30 additions & 35 deletions packages/ui/src/components/ConfigureSSO/ConfigureSSOHeader.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,14 @@
import { useLocalizations } from '@/customizables';
import { Flex, useLocalizations } from '@/customizables';

import { ProfileCardHeader } from './elements/ProfileCard';
import { Stepper } from './elements/Stepper';
import { useWizard } from './elements/Wizard';

/**
* The wizard breadcrumb, driven entirely by the generic entry-guard wizard
* facade.
*
* Breadcrumb membership is the labelled steps in declaration order — the
* provider-selection step carries no `label`, so it never appears (it replaced
* the old `hidden` provider step). Each item's reachability comes straight from
* the guard-driven `isReachable` flag (the same predicate `goToStep` checks), so
* a disabled breadcrumb item and a blocked jump always agree. Completion stays
* positional. The reset affordance now lives in the step footers
* (`Step.Footer.Reset`), which delete the connection via the context mutation
* rather than a wizard binding.
*/
export const ConfigureSSOHeader = (): JSX.Element => {
type ConfigureSSOHeaderProps = {
title?: React.ReactNode;
};

export const ConfigureSSOHeader = ({ title }: ConfigureSSOHeaderProps): JSX.Element => {
const { activeSteps, currentIndex, goToStep } = useWizard();
const { t } = useLocalizations();

Expand All@@ -28,27 +19,31 @@ export const ConfigureSSOHeader = (): JSX.Element => {

return (
<ProfileCardHeader>
<Stepper>
{visibleSteps.map((step, index) => {
const isCurrent = index === currentVisibleIndex;
const labelText = step.label ? (typeof step.label === 'string' ? step.label : t(step.label)) : '';
{title}

<Flex sx={title ? { marginInlineStart: 'auto' } : undefined}>
<Stepper>
{visibleSteps.map((step, index) => {
const isCurrent = index === currentVisibleIndex;
const labelText = step.label ? (typeof step.label === 'string' ? step.label : t(step.label)) : '';

return (
<Stepper.Item
key={step.id}
bullet={index + 1}
isCurrent={isCurrent}
isCompleted={step.isCompleted}
// Guard-driven: bind directly to the wizard's reachability flag so
// a disabled breadcrumb item and a blocked `goToStep` agree.
isReachable={step.isReachable}
onClick={() => goToStep(step.id)}
>
{labelText}
</Stepper.Item>
);
})}
</Stepper>
return (
<Stepper.Item
key={step.id}
bullet={index + 1}
isCurrent={isCurrent}
isCompleted={step.isCompleted}
// Guard-driven: bind directly to the wizard's reachability flag so
// a disabled breadcrumb item and a blocked `goToStep` agree.
isReachable={step.isReachable}
onClick={() => goToStep(step.id)}
>
{labelText}
</Stepper.Item>
);
})}
</Stepper>
</Flex>
</ProfileCardHeader>
);
};
18 changes: 12 additions & 6 deletions packages/ui/src/components/ConfigureSSO/ConfigureSSOWizard.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,10 +14,12 @@ import {
TestConfigurationStep,
} from './steps';

export type ConfigureSSOWizardProps = Omit<ComponentProps<typeof ConfigureSSOProvider>, 'children'>;
export type ConfigureSSOWizardProps = Omit<ComponentProps<typeof ConfigureSSOProvider>, 'children'> & {
title?: React.ReactNode;
forceInitialStep?: boolean;
};

/** Pure, data-injected ConfigureSSO flow — hosts own fetching, loading, and permission gating. */
export const ConfigureSSOWizard = (props: ConfigureSSOWizardProps): JSX.Element => {
export const ConfigureSSOWizard = ({ title, forceInitialStep, ...props }: ConfigureSSOWizardProps): JSX.Element => {
const { organizationEnterpriseConnection: c, organizationDomains } = props;

const allDomainsVerified = areAllOrganizationDomainsVerified(organizationDomains);
Expand All@@ -33,11 +35,15 @@ export const ConfigureSSOWizard = (props: ConfigureSSOWizardProps): JSX.Element
[c, allDomainsVerified],
);

// Each step owns a `CardStateProvider` so card errors stay scoped to their step and clear when it unmounts.
const initialStepId = forceInitialStep ? steps[0].id : undefined;

return (
<ConfigureSSOProvider {...props}>
<Wizard steps={steps}>
<ConfigureSSOHeader />
<Wizard
steps={steps}
initialStepId={initialStepId}
>
<ConfigureSSOHeader title={title} />

<Wizard.Match id='verify-domain'>
<CardStateProvider>
Expand Down
25 changes: 25 additions & 0 deletions packages/ui/src/components/ConfigureSSO/__tests__/ConfigureSSO.test.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -71,6 +71,31 @@ describe('ConfigureSSO', () => {
});
});

describe('standalone mount header', () => {
it('renders the stepper without a back control (no host title / onExit)', async () => {
const { wrapper, fixtures } = await createFixtures(f => {
f.withEnterpriseSso({ selfServeSSO: true });
f.withEmailAddress();
f.withOrganizations();
f.withUser({
email_addresses: ['test@clerk.com'],
organization_memberships: [{ name: 'Org1', permissions: ['org:sys_entconns:manage'] }],
});
});

fixtures.clerk.organization?.getEnterpriseConnections.mockResolvedValue([]);
mockOrganizationDomains(fixtures, [verifiedDomain]);

const { findByText, queryByRole } = render(<ConfigureSSO />, { wrapper });

await findByText(/select your identity provider/i);

// The standalone wizard is mounted without `title`/`onExit`, so the header
// exposes no "Security" back control.
expect(queryByRole('button', { name: 'Security' })).not.toBeInTheDocument();
});
});

describe('in a personal workspace', () => {
it('renders the wizard without checking the manage enterprise connections permission', async () => {
const { wrapper, fixtures } = await createFixtures(f => {
Expand Down
42 changes: 36 additions & 6 deletions packages/ui/src/components/OrganizationProfile/OrganizationSecurityPage.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
import { useOrganization } from '@clerk/shared/react';
import { useState } from 'react';
import React, { useState } from 'react';

import { Header } from '@/ui/elements/Header';
import { ProfileCard } from '@/ui/elements/ProfileCard';

import React from 'react';
import { Col, descriptors, localizationKeys } from '../../customizables';
import { Col, descriptors, Icon, localizationKeys, SimpleButton, Text } from '../../customizables';
import { ChevronLeft } from '../../icons';
import { ConfigureSSOProtect } from '../ConfigureSSO/ConfigureSSO';
import { ConfigureSSOSkeleton } from '../ConfigureSSO/ConfigureSSOSkeleton';
import { ConfigureSSOWizard } from '../ConfigureSSO/ConfigureSSOWizard';
Expand All@@ -27,7 +27,6 @@ export const OrganizationSecurityPage = ({ contentRef }: OrganizationSecurityPag
return <OrganizationSecurityPageContent contentRef={contentRef} />;
};

/** Separate from the page so the connection hook only runs behind the organization check. */
const OrganizationSecurityPageContent = ({ contentRef }: OrganizationSecurityPageProps) => {
const {
organization,
Expand All@@ -41,12 +40,40 @@ const OrganizationSecurityPageContent = ({ contentRef }: OrganizationSecurityPag
} = useOrganizationEnterpriseConnection();

const [view, setView] = useState<'overview' | 'wizard'>('overview');
const [forceFirstStep, setForceFirstStep] = useState(false);

const exitWizard = () => setView('overview');

const openWizard = (forceInitialStep = false) => {
setForceFirstStep(forceInitialStep);
setView('wizard');
};

// Gate loading above the provider so the context never observes a loading state.
if (isLoading) {
return <ConfigureSSOSkeleton />;
}

const backControl = (
<SimpleButton
elementDescriptor={descriptors.configureSSOHeaderBackButton}
variant='unstyled'
onClick={exitWizard}
sx={t => ({
gap: t.space.$1,
padding: 0,
color: t.colors.$colorMutedForeground,
'&:hover': { color: t.colors.$colorForeground },
})}
>
<Icon icon={ChevronLeft} />
<Text
as='span'
variant='body'
localizationKey={localizationKeys('organizationProfile.navbar.security')}
/>
</SimpleButton>
);

return (
<ConfigureSSOProtect>
{view === 'overview' ? (
Expand All@@ -73,7 +100,7 @@ const OrganizationSecurityPageContent = ({ contentRef }: OrganizationSecurityPag
deleteConnection={enterpriseConnectionMutations.deleteConnection}
organizationName={organization?.name ?? ''}
contentRef={contentRef}
onConfigure={() => setView('wizard')}
onConfigure={openWizard}
/>
</Col>
</Col>
Expand All@@ -87,6 +114,9 @@ const OrganizationSecurityPageContent = ({ contentRef }: OrganizationSecurityPag
enterpriseConnectionMutations={enterpriseConnectionMutations}
organizationDomainMutations={organizationDomainMutations}
organizationDomains={organizationDomains}
forceInitialStep={forceFirstStep}
title={backControl}
onExit={exitWizard}
/>
)}
</ConfigureSSOProtect>
Expand Down
8 changes: 4 additions & 4 deletions packages/ui/src/components/OrganizationProfile/SecuritySsoSection.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -28,7 +28,7 @@ type SecuritySsoSectionProps = {
deleteConnection: EnterpriseConnectionMutations['deleteConnection'];
organizationName: string;
contentRef: React.RefObject<HTMLDivElement>;
onConfigure: () => void;
onConfigure: (forceInitialStep?: boolean) => void;
};

const STATUS_BADGES: Record<
Expand DownExpand Up@@ -95,7 +95,7 @@ export const SecuritySsoSection = (props: SecuritySsoSectionProps): JSX.Element
'organizationProfile.securityPage.ssoSection.primaryButton__startConfiguration',
)}
primaryButtonId='start'
onConfigure={onConfigure}
onConfigure={() => onConfigure(true)}
/>
)}

Expand All@@ -105,7 +105,7 @@ export const SecuritySsoSection = (props: SecuritySsoSectionProps): JSX.Element
'organizationProfile.securityPage.ssoSection.primaryButton__continueConfiguration',
)}
primaryButtonId='continue'
onConfigure={onConfigure}
onConfigure={() => onConfigure()}
/>
)}

Expand DownExpand Up@@ -205,7 +205,7 @@ const ConfiguredContent = (props: ConfiguredContentProps): JSX.Element => {
actions={[
{
label: localizationKeys('organizationProfile.securityPage.ssoSection.menuAction__edit'),
onClick: onConfigure,
onClick: () => onConfigure(true),
},
isActive
? {
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): wire the Security page navigation into the ConfigureSSO wizard by iagodahlem · Pull Request #8864 · clerk/javascript · GitHub
Skip to content
feat(ui): wire the Security page navigation into the ConfigureSSO wizard#8864

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 2 commits into

from

Jun 16, 2026
 Merged


feat(ui): wire the Security page navigation into the ConfigureSSO wizard
#8864
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
a71a77a

feat(ui): add onExit to ConfigureSSO context and host-rendered header…


iagodahlem Jun 16, 2026
88acd1b

feat(ui): add Security back control and first-step launch to the SSO …


iagodahlem Jun 16, 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


5 changes: 5 additions & 0 deletions
.changeset/whole-parents-care.md

View file


Open in desktop

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

The Security page's SSO wizard now has a back-to-Security control, and Start/Edit open the wizard at the first step (Continue resumes where you left off).

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -25,6 +25,7 @@ export interface ConfigureSSOData {
 organizationEnterpriseConnection: OrganizationEnterpriseConnection;
 testRuns: TestRunsView;
 organizationDomains: OrganizationDomainResource[] | undefined;
 onExit?: () => void;
}

interface ConfigureSSOProviderProps {
Expand All@@ -35,6 +36,7 @@ interface ConfigureSSOProviderProps {
 contentRef: React.RefObject<HTMLDivElement>;
 enterpriseConnectionMutations: EnterpriseConnectionMutations;
 organizationDomainMutations: OrganizationDomainMutations;
 onExit?: () => void;
}

const ConfigureSSOContext = React.createContext<ConfigureSSOData | null>(null);
Expand All@@ -48,6 +50,7 @@ export const ConfigureSSOProvider = ({
 contentRef,
 enterpriseConnectionMutations,
 organizationDomainMutations,
 onExit,
 children,
}: PropsWithChildren<ConfigureSSOProviderProps>): JSX.Element => {
 const value = React.useMemo<ConfigureSSOData>(
Expand All@@ -59,6 +62,7 @@ export const ConfigureSSOProvider = ({
 organizationDomains,
 enterpriseConnectionMutations,
 organizationDomainMutations,
 onExit,
 }),
 [
 contentRef,
Expand All@@ -68,6 +72,7 @@ export const ConfigureSSOProvider = ({
 testRuns,
 organizationDomains,
 enterpriseConnection,
 onExit,
 ],
 );

Expand Down

65 changes: 30 additions & 35 deletions
packages/ui/src/components/ConfigureSSO/ConfigureSSOHeader.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,23 +1,14 @@
import { useLocalizations } from '@/customizables';
import { Flex, useLocalizations } from '@/customizables';

import { ProfileCardHeader } from './elements/ProfileCard';
import { Stepper } from './elements/Stepper';
import { useWizard } from './elements/Wizard';

/**
 * The wizard breadcrumb, driven entirely by the generic entry-guard wizard
 * facade.
 *
 * Breadcrumb membership is the labelled steps in declaration order — the
 * provider-selection step carries no `label`, so it never appears (it replaced
 * the old `hidden` provider step). Each item's reachability comes straight from
 * the guard-driven `isReachable` flag (the same predicate `goToStep` checks), so
 * a disabled breadcrumb item and a blocked jump always agree. Completion stays
 * positional. The reset affordance now lives in the step footers
 * (`Step.Footer.Reset`), which delete the connection via the context mutation
 * rather than a wizard binding.
 */
export const ConfigureSSOHeader = (): JSX.Element => {
type ConfigureSSOHeaderProps = {
 title?: React.ReactNode;
};

export const ConfigureSSOHeader = ({ title }: ConfigureSSOHeaderProps): JSX.Element => {
 const { activeSteps, currentIndex, goToStep } = useWizard();
 const { t } = useLocalizations();

Expand All@@ -28,27 +19,31 @@ export const ConfigureSSOHeader = (): JSX.Element => {

 return (
 <ProfileCardHeader>
 <Stepper>
 {visibleSteps.map((step, index) => {
 const isCurrent = index === currentVisibleIndex;
 const labelText = step.label ? (typeof step.label === 'string' ? step.label : t(step.label)) : '';
 {title}

 <Flex sx={title ? { marginInlineStart: 'auto' } : undefined}>
 <Stepper>
 {visibleSteps.map((step, index) => {
 const isCurrent = index === currentVisibleIndex;
 const labelText = step.label ? (typeof step.label === 'string' ? step.label : t(step.label)) : '';

 return (
 <Stepper.Item
 key={step.id}
 bullet={index + 1}
 isCurrent={isCurrent}
 isCompleted={step.isCompleted}
 // Guard-driven: bind directly to the wizard's reachability flag so
 // a disabled breadcrumb item and a blocked `goToStep` agree.
 isReachable={step.isReachable}
 onClick={() => goToStep(step.id)}
 >
 {labelText}
 </Stepper.Item>
 );
 })}
 </Stepper>
 return (
 <Stepper.Item
 key={step.id}
 bullet={index + 1}
 isCurrent={isCurrent}
 isCompleted={step.isCompleted}
 // Guard-driven: bind directly to the wizard's reachability flag so
 // a disabled breadcrumb item and a blocked `goToStep` agree.
 isReachable={step.isReachable}
 onClick={() => goToStep(step.id)}
 >
 {labelText}
 </Stepper.Item>
 );
 })}
 </Stepper>
 </Flex>
 </ProfileCardHeader>
 );
};

18 changes: 12 additions & 6 deletions
packages/ui/src/components/ConfigureSSO/ConfigureSSOWizard.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,10 +14,12 @@ import {
 TestConfigurationStep,
} from './steps';

export type ConfigureSSOWizardProps = Omit<ComponentProps<typeof ConfigureSSOProvider>, 'children'>;
export type ConfigureSSOWizardProps = Omit<ComponentProps<typeof ConfigureSSOProvider>, 'children'> & {
 title?: React.ReactNode;
 forceInitialStep?: boolean;
};

/** Pure, data-injected ConfigureSSO flow — hosts own fetching, loading, and permission gating. */
export const ConfigureSSOWizard = (props: ConfigureSSOWizardProps): JSX.Element => {
export const ConfigureSSOWizard = ({ title, forceInitialStep, ...props }: ConfigureSSOWizardProps): JSX.Element => {
 const { organizationEnterpriseConnection: c, organizationDomains } = props;

 const allDomainsVerified = areAllOrganizationDomainsVerified(organizationDomains);
Expand All@@ -33,11 +35,15 @@ export const ConfigureSSOWizard = (props: ConfigureSSOWizardProps): JSX.Element
 [c, allDomainsVerified],
 );

 // Each step owns a `CardStateProvider` so card errors stay scoped to their step and clear when it unmounts.
 const initialStepId = forceInitialStep ? steps[0].id : undefined;

 return (
 <ConfigureSSOProvider {...props}>
 <Wizard steps={steps}>
 <ConfigureSSOHeader />
 <Wizard
 steps={steps}
 initialStepId={initialStepId}
 >
 <ConfigureSSOHeader title={title} />

 <Wizard.Match id='verify-domain'>
 <CardStateProvider>
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -71,6 +71,31 @@ describe('ConfigureSSO', () => {
 });
 });

 describe('standalone mount header', () => {
 it('renders the stepper without a back control (no host title / onExit)', async () => {
 const { wrapper, fixtures } = await createFixtures(f => {
 f.withEnterpriseSso({ selfServeSSO: true });
 f.withEmailAddress();
 f.withOrganizations();
 f.withUser({
 email_addresses: ['test@clerk.com'],
 organization_memberships: [{ name: 'Org1', permissions: ['org:sys_entconns:manage'] }],
 });
 });

 fixtures.clerk.organization?.getEnterpriseConnections.mockResolvedValue([]);
 mockOrganizationDomains(fixtures, [verifiedDomain]);

 const { findByText, queryByRole } = render(<ConfigureSSO />, { wrapper });

 await findByText(/select your identity provider/i);

 // The standalone wizard is mounted without `title`/`onExit`, so the header
 // exposes no "Security" back control.
 expect(queryByRole('button', { name: 'Security' })).not.toBeInTheDocument();
 });
 });

 describe('in a personal workspace', () => {
 it('renders the wizard without checking the manage enterprise connections permission', async () => {
 const { wrapper, fixtures } = await createFixtures(f => {
Expand Down

42 changes: 36 additions & 6 deletions
packages/ui/src/components/OrganizationProfile/OrganizationSecurityPage.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
import { useOrganization } from '@clerk/shared/react';
import { useState } from 'react';
import React, { useState } from 'react';

import { Header } from '@/ui/elements/Header';
import { ProfileCard } from '@/ui/elements/ProfileCard';

import React from 'react';
import { Col, descriptors, localizationKeys } from '../../customizables';
import { Col, descriptors, Icon, localizationKeys, SimpleButton, Text } from '../../customizables';
import { ChevronLeft } from '../../icons';
import { ConfigureSSOProtect } from '../ConfigureSSO/ConfigureSSO';
import { ConfigureSSOSkeleton } from '../ConfigureSSO/ConfigureSSOSkeleton';
import { ConfigureSSOWizard } from '../ConfigureSSO/ConfigureSSOWizard';
Expand All@@ -27,7 +27,6 @@ export const OrganizationSecurityPage = ({ contentRef }: OrganizationSecurityPag
 return <OrganizationSecurityPageContent contentRef={contentRef} />;
};

/** Separate from the page so the connection hook only runs behind the organization check. */
const OrganizationSecurityPageContent = ({ contentRef }: OrganizationSecurityPageProps) => {
 const {
 organization,
Expand All@@ -41,12 +40,40 @@ const OrganizationSecurityPageContent = ({ contentRef }: OrganizationSecurityPag
 } = useOrganizationEnterpriseConnection();

 const [view, setView] = useState<'overview' | 'wizard'>('overview');
 const [forceFirstStep, setForceFirstStep] = useState(false);

 const exitWizard = () => setView('overview');

 const openWizard = (forceInitialStep = false) => {
 setForceFirstStep(forceInitialStep);
 setView('wizard');
 };

 // Gate loading above the provider so the context never observes a loading state.
 if (isLoading) {
 return <ConfigureSSOSkeleton />;
 }

 const backControl = (
 <SimpleButton
 elementDescriptor={descriptors.configureSSOHeaderBackButton}
 variant='unstyled'
 onClick={exitWizard}
 sx={t => ({
 gap: t.space.$1,
 padding: 0,
 color: t.colors.$colorMutedForeground,
 '&:hover': { color: t.colors.$colorForeground },
 })}
 >
 <Icon icon={ChevronLeft} />
 <Text
 as='span'
 variant='body'
 localizationKey={localizationKeys('organizationProfile.navbar.security')}
 />
 </SimpleButton>
 );

 return (
 <ConfigureSSOProtect>
 {view === 'overview' ? (
Expand All@@ -73,7 +100,7 @@ const OrganizationSecurityPageContent = ({ contentRef }: OrganizationSecurityPag
 deleteConnection={enterpriseConnectionMutations.deleteConnection}
 organizationName={organization?.name ?? ''}
 contentRef={contentRef}
 onConfigure={() => setView('wizard')}
 onConfigure={openWizard}
 />
 </Col>
 </Col>
Expand All@@ -87,6 +114,9 @@ const OrganizationSecurityPageContent = ({ contentRef }: OrganizationSecurityPag
 enterpriseConnectionMutations={enterpriseConnectionMutations}
 organizationDomainMutations={organizationDomainMutations}
 organizationDomains={organizationDomains}
 forceInitialStep={forceFirstStep}
 title={backControl}
 onExit={exitWizard}
 />
 )}
 </ConfigureSSOProtect>
Expand Down

8 changes: 4 additions & 4 deletions
packages/ui/src/components/OrganizationProfile/SecuritySsoSection.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -28,7 +28,7 @@ type SecuritySsoSectionProps = {
 deleteConnection: EnterpriseConnectionMutations['deleteConnection'];
 organizationName: string;
 contentRef: React.RefObject<HTMLDivElement>;
 onConfigure: () => void;
 onConfigure: (forceInitialStep?: boolean) => void;
};

const STATUS_BADGES: Record<
Expand DownExpand Up@@ -95,7 +95,7 @@ export const SecuritySsoSection = (props: SecuritySsoSectionProps): JSX.Element
 'organizationProfile.securityPage.ssoSection.primaryButton__startConfiguration',
 )}
 primaryButtonId='start'
 onConfigure={onConfigure}
 onConfigure={() => onConfigure(true)}
 />
 )}

Expand All@@ -105,7 +105,7 @@ export const SecuritySsoSection = (props: SecuritySsoSectionProps): JSX.Element
 'organizationProfile.securityPage.ssoSection.primaryButton__continueConfiguration',
 )}
 primaryButtonId='continue'
 onConfigure={onConfigure}
 onConfigure={() => onConfigure()}
 />
 )}

Expand DownExpand Up@@ -205,7 +205,7 @@ const ConfiguredContent = (props: ConfiguredContentProps): JSX.Element => {
 actions={[
 {
 label: localizationKeys('organizationProfile.securityPage.ssoSection.menuAction__edit'),
 onClick: onConfigure,
 onClick: () => onConfigure(true),
 },
 isActive
 ? {
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): wire the Security page navigation into the ConfigureSSO wizard by iagodahlem · Pull Request #8864 · clerk/javascript · GitHub
Skip to content
feat(ui): wire the Security page navigation into the ConfigureSSO wizard#8864

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 2 commits into

from

Jun 16, 2026
 Merged


feat(ui): wire the Security page navigation into the ConfigureSSO wizard
#8864
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
a71a77a

feat(ui): add onExit to ConfigureSSO context and host-rendered header…


iagodahlem Jun 16, 2026
88acd1b

feat(ui): add Security back control and first-step launch to the SSO …


iagodahlem Jun 16, 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


5 changes: 5 additions & 0 deletions
.changeset/whole-parents-care.md

View file


Open in desktop

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

The Security page's SSO wizard now has a back-to-Security control, and Start/Edit open the wizard at the first step (Continue resumes where you left off).

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -25,6 +25,7 @@ export interface ConfigureSSOData {
 organizationEnterpriseConnection: OrganizationEnterpriseConnection;
 testRuns: TestRunsView;
 organizationDomains: OrganizationDomainResource[] | undefined;
 onExit?: () => void;
}

interface ConfigureSSOProviderProps {
Expand All@@ -35,6 +36,7 @@ interface ConfigureSSOProviderProps {
 contentRef: React.RefObject<HTMLDivElement>;
 enterpriseConnectionMutations: EnterpriseConnectionMutations;
 organizationDomainMutations: OrganizationDomainMutations;
 onExit?: () => void;
}

const ConfigureSSOContext = React.createContext<ConfigureSSOData | null>(null);
Expand All@@ -48,6 +50,7 @@ export const ConfigureSSOProvider = ({
 contentRef,
 enterpriseConnectionMutations,
 organizationDomainMutations,
 onExit,
 children,
}: PropsWithChildren<ConfigureSSOProviderProps>): JSX.Element => {
 const value = React.useMemo<ConfigureSSOData>(
Expand All@@ -59,6 +62,7 @@ export const ConfigureSSOProvider = ({
 organizationDomains,
 enterpriseConnectionMutations,
 organizationDomainMutations,
 onExit,
 }),
 [
 contentRef,
Expand All@@ -68,6 +72,7 @@ export const ConfigureSSOProvider = ({
 testRuns,
 organizationDomains,
 enterpriseConnection,
 onExit,
 ],
 );

Expand Down

65 changes: 30 additions & 35 deletions
packages/ui/src/components/ConfigureSSO/ConfigureSSOHeader.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,23 +1,14 @@
import { useLocalizations } from '@/customizables';
import { Flex, useLocalizations } from '@/customizables';

import { ProfileCardHeader } from './elements/ProfileCard';
import { Stepper } from './elements/Stepper';
import { useWizard } from './elements/Wizard';

/**
 * The wizard breadcrumb, driven entirely by the generic entry-guard wizard
 * facade.
 *
 * Breadcrumb membership is the labelled steps in declaration order — the
 * provider-selection step carries no `label`, so it never appears (it replaced
 * the old `hidden` provider step). Each item's reachability comes straight from
 * the guard-driven `isReachable` flag (the same predicate `goToStep` checks), so
 * a disabled breadcrumb item and a blocked jump always agree. Completion stays
 * positional. The reset affordance now lives in the step footers
 * (`Step.Footer.Reset`), which delete the connection via the context mutation
 * rather than a wizard binding.
 */
export const ConfigureSSOHeader = (): JSX.Element => {
type ConfigureSSOHeaderProps = {
 title?: React.ReactNode;
};

export const ConfigureSSOHeader = ({ title }: ConfigureSSOHeaderProps): JSX.Element => {
 const { activeSteps, currentIndex, goToStep } = useWizard();
 const { t } = useLocalizations();

Expand All@@ -28,27 +19,31 @@ export const ConfigureSSOHeader = (): JSX.Element => {

 return (
 <ProfileCardHeader>
 <Stepper>
 {visibleSteps.map((step, index) => {
 const isCurrent = index === currentVisibleIndex;
 const labelText = step.label ? (typeof step.label === 'string' ? step.label : t(step.label)) : '';
 {title}

 <Flex sx={title ? { marginInlineStart: 'auto' } : undefined}>
 <Stepper>
 {visibleSteps.map((step, index) => {
 const isCurrent = index === currentVisibleIndex;
 const labelText = step.label ? (typeof step.label === 'string' ? step.label : t(step.label)) : '';

 return (
 <Stepper.Item
 key={step.id}
 bullet={index + 1}
 isCurrent={isCurrent}
 isCompleted={step.isCompleted}
 // Guard-driven: bind directly to the wizard's reachability flag so
 // a disabled breadcrumb item and a blocked `goToStep` agree.
 isReachable={step.isReachable}
 onClick={() => goToStep(step.id)}
 >
 {labelText}
 </Stepper.Item>
 );
 })}
 </Stepper>
 return (
 <Stepper.Item
 key={step.id}
 bullet={index + 1}
 isCurrent={isCurrent}
 isCompleted={step.isCompleted}
 // Guard-driven: bind directly to the wizard's reachability flag so
 // a disabled breadcrumb item and a blocked `goToStep` agree.
 isReachable={step.isReachable}
 onClick={() => goToStep(step.id)}
 >
 {labelText}
 </Stepper.Item>
 );
 })}
 </Stepper>
 </Flex>
 </ProfileCardHeader>
 );
};

18 changes: 12 additions & 6 deletions
packages/ui/src/components/ConfigureSSO/ConfigureSSOWizard.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,10 +14,12 @@ import {
 TestConfigurationStep,
} from './steps';

export type ConfigureSSOWizardProps = Omit<ComponentProps<typeof ConfigureSSOProvider>, 'children'>;
export type ConfigureSSOWizardProps = Omit<ComponentProps<typeof ConfigureSSOProvider>, 'children'> & {
 title?: React.ReactNode;
 forceInitialStep?: boolean;
};

/** Pure, data-injected ConfigureSSO flow — hosts own fetching, loading, and permission gating. */
export const ConfigureSSOWizard = (props: ConfigureSSOWizardProps): JSX.Element => {
export const ConfigureSSOWizard = ({ title, forceInitialStep, ...props }: ConfigureSSOWizardProps): JSX.Element => {
 const { organizationEnterpriseConnection: c, organizationDomains } = props;

 const allDomainsVerified = areAllOrganizationDomainsVerified(organizationDomains);
Expand All@@ -33,11 +35,15 @@ export const ConfigureSSOWizard = (props: ConfigureSSOWizardProps): JSX.Element
 [c, allDomainsVerified],
 );

 // Each step owns a `CardStateProvider` so card errors stay scoped to their step and clear when it unmounts.
 const initialStepId = forceInitialStep ? steps[0].id : undefined;

 return (
 <ConfigureSSOProvider {...props}>
 <Wizard steps={steps}>
 <ConfigureSSOHeader />
 <Wizard
 steps={steps}
 initialStepId={initialStepId}
 >
 <ConfigureSSOHeader title={title} />

 <Wizard.Match id='verify-domain'>
 <CardStateProvider>
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -71,6 +71,31 @@ describe('ConfigureSSO', () => {
 });
 });

 describe('standalone mount header', () => {
 it('renders the stepper without a back control (no host title / onExit)', async () => {
 const { wrapper, fixtures } = await createFixtures(f => {
 f.withEnterpriseSso({ selfServeSSO: true });
 f.withEmailAddress();
 f.withOrganizations();
 f.withUser({
 email_addresses: ['test@clerk.com'],
 organization_memberships: [{ name: 'Org1', permissions: ['org:sys_entconns:manage'] }],
 });
 });

 fixtures.clerk.organization?.getEnterpriseConnections.mockResolvedValue([]);
 mockOrganizationDomains(fixtures, [verifiedDomain]);

 const { findByText, queryByRole } = render(<ConfigureSSO />, { wrapper });

 await findByText(/select your identity provider/i);

 // The standalone wizard is mounted without `title`/`onExit`, so the header
 // exposes no "Security" back control.
 expect(queryByRole('button', { name: 'Security' })).not.toBeInTheDocument();
 });
 });

 describe('in a personal workspace', () => {
 it('renders the wizard without checking the manage enterprise connections permission', async () => {
 const { wrapper, fixtures } = await createFixtures(f => {
Expand Down

42 changes: 36 additions & 6 deletions
packages/ui/src/components/OrganizationProfile/OrganizationSecurityPage.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
import { useOrganization } from '@clerk/shared/react';
import { useState } from 'react';
import React, { useState } from 'react';

import { Header } from '@/ui/elements/Header';
import { ProfileCard } from '@/ui/elements/ProfileCard';

import React from 'react';
import { Col, descriptors, localizationKeys } from '../../customizables';
import { Col, descriptors, Icon, localizationKeys, SimpleButton, Text } from '../../customizables';
import { ChevronLeft } from '../../icons';
import { ConfigureSSOProtect } from '../ConfigureSSO/ConfigureSSO';
import { ConfigureSSOSkeleton } from '../ConfigureSSO/ConfigureSSOSkeleton';
import { ConfigureSSOWizard } from '../ConfigureSSO/ConfigureSSOWizard';
Expand All@@ -27,7 +27,6 @@ export const OrganizationSecurityPage = ({ contentRef }: OrganizationSecurityPag
 return <OrganizationSecurityPageContent contentRef={contentRef} />;
};

/** Separate from the page so the connection hook only runs behind the organization check. */
const OrganizationSecurityPageContent = ({ contentRef }: OrganizationSecurityPageProps) => {
 const {
 organization,
Expand All@@ -41,12 +40,40 @@ const OrganizationSecurityPageContent = ({ contentRef }: OrganizationSecurityPag
 } = useOrganizationEnterpriseConnection();

 const [view, setView] = useState<'overview' | 'wizard'>('overview');
 const [forceFirstStep, setForceFirstStep] = useState(false);

 const exitWizard = () => setView('overview');

 const openWizard = (forceInitialStep = false) => {
 setForceFirstStep(forceInitialStep);
 setView('wizard');
 };

 // Gate loading above the provider so the context never observes a loading state.
 if (isLoading) {
 return <ConfigureSSOSkeleton />;
 }

 const backControl = (
 <SimpleButton
 elementDescriptor={descriptors.configureSSOHeaderBackButton}
 variant='unstyled'
 onClick={exitWizard}
 sx={t => ({
 gap: t.space.$1,
 padding: 0,
 color: t.colors.$colorMutedForeground,
 '&:hover': { color: t.colors.$colorForeground },
 })}
 >
 <Icon icon={ChevronLeft} />
 <Text
 as='span'
 variant='body'
 localizationKey={localizationKeys('organizationProfile.navbar.security')}
 />
 </SimpleButton>
 );

 return (
 <ConfigureSSOProtect>
 {view === 'overview' ? (
Expand All@@ -73,7 +100,7 @@ const OrganizationSecurityPageContent = ({ contentRef }: OrganizationSecurityPag
 deleteConnection={enterpriseConnectionMutations.deleteConnection}
 organizationName={organization?.name ?? ''}
 contentRef={contentRef}
 onConfigure={() => setView('wizard')}
 onConfigure={openWizard}
 />
 </Col>
 </Col>
Expand All@@ -87,6 +114,9 @@ const OrganizationSecurityPageContent = ({ contentRef }: OrganizationSecurityPag
 enterpriseConnectionMutations={enterpriseConnectionMutations}
 organizationDomainMutations={organizationDomainMutations}
 organizationDomains={organizationDomains}
 forceInitialStep={forceFirstStep}
 title={backControl}
 onExit={exitWizard}
 />
 )}
 </ConfigureSSOProtect>
Expand Down

8 changes: 4 additions & 4 deletions
packages/ui/src/components/OrganizationProfile/SecuritySsoSection.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -28,7 +28,7 @@ type SecuritySsoSectionProps = {
 deleteConnection: EnterpriseConnectionMutations['deleteConnection'];
 organizationName: string;
 contentRef: React.RefObject<HTMLDivElement>;
 onConfigure: () => void;
 onConfigure: (forceInitialStep?: boolean) => void;
};

const STATUS_BADGES: Record<
Expand DownExpand Up@@ -95,7 +95,7 @@ export const SecuritySsoSection = (props: SecuritySsoSectionProps): JSX.Element
 'organizationProfile.securityPage.ssoSection.primaryButton__startConfiguration',
 )}
 primaryButtonId='start'
 onConfigure={onConfigure}
 onConfigure={() => onConfigure(true)}
 />
 )}

Expand All@@ -105,7 +105,7 @@ export const SecuritySsoSection = (props: SecuritySsoSectionProps): JSX.Element
 'organizationProfile.securityPage.ssoSection.primaryButton__continueConfiguration',
 )}
 primaryButtonId='continue'
 onConfigure={onConfigure}
 onConfigure={() => onConfigure()}
 />
 )}

Expand DownExpand Up@@ -205,7 +205,7 @@ const ConfiguredContent = (props: ConfiguredContentProps): JSX.Element => {
 actions={[
 {
 label: localizationKeys('organizationProfile.securityPage.ssoSection.menuAction__edit'),
 onClick: onConfigure,
 onClick: () => onConfigure(true),
 },
 isActive
 ? {
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): wire the Security page navigation into the ConfigureSSO wizard by iagodahlem · Pull Request #8864 · clerk/javascript · GitHub
Skip to content
feat(ui): wire the Security page navigation into the ConfigureSSO wizard#8864

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 2 commits into

from

Jun 16, 2026
 Merged


feat(ui): wire the Security page navigation into the ConfigureSSO wizard
#8864
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
a71a77a

feat(ui): add onExit to ConfigureSSO context and host-rendered header…


iagodahlem Jun 16, 2026
88acd1b

feat(ui): add Security back control and first-step launch to the SSO …


iagodahlem Jun 16, 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


5 changes: 5 additions & 0 deletions
.changeset/whole-parents-care.md

View file


Open in desktop

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

The Security page's SSO wizard now has a back-to-Security control, and Start/Edit open the wizard at the first step (Continue resumes where you left off).

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -25,6 +25,7 @@ export interface ConfigureSSOData {
 organizationEnterpriseConnection: OrganizationEnterpriseConnection;
 testRuns: TestRunsView;
 organizationDomains: OrganizationDomainResource[] | undefined;
 onExit?: () => void;
}

interface ConfigureSSOProviderProps {
Expand All@@ -35,6 +36,7 @@ interface ConfigureSSOProviderProps {
 contentRef: React.RefObject<HTMLDivElement>;
 enterpriseConnectionMutations: EnterpriseConnectionMutations;
 organizationDomainMutations: OrganizationDomainMutations;
 onExit?: () => void;
}

const ConfigureSSOContext = React.createContext<ConfigureSSOData | null>(null);
Expand All@@ -48,6 +50,7 @@ export const ConfigureSSOProvider = ({
 contentRef,
 enterpriseConnectionMutations,
 organizationDomainMutations,
 onExit,
 children,
}: PropsWithChildren<ConfigureSSOProviderProps>): JSX.Element => {
 const value = React.useMemo<ConfigureSSOData>(
Expand All@@ -59,6 +62,7 @@ export const ConfigureSSOProvider = ({
 organizationDomains,
 enterpriseConnectionMutations,
 organizationDomainMutations,
 onExit,
 }),
 [
 contentRef,
Expand All@@ -68,6 +72,7 @@ export const ConfigureSSOProvider = ({
 testRuns,
 organizationDomains,
 enterpriseConnection,
 onExit,
 ],
 );

Expand Down

65 changes: 30 additions & 35 deletions
packages/ui/src/components/ConfigureSSO/ConfigureSSOHeader.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,23 +1,14 @@
import { useLocalizations } from '@/customizables';
import { Flex, useLocalizations } from '@/customizables';

import { ProfileCardHeader } from './elements/ProfileCard';
import { Stepper } from './elements/Stepper';
import { useWizard } from './elements/Wizard';

/**
 * The wizard breadcrumb, driven entirely by the generic entry-guard wizard
 * facade.
 *
 * Breadcrumb membership is the labelled steps in declaration order — the
 * provider-selection step carries no `label`, so it never appears (it replaced
 * the old `hidden` provider step). Each item's reachability comes straight from
 * the guard-driven `isReachable` flag (the same predicate `goToStep` checks), so
 * a disabled breadcrumb item and a blocked jump always agree. Completion stays
 * positional. The reset affordance now lives in the step footers
 * (`Step.Footer.Reset`), which delete the connection via the context mutation
 * rather than a wizard binding.
 */
export const ConfigureSSOHeader = (): JSX.Element => {
type ConfigureSSOHeaderProps = {
 title?: React.ReactNode;
};

export const ConfigureSSOHeader = ({ title }: ConfigureSSOHeaderProps): JSX.Element => {
 const { activeSteps, currentIndex, goToStep } = useWizard();
 const { t } = useLocalizations();

Expand All@@ -28,27 +19,31 @@ export const ConfigureSSOHeader = (): JSX.Element => {

 return (
 <ProfileCardHeader>
 <Stepper>
 {visibleSteps.map((step, index) => {
 const isCurrent = index === currentVisibleIndex;
 const labelText = step.label ? (typeof step.label === 'string' ? step.label : t(step.label)) : '';
 {title}

 <Flex sx={title ? { marginInlineStart: 'auto' } : undefined}>
 <Stepper>
 {visibleSteps.map((step, index) => {
 const isCurrent = index === currentVisibleIndex;
 const labelText = step.label ? (typeof step.label === 'string' ? step.label : t(step.label)) : '';

 return (
 <Stepper.Item
 key={step.id}
 bullet={index + 1}
 isCurrent={isCurrent}
 isCompleted={step.isCompleted}
 // Guard-driven: bind directly to the wizard's reachability flag so
 // a disabled breadcrumb item and a blocked `goToStep` agree.
 isReachable={step.isReachable}
 onClick={() => goToStep(step.id)}
 >
 {labelText}
 </Stepper.Item>
 );
 })}
 </Stepper>
 return (
 <Stepper.Item
 key={step.id}
 bullet={index + 1}
 isCurrent={isCurrent}
 isCompleted={step.isCompleted}
 // Guard-driven: bind directly to the wizard's reachability flag so
 // a disabled breadcrumb item and a blocked `goToStep` agree.
 isReachable={step.isReachable}
 onClick={() => goToStep(step.id)}
 >
 {labelText}
 </Stepper.Item>
 );
 })}
 </Stepper>
 </Flex>
 </ProfileCardHeader>
 );
};

18 changes: 12 additions & 6 deletions
packages/ui/src/components/ConfigureSSO/ConfigureSSOWizard.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,10 +14,12 @@ import {
 TestConfigurationStep,
} from './steps';

export type ConfigureSSOWizardProps = Omit<ComponentProps<typeof ConfigureSSOProvider>, 'children'>;
export type ConfigureSSOWizardProps = Omit<ComponentProps<typeof ConfigureSSOProvider>, 'children'> & {
 title?: React.ReactNode;
 forceInitialStep?: boolean;
};

/** Pure, data-injected ConfigureSSO flow — hosts own fetching, loading, and permission gating. */
export const ConfigureSSOWizard = (props: ConfigureSSOWizardProps): JSX.Element => {
export const ConfigureSSOWizard = ({ title, forceInitialStep, ...props }: ConfigureSSOWizardProps): JSX.Element => {
 const { organizationEnterpriseConnection: c, organizationDomains } = props;

 const allDomainsVerified = areAllOrganizationDomainsVerified(organizationDomains);
Expand All@@ -33,11 +35,15 @@ export const ConfigureSSOWizard = (props: ConfigureSSOWizardProps): JSX.Element
 [c, allDomainsVerified],
 );

 // Each step owns a `CardStateProvider` so card errors stay scoped to their step and clear when it unmounts.
 const initialStepId = forceInitialStep ? steps[0].id : undefined;

 return (
 <ConfigureSSOProvider {...props}>
 <Wizard steps={steps}>
 <ConfigureSSOHeader />
 <Wizard
 steps={steps}
 initialStepId={initialStepId}
 >
 <ConfigureSSOHeader title={title} />

 <Wizard.Match id='verify-domain'>
 <CardStateProvider>
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -71,6 +71,31 @@ describe('ConfigureSSO', () => {
 });
 });

 describe('standalone mount header', () => {
 it('renders the stepper without a back control (no host title / onExit)', async () => {
 const { wrapper, fixtures } = await createFixtures(f => {
 f.withEnterpriseSso({ selfServeSSO: true });
 f.withEmailAddress();
 f.withOrganizations();
 f.withUser({
 email_addresses: ['test@clerk.com'],
 organization_memberships: [{ name: 'Org1', permissions: ['org:sys_entconns:manage'] }],
 });
 });

 fixtures.clerk.organization?.getEnterpriseConnections.mockResolvedValue([]);
 mockOrganizationDomains(fixtures, [verifiedDomain]);

 const { findByText, queryByRole } = render(<ConfigureSSO />, { wrapper });

 await findByText(/select your identity provider/i);

 // The standalone wizard is mounted without `title`/`onExit`, so the header
 // exposes no "Security" back control.
 expect(queryByRole('button', { name: 'Security' })).not.toBeInTheDocument();
 });
 });

 describe('in a personal workspace', () => {
 it('renders the wizard without checking the manage enterprise connections permission', async () => {
 const { wrapper, fixtures } = await createFixtures(f => {
Expand Down

42 changes: 36 additions & 6 deletions
packages/ui/src/components/OrganizationProfile/OrganizationSecurityPage.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
import { useOrganization } from '@clerk/shared/react';
import { useState } from 'react';
import React, { useState } from 'react';

import { Header } from '@/ui/elements/Header';
import { ProfileCard } from '@/ui/elements/ProfileCard';

import React from 'react';
import { Col, descriptors, localizationKeys } from '../../customizables';
import { Col, descriptors, Icon, localizationKeys, SimpleButton, Text } from '../../customizables';
import { ChevronLeft } from '../../icons';
import { ConfigureSSOProtect } from '../ConfigureSSO/ConfigureSSO';
import { ConfigureSSOSkeleton } from '../ConfigureSSO/ConfigureSSOSkeleton';
import { ConfigureSSOWizard } from '../ConfigureSSO/ConfigureSSOWizard';
Expand All@@ -27,7 +27,6 @@ export const OrganizationSecurityPage = ({ contentRef }: OrganizationSecurityPag
 return <OrganizationSecurityPageContent contentRef={contentRef} />;
};

/** Separate from the page so the connection hook only runs behind the organization check. */
const OrganizationSecurityPageContent = ({ contentRef }: OrganizationSecurityPageProps) => {
 const {
 organization,
Expand All@@ -41,12 +40,40 @@ const OrganizationSecurityPageContent = ({ contentRef }: OrganizationSecurityPag
 } = useOrganizationEnterpriseConnection();

 const [view, setView] = useState<'overview' | 'wizard'>('overview');
 const [forceFirstStep, setForceFirstStep] = useState(false);

 const exitWizard = () => setView('overview');

 const openWizard = (forceInitialStep = false) => {
 setForceFirstStep(forceInitialStep);
 setView('wizard');
 };

 // Gate loading above the provider so the context never observes a loading state.
 if (isLoading) {
 return <ConfigureSSOSkeleton />;
 }

 const backControl = (
 <SimpleButton
 elementDescriptor={descriptors.configureSSOHeaderBackButton}
 variant='unstyled'
 onClick={exitWizard}
 sx={t => ({
 gap: t.space.$1,
 padding: 0,
 color: t.colors.$colorMutedForeground,
 '&:hover': { color: t.colors.$colorForeground },
 })}
 >
 <Icon icon={ChevronLeft} />
 <Text
 as='span'
 variant='body'
 localizationKey={localizationKeys('organizationProfile.navbar.security')}
 />
 </SimpleButton>
 );

 return (
 <ConfigureSSOProtect>
 {view === 'overview' ? (
Expand All@@ -73,7 +100,7 @@ const OrganizationSecurityPageContent = ({ contentRef }: OrganizationSecurityPag
 deleteConnection={enterpriseConnectionMutations.deleteConnection}
 organizationName={organization?.name ?? ''}
 contentRef={contentRef}
 onConfigure={() => setView('wizard')}
 onConfigure={openWizard}
 />
 </Col>
 </Col>
Expand All@@ -87,6 +114,9 @@ const OrganizationSecurityPageContent = ({ contentRef }: OrganizationSecurityPag
 enterpriseConnectionMutations={enterpriseConnectionMutations}
 organizationDomainMutations={organizationDomainMutations}
 organizationDomains={organizationDomains}
 forceInitialStep={forceFirstStep}
 title={backControl}
 onExit={exitWizard}
 />
 )}
 </ConfigureSSOProtect>
Expand Down

8 changes: 4 additions & 4 deletions
packages/ui/src/components/OrganizationProfile/SecuritySsoSection.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -28,7 +28,7 @@ type SecuritySsoSectionProps = {
 deleteConnection: EnterpriseConnectionMutations['deleteConnection'];
 organizationName: string;
 contentRef: React.RefObject<HTMLDivElement>;
 onConfigure: () => void;
 onConfigure: (forceInitialStep?: boolean) => void;
};

const STATUS_BADGES: Record<
Expand DownExpand Up@@ -95,7 +95,7 @@ export const SecuritySsoSection = (props: SecuritySsoSectionProps): JSX.Element
 'organizationProfile.securityPage.ssoSection.primaryButton__startConfiguration',
 )}
 primaryButtonId='start'
 onConfigure={onConfigure}
 onConfigure={() => onConfigure(true)}
 />
 )}

Expand All@@ -105,7 +105,7 @@ export const SecuritySsoSection = (props: SecuritySsoSectionProps): JSX.Element
 'organizationProfile.securityPage.ssoSection.primaryButton__continueConfiguration',
 )}
 primaryButtonId='continue'
 onConfigure={onConfigure}
 onConfigure={() => onConfigure()}
 />
 )}

Expand DownExpand Up@@ -205,7 +205,7 @@ const ConfiguredContent = (props: ConfiguredContentProps): JSX.Element => {
 actions={[
 {
 label: localizationKeys('organizationProfile.securityPage.ssoSection.menuAction__edit'),
 onClick: onConfigure,
 onClick: () => onConfigure(true),
 },
 isActive
 ? {
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): wire the Security page navigation into the ConfigureSSO wizard by iagodahlem · Pull Request #8864 · clerk/javascript · GitHub
Skip to content
feat(ui): wire the Security page navigation into the ConfigureSSO wizard#8864

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 2 commits into

from

Jun 16, 2026
 Merged


feat(ui): wire the Security page navigation into the ConfigureSSO wizard
#8864
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
a71a77a

feat(ui): add onExit to ConfigureSSO context and host-rendered header…


iagodahlem Jun 16, 2026
88acd1b

feat(ui): add Security back control and first-step launch to the SSO …


iagodahlem Jun 16, 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


5 changes: 5 additions & 0 deletions
.changeset/whole-parents-care.md

View file


Open in desktop

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

The Security page's SSO wizard now has a back-to-Security control, and Start/Edit open the wizard at the first step (Continue resumes where you left off).

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -25,6 +25,7 @@ export interface ConfigureSSOData {
 organizationEnterpriseConnection: OrganizationEnterpriseConnection;
 testRuns: TestRunsView;
 organizationDomains: OrganizationDomainResource[] | undefined;
 onExit?: () => void;
}

interface ConfigureSSOProviderProps {
Expand All@@ -35,6 +36,7 @@ interface ConfigureSSOProviderProps {
 contentRef: React.RefObject<HTMLDivElement>;
 enterpriseConnectionMutations: EnterpriseConnectionMutations;
 organizationDomainMutations: OrganizationDomainMutations;
 onExit?: () => void;
}

const ConfigureSSOContext = React.createContext<ConfigureSSOData | null>(null);
Expand All@@ -48,6 +50,7 @@ export const ConfigureSSOProvider = ({
 contentRef,
 enterpriseConnectionMutations,
 organizationDomainMutations,
 onExit,
 children,
}: PropsWithChildren<ConfigureSSOProviderProps>): JSX.Element => {
 const value = React.useMemo<ConfigureSSOData>(
Expand All@@ -59,6 +62,7 @@ export const ConfigureSSOProvider = ({
 organizationDomains,
 enterpriseConnectionMutations,
 organizationDomainMutations,
 onExit,
 }),
 [
 contentRef,
Expand All@@ -68,6 +72,7 @@ export const ConfigureSSOProvider = ({
 testRuns,
 organizationDomains,
 enterpriseConnection,
 onExit,
 ],
 );

Expand Down

65 changes: 30 additions & 35 deletions
packages/ui/src/components/ConfigureSSO/ConfigureSSOHeader.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,23 +1,14 @@
import { useLocalizations } from '@/customizables';
import { Flex, useLocalizations } from '@/customizables';

import { ProfileCardHeader } from './elements/ProfileCard';
import { Stepper } from './elements/Stepper';
import { useWizard } from './elements/Wizard';

/**
 * The wizard breadcrumb, driven entirely by the generic entry-guard wizard
 * facade.
 *
 * Breadcrumb membership is the labelled steps in declaration order — the
 * provider-selection step carries no `label`, so it never appears (it replaced
 * the old `hidden` provider step). Each item's reachability comes straight from
 * the guard-driven `isReachable` flag (the same predicate `goToStep` checks), so
 * a disabled breadcrumb item and a blocked jump always agree. Completion stays
 * positional. The reset affordance now lives in the step footers
 * (`Step.Footer.Reset`), which delete the connection via the context mutation
 * rather than a wizard binding.
 */
export const ConfigureSSOHeader = (): JSX.Element => {
type ConfigureSSOHeaderProps = {
 title?: React.ReactNode;
};

export const ConfigureSSOHeader = ({ title }: ConfigureSSOHeaderProps): JSX.Element => {
 const { activeSteps, currentIndex, goToStep } = useWizard();
 const { t } = useLocalizations();

Expand All@@ -28,27 +19,31 @@ export const ConfigureSSOHeader = (): JSX.Element => {

 return (
 <ProfileCardHeader>
 <Stepper>
 {visibleSteps.map((step, index) => {
 const isCurrent = index === currentVisibleIndex;
 const labelText = step.label ? (typeof step.label === 'string' ? step.label : t(step.label)) : '';
 {title}

 <Flex sx={title ? { marginInlineStart: 'auto' } : undefined}>
 <Stepper>
 {visibleSteps.map((step, index) => {
 const isCurrent = index === currentVisibleIndex;
 const labelText = step.label ? (typeof step.label === 'string' ? step.label : t(step.label)) : '';

 return (
 <Stepper.Item
 key={step.id}
 bullet={index + 1}
 isCurrent={isCurrent}
 isCompleted={step.isCompleted}
 // Guard-driven: bind directly to the wizard's reachability flag so
 // a disabled breadcrumb item and a blocked `goToStep` agree.
 isReachable={step.isReachable}
 onClick={() => goToStep(step.id)}
 >
 {labelText}
 </Stepper.Item>
 );
 })}
 </Stepper>
 return (
 <Stepper.Item
 key={step.id}
 bullet={index + 1}
 isCurrent={isCurrent}
 isCompleted={step.isCompleted}
 // Guard-driven: bind directly to the wizard's reachability flag so
 // a disabled breadcrumb item and a blocked `goToStep` agree.
 isReachable={step.isReachable}
 onClick={() => goToStep(step.id)}
 >
 {labelText}
 </Stepper.Item>
 );
 })}
 </Stepper>
 </Flex>
 </ProfileCardHeader>
 );
};

18 changes: 12 additions & 6 deletions
packages/ui/src/components/ConfigureSSO/ConfigureSSOWizard.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,10 +14,12 @@ import {
 TestConfigurationStep,
} from './steps';

export type ConfigureSSOWizardProps = Omit<ComponentProps<typeof ConfigureSSOProvider>, 'children'>;
export type ConfigureSSOWizardProps = Omit<ComponentProps<typeof ConfigureSSOProvider>, 'children'> & {
 title?: React.ReactNode;
 forceInitialStep?: boolean;
};

/** Pure, data-injected ConfigureSSO flow — hosts own fetching, loading, and permission gating. */
export const ConfigureSSOWizard = (props: ConfigureSSOWizardProps): JSX.Element => {
export const ConfigureSSOWizard = ({ title, forceInitialStep, ...props }: ConfigureSSOWizardProps): JSX.Element => {
 const { organizationEnterpriseConnection: c, organizationDomains } = props;

 const allDomainsVerified = areAllOrganizationDomainsVerified(organizationDomains);
Expand All@@ -33,11 +35,15 @@ export const ConfigureSSOWizard = (props: ConfigureSSOWizardProps): JSX.Element
 [c, allDomainsVerified],
 );

 // Each step owns a `CardStateProvider` so card errors stay scoped to their step and clear when it unmounts.
 const initialStepId = forceInitialStep ? steps[0].id : undefined;

 return (
 <ConfigureSSOProvider {...props}>
 <Wizard steps={steps}>
 <ConfigureSSOHeader />
 <Wizard
 steps={steps}
 initialStepId={initialStepId}
 >
 <ConfigureSSOHeader title={title} />

 <Wizard.Match id='verify-domain'>
 <CardStateProvider>
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -71,6 +71,31 @@ describe('ConfigureSSO', () => {
 });
 });

 describe('standalone mount header', () => {
 it('renders the stepper without a back control (no host title / onExit)', async () => {
 const { wrapper, fixtures } = await createFixtures(f => {
 f.withEnterpriseSso({ selfServeSSO: true });
 f.withEmailAddress();
 f.withOrganizations();
 f.withUser({
 email_addresses: ['test@clerk.com'],
 organization_memberships: [{ name: 'Org1', permissions: ['org:sys_entconns:manage'] }],
 });
 });

 fixtures.clerk.organization?.getEnterpriseConnections.mockResolvedValue([]);
 mockOrganizationDomains(fixtures, [verifiedDomain]);

 const { findByText, queryByRole } = render(<ConfigureSSO />, { wrapper });

 await findByText(/select your identity provider/i);

 // The standalone wizard is mounted without `title`/`onExit`, so the header
 // exposes no "Security" back control.
 expect(queryByRole('button', { name: 'Security' })).not.toBeInTheDocument();
 });
 });

 describe('in a personal workspace', () => {
 it('renders the wizard without checking the manage enterprise connections permission', async () => {
 const { wrapper, fixtures } = await createFixtures(f => {
Expand Down

42 changes: 36 additions & 6 deletions
packages/ui/src/components/OrganizationProfile/OrganizationSecurityPage.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
import { useOrganization } from '@clerk/shared/react';
import { useState } from 'react';
import React, { useState } from 'react';

import { Header } from '@/ui/elements/Header';
import { ProfileCard } from '@/ui/elements/ProfileCard';

import React from 'react';
import { Col, descriptors, localizationKeys } from '../../customizables';
import { Col, descriptors, Icon, localizationKeys, SimpleButton, Text } from '../../customizables';
import { ChevronLeft } from '../../icons';
import { ConfigureSSOProtect } from '../ConfigureSSO/ConfigureSSO';
import { ConfigureSSOSkeleton } from '../ConfigureSSO/ConfigureSSOSkeleton';
import { ConfigureSSOWizard } from '../ConfigureSSO/ConfigureSSOWizard';
Expand All@@ -27,7 +27,6 @@ export const OrganizationSecurityPage = ({ contentRef }: OrganizationSecurityPag
 return <OrganizationSecurityPageContent contentRef={contentRef} />;
};

/** Separate from the page so the connection hook only runs behind the organization check. */
const OrganizationSecurityPageContent = ({ contentRef }: OrganizationSecurityPageProps) => {
 const {
 organization,
Expand All@@ -41,12 +40,40 @@ const OrganizationSecurityPageContent = ({ contentRef }: OrganizationSecurityPag
 } = useOrganizationEnterpriseConnection();

 const [view, setView] = useState<'overview' | 'wizard'>('overview');
 const [forceFirstStep, setForceFirstStep] = useState(false);

 const exitWizard = () => setView('overview');

 const openWizard = (forceInitialStep = false) => {
 setForceFirstStep(forceInitialStep);
 setView('wizard');
 };

 // Gate loading above the provider so the context never observes a loading state.
 if (isLoading) {
 return <ConfigureSSOSkeleton />;
 }

 const backControl = (
 <SimpleButton
 elementDescriptor={descriptors.configureSSOHeaderBackButton}
 variant='unstyled'
 onClick={exitWizard}
 sx={t => ({
 gap: t.space.$1,
 padding: 0,
 color: t.colors.$colorMutedForeground,
 '&:hover': { color: t.colors.$colorForeground },
 })}
 >
 <Icon icon={ChevronLeft} />
 <Text
 as='span'
 variant='body'
 localizationKey={localizationKeys('organizationProfile.navbar.security')}
 />
 </SimpleButton>
 );

 return (
 <ConfigureSSOProtect>
 {view === 'overview' ? (
Expand All@@ -73,7 +100,7 @@ const OrganizationSecurityPageContent = ({ contentRef }: OrganizationSecurityPag
 deleteConnection={enterpriseConnectionMutations.deleteConnection}
 organizationName={organization?.name ?? ''}
 contentRef={contentRef}
 onConfigure={() => setView('wizard')}
 onConfigure={openWizard}
 />
 </Col>
 </Col>
Expand All@@ -87,6 +114,9 @@ const OrganizationSecurityPageContent = ({ contentRef }: OrganizationSecurityPag
 enterpriseConnectionMutations={enterpriseConnectionMutations}
 organizationDomainMutations={organizationDomainMutations}
 organizationDomains={organizationDomains}
 forceInitialStep={forceFirstStep}
 title={backControl}
 onExit={exitWizard}
 />
 )}
 </ConfigureSSOProtect>
Expand Down

8 changes: 4 additions & 4 deletions
packages/ui/src/components/OrganizationProfile/SecuritySsoSection.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -28,7 +28,7 @@ type SecuritySsoSectionProps = {
 deleteConnection: EnterpriseConnectionMutations['deleteConnection'];
 organizationName: string;
 contentRef: React.RefObject<HTMLDivElement>;
 onConfigure: () => void;
 onConfigure: (forceInitialStep?: boolean) => void;
};

const STATUS_BADGES: Record<
Expand DownExpand Up@@ -95,7 +95,7 @@ export const SecuritySsoSection = (props: SecuritySsoSectionProps): JSX.Element
 'organizationProfile.securityPage.ssoSection.primaryButton__startConfiguration',
 )}
 primaryButtonId='start'
 onConfigure={onConfigure}
 onConfigure={() => onConfigure(true)}
 />
 )}

Expand All@@ -105,7 +105,7 @@ export const SecuritySsoSection = (props: SecuritySsoSectionProps): JSX.Element
 'organizationProfile.securityPage.ssoSection.primaryButton__continueConfiguration',
 )}
 primaryButtonId='continue'
 onConfigure={onConfigure}
 onConfigure={() => onConfigure()}
 />
 )}

Expand DownExpand Up@@ -205,7 +205,7 @@ const ConfiguredContent = (props: ConfiguredContentProps): JSX.Element => {
 actions={[
 {
 label: localizationKeys('organizationProfile.securityPage.ssoSection.menuAction__edit'),
 onClick: onConfigure,
 onClick: () => onConfigure(true),
 },
 isActive
 ? {
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): wire the Security page navigation into the ConfigureSSO wizard by iagodahlem · Pull Request #8864 · clerk/javascript · GitHub
Skip to content
feat(ui): wire the Security page navigation into the ConfigureSSO wizard#8864

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 2 commits into

from

Jun 16, 2026
 Merged


feat(ui): wire the Security page navigation into the ConfigureSSO wizard
#8864
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
a71a77a

feat(ui): add onExit to ConfigureSSO context and host-rendered header…


iagodahlem Jun 16, 2026
88acd1b

feat(ui): add Security back control and first-step launch to the SSO …


iagodahlem Jun 16, 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


5 changes: 5 additions & 0 deletions
.changeset/whole-parents-care.md

View file


Open in desktop

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

The Security page's SSO wizard now has a back-to-Security control, and Start/Edit open the wizard at the first step (Continue resumes where you left off).

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -25,6 +25,7 @@ export interface ConfigureSSOData {
 organizationEnterpriseConnection: OrganizationEnterpriseConnection;
 testRuns: TestRunsView;
 organizationDomains: OrganizationDomainResource[] | undefined;
 onExit?: () => void;
}

interface ConfigureSSOProviderProps {
Expand All@@ -35,6 +36,7 @@ interface ConfigureSSOProviderProps {
 contentRef: React.RefObject<HTMLDivElement>;
 enterpriseConnectionMutations: EnterpriseConnectionMutations;
 organizationDomainMutations: OrganizationDomainMutations;
 onExit?: () => void;
}

const ConfigureSSOContext = React.createContext<ConfigureSSOData | null>(null);
Expand All@@ -48,6 +50,7 @@ export const ConfigureSSOProvider = ({
 contentRef,
 enterpriseConnectionMutations,
 organizationDomainMutations,
 onExit,
 children,
}: PropsWithChildren<ConfigureSSOProviderProps>): JSX.Element => {
 const value = React.useMemo<ConfigureSSOData>(
Expand All@@ -59,6 +62,7 @@ export const ConfigureSSOProvider = ({
 organizationDomains,
 enterpriseConnectionMutations,
 organizationDomainMutations,
 onExit,
 }),
 [
 contentRef,
Expand All@@ -68,6 +72,7 @@ export const ConfigureSSOProvider = ({
 testRuns,
 organizationDomains,
 enterpriseConnection,
 onExit,
 ],
 );

Expand Down

65 changes: 30 additions & 35 deletions
packages/ui/src/components/ConfigureSSO/ConfigureSSOHeader.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,23 +1,14 @@
import { useLocalizations } from '@/customizables';
import { Flex, useLocalizations } from '@/customizables';

import { ProfileCardHeader } from './elements/ProfileCard';
import { Stepper } from './elements/Stepper';
import { useWizard } from './elements/Wizard';

/**
 * The wizard breadcrumb, driven entirely by the generic entry-guard wizard
 * facade.
 *
 * Breadcrumb membership is the labelled steps in declaration order — the
 * provider-selection step carries no `label`, so it never appears (it replaced
 * the old `hidden` provider step). Each item's reachability comes straight from
 * the guard-driven `isReachable` flag (the same predicate `goToStep` checks), so
 * a disabled breadcrumb item and a blocked jump always agree. Completion stays
 * positional. The reset affordance now lives in the step footers
 * (`Step.Footer.Reset`), which delete the connection via the context mutation
 * rather than a wizard binding.
 */
export const ConfigureSSOHeader = (): JSX.Element => {
type ConfigureSSOHeaderProps = {
 title?: React.ReactNode;
};

export const ConfigureSSOHeader = ({ title }: ConfigureSSOHeaderProps): JSX.Element => {
 const { activeSteps, currentIndex, goToStep } = useWizard();
 const { t } = useLocalizations();

Expand All@@ -28,27 +19,31 @@ export const ConfigureSSOHeader = (): JSX.Element => {

 return (
 <ProfileCardHeader>
 <Stepper>
 {visibleSteps.map((step, index) => {
 const isCurrent = index === currentVisibleIndex;
 const labelText = step.label ? (typeof step.label === 'string' ? step.label : t(step.label)) : '';
 {title}

 <Flex sx={title ? { marginInlineStart: 'auto' } : undefined}>
 <Stepper>
 {visibleSteps.map((step, index) => {
 const isCurrent = index === currentVisibleIndex;
 const labelText = step.label ? (typeof step.label === 'string' ? step.label : t(step.label)) : '';

 return (
 <Stepper.Item
 key={step.id}
 bullet={index + 1}
 isCurrent={isCurrent}
 isCompleted={step.isCompleted}
 // Guard-driven: bind directly to the wizard's reachability flag so
 // a disabled breadcrumb item and a blocked `goToStep` agree.
 isReachable={step.isReachable}
 onClick={() => goToStep(step.id)}
 >
 {labelText}
 </Stepper.Item>
 );
 })}
 </Stepper>
 return (
 <Stepper.Item
 key={step.id}
 bullet={index + 1}
 isCurrent={isCurrent}
 isCompleted={step.isCompleted}
 // Guard-driven: bind directly to the wizard's reachability flag so
 // a disabled breadcrumb item and a blocked `goToStep` agree.
 isReachable={step.isReachable}
 onClick={() => goToStep(step.id)}
 >
 {labelText}
 </Stepper.Item>
 );
 })}
 </Stepper>
 </Flex>
 </ProfileCardHeader>
 );
};

18 changes: 12 additions & 6 deletions
packages/ui/src/components/ConfigureSSO/ConfigureSSOWizard.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,10 +14,12 @@ import {
 TestConfigurationStep,
} from './steps';

export type ConfigureSSOWizardProps = Omit<ComponentProps<typeof ConfigureSSOProvider>, 'children'>;
export type ConfigureSSOWizardProps = Omit<ComponentProps<typeof ConfigureSSOProvider>, 'children'> & {
 title?: React.ReactNode;
 forceInitialStep?: boolean;
};

/** Pure, data-injected ConfigureSSO flow — hosts own fetching, loading, and permission gating. */
export const ConfigureSSOWizard = (props: ConfigureSSOWizardProps): JSX.Element => {
export const ConfigureSSOWizard = ({ title, forceInitialStep, ...props }: ConfigureSSOWizardProps): JSX.Element => {
 const { organizationEnterpriseConnection: c, organizationDomains } = props;

 const allDomainsVerified = areAllOrganizationDomainsVerified(organizationDomains);
Expand All@@ -33,11 +35,15 @@ export const ConfigureSSOWizard = (props: ConfigureSSOWizardProps): JSX.Element
 [c, allDomainsVerified],
 );

 // Each step owns a `CardStateProvider` so card errors stay scoped to their step and clear when it unmounts.
 const initialStepId = forceInitialStep ? steps[0].id : undefined;

 return (
 <ConfigureSSOProvider {...props}>
 <Wizard steps={steps}>
 <ConfigureSSOHeader />
 <Wizard
 steps={steps}
 initialStepId={initialStepId}
 >
 <ConfigureSSOHeader title={title} />

 <Wizard.Match id='verify-domain'>
 <CardStateProvider>
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -71,6 +71,31 @@ describe('ConfigureSSO', () => {
 });
 });

 describe('standalone mount header', () => {
 it('renders the stepper without a back control (no host title / onExit)', async () => {
 const { wrapper, fixtures } = await createFixtures(f => {
 f.withEnterpriseSso({ selfServeSSO: true });
 f.withEmailAddress();
 f.withOrganizations();
 f.withUser({
 email_addresses: ['test@clerk.com'],
 organization_memberships: [{ name: 'Org1', permissions: ['org:sys_entconns:manage'] }],
 });
 });

 fixtures.clerk.organization?.getEnterpriseConnections.mockResolvedValue([]);
 mockOrganizationDomains(fixtures, [verifiedDomain]);

 const { findByText, queryByRole } = render(<ConfigureSSO />, { wrapper });

 await findByText(/select your identity provider/i);

 // The standalone wizard is mounted without `title`/`onExit`, so the header
 // exposes no "Security" back control.
 expect(queryByRole('button', { name: 'Security' })).not.toBeInTheDocument();
 });
 });

 describe('in a personal workspace', () => {
 it('renders the wizard without checking the manage enterprise connections permission', async () => {
 const { wrapper, fixtures } = await createFixtures(f => {
Expand Down

42 changes: 36 additions & 6 deletions
packages/ui/src/components/OrganizationProfile/OrganizationSecurityPage.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
import { useOrganization } from '@clerk/shared/react';
import { useState } from 'react';
import React, { useState } from 'react';

import { Header } from '@/ui/elements/Header';
import { ProfileCard } from '@/ui/elements/ProfileCard';

import React from 'react';
import { Col, descriptors, localizationKeys } from '../../customizables';
import { Col, descriptors, Icon, localizationKeys, SimpleButton, Text } from '../../customizables';
import { ChevronLeft } from '../../icons';
import { ConfigureSSOProtect } from '../ConfigureSSO/ConfigureSSO';
import { ConfigureSSOSkeleton } from '../ConfigureSSO/ConfigureSSOSkeleton';
import { ConfigureSSOWizard } from '../ConfigureSSO/ConfigureSSOWizard';
Expand All@@ -27,7 +27,6 @@ export const OrganizationSecurityPage = ({ contentRef }: OrganizationSecurityPag
 return <OrganizationSecurityPageContent contentRef={contentRef} />;
};

/** Separate from the page so the connection hook only runs behind the organization check. */
const OrganizationSecurityPageContent = ({ contentRef }: OrganizationSecurityPageProps) => {
 const {
 organization,
Expand All@@ -41,12 +40,40 @@ const OrganizationSecurityPageContent = ({ contentRef }: OrganizationSecurityPag
 } = useOrganizationEnterpriseConnection();

 const [view, setView] = useState<'overview' | 'wizard'>('overview');
 const [forceFirstStep, setForceFirstStep] = useState(false);

 const exitWizard = () => setView('overview');

 const openWizard = (forceInitialStep = false) => {
 setForceFirstStep(forceInitialStep);
 setView('wizard');
 };

 // Gate loading above the provider so the context never observes a loading state.
 if (isLoading) {
 return <ConfigureSSOSkeleton />;
 }

 const backControl = (
 <SimpleButton
 elementDescriptor={descriptors.configureSSOHeaderBackButton}
 variant='unstyled'
 onClick={exitWizard}
 sx={t => ({
 gap: t.space.$1,
 padding: 0,
 color: t.colors.$colorMutedForeground,
 '&:hover': { color: t.colors.$colorForeground },
 })}
 >
 <Icon icon={ChevronLeft} />
 <Text
 as='span'
 variant='body'
 localizationKey={localizationKeys('organizationProfile.navbar.security')}
 />
 </SimpleButton>
 );

 return (
 <ConfigureSSOProtect>
 {view === 'overview' ? (
Expand All@@ -73,7 +100,7 @@ const OrganizationSecurityPageContent = ({ contentRef }: OrganizationSecurityPag
 deleteConnection={enterpriseConnectionMutations.deleteConnection}
 organizationName={organization?.name ?? ''}
 contentRef={contentRef}
 onConfigure={() => setView('wizard')}
 onConfigure={openWizard}
 />
 </Col>
 </Col>
Expand All@@ -87,6 +114,9 @@ const OrganizationSecurityPageContent = ({ contentRef }: OrganizationSecurityPag
 enterpriseConnectionMutations={enterpriseConnectionMutations}
 organizationDomainMutations={organizationDomainMutations}
 organizationDomains={organizationDomains}
 forceInitialStep={forceFirstStep}
 title={backControl}
 onExit={exitWizard}
 />
 )}
 </ConfigureSSOProtect>
Expand Down

8 changes: 4 additions & 4 deletions
packages/ui/src/components/OrganizationProfile/SecuritySsoSection.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -28,7 +28,7 @@ type SecuritySsoSectionProps = {
 deleteConnection: EnterpriseConnectionMutations['deleteConnection'];
 organizationName: string;
 contentRef: React.RefObject<HTMLDivElement>;
 onConfigure: () => void;
 onConfigure: (forceInitialStep?: boolean) => void;
};

const STATUS_BADGES: Record<
Expand DownExpand Up@@ -95,7 +95,7 @@ export const SecuritySsoSection = (props: SecuritySsoSectionProps): JSX.Element
 'organizationProfile.securityPage.ssoSection.primaryButton__startConfiguration',
 )}
 primaryButtonId='start'
 onConfigure={onConfigure}
 onConfigure={() => onConfigure(true)}
 />
 )}

Expand All@@ -105,7 +105,7 @@ export const SecuritySsoSection = (props: SecuritySsoSectionProps): JSX.Element
 'organizationProfile.securityPage.ssoSection.primaryButton__continueConfiguration',
 )}
 primaryButtonId='continue'
 onConfigure={onConfigure}
 onConfigure={() => onConfigure()}
 />
 )}

Expand DownExpand Up@@ -205,7 +205,7 @@ const ConfiguredContent = (props: ConfiguredContentProps): JSX.Element => {
 actions={[
 {
 label: localizationKeys('organizationProfile.securityPage.ssoSection.menuAction__edit'),
 onClick: onConfigure,
 onClick: () => onConfigure(true),
 },
 isActive
 ? {
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): wire the Security page navigation into the ConfigureSSO wizard by iagodahlem · Pull Request #8864 · clerk/javascript · GitHub
Skip to content
feat(ui): wire the Security page navigation into the ConfigureSSO wizard#8864

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 2 commits into

from

Jun 16, 2026
 Merged


feat(ui): wire the Security page navigation into the ConfigureSSO wizard
#8864
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
a71a77a

feat(ui): add onExit to ConfigureSSO context and host-rendered header…


iagodahlem Jun 16, 2026
88acd1b

feat(ui): add Security back control and first-step launch to the SSO …


iagodahlem Jun 16, 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


5 changes: 5 additions & 0 deletions
.changeset/whole-parents-care.md

View file


Open in desktop

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

The Security page's SSO wizard now has a back-to-Security control, and Start/Edit open the wizard at the first step (Continue resumes where you left off).

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -25,6 +25,7 @@ export interface ConfigureSSOData {
 organizationEnterpriseConnection: OrganizationEnterpriseConnection;
 testRuns: TestRunsView;
 organizationDomains: OrganizationDomainResource[] | undefined;
 onExit?: () => void;
}

interface ConfigureSSOProviderProps {
Expand All@@ -35,6 +36,7 @@ interface ConfigureSSOProviderProps {
 contentRef: React.RefObject<HTMLDivElement>;
 enterpriseConnectionMutations: EnterpriseConnectionMutations;
 organizationDomainMutations: OrganizationDomainMutations;
 onExit?: () => void;
}

const ConfigureSSOContext = React.createContext<ConfigureSSOData | null>(null);
Expand All@@ -48,6 +50,7 @@ export const ConfigureSSOProvider = ({
 contentRef,
 enterpriseConnectionMutations,
 organizationDomainMutations,
 onExit,
 children,
}: PropsWithChildren<ConfigureSSOProviderProps>): JSX.Element => {
 const value = React.useMemo<ConfigureSSOData>(
Expand All@@ -59,6 +62,7 @@ export const ConfigureSSOProvider = ({
 organizationDomains,
 enterpriseConnectionMutations,
 organizationDomainMutations,
 onExit,
 }),
 [
 contentRef,
Expand All@@ -68,6 +72,7 @@ export const ConfigureSSOProvider = ({
 testRuns,
 organizationDomains,
 enterpriseConnection,
 onExit,
 ],
 );

Expand Down

65 changes: 30 additions & 35 deletions
packages/ui/src/components/ConfigureSSO/ConfigureSSOHeader.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,23 +1,14 @@
import { useLocalizations } from '@/customizables';
import { Flex, useLocalizations } from '@/customizables';

import { ProfileCardHeader } from './elements/ProfileCard';
import { Stepper } from './elements/Stepper';
import { useWizard } from './elements/Wizard';

/**
 * The wizard breadcrumb, driven entirely by the generic entry-guard wizard
 * facade.
 *
 * Breadcrumb membership is the labelled steps in declaration order — the
 * provider-selection step carries no `label`, so it never appears (it replaced
 * the old `hidden` provider step). Each item's reachability comes straight from
 * the guard-driven `isReachable` flag (the same predicate `goToStep` checks), so
 * a disabled breadcrumb item and a blocked jump always agree. Completion stays
 * positional. The reset affordance now lives in the step footers
 * (`Step.Footer.Reset`), which delete the connection via the context mutation
 * rather than a wizard binding.
 */
export const ConfigureSSOHeader = (): JSX.Element => {
type ConfigureSSOHeaderProps = {
 title?: React.ReactNode;
};

export const ConfigureSSOHeader = ({ title }: ConfigureSSOHeaderProps): JSX.Element => {
 const { activeSteps, currentIndex, goToStep } = useWizard();
 const { t } = useLocalizations();

Expand All@@ -28,27 +19,31 @@ export const ConfigureSSOHeader = (): JSX.Element => {

 return (
 <ProfileCardHeader>
 <Stepper>
 {visibleSteps.map((step, index) => {
 const isCurrent = index === currentVisibleIndex;
 const labelText = step.label ? (typeof step.label === 'string' ? step.label : t(step.label)) : '';
 {title}

 <Flex sx={title ? { marginInlineStart: 'auto' } : undefined}>
 <Stepper>
 {visibleSteps.map((step, index) => {
 const isCurrent = index === currentVisibleIndex;
 const labelText = step.label ? (typeof step.label === 'string' ? step.label : t(step.label)) : '';

 return (
 <Stepper.Item
 key={step.id}
 bullet={index + 1}
 isCurrent={isCurrent}
 isCompleted={step.isCompleted}
 // Guard-driven: bind directly to the wizard's reachability flag so
 // a disabled breadcrumb item and a blocked `goToStep` agree.
 isReachable={step.isReachable}
 onClick={() => goToStep(step.id)}
 >
 {labelText}
 </Stepper.Item>
 );
 })}
 </Stepper>
 return (
 <Stepper.Item
 key={step.id}
 bullet={index + 1}
 isCurrent={isCurrent}
 isCompleted={step.isCompleted}
 // Guard-driven: bind directly to the wizard's reachability flag so
 // a disabled breadcrumb item and a blocked `goToStep` agree.
 isReachable={step.isReachable}
 onClick={() => goToStep(step.id)}
 >
 {labelText}
 </Stepper.Item>
 );
 })}
 </Stepper>
 </Flex>
 </ProfileCardHeader>
 );
};

18 changes: 12 additions & 6 deletions
packages/ui/src/components/ConfigureSSO/ConfigureSSOWizard.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,10 +14,12 @@ import {
 TestConfigurationStep,
} from './steps';

export type ConfigureSSOWizardProps = Omit<ComponentProps<typeof ConfigureSSOProvider>, 'children'>;
export type ConfigureSSOWizardProps = Omit<ComponentProps<typeof ConfigureSSOProvider>, 'children'> & {
 title?: React.ReactNode;
 forceInitialStep?: boolean;
};

/** Pure, data-injected ConfigureSSO flow — hosts own fetching, loading, and permission gating. */
export const ConfigureSSOWizard = (props: ConfigureSSOWizardProps): JSX.Element => {
export const ConfigureSSOWizard = ({ title, forceInitialStep, ...props }: ConfigureSSOWizardProps): JSX.Element => {
 const { organizationEnterpriseConnection: c, organizationDomains } = props;

 const allDomainsVerified = areAllOrganizationDomainsVerified(organizationDomains);
Expand All@@ -33,11 +35,15 @@ export const ConfigureSSOWizard = (props: ConfigureSSOWizardProps): JSX.Element
 [c, allDomainsVerified],
 );

 // Each step owns a `CardStateProvider` so card errors stay scoped to their step and clear when it unmounts.
 const initialStepId = forceInitialStep ? steps[0].id : undefined;

 return (
 <ConfigureSSOProvider {...props}>
 <Wizard steps={steps}>
 <ConfigureSSOHeader />
 <Wizard
 steps={steps}
 initialStepId={initialStepId}
 >
 <ConfigureSSOHeader title={title} />

 <Wizard.Match id='verify-domain'>
 <CardStateProvider>
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -71,6 +71,31 @@ describe('ConfigureSSO', () => {
 });
 });

 describe('standalone mount header', () => {
 it('renders the stepper without a back control (no host title / onExit)', async () => {
 const { wrapper, fixtures } = await createFixtures(f => {
 f.withEnterpriseSso({ selfServeSSO: true });
 f.withEmailAddress();
 f.withOrganizations();
 f.withUser({
 email_addresses: ['test@clerk.com'],
 organization_memberships: [{ name: 'Org1', permissions: ['org:sys_entconns:manage'] }],
 });
 });

 fixtures.clerk.organization?.getEnterpriseConnections.mockResolvedValue([]);
 mockOrganizationDomains(fixtures, [verifiedDomain]);

 const { findByText, queryByRole } = render(<ConfigureSSO />, { wrapper });

 await findByText(/select your identity provider/i);

 // The standalone wizard is mounted without `title`/`onExit`, so the header
 // exposes no "Security" back control.
 expect(queryByRole('button', { name: 'Security' })).not.toBeInTheDocument();
 });
 });

 describe('in a personal workspace', () => {
 it('renders the wizard without checking the manage enterprise connections permission', async () => {
 const { wrapper, fixtures } = await createFixtures(f => {
Expand Down

42 changes: 36 additions & 6 deletions
packages/ui/src/components/OrganizationProfile/OrganizationSecurityPage.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
import { useOrganization } from '@clerk/shared/react';
import { useState } from 'react';
import React, { useState } from 'react';

import { Header } from '@/ui/elements/Header';
import { ProfileCard } from '@/ui/elements/ProfileCard';

import React from 'react';
import { Col, descriptors, localizationKeys } from '../../customizables';
import { Col, descriptors, Icon, localizationKeys, SimpleButton, Text } from '../../customizables';
import { ChevronLeft } from '../../icons';
import { ConfigureSSOProtect } from '../ConfigureSSO/ConfigureSSO';
import { ConfigureSSOSkeleton } from '../ConfigureSSO/ConfigureSSOSkeleton';
import { ConfigureSSOWizard } from '../ConfigureSSO/ConfigureSSOWizard';
Expand All@@ -27,7 +27,6 @@ export const OrganizationSecurityPage = ({ contentRef }: OrganizationSecurityPag
 return <OrganizationSecurityPageContent contentRef={contentRef} />;
};

/** Separate from the page so the connection hook only runs behind the organization check. */
const OrganizationSecurityPageContent = ({ contentRef }: OrganizationSecurityPageProps) => {
 const {
 organization,
Expand All@@ -41,12 +40,40 @@ const OrganizationSecurityPageContent = ({ contentRef }: OrganizationSecurityPag
 } = useOrganizationEnterpriseConnection();

 const [view, setView] = useState<'overview' | 'wizard'>('overview');
 const [forceFirstStep, setForceFirstStep] = useState(false);

 const exitWizard = () => setView('overview');

 const openWizard = (forceInitialStep = false) => {
 setForceFirstStep(forceInitialStep);
 setView('wizard');
 };

 // Gate loading above the provider so the context never observes a loading state.
 if (isLoading) {
 return <ConfigureSSOSkeleton />;
 }

 const backControl = (
 <SimpleButton
 elementDescriptor={descriptors.configureSSOHeaderBackButton}
 variant='unstyled'
 onClick={exitWizard}
 sx={t => ({
 gap: t.space.$1,
 padding: 0,
 color: t.colors.$colorMutedForeground,
 '&:hover': { color: t.colors.$colorForeground },
 })}
 >
 <Icon icon={ChevronLeft} />
 <Text
 as='span'
 variant='body'
 localizationKey={localizationKeys('organizationProfile.navbar.security')}
 />
 </SimpleButton>
 );

 return (
 <ConfigureSSOProtect>
 {view === 'overview' ? (
Expand All@@ -73,7 +100,7 @@ const OrganizationSecurityPageContent = ({ contentRef }: OrganizationSecurityPag
 deleteConnection={enterpriseConnectionMutations.deleteConnection}
 organizationName={organization?.name ?? ''}
 contentRef={contentRef}
 onConfigure={() => setView('wizard')}
 onConfigure={openWizard}
 />
 </Col>
 </Col>
Expand All@@ -87,6 +114,9 @@ const OrganizationSecurityPageContent = ({ contentRef }: OrganizationSecurityPag
 enterpriseConnectionMutations={enterpriseConnectionMutations}
 organizationDomainMutations={organizationDomainMutations}
 organizationDomains={organizationDomains}
 forceInitialStep={forceFirstStep}
 title={backControl}
 onExit={exitWizard}
 />
 )}
 </ConfigureSSOProtect>
Expand Down

8 changes: 4 additions & 4 deletions
packages/ui/src/components/OrganizationProfile/SecuritySsoSection.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -28,7 +28,7 @@ type SecuritySsoSectionProps = {
 deleteConnection: EnterpriseConnectionMutations['deleteConnection'];
 organizationName: string;
 contentRef: React.RefObject<HTMLDivElement>;
 onConfigure: () => void;
 onConfigure: (forceInitialStep?: boolean) => void;
};

const STATUS_BADGES: Record<
Expand DownExpand Up@@ -95,7 +95,7 @@ export const SecuritySsoSection = (props: SecuritySsoSectionProps): JSX.Element
 'organizationProfile.securityPage.ssoSection.primaryButton__startConfiguration',
 )}
 primaryButtonId='start'
 onConfigure={onConfigure}
 onConfigure={() => onConfigure(true)}
 />
 )}

Expand All@@ -105,7 +105,7 @@ export const SecuritySsoSection = (props: SecuritySsoSectionProps): JSX.Element
 'organizationProfile.securityPage.ssoSection.primaryButton__continueConfiguration',
 )}
 primaryButtonId='continue'
 onConfigure={onConfigure}
 onConfigure={() => onConfigure()}
 />
 )}

Expand DownExpand Up@@ -205,7 +205,7 @@ const ConfiguredContent = (props: ConfiguredContentProps): JSX.Element => {
 actions={[
 {
 label: localizationKeys('organizationProfile.securityPage.ssoSection.menuAction__edit'),
 onClick: onConfigure,
 onClick: () => onConfigure(true),
 },
 isActive
 ? {
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): wire the Security page navigation into the ConfigureSSO wizard by iagodahlem · Pull Request #8864 · clerk/javascript · GitHub
Skip to content
feat(ui): wire the Security page navigation into the ConfigureSSO wizard#8864

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 2 commits into

from

Jun 16, 2026
 Merged


feat(ui): wire the Security page navigation into the ConfigureSSO wizard
#8864
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
a71a77a

feat(ui): add onExit to ConfigureSSO context and host-rendered header…


iagodahlem Jun 16, 2026
88acd1b

feat(ui): add Security back control and first-step launch to the SSO …


iagodahlem Jun 16, 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


5 changes: 5 additions & 0 deletions
.changeset/whole-parents-care.md

View file


Open in desktop

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

The Security page's SSO wizard now has a back-to-Security control, and Start/Edit open the wizard at the first step (Continue resumes where you left off).

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -25,6 +25,7 @@ export interface ConfigureSSOData {
 organizationEnterpriseConnection: OrganizationEnterpriseConnection;
 testRuns: TestRunsView;
 organizationDomains: OrganizationDomainResource[] | undefined;
 onExit?: () => void;
}

interface ConfigureSSOProviderProps {
Expand All@@ -35,6 +36,7 @@ interface ConfigureSSOProviderProps {
 contentRef: React.RefObject<HTMLDivElement>;
 enterpriseConnectionMutations: EnterpriseConnectionMutations;
 organizationDomainMutations: OrganizationDomainMutations;
 onExit?: () => void;
}

const ConfigureSSOContext = React.createContext<ConfigureSSOData | null>(null);
Expand All@@ -48,6 +50,7 @@ export const ConfigureSSOProvider = ({
 contentRef,
 enterpriseConnectionMutations,
 organizationDomainMutations,
 onExit,
 children,
}: PropsWithChildren<ConfigureSSOProviderProps>): JSX.Element => {
 const value = React.useMemo<ConfigureSSOData>(
Expand All@@ -59,6 +62,7 @@ export const ConfigureSSOProvider = ({
 organizationDomains,
 enterpriseConnectionMutations,
 organizationDomainMutations,
 onExit,
 }),
 [
 contentRef,
Expand All@@ -68,6 +72,7 @@ export const ConfigureSSOProvider = ({
 testRuns,
 organizationDomains,
 enterpriseConnection,
 onExit,
 ],
 );

Expand Down

65 changes: 30 additions & 35 deletions
packages/ui/src/components/ConfigureSSO/ConfigureSSOHeader.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,23 +1,14 @@
import { useLocalizations } from '@/customizables';
import { Flex, useLocalizations } from '@/customizables';

import { ProfileCardHeader } from './elements/ProfileCard';
import { Stepper } from './elements/Stepper';
import { useWizard } from './elements/Wizard';

/**
 * The wizard breadcrumb, driven entirely by the generic entry-guard wizard
 * facade.
 *
 * Breadcrumb membership is the labelled steps in declaration order — the
 * provider-selection step carries no `label`, so it never appears (it replaced
 * the old `hidden` provider step). Each item's reachability comes straight from
 * the guard-driven `isReachable` flag (the same predicate `goToStep` checks), so
 * a disabled breadcrumb item and a blocked jump always agree. Completion stays
 * positional. The reset affordance now lives in the step footers
 * (`Step.Footer.Reset`), which delete the connection via the context mutation
 * rather than a wizard binding.
 */
export const ConfigureSSOHeader = (): JSX.Element => {
type ConfigureSSOHeaderProps = {
 title?: React.ReactNode;
};

export const ConfigureSSOHeader = ({ title }: ConfigureSSOHeaderProps): JSX.Element => {
 const { activeSteps, currentIndex, goToStep } = useWizard();
 const { t } = useLocalizations();

Expand All@@ -28,27 +19,31 @@ export const ConfigureSSOHeader = (): JSX.Element => {

 return (
 <ProfileCardHeader>
 <Stepper>
 {visibleSteps.map((step, index) => {
 const isCurrent = index === currentVisibleIndex;
 const labelText = step.label ? (typeof step.label === 'string' ? step.label : t(step.label)) : '';
 {title}

 <Flex sx={title ? { marginInlineStart: 'auto' } : undefined}>
 <Stepper>
 {visibleSteps.map((step, index) => {
 const isCurrent = index === currentVisibleIndex;
 const labelText = step.label ? (typeof step.label === 'string' ? step.label : t(step.label)) : '';

 return (
 <Stepper.Item
 key={step.id}
 bullet={index + 1}
 isCurrent={isCurrent}
 isCompleted={step.isCompleted}
 // Guard-driven: bind directly to the wizard's reachability flag so
 // a disabled breadcrumb item and a blocked `goToStep` agree.
 isReachable={step.isReachable}
 onClick={() => goToStep(step.id)}
 >
 {labelText}
 </Stepper.Item>
 );
 })}
 </Stepper>
 return (
 <Stepper.Item
 key={step.id}
 bullet={index + 1}
 isCurrent={isCurrent}
 isCompleted={step.isCompleted}
 // Guard-driven: bind directly to the wizard's reachability flag so
 // a disabled breadcrumb item and a blocked `goToStep` agree.
 isReachable={step.isReachable}
 onClick={() => goToStep(step.id)}
 >
 {labelText}
 </Stepper.Item>
 );
 })}
 </Stepper>
 </Flex>
 </ProfileCardHeader>
 );
};

18 changes: 12 additions & 6 deletions
packages/ui/src/components/ConfigureSSO/ConfigureSSOWizard.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,10 +14,12 @@ import {
 TestConfigurationStep,
} from './steps';

export type ConfigureSSOWizardProps = Omit<ComponentProps<typeof ConfigureSSOProvider>, 'children'>;
export type ConfigureSSOWizardProps = Omit<ComponentProps<typeof ConfigureSSOProvider>, 'children'> & {
 title?: React.ReactNode;
 forceInitialStep?: boolean;
};

/** Pure, data-injected ConfigureSSO flow — hosts own fetching, loading, and permission gating. */
export const ConfigureSSOWizard = (props: ConfigureSSOWizardProps): JSX.Element => {
export const ConfigureSSOWizard = ({ title, forceInitialStep, ...props }: ConfigureSSOWizardProps): JSX.Element => {
 const { organizationEnterpriseConnection: c, organizationDomains } = props;

 const allDomainsVerified = areAllOrganizationDomainsVerified(organizationDomains);
Expand All@@ -33,11 +35,15 @@ export const ConfigureSSOWizard = (props: ConfigureSSOWizardProps): JSX.Element
 [c, allDomainsVerified],
 );

 // Each step owns a `CardStateProvider` so card errors stay scoped to their step and clear when it unmounts.
 const initialStepId = forceInitialStep ? steps[0].id : undefined;

 return (
 <ConfigureSSOProvider {...props}>
 <Wizard steps={steps}>
 <ConfigureSSOHeader />
 <Wizard
 steps={steps}
 initialStepId={initialStepId}
 >
 <ConfigureSSOHeader title={title} />

 <Wizard.Match id='verify-domain'>
 <CardStateProvider>
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -71,6 +71,31 @@ describe('ConfigureSSO', () => {
 });
 });

 describe('standalone mount header', () => {
 it('renders the stepper without a back control (no host title / onExit)', async () => {
 const { wrapper, fixtures } = await createFixtures(f => {
 f.withEnterpriseSso({ selfServeSSO: true });
 f.withEmailAddress();
 f.withOrganizations();
 f.withUser({
 email_addresses: ['test@clerk.com'],
 organization_memberships: [{ name: 'Org1', permissions: ['org:sys_entconns:manage'] }],
 });
 });

 fixtures.clerk.organization?.getEnterpriseConnections.mockResolvedValue([]);
 mockOrganizationDomains(fixtures, [verifiedDomain]);

 const { findByText, queryByRole } = render(<ConfigureSSO />, { wrapper });

 await findByText(/select your identity provider/i);

 // The standalone wizard is mounted without `title`/`onExit`, so the header
 // exposes no "Security" back control.
 expect(queryByRole('button', { name: 'Security' })).not.toBeInTheDocument();
 });
 });

 describe('in a personal workspace', () => {
 it('renders the wizard without checking the manage enterprise connections permission', async () => {
 const { wrapper, fixtures } = await createFixtures(f => {
Expand Down

42 changes: 36 additions & 6 deletions
packages/ui/src/components/OrganizationProfile/OrganizationSecurityPage.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
import { useOrganization } from '@clerk/shared/react';
import { useState } from 'react';
import React, { useState } from 'react';

import { Header } from '@/ui/elements/Header';
import { ProfileCard } from '@/ui/elements/ProfileCard';

import React from 'react';
import { Col, descriptors, localizationKeys } from '../../customizables';
import { Col, descriptors, Icon, localizationKeys, SimpleButton, Text } from '../../customizables';
import { ChevronLeft } from '../../icons';
import { ConfigureSSOProtect } from '../ConfigureSSO/ConfigureSSO';
import { ConfigureSSOSkeleton } from '../ConfigureSSO/ConfigureSSOSkeleton';
import { ConfigureSSOWizard } from '../ConfigureSSO/ConfigureSSOWizard';
Expand All@@ -27,7 +27,6 @@ export const OrganizationSecurityPage = ({ contentRef }: OrganizationSecurityPag
 return <OrganizationSecurityPageContent contentRef={contentRef} />;
};

/** Separate from the page so the connection hook only runs behind the organization check. */
const OrganizationSecurityPageContent = ({ contentRef }: OrganizationSecurityPageProps) => {
 const {
 organization,
Expand All@@ -41,12 +40,40 @@ const OrganizationSecurityPageContent = ({ contentRef }: OrganizationSecurityPag
 } = useOrganizationEnterpriseConnection();

 const [view, setView] = useState<'overview' | 'wizard'>('overview');
 const [forceFirstStep, setForceFirstStep] = useState(false);

 const exitWizard = () => setView('overview');

 const openWizard = (forceInitialStep = false) => {
 setForceFirstStep(forceInitialStep);
 setView('wizard');
 };

 // Gate loading above the provider so the context never observes a loading state.
 if (isLoading) {
 return <ConfigureSSOSkeleton />;
 }

 const backControl = (
 <SimpleButton
 elementDescriptor={descriptors.configureSSOHeaderBackButton}
 variant='unstyled'
 onClick={exitWizard}
 sx={t => ({
 gap: t.space.$1,
 padding: 0,
 color: t.colors.$colorMutedForeground,
 '&:hover': { color: t.colors.$colorForeground },
 })}
 >
 <Icon icon={ChevronLeft} />
 <Text
 as='span'
 variant='body'
 localizationKey={localizationKeys('organizationProfile.navbar.security')}
 />
 </SimpleButton>
 );

 return (
 <ConfigureSSOProtect>
 {view === 'overview' ? (
Expand All@@ -73,7 +100,7 @@ const OrganizationSecurityPageContent = ({ contentRef }: OrganizationSecurityPag
 deleteConnection={enterpriseConnectionMutations.deleteConnection}
 organizationName={organization?.name ?? ''}
 contentRef={contentRef}
 onConfigure={() => setView('wizard')}
 onConfigure={openWizard}
 />
 </Col>
 </Col>
Expand All@@ -87,6 +114,9 @@ const OrganizationSecurityPageContent = ({ contentRef }: OrganizationSecurityPag
 enterpriseConnectionMutations={enterpriseConnectionMutations}
 organizationDomainMutations={organizationDomainMutations}
 organizationDomains={organizationDomains}
 forceInitialStep={forceFirstStep}
 title={backControl}
 onExit={exitWizard}
 />
 )}
 </ConfigureSSOProtect>
Expand Down

8 changes: 4 additions & 4 deletions
packages/ui/src/components/OrganizationProfile/SecuritySsoSection.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -28,7 +28,7 @@ type SecuritySsoSectionProps = {
 deleteConnection: EnterpriseConnectionMutations['deleteConnection'];
 organizationName: string;
 contentRef: React.RefObject<HTMLDivElement>;
 onConfigure: () => void;
 onConfigure: (forceInitialStep?: boolean) => void;
};

const STATUS_BADGES: Record<
Expand DownExpand Up@@ -95,7 +95,7 @@ export const SecuritySsoSection = (props: SecuritySsoSectionProps): JSX.Element
 'organizationProfile.securityPage.ssoSection.primaryButton__startConfiguration',
 )}
 primaryButtonId='start'
 onConfigure={onConfigure}
 onConfigure={() => onConfigure(true)}
 />
 )}

Expand All@@ -105,7 +105,7 @@ export const SecuritySsoSection = (props: SecuritySsoSectionProps): JSX.Element
 'organizationProfile.securityPage.ssoSection.primaryButton__continueConfiguration',
 )}
 primaryButtonId='continue'
 onConfigure={onConfigure}
 onConfigure={() => onConfigure()}
 />
 )}

Expand DownExpand Up@@ -205,7 +205,7 @@ const ConfiguredContent = (props: ConfiguredContentProps): JSX.Element => {
 actions={[
 {
 label: localizationKeys('organizationProfile.securityPage.ssoSection.menuAction__edit'),
 onClick: onConfigure,
 onClick: () => onConfigure(true),
 },
 isActive
 ? {
Expand Down
Loading
Loading