feat(ui): remove experimental gate from self-serve OIDC flow#9288

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
NicolasLopes7 merged 5 commits into from
Jul 31, 2026
Merged

feat(ui): remove experimental gate from self-serve OIDC flow #9288

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a164dc0
feat(ui): remove experimental gate from self-serve OIDC flow
NicolasLopes7 Jul 30, 2026
b32efd1
Merge branch 'main' into nicolas/remove-oidc-self-serve-flag
NicolasLopes7 Jul 30, 2026
558c427
test(ui): count the OIDC tile in the provider icon assertion
NicolasLopes7 Jul 30, 2026
6c0e230
Merge branch 'main' into nicolas/remove-oidc-self-serve-flag
wobsoriano Jul 30, 2026
abfbac2
Merge branch 'main' into nicolas/remove-oidc-self-serve-flag
NicolasLopes7 Jul 30, 2026
File filter

Filter by extension

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

Enable self-serve OIDC configuration for every application. Organization admins can now select an OIDC provider in the `<OrganizationProfile />` Security tab without the `experimental.oidcSelfServe` option, and existing OIDC connections open their configuration steps instead of the unsupported-provider state. The `experimental.oidcSelfServe` option no longer does anything and can be removed from `<ClerkProvider />` and `Clerk.load()`.
4 changes: 0 additions & 4 deletions packages/shared/src/types/clerk.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -1513,10 +1513,6 @@ export type ClerkOptions = ClerkOptionsNavigation &
* directly with the provided Clerk instance. Used by React Native / Expo.
*/
runtimeEnvironment: 'headless';
/**
* Temporary flag that gates the self-serve OIDC flow in `<ConfigureSSO />`. Remove once the self-serve OIDC flow reaches GA.
*/
oidcSelfServe: boolean;
},
Record<string, any>
>;
Expand Down
8 changes: 0 additions & 8 deletions packages/ui/src/components/ConfigureSSO/ConfigureSSOContext.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
import type { EnterpriseConnectionResource, OrganizationDomainResource } from '@clerk/shared/types';
import React, { type PropsWithChildren } from 'react';

import { useOptions } from '@/contexts';

import type { OrganizationEnterpriseConnection } from './domain/organizationEnterpriseConnection';
import type {
EnterpriseConnectionMutations,
Expand All@@ -28,8 +26,6 @@ export interface ConfigureSSOData {
testRuns: TestRunsView;
organizationDomains: OrganizationDomainResource[] | undefined;
onExit?: () => void;
/** Temporary gate for the self-serve OIDC flow; remove at OIDC GA. */
isOIDCFlowEnabled: boolean;
}

interface ConfigureSSOProviderProps {
Expand DownExpand Up@@ -57,8 +53,6 @@ export const ConfigureSSOProvider = ({
onExit,
children,
}: PropsWithChildren<ConfigureSSOProviderProps>): JSX.Element => {
const isOIDCFlowEnabled = useOptions().experimental?.oidcSelfServe ?? false;

const value = React.useMemo<ConfigureSSOData>(
() => ({
contentRef,
Expand All@@ -69,7 +63,6 @@ export const ConfigureSSOProvider = ({
enterpriseConnectionMutations,
organizationDomainMutations,
onExit,
isOIDCFlowEnabled,
}),
[
contentRef,
Expand All@@ -80,7 +73,6 @@ export const ConfigureSSOProvider = ({
organizationDomains,
enterpriseConnection,
onExit,
isOIDCFlowEnabled,
],
);

Expand Down
39 changes: 10 additions & 29 deletions packages/ui/src/components/ConfigureSSO/steps/ConfigureStep/__tests__/ConfigureStep.test.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,7 +14,6 @@ import type { EnterpriseConnectionProviderType } from '../../../types';
// left undefined so that footer self-hides in this isolated render.
const contextState = vi.hoisted(() => ({
provider: undefined as string | undefined,
isOIDCFlowEnabled: true,
enterpriseConnection: undefined as
| {
id: string;
Expand DownExpand Up@@ -45,7 +44,6 @@ vi.mock('../../../ConfigureSSOContext', () => ({
provider: contextState.provider,
hasConnection: true,
},
isOIDCFlowEnabled: contextState.isOIDCFlowEnabled,
}),
}));

Expand All@@ -63,34 +61,28 @@ const { createFixtures } = bindCreateFixtures('ConfigureSSO');

describe('resolveConfigureSteps', () => {
it('dispatches custom and legacy OIDC provider keys to the OIDC sub-flow', () => {
expect(resolveConfigureSteps('oauth_custom_clerk_dev', true)).toBe(OidcCustomConfigureSteps);
expect(resolveConfigureSteps('oidc_clerk_dev', true)).toBe(OidcCustomConfigureSteps);
expect(resolveConfigureSteps('oidc_ghe_acme', true)).toBe(OidcCustomConfigureSteps);
expect(resolveConfigureSteps('oidc_gitlab_ent_acme', true)).toBe(OidcCustomConfigureSteps);
expect(resolveConfigureSteps('oidc_custom', true)).toBe(OidcCustomConfigureSteps);
});

it('does not dispatch OIDC providers while the experimental flow is disabled', () => {
expect(resolveConfigureSteps('oauth_custom_clerk_dev', false)).toBeUndefined();
expect(resolveConfigureSteps('oidc_clerk_dev', false)).toBeUndefined();
expect(resolveConfigureSteps('oauth_custom_clerk_dev')).toBe(OidcCustomConfigureSteps);
expect(resolveConfigureSteps('oidc_clerk_dev')).toBe(OidcCustomConfigureSteps);
expect(resolveConfigureSteps('oidc_ghe_acme')).toBe(OidcCustomConfigureSteps);
expect(resolveConfigureSteps('oidc_gitlab_ent_acme')).toBe(OidcCustomConfigureSteps);
expect(resolveConfigureSteps('oidc_custom')).toBe(OidcCustomConfigureSteps);
});

it('dispatches SAML providers by exact literal', () => {
expect(resolveConfigureSteps('saml_okta', false)).toBe(SamlOktaConfigureSteps);
expect(resolveConfigureSteps('saml_custom', false)).toBe(SamlCustomConfigureSteps);
expect(resolveConfigureSteps('saml_google', false)).toBe(SamlGoogleConfigureSteps);
expect(resolveConfigureSteps('saml_microsoft', false)).toBe(SamlMicrosoftConfigureSteps);
expect(resolveConfigureSteps('saml_okta')).toBe(SamlOktaConfigureSteps);
expect(resolveConfigureSteps('saml_custom')).toBe(SamlCustomConfigureSteps);
expect(resolveConfigureSteps('saml_google')).toBe(SamlGoogleConfigureSteps);
expect(resolveConfigureSteps('saml_microsoft')).toBe(SamlMicrosoftConfigureSteps);
});

it('returns undefined for an unrecognized provider so the caller can degrade', () => {
expect(resolveConfigureSteps('ldap_enterprise' as EnterpriseConnectionProviderType, true)).toBeUndefined();
expect(resolveConfigureSteps('ldap_enterprise' as EnterpriseConnectionProviderType)).toBeUndefined();
});
});

describe('ConfigureProviderStep', () => {
beforeEach(() => {
contextState.provider = undefined;
contextState.isOIDCFlowEnabled = true;
contextState.enterpriseConnection = undefined;
updateConnection.mockReset();
});
Expand DownExpand Up@@ -469,15 +461,4 @@ describe('ConfigureProviderStep', () => {

expect(await screen.findByText(/unsupported provider/i)).toBeInTheDocument();
});

it('degrades to the unsupported-provider state for an existing OIDC connection when the flag is off', async () => {
contextState.provider = 'oauth_custom_clerk_dev';
contextState.isOIDCFlowEnabled = false;
const { wrapper } = await createFixtures();

renderStep(wrapper);

expect(await screen.findByText(/unsupported provider/i)).toBeInTheDocument();
expect(screen.queryByText(/create a new oidc application/i)).not.toBeInTheDocument();
});
});
13 changes: 4 additions & 9 deletions packages/ui/src/components/ConfigureSSO/steps/ConfigureStep/index.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -28,13 +28,8 @@ const STEPS_BY_SAML_PROVIDER: Record<SamlProviderType, ConfigureStepsComponent>

export const resolveConfigureSteps = (
provider: EnterpriseConnectionProviderType,
isOIDCFlowEnabled: boolean,
): ConfigureStepsComponent | undefined => {
if (isOidcProvider(provider)) {
return isOIDCFlowEnabled ? OidcCustomConfigureSteps : undefined;
}
return STEPS_BY_SAML_PROVIDER[provider];
};
): ConfigureStepsComponent | undefined =>
isOidcProvider(provider) ? OidcCustomConfigureSteps : STEPS_BY_SAML_PROVIDER[provider];

export const ConfigureStep = (): JSX.Element => {
const { organizationEnterpriseConnection: c } = useConfigureSSO();
Expand DownExpand Up@@ -68,13 +63,13 @@ export const ConfigureStep = (): JSX.Element => {
};

export const ConfigureProviderStep = (): JSX.Element | null => {
const { organizationEnterpriseConnection: c, isOIDCFlowEnabled } = useConfigureSSO();
const { organizationEnterpriseConnection: c } = useConfigureSSO();

if (!c.provider) {
return null;
}

const ConfigureSteps = resolveConfigureSteps(c.provider, isOIDCFlowEnabled);
const ConfigureSteps = resolveConfigureSteps(c.provider);

return (
<Flow.Part part='configureCreateApp'>
Expand Down
8 changes: 1 addition & 7 deletions packages/ui/src/components/ConfigureSSO/steps/SelectProviderStep.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -78,16 +78,10 @@ export const SelectProviderStep = (): JSX.Element => {
organizationEnterpriseConnection: c,
enterpriseConnectionMutations: { createConnection, changeProvider },
contentRef,
isOIDCFlowEnabled,
} = useConfigureSSO();
const { goNext, goPrev, isFirstStep } = useWizard();
const { t } = useLocalizations();

const providerGroups = React.useMemo(
() => PROVIDER_GROUPS.filter(group => group.id !== 'oidc' || isOIDCFlowEnabled),
[isOIDCFlowEnabled],
);

const currentCard = c.provider ? toProviderCard(c.provider) : null;

const [selected, setSelected] = React.useState<ProviderType | null>(currentCard);
Expand DownExpand Up@@ -166,7 +160,7 @@ export const SelectProviderStep = (): JSX.Element => {

<Step.Body>
<Step.Section sx={theme => ({ gap: theme.space.$5 })}>
{providerGroups.map(group => (
{PROVIDER_GROUPS.map(group => (
<Col
key={group.id}
elementDescriptor={descriptors.configureSSOProviderGroup}
Expand Down
29 changes: 8 additions & 21 deletions packages/ui/src/components/ConfigureSSO/steps/__tests__/SelectProviderStep.test.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -25,7 +25,6 @@ const changeProvider = vi.fn();
const contextState = vi.hoisted(() => ({
provider: undefined as 'saml_okta' | 'saml_custom' | 'saml_google' | undefined,
hasConnection: false,
isOIDCFlowEnabled: false,
}));

vi.mock('../../ConfigureSSOContext', () => ({
Expand All@@ -40,7 +39,6 @@ vi.mock('../../ConfigureSSOContext', () => ({
provider: contextState.provider,
hasConnection: contextState.hasConnection,
},
isOIDCFlowEnabled: contextState.isOIDCFlowEnabled,
}),
}));

Expand All@@ -64,7 +62,6 @@ const resetMocks = () => {
changeProvider.mockResolvedValue(undefined);
contextState.provider = undefined;
contextState.hasConnection = false;
contextState.isOIDCFlowEnabled = false;
};

describe('SelectProviderStep', () => {
Expand DownExpand Up@@ -96,7 +93,7 @@ describe('SelectProviderStep', () => {
// Each provider card is a <label> wrapping a visually-hidden native radio; the
// aria-hidden icon span lives inside it.
const iconSpans = Array.from(container.querySelectorAll('label span[aria-hidden]'));
expect(iconSpans).toHaveLength(4);
expect(iconSpans).toHaveLength(5);

const collectedStyles = [
...Array.from(document.head.querySelectorAll('style')).map(s => s.textContent ?? ''),
Expand All@@ -106,26 +103,16 @@ describe('SelectProviderStep', () => {
expect(collectedStyles).toMatch(/img\.clerk\.com\/static\/okta\.svg/);
expect(collectedStyles).toMatch(/img\.clerk\.com\/static\/saml\.svg/);
expect(collectedStyles).toMatch(/img\.clerk\.com\/static\/google\.svg/);
expect(collectedStyles).toMatch(/img\.clerk\.com\/static\/oidc\.svg/);
});

describe('OIDC provider (experimental flag)', () => {
it('hides the OIDC provider tile when the flag is off', async () => {
resetMocks();
const { wrapper } = await createFixtures();
const { container } = renderStep(wrapper);

expect(screen.getByRole('radio', { name: 'Okta Workforce' })).toBeInTheDocument();
expect(container.querySelector('input[value="oidc_custom"]')).not.toBeInTheDocument();
});

it('shows the OIDC provider tile when the flag is on', async () => {
resetMocks();
contextState.isOIDCFlowEnabled = true;
const { wrapper } = await createFixtures();
const { container } = renderStep(wrapper);
it('renders the OIDC provider tile', async () => {
resetMocks();
const { wrapper } = await createFixtures();
const { container } = renderStep(wrapper);

expect(container.querySelector('input[value="oidc_custom"]')).toBeInTheDocument();
});
expect(screen.getByRole('radio', { name: 'Okta Workforce' })).toBeInTheDocument();
expect(container.querySelector('input[value="oidc_custom"]')).toBeInTheDocument();
});

it('disables Continue when no provider is selected', async () => {
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n 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;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
feat(ui): remove experimental gate from self-serve OIDC flow#9288

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

NicolasLopes7
merged 5 commits into

from

Jul 31, 2026
 Merged


feat(ui): remove experimental gate from self-serve OIDC flow
#9288
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
a164dc0

feat(ui): remove experimental gate from self-serve OIDC flow


NicolasLopes7 Jul 30, 2026
b32efd1

Merge branch 'main' into nicolas/remove-oidc-self-serve-flag


NicolasLopes7 Jul 30, 2026
558c427

test(ui): count the OIDC tile in the provider icon assertion


NicolasLopes7 Jul 30, 2026
6c0e230

Merge branch 'main' into nicolas/remove-oidc-self-serve-flag


wobsoriano Jul 30, 2026
abfbac2

Merge branch 'main' into nicolas/remove-oidc-self-serve-flag


NicolasLopes7 Jul 30, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


7 changes: 7 additions & 0 deletions
.changeset/quiet-moons-shine.md

View file


Open in desktop

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

Enable self-serve OIDC configuration for every application. Organization admins can now select an OIDC provider in the `<OrganizationProfile />` Security tab without the `experimental.oidcSelfServe` option, and existing OIDC connections open their configuration steps instead of the unsupported-provider state. The `experimental.oidcSelfServe` option no longer does anything and can be removed from `<ClerkProvider />` and `Clerk.load()`.

4 changes: 0 additions & 4 deletions
packages/shared/src/types/clerk.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1513,10 +1513,6 @@ export type ClerkOptions = ClerkOptionsNavigation &
 * directly with the provided Clerk instance. Used by React Native / Expo.
 */
 runtimeEnvironment: 'headless';
 /**
 * Temporary flag that gates the self-serve OIDC flow in `<ConfigureSSO />`. Remove once the self-serve OIDC flow reaches GA.
 */
 oidcSelfServe: boolean;
 },
 Record<string, any>
 >;
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
import type { EnterpriseConnectionResource, OrganizationDomainResource } from '@clerk/shared/types';
import React, { type PropsWithChildren } from 'react';

import { useOptions } from '@/contexts';

import type { OrganizationEnterpriseConnection } from './domain/organizationEnterpriseConnection';
import type {
 EnterpriseConnectionMutations,
Expand All@@ -28,8 +26,6 @@ export interface ConfigureSSOData {
 testRuns: TestRunsView;
 organizationDomains: OrganizationDomainResource[] | undefined;
 onExit?: () => void;
 /** Temporary gate for the self-serve OIDC flow; remove at OIDC GA. */
 isOIDCFlowEnabled: boolean;
}

interface ConfigureSSOProviderProps {
Expand DownExpand Up@@ -57,8 +53,6 @@ export const ConfigureSSOProvider = ({
 onExit,
 children,
}: PropsWithChildren<ConfigureSSOProviderProps>): JSX.Element => {
 const isOIDCFlowEnabled = useOptions().experimental?.oidcSelfServe ?? false;

 const value = React.useMemo<ConfigureSSOData>(
 () => ({
 contentRef,
Expand All@@ -69,7 +63,6 @@ export const ConfigureSSOProvider = ({
 enterpriseConnectionMutations,
 organizationDomainMutations,
 onExit,
 isOIDCFlowEnabled,
 }),
 [
 contentRef,
Expand All@@ -80,7 +73,6 @@ export const ConfigureSSOProvider = ({
 organizationDomains,
 enterpriseConnection,
 onExit,
 isOIDCFlowEnabled,
 ],
 );

Expand Down

39 changes: 10 additions & 29 deletions
packages/ui/src/components/ConfigureSSO/steps/ConfigureStep/__tests__/ConfigureStep.test.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,7 +14,6 @@ import type { EnterpriseConnectionProviderType } from '../../../types';
// left undefined so that footer self-hides in this isolated render.
const contextState = vi.hoisted(() => ({
 provider: undefined as string | undefined,
 isOIDCFlowEnabled: true,
 enterpriseConnection: undefined as
 | {
 id: string;
Expand DownExpand Up@@ -45,7 +44,6 @@ vi.mock('../../../ConfigureSSOContext', () => ({
 provider: contextState.provider,
 hasConnection: true,
 },
 isOIDCFlowEnabled: contextState.isOIDCFlowEnabled,
 }),
}));

Expand All@@ -63,34 +61,28 @@ const { createFixtures } = bindCreateFixtures('ConfigureSSO');

describe('resolveConfigureSteps', () => {
 it('dispatches custom and legacy OIDC provider keys to the OIDC sub-flow', () => {
 expect(resolveConfigureSteps('oauth_custom_clerk_dev', true)).toBe(OidcCustomConfigureSteps);
 expect(resolveConfigureSteps('oidc_clerk_dev', true)).toBe(OidcCustomConfigureSteps);
 expect(resolveConfigureSteps('oidc_ghe_acme', true)).toBe(OidcCustomConfigureSteps);
 expect(resolveConfigureSteps('oidc_gitlab_ent_acme', true)).toBe(OidcCustomConfigureSteps);
 expect(resolveConfigureSteps('oidc_custom', true)).toBe(OidcCustomConfigureSteps);
 });

 it('does not dispatch OIDC providers while the experimental flow is disabled', () => {
 expect(resolveConfigureSteps('oauth_custom_clerk_dev', false)).toBeUndefined();
 expect(resolveConfigureSteps('oidc_clerk_dev', false)).toBeUndefined();
 expect(resolveConfigureSteps('oauth_custom_clerk_dev')).toBe(OidcCustomConfigureSteps);
 expect(resolveConfigureSteps('oidc_clerk_dev')).toBe(OidcCustomConfigureSteps);
 expect(resolveConfigureSteps('oidc_ghe_acme')).toBe(OidcCustomConfigureSteps);
 expect(resolveConfigureSteps('oidc_gitlab_ent_acme')).toBe(OidcCustomConfigureSteps);
 expect(resolveConfigureSteps('oidc_custom')).toBe(OidcCustomConfigureSteps);
 });

 it('dispatches SAML providers by exact literal', () => {
 expect(resolveConfigureSteps('saml_okta', false)).toBe(SamlOktaConfigureSteps);
 expect(resolveConfigureSteps('saml_custom', false)).toBe(SamlCustomConfigureSteps);
 expect(resolveConfigureSteps('saml_google', false)).toBe(SamlGoogleConfigureSteps);
 expect(resolveConfigureSteps('saml_microsoft', false)).toBe(SamlMicrosoftConfigureSteps);
 expect(resolveConfigureSteps('saml_okta')).toBe(SamlOktaConfigureSteps);
 expect(resolveConfigureSteps('saml_custom')).toBe(SamlCustomConfigureSteps);
 expect(resolveConfigureSteps('saml_google')).toBe(SamlGoogleConfigureSteps);
 expect(resolveConfigureSteps('saml_microsoft')).toBe(SamlMicrosoftConfigureSteps);
 });

 it('returns undefined for an unrecognized provider so the caller can degrade', () => {
 expect(resolveConfigureSteps('ldap_enterprise' as EnterpriseConnectionProviderType, true)).toBeUndefined();
 expect(resolveConfigureSteps('ldap_enterprise' as EnterpriseConnectionProviderType)).toBeUndefined();
 });
});

describe('ConfigureProviderStep', () => {
 beforeEach(() => {
 contextState.provider = undefined;
 contextState.isOIDCFlowEnabled = true;
 contextState.enterpriseConnection = undefined;
 updateConnection.mockReset();
 });
Expand DownExpand Up@@ -469,15 +461,4 @@ describe('ConfigureProviderStep', () => {

 expect(await screen.findByText(/unsupported provider/i)).toBeInTheDocument();
 });

 it('degrades to the unsupported-provider state for an existing OIDC connection when the flag is off', async () => {
 contextState.provider = 'oauth_custom_clerk_dev';
 contextState.isOIDCFlowEnabled = false;
 const { wrapper } = await createFixtures();

 renderStep(wrapper);

 expect(await screen.findByText(/unsupported provider/i)).toBeInTheDocument();
 expect(screen.queryByText(/create a new oidc application/i)).not.toBeInTheDocument();
 });
});

13 changes: 4 additions & 9 deletions
packages/ui/src/components/ConfigureSSO/steps/ConfigureStep/index.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -28,13 +28,8 @@ const STEPS_BY_SAML_PROVIDER: Record<SamlProviderType, ConfigureStepsComponent>

export const resolveConfigureSteps = (
 provider: EnterpriseConnectionProviderType,
 isOIDCFlowEnabled: boolean,
): ConfigureStepsComponent | undefined => {
 if (isOidcProvider(provider)) {
 return isOIDCFlowEnabled ? OidcCustomConfigureSteps : undefined;
 }
 return STEPS_BY_SAML_PROVIDER[provider];
};
): ConfigureStepsComponent | undefined =>
 isOidcProvider(provider) ? OidcCustomConfigureSteps : STEPS_BY_SAML_PROVIDER[provider];

export const ConfigureStep = (): JSX.Element => {
 const { organizationEnterpriseConnection: c } = useConfigureSSO();
Expand DownExpand Up@@ -68,13 +63,13 @@ export const ConfigureStep = (): JSX.Element => {
};

export const ConfigureProviderStep = (): JSX.Element | null => {
 const { organizationEnterpriseConnection: c, isOIDCFlowEnabled } = useConfigureSSO();
 const { organizationEnterpriseConnection: c } = useConfigureSSO();

 if (!c.provider) {
 return null;
 }

 const ConfigureSteps = resolveConfigureSteps(c.provider, isOIDCFlowEnabled);
 const ConfigureSteps = resolveConfigureSteps(c.provider);

 return (
 <Flow.Part part='configureCreateApp'>
Expand Down

8 changes: 1 addition & 7 deletions
packages/ui/src/components/ConfigureSSO/steps/SelectProviderStep.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -78,16 +78,10 @@ export const SelectProviderStep = (): JSX.Element => {
 organizationEnterpriseConnection: c,
 enterpriseConnectionMutations: { createConnection, changeProvider },
 contentRef,
 isOIDCFlowEnabled,
 } = useConfigureSSO();
 const { goNext, goPrev, isFirstStep } = useWizard();
 const { t } = useLocalizations();

 const providerGroups = React.useMemo(
 () => PROVIDER_GROUPS.filter(group => group.id !== 'oidc' || isOIDCFlowEnabled),
 [isOIDCFlowEnabled],
 );

 const currentCard = c.provider ? toProviderCard(c.provider) : null;

 const [selected, setSelected] = React.useState<ProviderType | null>(currentCard);
Expand DownExpand Up@@ -166,7 +160,7 @@ export const SelectProviderStep = (): JSX.Element => {

 <Step.Body>
 <Step.Section sx={theme => ({ gap: theme.space.$5 })}>
 {providerGroups.map(group => (
 {PROVIDER_GROUPS.map(group => (
 <Col
 key={group.id}
 elementDescriptor={descriptors.configureSSOProviderGroup}
Expand Down

29 changes: 8 additions & 21 deletions
packages/ui/src/components/ConfigureSSO/steps/__tests__/SelectProviderStep.test.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -25,7 +25,6 @@ const changeProvider = vi.fn();
const contextState = vi.hoisted(() => ({
 provider: undefined as 'saml_okta' | 'saml_custom' | 'saml_google' | undefined,
 hasConnection: false,
 isOIDCFlowEnabled: false,
}));

vi.mock('../../ConfigureSSOContext', () => ({
Expand All@@ -40,7 +39,6 @@ vi.mock('../../ConfigureSSOContext', () => ({
 provider: contextState.provider,
 hasConnection: contextState.hasConnection,
 },
 isOIDCFlowEnabled: contextState.isOIDCFlowEnabled,
 }),
}));

Expand All@@ -64,7 +62,6 @@ const resetMocks = () => {
 changeProvider.mockResolvedValue(undefined);
 contextState.provider = undefined;
 contextState.hasConnection = false;
 contextState.isOIDCFlowEnabled = false;
};

describe('SelectProviderStep', () => {
Expand DownExpand Up@@ -96,7 +93,7 @@ describe('SelectProviderStep', () => {
 // Each provider card is a <label> wrapping a visually-hidden native radio; the
 // aria-hidden icon span lives inside it.
 const iconSpans = Array.from(container.querySelectorAll('label span[aria-hidden]'));
 expect(iconSpans).toHaveLength(4);
 expect(iconSpans).toHaveLength(5);

 const collectedStyles = [
 ...Array.from(document.head.querySelectorAll('style')).map(s => s.textContent ?? ''),
Expand All@@ -106,26 +103,16 @@ describe('SelectProviderStep', () => {
 expect(collectedStyles).toMatch(/img\.clerk\.com\/static\/okta\.svg/);
 expect(collectedStyles).toMatch(/img\.clerk\.com\/static\/saml\.svg/);
 expect(collectedStyles).toMatch(/img\.clerk\.com\/static\/google\.svg/);
 expect(collectedStyles).toMatch(/img\.clerk\.com\/static\/oidc\.svg/);
 });

 describe('OIDC provider (experimental flag)', () => {
 it('hides the OIDC provider tile when the flag is off', async () => {
 resetMocks();
 const { wrapper } = await createFixtures();
 const { container } = renderStep(wrapper);

 expect(screen.getByRole('radio', { name: 'Okta Workforce' })).toBeInTheDocument();
 expect(container.querySelector('input[value="oidc_custom"]')).not.toBeInTheDocument();
 });

 it('shows the OIDC provider tile when the flag is on', async () => {
 resetMocks();
 contextState.isOIDCFlowEnabled = true;
 const { wrapper } = await createFixtures();
 const { container } = renderStep(wrapper);
 it('renders the OIDC provider tile', async () => {
 resetMocks();
 const { wrapper } = await createFixtures();
 const { container } = renderStep(wrapper);

expect(container.querySelector('input[value="oidc_custom"]')).toBeInTheDocument();
});
 expect(screen.getByRole('radio', { name: 'Okta Workforce' })).toBeInTheDocument();
expect(container.querySelector('input[value="oidc_custom"]')).toBeInTheDocument();
 });

 it('disables Continue when no provider is selected', async () => {
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
feat(ui): remove experimental gate from self-serve OIDC flow#9288

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

NicolasLopes7
merged 5 commits into

from

Jul 31, 2026
 Merged


feat(ui): remove experimental gate from self-serve OIDC flow
#9288
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
a164dc0

feat(ui): remove experimental gate from self-serve OIDC flow


NicolasLopes7 Jul 30, 2026
b32efd1

Merge branch 'main' into nicolas/remove-oidc-self-serve-flag


NicolasLopes7 Jul 30, 2026
558c427

test(ui): count the OIDC tile in the provider icon assertion


NicolasLopes7 Jul 30, 2026
6c0e230

Merge branch 'main' into nicolas/remove-oidc-self-serve-flag


wobsoriano Jul 30, 2026
abfbac2

Merge branch 'main' into nicolas/remove-oidc-self-serve-flag


NicolasLopes7 Jul 30, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


7 changes: 7 additions & 0 deletions
.changeset/quiet-moons-shine.md

View file


Open in desktop

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

Enable self-serve OIDC configuration for every application. Organization admins can now select an OIDC provider in the `<OrganizationProfile />` Security tab without the `experimental.oidcSelfServe` option, and existing OIDC connections open their configuration steps instead of the unsupported-provider state. The `experimental.oidcSelfServe` option no longer does anything and can be removed from `<ClerkProvider />` and `Clerk.load()`.

4 changes: 0 additions & 4 deletions
packages/shared/src/types/clerk.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1513,10 +1513,6 @@ export type ClerkOptions = ClerkOptionsNavigation &
 * directly with the provided Clerk instance. Used by React Native / Expo.
 */
 runtimeEnvironment: 'headless';
 /**
 * Temporary flag that gates the self-serve OIDC flow in `<ConfigureSSO />`. Remove once the self-serve OIDC flow reaches GA.
 */
 oidcSelfServe: boolean;
 },
 Record<string, any>
 >;
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
import type { EnterpriseConnectionResource, OrganizationDomainResource } from '@clerk/shared/types';
import React, { type PropsWithChildren } from 'react';

import { useOptions } from '@/contexts';

import type { OrganizationEnterpriseConnection } from './domain/organizationEnterpriseConnection';
import type {
 EnterpriseConnectionMutations,
Expand All@@ -28,8 +26,6 @@ export interface ConfigureSSOData {
 testRuns: TestRunsView;
 organizationDomains: OrganizationDomainResource[] | undefined;
 onExit?: () => void;
 /** Temporary gate for the self-serve OIDC flow; remove at OIDC GA. */
 isOIDCFlowEnabled: boolean;
}

interface ConfigureSSOProviderProps {
Expand DownExpand Up@@ -57,8 +53,6 @@ export const ConfigureSSOProvider = ({
 onExit,
 children,
}: PropsWithChildren<ConfigureSSOProviderProps>): JSX.Element => {
 const isOIDCFlowEnabled = useOptions().experimental?.oidcSelfServe ?? false;

 const value = React.useMemo<ConfigureSSOData>(
 () => ({
 contentRef,
Expand All@@ -69,7 +63,6 @@ export const ConfigureSSOProvider = ({
 enterpriseConnectionMutations,
 organizationDomainMutations,
 onExit,
 isOIDCFlowEnabled,
 }),
 [
 contentRef,
Expand All@@ -80,7 +73,6 @@ export const ConfigureSSOProvider = ({
 organizationDomains,
 enterpriseConnection,
 onExit,
 isOIDCFlowEnabled,
 ],
 );

Expand Down

39 changes: 10 additions & 29 deletions
packages/ui/src/components/ConfigureSSO/steps/ConfigureStep/__tests__/ConfigureStep.test.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,7 +14,6 @@ import type { EnterpriseConnectionProviderType } from '../../../types';
// left undefined so that footer self-hides in this isolated render.
const contextState = vi.hoisted(() => ({
 provider: undefined as string | undefined,
 isOIDCFlowEnabled: true,
 enterpriseConnection: undefined as
 | {
 id: string;
Expand DownExpand Up@@ -45,7 +44,6 @@ vi.mock('../../../ConfigureSSOContext', () => ({
 provider: contextState.provider,
 hasConnection: true,
 },
 isOIDCFlowEnabled: contextState.isOIDCFlowEnabled,
 }),
}));

Expand All@@ -63,34 +61,28 @@ const { createFixtures } = bindCreateFixtures('ConfigureSSO');

describe('resolveConfigureSteps', () => {
 it('dispatches custom and legacy OIDC provider keys to the OIDC sub-flow', () => {
 expect(resolveConfigureSteps('oauth_custom_clerk_dev', true)).toBe(OidcCustomConfigureSteps);
 expect(resolveConfigureSteps('oidc_clerk_dev', true)).toBe(OidcCustomConfigureSteps);
 expect(resolveConfigureSteps('oidc_ghe_acme', true)).toBe(OidcCustomConfigureSteps);
 expect(resolveConfigureSteps('oidc_gitlab_ent_acme', true)).toBe(OidcCustomConfigureSteps);
 expect(resolveConfigureSteps('oidc_custom', true)).toBe(OidcCustomConfigureSteps);
 });

 it('does not dispatch OIDC providers while the experimental flow is disabled', () => {
 expect(resolveConfigureSteps('oauth_custom_clerk_dev', false)).toBeUndefined();
 expect(resolveConfigureSteps('oidc_clerk_dev', false)).toBeUndefined();
 expect(resolveConfigureSteps('oauth_custom_clerk_dev')).toBe(OidcCustomConfigureSteps);
 expect(resolveConfigureSteps('oidc_clerk_dev')).toBe(OidcCustomConfigureSteps);
 expect(resolveConfigureSteps('oidc_ghe_acme')).toBe(OidcCustomConfigureSteps);
 expect(resolveConfigureSteps('oidc_gitlab_ent_acme')).toBe(OidcCustomConfigureSteps);
 expect(resolveConfigureSteps('oidc_custom')).toBe(OidcCustomConfigureSteps);
 });

 it('dispatches SAML providers by exact literal', () => {
 expect(resolveConfigureSteps('saml_okta', false)).toBe(SamlOktaConfigureSteps);
 expect(resolveConfigureSteps('saml_custom', false)).toBe(SamlCustomConfigureSteps);
 expect(resolveConfigureSteps('saml_google', false)).toBe(SamlGoogleConfigureSteps);
 expect(resolveConfigureSteps('saml_microsoft', false)).toBe(SamlMicrosoftConfigureSteps);
 expect(resolveConfigureSteps('saml_okta')).toBe(SamlOktaConfigureSteps);
 expect(resolveConfigureSteps('saml_custom')).toBe(SamlCustomConfigureSteps);
 expect(resolveConfigureSteps('saml_google')).toBe(SamlGoogleConfigureSteps);
 expect(resolveConfigureSteps('saml_microsoft')).toBe(SamlMicrosoftConfigureSteps);
 });

 it('returns undefined for an unrecognized provider so the caller can degrade', () => {
 expect(resolveConfigureSteps('ldap_enterprise' as EnterpriseConnectionProviderType, true)).toBeUndefined();
 expect(resolveConfigureSteps('ldap_enterprise' as EnterpriseConnectionProviderType)).toBeUndefined();
 });
});

describe('ConfigureProviderStep', () => {
 beforeEach(() => {
 contextState.provider = undefined;
 contextState.isOIDCFlowEnabled = true;
 contextState.enterpriseConnection = undefined;
 updateConnection.mockReset();
 });
Expand DownExpand Up@@ -469,15 +461,4 @@ describe('ConfigureProviderStep', () => {

 expect(await screen.findByText(/unsupported provider/i)).toBeInTheDocument();
 });

 it('degrades to the unsupported-provider state for an existing OIDC connection when the flag is off', async () => {
 contextState.provider = 'oauth_custom_clerk_dev';
 contextState.isOIDCFlowEnabled = false;
 const { wrapper } = await createFixtures();

 renderStep(wrapper);

 expect(await screen.findByText(/unsupported provider/i)).toBeInTheDocument();
 expect(screen.queryByText(/create a new oidc application/i)).not.toBeInTheDocument();
 });
});

13 changes: 4 additions & 9 deletions
packages/ui/src/components/ConfigureSSO/steps/ConfigureStep/index.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -28,13 +28,8 @@ const STEPS_BY_SAML_PROVIDER: Record<SamlProviderType, ConfigureStepsComponent>

export const resolveConfigureSteps = (
 provider: EnterpriseConnectionProviderType,
 isOIDCFlowEnabled: boolean,
): ConfigureStepsComponent | undefined => {
 if (isOidcProvider(provider)) {
 return isOIDCFlowEnabled ? OidcCustomConfigureSteps : undefined;
 }
 return STEPS_BY_SAML_PROVIDER[provider];
};
): ConfigureStepsComponent | undefined =>
 isOidcProvider(provider) ? OidcCustomConfigureSteps : STEPS_BY_SAML_PROVIDER[provider];

export const ConfigureStep = (): JSX.Element => {
 const { organizationEnterpriseConnection: c } = useConfigureSSO();
Expand DownExpand Up@@ -68,13 +63,13 @@ export const ConfigureStep = (): JSX.Element => {
};

export const ConfigureProviderStep = (): JSX.Element | null => {
 const { organizationEnterpriseConnection: c, isOIDCFlowEnabled } = useConfigureSSO();
 const { organizationEnterpriseConnection: c } = useConfigureSSO();

 if (!c.provider) {
 return null;
 }

 const ConfigureSteps = resolveConfigureSteps(c.provider, isOIDCFlowEnabled);
 const ConfigureSteps = resolveConfigureSteps(c.provider);

 return (
 <Flow.Part part='configureCreateApp'>
Expand Down

8 changes: 1 addition & 7 deletions
packages/ui/src/components/ConfigureSSO/steps/SelectProviderStep.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -78,16 +78,10 @@ export const SelectProviderStep = (): JSX.Element => {
 organizationEnterpriseConnection: c,
 enterpriseConnectionMutations: { createConnection, changeProvider },
 contentRef,
 isOIDCFlowEnabled,
 } = useConfigureSSO();
 const { goNext, goPrev, isFirstStep } = useWizard();
 const { t } = useLocalizations();

 const providerGroups = React.useMemo(
 () => PROVIDER_GROUPS.filter(group => group.id !== 'oidc' || isOIDCFlowEnabled),
 [isOIDCFlowEnabled],
 );

 const currentCard = c.provider ? toProviderCard(c.provider) : null;

 const [selected, setSelected] = React.useState<ProviderType | null>(currentCard);
Expand DownExpand Up@@ -166,7 +160,7 @@ export const SelectProviderStep = (): JSX.Element => {

 <Step.Body>
 <Step.Section sx={theme => ({ gap: theme.space.$5 })}>
 {providerGroups.map(group => (
 {PROVIDER_GROUPS.map(group => (
 <Col
 key={group.id}
 elementDescriptor={descriptors.configureSSOProviderGroup}
Expand Down

29 changes: 8 additions & 21 deletions
packages/ui/src/components/ConfigureSSO/steps/__tests__/SelectProviderStep.test.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -25,7 +25,6 @@ const changeProvider = vi.fn();
const contextState = vi.hoisted(() => ({
 provider: undefined as 'saml_okta' | 'saml_custom' | 'saml_google' | undefined,
 hasConnection: false,
 isOIDCFlowEnabled: false,
}));

vi.mock('../../ConfigureSSOContext', () => ({
Expand All@@ -40,7 +39,6 @@ vi.mock('../../ConfigureSSOContext', () => ({
 provider: contextState.provider,
 hasConnection: contextState.hasConnection,
 },
 isOIDCFlowEnabled: contextState.isOIDCFlowEnabled,
 }),
}));

Expand All@@ -64,7 +62,6 @@ const resetMocks = () => {
 changeProvider.mockResolvedValue(undefined);
 contextState.provider = undefined;
 contextState.hasConnection = false;
 contextState.isOIDCFlowEnabled = false;
};

describe('SelectProviderStep', () => {
Expand DownExpand Up@@ -96,7 +93,7 @@ describe('SelectProviderStep', () => {
 // Each provider card is a <label> wrapping a visually-hidden native radio; the
 // aria-hidden icon span lives inside it.
 const iconSpans = Array.from(container.querySelectorAll('label span[aria-hidden]'));
 expect(iconSpans).toHaveLength(4);
 expect(iconSpans).toHaveLength(5);

 const collectedStyles = [
 ...Array.from(document.head.querySelectorAll('style')).map(s => s.textContent ?? ''),
Expand All@@ -106,26 +103,16 @@ describe('SelectProviderStep', () => {
 expect(collectedStyles).toMatch(/img\.clerk\.com\/static\/okta\.svg/);
 expect(collectedStyles).toMatch(/img\.clerk\.com\/static\/saml\.svg/);
 expect(collectedStyles).toMatch(/img\.clerk\.com\/static\/google\.svg/);
 expect(collectedStyles).toMatch(/img\.clerk\.com\/static\/oidc\.svg/);
 });

 describe('OIDC provider (experimental flag)', () => {
 it('hides the OIDC provider tile when the flag is off', async () => {
 resetMocks();
 const { wrapper } = await createFixtures();
 const { container } = renderStep(wrapper);

 expect(screen.getByRole('radio', { name: 'Okta Workforce' })).toBeInTheDocument();
 expect(container.querySelector('input[value="oidc_custom"]')).not.toBeInTheDocument();
 });

 it('shows the OIDC provider tile when the flag is on', async () => {
 resetMocks();
 contextState.isOIDCFlowEnabled = true;
 const { wrapper } = await createFixtures();
 const { container } = renderStep(wrapper);
 it('renders the OIDC provider tile', async () => {
 resetMocks();
 const { wrapper } = await createFixtures();
 const { container } = renderStep(wrapper);

expect(container.querySelector('input[value="oidc_custom"]')).toBeInTheDocument();
});
 expect(screen.getByRole('radio', { name: 'Okta Workforce' })).toBeInTheDocument();
expect(container.querySelector('input[value="oidc_custom"]')).toBeInTheDocument();
 });

 it('disables Continue when no provider is selected', async () => {
Expand Down
Loading

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

Skip to content
feat(ui): remove experimental gate from self-serve OIDC flow#9288

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

NicolasLopes7
merged 5 commits into

from

Jul 31, 2026
 Merged


feat(ui): remove experimental gate from self-serve OIDC flow
#9288
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
a164dc0

feat(ui): remove experimental gate from self-serve OIDC flow


NicolasLopes7 Jul 30, 2026
b32efd1

Merge branch 'main' into nicolas/remove-oidc-self-serve-flag


NicolasLopes7 Jul 30, 2026
558c427

test(ui): count the OIDC tile in the provider icon assertion


NicolasLopes7 Jul 30, 2026
6c0e230

Merge branch 'main' into nicolas/remove-oidc-self-serve-flag


wobsoriano Jul 30, 2026
abfbac2

Merge branch 'main' into nicolas/remove-oidc-self-serve-flag


NicolasLopes7 Jul 30, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


7 changes: 7 additions & 0 deletions
.changeset/quiet-moons-shine.md

View file


Open in desktop

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

Enable self-serve OIDC configuration for every application. Organization admins can now select an OIDC provider in the `<OrganizationProfile />` Security tab without the `experimental.oidcSelfServe` option, and existing OIDC connections open their configuration steps instead of the unsupported-provider state. The `experimental.oidcSelfServe` option no longer does anything and can be removed from `<ClerkProvider />` and `Clerk.load()`.

4 changes: 0 additions & 4 deletions
packages/shared/src/types/clerk.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1513,10 +1513,6 @@ export type ClerkOptions = ClerkOptionsNavigation &
 * directly with the provided Clerk instance. Used by React Native / Expo.
 */
 runtimeEnvironment: 'headless';
 /**
 * Temporary flag that gates the self-serve OIDC flow in `<ConfigureSSO />`. Remove once the self-serve OIDC flow reaches GA.
 */
 oidcSelfServe: boolean;
 },
 Record<string, any>
 >;
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
import type { EnterpriseConnectionResource, OrganizationDomainResource } from '@clerk/shared/types';
import React, { type PropsWithChildren } from 'react';

import { useOptions } from '@/contexts';

import type { OrganizationEnterpriseConnection } from './domain/organizationEnterpriseConnection';
import type {
 EnterpriseConnectionMutations,
Expand All@@ -28,8 +26,6 @@ export interface ConfigureSSOData {
 testRuns: TestRunsView;
 organizationDomains: OrganizationDomainResource[] | undefined;
 onExit?: () => void;
 /** Temporary gate for the self-serve OIDC flow; remove at OIDC GA. */
 isOIDCFlowEnabled: boolean;
}

interface ConfigureSSOProviderProps {
Expand DownExpand Up@@ -57,8 +53,6 @@ export const ConfigureSSOProvider = ({
 onExit,
 children,
}: PropsWithChildren<ConfigureSSOProviderProps>): JSX.Element => {
 const isOIDCFlowEnabled = useOptions().experimental?.oidcSelfServe ?? false;

 const value = React.useMemo<ConfigureSSOData>(
 () => ({
 contentRef,
Expand All@@ -69,7 +63,6 @@ export const ConfigureSSOProvider = ({
 enterpriseConnectionMutations,
 organizationDomainMutations,
 onExit,
 isOIDCFlowEnabled,
 }),
 [
 contentRef,
Expand All@@ -80,7 +73,6 @@ export const ConfigureSSOProvider = ({
 organizationDomains,
 enterpriseConnection,
 onExit,
 isOIDCFlowEnabled,
 ],
 );

Expand Down

39 changes: 10 additions & 29 deletions
packages/ui/src/components/ConfigureSSO/steps/ConfigureStep/__tests__/ConfigureStep.test.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,7 +14,6 @@ import type { EnterpriseConnectionProviderType } from '../../../types';
// left undefined so that footer self-hides in this isolated render.
const contextState = vi.hoisted(() => ({
 provider: undefined as string | undefined,
 isOIDCFlowEnabled: true,
 enterpriseConnection: undefined as
 | {
 id: string;
Expand DownExpand Up@@ -45,7 +44,6 @@ vi.mock('../../../ConfigureSSOContext', () => ({
 provider: contextState.provider,
 hasConnection: true,
 },
 isOIDCFlowEnabled: contextState.isOIDCFlowEnabled,
 }),
}));

Expand All@@ -63,34 +61,28 @@ const { createFixtures } = bindCreateFixtures('ConfigureSSO');

describe('resolveConfigureSteps', () => {
 it('dispatches custom and legacy OIDC provider keys to the OIDC sub-flow', () => {
 expect(resolveConfigureSteps('oauth_custom_clerk_dev', true)).toBe(OidcCustomConfigureSteps);
 expect(resolveConfigureSteps('oidc_clerk_dev', true)).toBe(OidcCustomConfigureSteps);
 expect(resolveConfigureSteps('oidc_ghe_acme', true)).toBe(OidcCustomConfigureSteps);
 expect(resolveConfigureSteps('oidc_gitlab_ent_acme', true)).toBe(OidcCustomConfigureSteps);
 expect(resolveConfigureSteps('oidc_custom', true)).toBe(OidcCustomConfigureSteps);
 });

 it('does not dispatch OIDC providers while the experimental flow is disabled', () => {
 expect(resolveConfigureSteps('oauth_custom_clerk_dev', false)).toBeUndefined();
 expect(resolveConfigureSteps('oidc_clerk_dev', false)).toBeUndefined();
 expect(resolveConfigureSteps('oauth_custom_clerk_dev')).toBe(OidcCustomConfigureSteps);
 expect(resolveConfigureSteps('oidc_clerk_dev')).toBe(OidcCustomConfigureSteps);
 expect(resolveConfigureSteps('oidc_ghe_acme')).toBe(OidcCustomConfigureSteps);
 expect(resolveConfigureSteps('oidc_gitlab_ent_acme')).toBe(OidcCustomConfigureSteps);
 expect(resolveConfigureSteps('oidc_custom')).toBe(OidcCustomConfigureSteps);
 });

 it('dispatches SAML providers by exact literal', () => {
 expect(resolveConfigureSteps('saml_okta', false)).toBe(SamlOktaConfigureSteps);
 expect(resolveConfigureSteps('saml_custom', false)).toBe(SamlCustomConfigureSteps);
 expect(resolveConfigureSteps('saml_google', false)).toBe(SamlGoogleConfigureSteps);
 expect(resolveConfigureSteps('saml_microsoft', false)).toBe(SamlMicrosoftConfigureSteps);
 expect(resolveConfigureSteps('saml_okta')).toBe(SamlOktaConfigureSteps);
 expect(resolveConfigureSteps('saml_custom')).toBe(SamlCustomConfigureSteps);
 expect(resolveConfigureSteps('saml_google')).toBe(SamlGoogleConfigureSteps);
 expect(resolveConfigureSteps('saml_microsoft')).toBe(SamlMicrosoftConfigureSteps);
 });

 it('returns undefined for an unrecognized provider so the caller can degrade', () => {
 expect(resolveConfigureSteps('ldap_enterprise' as EnterpriseConnectionProviderType, true)).toBeUndefined();
 expect(resolveConfigureSteps('ldap_enterprise' as EnterpriseConnectionProviderType)).toBeUndefined();
 });
});

describe('ConfigureProviderStep', () => {
 beforeEach(() => {
 contextState.provider = undefined;
 contextState.isOIDCFlowEnabled = true;
 contextState.enterpriseConnection = undefined;
 updateConnection.mockReset();
 });
Expand DownExpand Up@@ -469,15 +461,4 @@ describe('ConfigureProviderStep', () => {

 expect(await screen.findByText(/unsupported provider/i)).toBeInTheDocument();
 });

 it('degrades to the unsupported-provider state for an existing OIDC connection when the flag is off', async () => {
 contextState.provider = 'oauth_custom_clerk_dev';
 contextState.isOIDCFlowEnabled = false;
 const { wrapper } = await createFixtures();

 renderStep(wrapper);

 expect(await screen.findByText(/unsupported provider/i)).toBeInTheDocument();
 expect(screen.queryByText(/create a new oidc application/i)).not.toBeInTheDocument();
 });
});

13 changes: 4 additions & 9 deletions
packages/ui/src/components/ConfigureSSO/steps/ConfigureStep/index.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -28,13 +28,8 @@ const STEPS_BY_SAML_PROVIDER: Record<SamlProviderType, ConfigureStepsComponent>

export const resolveConfigureSteps = (
 provider: EnterpriseConnectionProviderType,
 isOIDCFlowEnabled: boolean,
): ConfigureStepsComponent | undefined => {
 if (isOidcProvider(provider)) {
 return isOIDCFlowEnabled ? OidcCustomConfigureSteps : undefined;
 }
 return STEPS_BY_SAML_PROVIDER[provider];
};
): ConfigureStepsComponent | undefined =>
 isOidcProvider(provider) ? OidcCustomConfigureSteps : STEPS_BY_SAML_PROVIDER[provider];

export const ConfigureStep = (): JSX.Element => {
 const { organizationEnterpriseConnection: c } = useConfigureSSO();
Expand DownExpand Up@@ -68,13 +63,13 @@ export const ConfigureStep = (): JSX.Element => {
};

export const ConfigureProviderStep = (): JSX.Element | null => {
 const { organizationEnterpriseConnection: c, isOIDCFlowEnabled } = useConfigureSSO();
 const { organizationEnterpriseConnection: c } = useConfigureSSO();

 if (!c.provider) {
 return null;
 }

 const ConfigureSteps = resolveConfigureSteps(c.provider, isOIDCFlowEnabled);
 const ConfigureSteps = resolveConfigureSteps(c.provider);

 return (
 <Flow.Part part='configureCreateApp'>
Expand Down

8 changes: 1 addition & 7 deletions
packages/ui/src/components/ConfigureSSO/steps/SelectProviderStep.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -78,16 +78,10 @@ export const SelectProviderStep = (): JSX.Element => {
 organizationEnterpriseConnection: c,
 enterpriseConnectionMutations: { createConnection, changeProvider },
 contentRef,
 isOIDCFlowEnabled,
 } = useConfigureSSO();
 const { goNext, goPrev, isFirstStep } = useWizard();
 const { t } = useLocalizations();

 const providerGroups = React.useMemo(
 () => PROVIDER_GROUPS.filter(group => group.id !== 'oidc' || isOIDCFlowEnabled),
 [isOIDCFlowEnabled],
 );

 const currentCard = c.provider ? toProviderCard(c.provider) : null;

 const [selected, setSelected] = React.useState<ProviderType | null>(currentCard);
Expand DownExpand Up@@ -166,7 +160,7 @@ export const SelectProviderStep = (): JSX.Element => {

 <Step.Body>
 <Step.Section sx={theme => ({ gap: theme.space.$5 })}>
 {providerGroups.map(group => (
 {PROVIDER_GROUPS.map(group => (
 <Col
 key={group.id}
 elementDescriptor={descriptors.configureSSOProviderGroup}
Expand Down

29 changes: 8 additions & 21 deletions
packages/ui/src/components/ConfigureSSO/steps/__tests__/SelectProviderStep.test.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -25,7 +25,6 @@ const changeProvider = vi.fn();
const contextState = vi.hoisted(() => ({
 provider: undefined as 'saml_okta' | 'saml_custom' | 'saml_google' | undefined,
 hasConnection: false,
 isOIDCFlowEnabled: false,
}));

vi.mock('../../ConfigureSSOContext', () => ({
Expand All@@ -40,7 +39,6 @@ vi.mock('../../ConfigureSSOContext', () => ({
 provider: contextState.provider,
 hasConnection: contextState.hasConnection,
 },
 isOIDCFlowEnabled: contextState.isOIDCFlowEnabled,
 }),
}));

Expand All@@ -64,7 +62,6 @@ const resetMocks = () => {
 changeProvider.mockResolvedValue(undefined);
 contextState.provider = undefined;
 contextState.hasConnection = false;
 contextState.isOIDCFlowEnabled = false;
};

describe('SelectProviderStep', () => {
Expand DownExpand Up@@ -96,7 +93,7 @@ describe('SelectProviderStep', () => {
 // Each provider card is a <label> wrapping a visually-hidden native radio; the
 // aria-hidden icon span lives inside it.
 const iconSpans = Array.from(container.querySelectorAll('label span[aria-hidden]'));
 expect(iconSpans).toHaveLength(4);
 expect(iconSpans).toHaveLength(5);

 const collectedStyles = [
 ...Array.from(document.head.querySelectorAll('style')).map(s => s.textContent ?? ''),
Expand All@@ -106,26 +103,16 @@ describe('SelectProviderStep', () => {
 expect(collectedStyles).toMatch(/img\.clerk\.com\/static\/okta\.svg/);
 expect(collectedStyles).toMatch(/img\.clerk\.com\/static\/saml\.svg/);
 expect(collectedStyles).toMatch(/img\.clerk\.com\/static\/google\.svg/);
 expect(collectedStyles).toMatch(/img\.clerk\.com\/static\/oidc\.svg/);
 });

 describe('OIDC provider (experimental flag)', () => {
 it('hides the OIDC provider tile when the flag is off', async () => {
 resetMocks();
 const { wrapper } = await createFixtures();
 const { container } = renderStep(wrapper);

 expect(screen.getByRole('radio', { name: 'Okta Workforce' })).toBeInTheDocument();
 expect(container.querySelector('input[value="oidc_custom"]')).not.toBeInTheDocument();
 });

 it('shows the OIDC provider tile when the flag is on', async () => {
 resetMocks();
 contextState.isOIDCFlowEnabled = true;
 const { wrapper } = await createFixtures();
 const { container } = renderStep(wrapper);
 it('renders the OIDC provider tile', async () => {
 resetMocks();
 const { wrapper } = await createFixtures();
 const { container } = renderStep(wrapper);

expect(container.querySelector('input[value="oidc_custom"]')).toBeInTheDocument();
});
 expect(screen.getByRole('radio', { name: 'Okta Workforce' })).toBeInTheDocument();
expect(container.querySelector('input[value="oidc_custom"]')).toBeInTheDocument();
 });

 it('disables Continue when no provider is selected', async () => {
Expand Down
Loading

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

Skip to content
feat(ui): remove experimental gate from self-serve OIDC flow#9288

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

NicolasLopes7
merged 5 commits into

from

Jul 31, 2026
 Merged


feat(ui): remove experimental gate from self-serve OIDC flow
#9288
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
a164dc0

feat(ui): remove experimental gate from self-serve OIDC flow


NicolasLopes7 Jul 30, 2026
b32efd1

Merge branch 'main' into nicolas/remove-oidc-self-serve-flag


NicolasLopes7 Jul 30, 2026
558c427

test(ui): count the OIDC tile in the provider icon assertion


NicolasLopes7 Jul 30, 2026
6c0e230

Merge branch 'main' into nicolas/remove-oidc-self-serve-flag


wobsoriano Jul 30, 2026
abfbac2

Merge branch 'main' into nicolas/remove-oidc-self-serve-flag


NicolasLopes7 Jul 30, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


7 changes: 7 additions & 0 deletions
.changeset/quiet-moons-shine.md

View file


Open in desktop

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

Enable self-serve OIDC configuration for every application. Organization admins can now select an OIDC provider in the `<OrganizationProfile />` Security tab without the `experimental.oidcSelfServe` option, and existing OIDC connections open their configuration steps instead of the unsupported-provider state. The `experimental.oidcSelfServe` option no longer does anything and can be removed from `<ClerkProvider />` and `Clerk.load()`.

4 changes: 0 additions & 4 deletions
packages/shared/src/types/clerk.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1513,10 +1513,6 @@ export type ClerkOptions = ClerkOptionsNavigation &
 * directly with the provided Clerk instance. Used by React Native / Expo.
 */
 runtimeEnvironment: 'headless';
 /**
 * Temporary flag that gates the self-serve OIDC flow in `<ConfigureSSO />`. Remove once the self-serve OIDC flow reaches GA.
 */
 oidcSelfServe: boolean;
 },
 Record<string, any>
 >;
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
import type { EnterpriseConnectionResource, OrganizationDomainResource } from '@clerk/shared/types';
import React, { type PropsWithChildren } from 'react';

import { useOptions } from '@/contexts';

import type { OrganizationEnterpriseConnection } from './domain/organizationEnterpriseConnection';
import type {
 EnterpriseConnectionMutations,
Expand All@@ -28,8 +26,6 @@ export interface ConfigureSSOData {
 testRuns: TestRunsView;
 organizationDomains: OrganizationDomainResource[] | undefined;
 onExit?: () => void;
 /** Temporary gate for the self-serve OIDC flow; remove at OIDC GA. */
 isOIDCFlowEnabled: boolean;
}

interface ConfigureSSOProviderProps {
Expand DownExpand Up@@ -57,8 +53,6 @@ export const ConfigureSSOProvider = ({
 onExit,
 children,
}: PropsWithChildren<ConfigureSSOProviderProps>): JSX.Element => {
 const isOIDCFlowEnabled = useOptions().experimental?.oidcSelfServe ?? false;

 const value = React.useMemo<ConfigureSSOData>(
 () => ({
 contentRef,
Expand All@@ -69,7 +63,6 @@ export const ConfigureSSOProvider = ({
 enterpriseConnectionMutations,
 organizationDomainMutations,
 onExit,
 isOIDCFlowEnabled,
 }),
 [
 contentRef,
Expand All@@ -80,7 +73,6 @@ export const ConfigureSSOProvider = ({
 organizationDomains,
 enterpriseConnection,
 onExit,
 isOIDCFlowEnabled,
 ],
 );

Expand Down

39 changes: 10 additions & 29 deletions
packages/ui/src/components/ConfigureSSO/steps/ConfigureStep/__tests__/ConfigureStep.test.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,7 +14,6 @@ import type { EnterpriseConnectionProviderType } from '../../../types';
// left undefined so that footer self-hides in this isolated render.
const contextState = vi.hoisted(() => ({
 provider: undefined as string | undefined,
 isOIDCFlowEnabled: true,
 enterpriseConnection: undefined as
 | {
 id: string;
Expand DownExpand Up@@ -45,7 +44,6 @@ vi.mock('../../../ConfigureSSOContext', () => ({
 provider: contextState.provider,
 hasConnection: true,
 },
 isOIDCFlowEnabled: contextState.isOIDCFlowEnabled,
 }),
}));

Expand All@@ -63,34 +61,28 @@ const { createFixtures } = bindCreateFixtures('ConfigureSSO');

describe('resolveConfigureSteps', () => {
 it('dispatches custom and legacy OIDC provider keys to the OIDC sub-flow', () => {
 expect(resolveConfigureSteps('oauth_custom_clerk_dev', true)).toBe(OidcCustomConfigureSteps);
 expect(resolveConfigureSteps('oidc_clerk_dev', true)).toBe(OidcCustomConfigureSteps);
 expect(resolveConfigureSteps('oidc_ghe_acme', true)).toBe(OidcCustomConfigureSteps);
 expect(resolveConfigureSteps('oidc_gitlab_ent_acme', true)).toBe(OidcCustomConfigureSteps);
 expect(resolveConfigureSteps('oidc_custom', true)).toBe(OidcCustomConfigureSteps);
 });

 it('does not dispatch OIDC providers while the experimental flow is disabled', () => {
 expect(resolveConfigureSteps('oauth_custom_clerk_dev', false)).toBeUndefined();
 expect(resolveConfigureSteps('oidc_clerk_dev', false)).toBeUndefined();
 expect(resolveConfigureSteps('oauth_custom_clerk_dev')).toBe(OidcCustomConfigureSteps);
 expect(resolveConfigureSteps('oidc_clerk_dev')).toBe(OidcCustomConfigureSteps);
 expect(resolveConfigureSteps('oidc_ghe_acme')).toBe(OidcCustomConfigureSteps);
 expect(resolveConfigureSteps('oidc_gitlab_ent_acme')).toBe(OidcCustomConfigureSteps);
 expect(resolveConfigureSteps('oidc_custom')).toBe(OidcCustomConfigureSteps);
 });

 it('dispatches SAML providers by exact literal', () => {
 expect(resolveConfigureSteps('saml_okta', false)).toBe(SamlOktaConfigureSteps);
 expect(resolveConfigureSteps('saml_custom', false)).toBe(SamlCustomConfigureSteps);
 expect(resolveConfigureSteps('saml_google', false)).toBe(SamlGoogleConfigureSteps);
 expect(resolveConfigureSteps('saml_microsoft', false)).toBe(SamlMicrosoftConfigureSteps);
 expect(resolveConfigureSteps('saml_okta')).toBe(SamlOktaConfigureSteps);
 expect(resolveConfigureSteps('saml_custom')).toBe(SamlCustomConfigureSteps);
 expect(resolveConfigureSteps('saml_google')).toBe(SamlGoogleConfigureSteps);
 expect(resolveConfigureSteps('saml_microsoft')).toBe(SamlMicrosoftConfigureSteps);
 });

 it('returns undefined for an unrecognized provider so the caller can degrade', () => {
 expect(resolveConfigureSteps('ldap_enterprise' as EnterpriseConnectionProviderType, true)).toBeUndefined();
 expect(resolveConfigureSteps('ldap_enterprise' as EnterpriseConnectionProviderType)).toBeUndefined();
 });
});

describe('ConfigureProviderStep', () => {
 beforeEach(() => {
 contextState.provider = undefined;
 contextState.isOIDCFlowEnabled = true;
 contextState.enterpriseConnection = undefined;
 updateConnection.mockReset();
 });
Expand DownExpand Up@@ -469,15 +461,4 @@ describe('ConfigureProviderStep', () => {

 expect(await screen.findByText(/unsupported provider/i)).toBeInTheDocument();
 });

 it('degrades to the unsupported-provider state for an existing OIDC connection when the flag is off', async () => {
 contextState.provider = 'oauth_custom_clerk_dev';
 contextState.isOIDCFlowEnabled = false;
 const { wrapper } = await createFixtures();

 renderStep(wrapper);

 expect(await screen.findByText(/unsupported provider/i)).toBeInTheDocument();
 expect(screen.queryByText(/create a new oidc application/i)).not.toBeInTheDocument();
 });
});

13 changes: 4 additions & 9 deletions
packages/ui/src/components/ConfigureSSO/steps/ConfigureStep/index.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -28,13 +28,8 @@ const STEPS_BY_SAML_PROVIDER: Record<SamlProviderType, ConfigureStepsComponent>

export const resolveConfigureSteps = (
 provider: EnterpriseConnectionProviderType,
 isOIDCFlowEnabled: boolean,
): ConfigureStepsComponent | undefined => {
 if (isOidcProvider(provider)) {
 return isOIDCFlowEnabled ? OidcCustomConfigureSteps : undefined;
 }
 return STEPS_BY_SAML_PROVIDER[provider];
};
): ConfigureStepsComponent | undefined =>
 isOidcProvider(provider) ? OidcCustomConfigureSteps : STEPS_BY_SAML_PROVIDER[provider];

export const ConfigureStep = (): JSX.Element => {
 const { organizationEnterpriseConnection: c } = useConfigureSSO();
Expand DownExpand Up@@ -68,13 +63,13 @@ export const ConfigureStep = (): JSX.Element => {
};

export const ConfigureProviderStep = (): JSX.Element | null => {
 const { organizationEnterpriseConnection: c, isOIDCFlowEnabled } = useConfigureSSO();
 const { organizationEnterpriseConnection: c } = useConfigureSSO();

 if (!c.provider) {
 return null;
 }

 const ConfigureSteps = resolveConfigureSteps(c.provider, isOIDCFlowEnabled);
 const ConfigureSteps = resolveConfigureSteps(c.provider);

 return (
 <Flow.Part part='configureCreateApp'>
Expand Down

8 changes: 1 addition & 7 deletions
packages/ui/src/components/ConfigureSSO/steps/SelectProviderStep.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -78,16 +78,10 @@ export const SelectProviderStep = (): JSX.Element => {
 organizationEnterpriseConnection: c,
 enterpriseConnectionMutations: { createConnection, changeProvider },
 contentRef,
 isOIDCFlowEnabled,
 } = useConfigureSSO();
 const { goNext, goPrev, isFirstStep } = useWizard();
 const { t } = useLocalizations();

 const providerGroups = React.useMemo(
 () => PROVIDER_GROUPS.filter(group => group.id !== 'oidc' || isOIDCFlowEnabled),
 [isOIDCFlowEnabled],
 );

 const currentCard = c.provider ? toProviderCard(c.provider) : null;

 const [selected, setSelected] = React.useState<ProviderType | null>(currentCard);
Expand DownExpand Up@@ -166,7 +160,7 @@ export const SelectProviderStep = (): JSX.Element => {

 <Step.Body>
 <Step.Section sx={theme => ({ gap: theme.space.$5 })}>
 {providerGroups.map(group => (
 {PROVIDER_GROUPS.map(group => (
 <Col
 key={group.id}
 elementDescriptor={descriptors.configureSSOProviderGroup}
Expand Down

29 changes: 8 additions & 21 deletions
packages/ui/src/components/ConfigureSSO/steps/__tests__/SelectProviderStep.test.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -25,7 +25,6 @@ const changeProvider = vi.fn();
const contextState = vi.hoisted(() => ({
 provider: undefined as 'saml_okta' | 'saml_custom' | 'saml_google' | undefined,
 hasConnection: false,
 isOIDCFlowEnabled: false,
}));

vi.mock('../../ConfigureSSOContext', () => ({
Expand All@@ -40,7 +39,6 @@ vi.mock('../../ConfigureSSOContext', () => ({
 provider: contextState.provider,
 hasConnection: contextState.hasConnection,
 },
 isOIDCFlowEnabled: contextState.isOIDCFlowEnabled,
 }),
}));

Expand All@@ -64,7 +62,6 @@ const resetMocks = () => {
 changeProvider.mockResolvedValue(undefined);
 contextState.provider = undefined;
 contextState.hasConnection = false;
 contextState.isOIDCFlowEnabled = false;
};

describe('SelectProviderStep', () => {
Expand DownExpand Up@@ -96,7 +93,7 @@ describe('SelectProviderStep', () => {
 // Each provider card is a <label> wrapping a visually-hidden native radio; the
 // aria-hidden icon span lives inside it.
 const iconSpans = Array.from(container.querySelectorAll('label span[aria-hidden]'));
 expect(iconSpans).toHaveLength(4);
 expect(iconSpans).toHaveLength(5);

 const collectedStyles = [
 ...Array.from(document.head.querySelectorAll('style')).map(s => s.textContent ?? ''),
Expand All@@ -106,26 +103,16 @@ describe('SelectProviderStep', () => {
 expect(collectedStyles).toMatch(/img\.clerk\.com\/static\/okta\.svg/);
 expect(collectedStyles).toMatch(/img\.clerk\.com\/static\/saml\.svg/);
 expect(collectedStyles).toMatch(/img\.clerk\.com\/static\/google\.svg/);
 expect(collectedStyles).toMatch(/img\.clerk\.com\/static\/oidc\.svg/);
 });

 describe('OIDC provider (experimental flag)', () => {
 it('hides the OIDC provider tile when the flag is off', async () => {
 resetMocks();
 const { wrapper } = await createFixtures();
 const { container } = renderStep(wrapper);

 expect(screen.getByRole('radio', { name: 'Okta Workforce' })).toBeInTheDocument();
 expect(container.querySelector('input[value="oidc_custom"]')).not.toBeInTheDocument();
 });

 it('shows the OIDC provider tile when the flag is on', async () => {
 resetMocks();
 contextState.isOIDCFlowEnabled = true;
 const { wrapper } = await createFixtures();
 const { container } = renderStep(wrapper);
 it('renders the OIDC provider tile', async () => {
 resetMocks();
 const { wrapper } = await createFixtures();
 const { container } = renderStep(wrapper);

expect(container.querySelector('input[value="oidc_custom"]')).toBeInTheDocument();
});
 expect(screen.getByRole('radio', { name: 'Okta Workforce' })).toBeInTheDocument();
expect(container.querySelector('input[value="oidc_custom"]')).toBeInTheDocument();
 });

 it('disables Continue when no provider is selected', async () => {
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
feat(ui): remove experimental gate from self-serve OIDC flow#9288

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

NicolasLopes7
merged 5 commits into

from

Jul 31, 2026
 Merged


feat(ui): remove experimental gate from self-serve OIDC flow
#9288
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
a164dc0

feat(ui): remove experimental gate from self-serve OIDC flow


NicolasLopes7 Jul 30, 2026
b32efd1

Merge branch 'main' into nicolas/remove-oidc-self-serve-flag


NicolasLopes7 Jul 30, 2026
558c427

test(ui): count the OIDC tile in the provider icon assertion


NicolasLopes7 Jul 30, 2026
6c0e230

Merge branch 'main' into nicolas/remove-oidc-self-serve-flag


wobsoriano Jul 30, 2026
abfbac2

Merge branch 'main' into nicolas/remove-oidc-self-serve-flag


NicolasLopes7 Jul 30, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


7 changes: 7 additions & 0 deletions
.changeset/quiet-moons-shine.md

View file


Open in desktop

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

Enable self-serve OIDC configuration for every application. Organization admins can now select an OIDC provider in the `<OrganizationProfile />` Security tab without the `experimental.oidcSelfServe` option, and existing OIDC connections open their configuration steps instead of the unsupported-provider state. The `experimental.oidcSelfServe` option no longer does anything and can be removed from `<ClerkProvider />` and `Clerk.load()`.

4 changes: 0 additions & 4 deletions
packages/shared/src/types/clerk.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1513,10 +1513,6 @@ export type ClerkOptions = ClerkOptionsNavigation &
 * directly with the provided Clerk instance. Used by React Native / Expo.
 */
 runtimeEnvironment: 'headless';
 /**
 * Temporary flag that gates the self-serve OIDC flow in `<ConfigureSSO />`. Remove once the self-serve OIDC flow reaches GA.
 */
 oidcSelfServe: boolean;
 },
 Record<string, any>
 >;
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
import type { EnterpriseConnectionResource, OrganizationDomainResource } from '@clerk/shared/types';
import React, { type PropsWithChildren } from 'react';

import { useOptions } from '@/contexts';

import type { OrganizationEnterpriseConnection } from './domain/organizationEnterpriseConnection';
import type {
 EnterpriseConnectionMutations,
Expand All@@ -28,8 +26,6 @@ export interface ConfigureSSOData {
 testRuns: TestRunsView;
 organizationDomains: OrganizationDomainResource[] | undefined;
 onExit?: () => void;
 /** Temporary gate for the self-serve OIDC flow; remove at OIDC GA. */
 isOIDCFlowEnabled: boolean;
}

interface ConfigureSSOProviderProps {
Expand DownExpand Up@@ -57,8 +53,6 @@ export const ConfigureSSOProvider = ({
 onExit,
 children,
}: PropsWithChildren<ConfigureSSOProviderProps>): JSX.Element => {
 const isOIDCFlowEnabled = useOptions().experimental?.oidcSelfServe ?? false;

 const value = React.useMemo<ConfigureSSOData>(
 () => ({
 contentRef,
Expand All@@ -69,7 +63,6 @@ export const ConfigureSSOProvider = ({
 enterpriseConnectionMutations,
 organizationDomainMutations,
 onExit,
 isOIDCFlowEnabled,
 }),
 [
 contentRef,
Expand All@@ -80,7 +73,6 @@ export const ConfigureSSOProvider = ({
 organizationDomains,
 enterpriseConnection,
 onExit,
 isOIDCFlowEnabled,
 ],
 );

Expand Down

39 changes: 10 additions & 29 deletions
packages/ui/src/components/ConfigureSSO/steps/ConfigureStep/__tests__/ConfigureStep.test.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,7 +14,6 @@ import type { EnterpriseConnectionProviderType } from '../../../types';
// left undefined so that footer self-hides in this isolated render.
const contextState = vi.hoisted(() => ({
 provider: undefined as string | undefined,
 isOIDCFlowEnabled: true,
 enterpriseConnection: undefined as
 | {
 id: string;
Expand DownExpand Up@@ -45,7 +44,6 @@ vi.mock('../../../ConfigureSSOContext', () => ({
 provider: contextState.provider,
 hasConnection: true,
 },
 isOIDCFlowEnabled: contextState.isOIDCFlowEnabled,
 }),
}));

Expand All@@ -63,34 +61,28 @@ const { createFixtures } = bindCreateFixtures('ConfigureSSO');

describe('resolveConfigureSteps', () => {
 it('dispatches custom and legacy OIDC provider keys to the OIDC sub-flow', () => {
 expect(resolveConfigureSteps('oauth_custom_clerk_dev', true)).toBe(OidcCustomConfigureSteps);
 expect(resolveConfigureSteps('oidc_clerk_dev', true)).toBe(OidcCustomConfigureSteps);
 expect(resolveConfigureSteps('oidc_ghe_acme', true)).toBe(OidcCustomConfigureSteps);
 expect(resolveConfigureSteps('oidc_gitlab_ent_acme', true)).toBe(OidcCustomConfigureSteps);
 expect(resolveConfigureSteps('oidc_custom', true)).toBe(OidcCustomConfigureSteps);
 });

 it('does not dispatch OIDC providers while the experimental flow is disabled', () => {
 expect(resolveConfigureSteps('oauth_custom_clerk_dev', false)).toBeUndefined();
 expect(resolveConfigureSteps('oidc_clerk_dev', false)).toBeUndefined();
 expect(resolveConfigureSteps('oauth_custom_clerk_dev')).toBe(OidcCustomConfigureSteps);
 expect(resolveConfigureSteps('oidc_clerk_dev')).toBe(OidcCustomConfigureSteps);
 expect(resolveConfigureSteps('oidc_ghe_acme')).toBe(OidcCustomConfigureSteps);
 expect(resolveConfigureSteps('oidc_gitlab_ent_acme')).toBe(OidcCustomConfigureSteps);
 expect(resolveConfigureSteps('oidc_custom')).toBe(OidcCustomConfigureSteps);
 });

 it('dispatches SAML providers by exact literal', () => {
 expect(resolveConfigureSteps('saml_okta', false)).toBe(SamlOktaConfigureSteps);
 expect(resolveConfigureSteps('saml_custom', false)).toBe(SamlCustomConfigureSteps);
 expect(resolveConfigureSteps('saml_google', false)).toBe(SamlGoogleConfigureSteps);
 expect(resolveConfigureSteps('saml_microsoft', false)).toBe(SamlMicrosoftConfigureSteps);
 expect(resolveConfigureSteps('saml_okta')).toBe(SamlOktaConfigureSteps);
 expect(resolveConfigureSteps('saml_custom')).toBe(SamlCustomConfigureSteps);
 expect(resolveConfigureSteps('saml_google')).toBe(SamlGoogleConfigureSteps);
 expect(resolveConfigureSteps('saml_microsoft')).toBe(SamlMicrosoftConfigureSteps);
 });

 it('returns undefined for an unrecognized provider so the caller can degrade', () => {
 expect(resolveConfigureSteps('ldap_enterprise' as EnterpriseConnectionProviderType, true)).toBeUndefined();
 expect(resolveConfigureSteps('ldap_enterprise' as EnterpriseConnectionProviderType)).toBeUndefined();
 });
});

describe('ConfigureProviderStep', () => {
 beforeEach(() => {
 contextState.provider = undefined;
 contextState.isOIDCFlowEnabled = true;
 contextState.enterpriseConnection = undefined;
 updateConnection.mockReset();
 });
Expand DownExpand Up@@ -469,15 +461,4 @@ describe('ConfigureProviderStep', () => {

 expect(await screen.findByText(/unsupported provider/i)).toBeInTheDocument();
 });

 it('degrades to the unsupported-provider state for an existing OIDC connection when the flag is off', async () => {
 contextState.provider = 'oauth_custom_clerk_dev';
 contextState.isOIDCFlowEnabled = false;
 const { wrapper } = await createFixtures();

 renderStep(wrapper);

 expect(await screen.findByText(/unsupported provider/i)).toBeInTheDocument();
 expect(screen.queryByText(/create a new oidc application/i)).not.toBeInTheDocument();
 });
});

13 changes: 4 additions & 9 deletions
packages/ui/src/components/ConfigureSSO/steps/ConfigureStep/index.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -28,13 +28,8 @@ const STEPS_BY_SAML_PROVIDER: Record<SamlProviderType, ConfigureStepsComponent>

export const resolveConfigureSteps = (
 provider: EnterpriseConnectionProviderType,
 isOIDCFlowEnabled: boolean,
): ConfigureStepsComponent | undefined => {
 if (isOidcProvider(provider)) {
 return isOIDCFlowEnabled ? OidcCustomConfigureSteps : undefined;
 }
 return STEPS_BY_SAML_PROVIDER[provider];
};
): ConfigureStepsComponent | undefined =>
 isOidcProvider(provider) ? OidcCustomConfigureSteps : STEPS_BY_SAML_PROVIDER[provider];

export const ConfigureStep = (): JSX.Element => {
 const { organizationEnterpriseConnection: c } = useConfigureSSO();
Expand DownExpand Up@@ -68,13 +63,13 @@ export const ConfigureStep = (): JSX.Element => {
};

export const ConfigureProviderStep = (): JSX.Element | null => {
 const { organizationEnterpriseConnection: c, isOIDCFlowEnabled } = useConfigureSSO();
 const { organizationEnterpriseConnection: c } = useConfigureSSO();

 if (!c.provider) {
 return null;
 }

 const ConfigureSteps = resolveConfigureSteps(c.provider, isOIDCFlowEnabled);
 const ConfigureSteps = resolveConfigureSteps(c.provider);

 return (
 <Flow.Part part='configureCreateApp'>
Expand Down

8 changes: 1 addition & 7 deletions
packages/ui/src/components/ConfigureSSO/steps/SelectProviderStep.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -78,16 +78,10 @@ export const SelectProviderStep = (): JSX.Element => {
 organizationEnterpriseConnection: c,
 enterpriseConnectionMutations: { createConnection, changeProvider },
 contentRef,
 isOIDCFlowEnabled,
 } = useConfigureSSO();
 const { goNext, goPrev, isFirstStep } = useWizard();
 const { t } = useLocalizations();

 const providerGroups = React.useMemo(
 () => PROVIDER_GROUPS.filter(group => group.id !== 'oidc' || isOIDCFlowEnabled),
 [isOIDCFlowEnabled],
 );

 const currentCard = c.provider ? toProviderCard(c.provider) : null;

 const [selected, setSelected] = React.useState<ProviderType | null>(currentCard);
Expand DownExpand Up@@ -166,7 +160,7 @@ export const SelectProviderStep = (): JSX.Element => {

 <Step.Body>
 <Step.Section sx={theme => ({ gap: theme.space.$5 })}>
 {providerGroups.map(group => (
 {PROVIDER_GROUPS.map(group => (
 <Col
 key={group.id}
 elementDescriptor={descriptors.configureSSOProviderGroup}
Expand Down

29 changes: 8 additions & 21 deletions
packages/ui/src/components/ConfigureSSO/steps/__tests__/SelectProviderStep.test.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -25,7 +25,6 @@ const changeProvider = vi.fn();
const contextState = vi.hoisted(() => ({
 provider: undefined as 'saml_okta' | 'saml_custom' | 'saml_google' | undefined,
 hasConnection: false,
 isOIDCFlowEnabled: false,
}));

vi.mock('../../ConfigureSSOContext', () => ({
Expand All@@ -40,7 +39,6 @@ vi.mock('../../ConfigureSSOContext', () => ({
 provider: contextState.provider,
 hasConnection: contextState.hasConnection,
 },
 isOIDCFlowEnabled: contextState.isOIDCFlowEnabled,
 }),
}));

Expand All@@ -64,7 +62,6 @@ const resetMocks = () => {
 changeProvider.mockResolvedValue(undefined);
 contextState.provider = undefined;
 contextState.hasConnection = false;
 contextState.isOIDCFlowEnabled = false;
};

describe('SelectProviderStep', () => {
Expand DownExpand Up@@ -96,7 +93,7 @@ describe('SelectProviderStep', () => {
 // Each provider card is a <label> wrapping a visually-hidden native radio; the
 // aria-hidden icon span lives inside it.
 const iconSpans = Array.from(container.querySelectorAll('label span[aria-hidden]'));
 expect(iconSpans).toHaveLength(4);
 expect(iconSpans).toHaveLength(5);

 const collectedStyles = [
 ...Array.from(document.head.querySelectorAll('style')).map(s => s.textContent ?? ''),
Expand All@@ -106,26 +103,16 @@ describe('SelectProviderStep', () => {
 expect(collectedStyles).toMatch(/img\.clerk\.com\/static\/okta\.svg/);
 expect(collectedStyles).toMatch(/img\.clerk\.com\/static\/saml\.svg/);
 expect(collectedStyles).toMatch(/img\.clerk\.com\/static\/google\.svg/);
 expect(collectedStyles).toMatch(/img\.clerk\.com\/static\/oidc\.svg/);
 });

 describe('OIDC provider (experimental flag)', () => {
 it('hides the OIDC provider tile when the flag is off', async () => {
 resetMocks();
 const { wrapper } = await createFixtures();
 const { container } = renderStep(wrapper);

 expect(screen.getByRole('radio', { name: 'Okta Workforce' })).toBeInTheDocument();
 expect(container.querySelector('input[value="oidc_custom"]')).not.toBeInTheDocument();
 });

 it('shows the OIDC provider tile when the flag is on', async () => {
 resetMocks();
 contextState.isOIDCFlowEnabled = true;
 const { wrapper } = await createFixtures();
 const { container } = renderStep(wrapper);
 it('renders the OIDC provider tile', async () => {
 resetMocks();
 const { wrapper } = await createFixtures();
 const { container } = renderStep(wrapper);

expect(container.querySelector('input[value="oidc_custom"]')).toBeInTheDocument();
});
 expect(screen.getByRole('radio', { name: 'Okta Workforce' })).toBeInTheDocument();
expect(container.querySelector('input[value="oidc_custom"]')).toBeInTheDocument();
 });

 it('disables Continue when no provider is selected', async () => {
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
feat(ui): remove experimental gate from self-serve OIDC flow#9288

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

NicolasLopes7
merged 5 commits into

from

Jul 31, 2026
 Merged


feat(ui): remove experimental gate from self-serve OIDC flow
#9288
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
a164dc0

feat(ui): remove experimental gate from self-serve OIDC flow


NicolasLopes7 Jul 30, 2026
b32efd1

Merge branch 'main' into nicolas/remove-oidc-self-serve-flag


NicolasLopes7 Jul 30, 2026
558c427

test(ui): count the OIDC tile in the provider icon assertion


NicolasLopes7 Jul 30, 2026
6c0e230

Merge branch 'main' into nicolas/remove-oidc-self-serve-flag


wobsoriano Jul 30, 2026
abfbac2

Merge branch 'main' into nicolas/remove-oidc-self-serve-flag


NicolasLopes7 Jul 30, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


7 changes: 7 additions & 0 deletions
.changeset/quiet-moons-shine.md

View file


Open in desktop

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

Enable self-serve OIDC configuration for every application. Organization admins can now select an OIDC provider in the `<OrganizationProfile />` Security tab without the `experimental.oidcSelfServe` option, and existing OIDC connections open their configuration steps instead of the unsupported-provider state. The `experimental.oidcSelfServe` option no longer does anything and can be removed from `<ClerkProvider />` and `Clerk.load()`.

4 changes: 0 additions & 4 deletions
packages/shared/src/types/clerk.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1513,10 +1513,6 @@ export type ClerkOptions = ClerkOptionsNavigation &
 * directly with the provided Clerk instance. Used by React Native / Expo.
 */
 runtimeEnvironment: 'headless';
 /**
 * Temporary flag that gates the self-serve OIDC flow in `<ConfigureSSO />`. Remove once the self-serve OIDC flow reaches GA.
 */
 oidcSelfServe: boolean;
 },
 Record<string, any>
 >;
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
import type { EnterpriseConnectionResource, OrganizationDomainResource } from '@clerk/shared/types';
import React, { type PropsWithChildren } from 'react';

import { useOptions } from '@/contexts';

import type { OrganizationEnterpriseConnection } from './domain/organizationEnterpriseConnection';
import type {
 EnterpriseConnectionMutations,
Expand All@@ -28,8 +26,6 @@ export interface ConfigureSSOData {
 testRuns: TestRunsView;
 organizationDomains: OrganizationDomainResource[] | undefined;
 onExit?: () => void;
 /** Temporary gate for the self-serve OIDC flow; remove at OIDC GA. */
 isOIDCFlowEnabled: boolean;
}

interface ConfigureSSOProviderProps {
Expand DownExpand Up@@ -57,8 +53,6 @@ export const ConfigureSSOProvider = ({
 onExit,
 children,
}: PropsWithChildren<ConfigureSSOProviderProps>): JSX.Element => {
 const isOIDCFlowEnabled = useOptions().experimental?.oidcSelfServe ?? false;

 const value = React.useMemo<ConfigureSSOData>(
 () => ({
 contentRef,
Expand All@@ -69,7 +63,6 @@ export const ConfigureSSOProvider = ({
 enterpriseConnectionMutations,
 organizationDomainMutations,
 onExit,
 isOIDCFlowEnabled,
 }),
 [
 contentRef,
Expand All@@ -80,7 +73,6 @@ export const ConfigureSSOProvider = ({
 organizationDomains,
 enterpriseConnection,
 onExit,
 isOIDCFlowEnabled,
 ],
 );

Expand Down

39 changes: 10 additions & 29 deletions
packages/ui/src/components/ConfigureSSO/steps/ConfigureStep/__tests__/ConfigureStep.test.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,7 +14,6 @@ import type { EnterpriseConnectionProviderType } from '../../../types';
// left undefined so that footer self-hides in this isolated render.
const contextState = vi.hoisted(() => ({
 provider: undefined as string | undefined,
 isOIDCFlowEnabled: true,
 enterpriseConnection: undefined as
 | {
 id: string;
Expand DownExpand Up@@ -45,7 +44,6 @@ vi.mock('../../../ConfigureSSOContext', () => ({
 provider: contextState.provider,
 hasConnection: true,
 },
 isOIDCFlowEnabled: contextState.isOIDCFlowEnabled,
 }),
}));

Expand All@@ -63,34 +61,28 @@ const { createFixtures } = bindCreateFixtures('ConfigureSSO');

describe('resolveConfigureSteps', () => {
 it('dispatches custom and legacy OIDC provider keys to the OIDC sub-flow', () => {
 expect(resolveConfigureSteps('oauth_custom_clerk_dev', true)).toBe(OidcCustomConfigureSteps);
 expect(resolveConfigureSteps('oidc_clerk_dev', true)).toBe(OidcCustomConfigureSteps);
 expect(resolveConfigureSteps('oidc_ghe_acme', true)).toBe(OidcCustomConfigureSteps);
 expect(resolveConfigureSteps('oidc_gitlab_ent_acme', true)).toBe(OidcCustomConfigureSteps);
 expect(resolveConfigureSteps('oidc_custom', true)).toBe(OidcCustomConfigureSteps);
 });

 it('does not dispatch OIDC providers while the experimental flow is disabled', () => {
 expect(resolveConfigureSteps('oauth_custom_clerk_dev', false)).toBeUndefined();
 expect(resolveConfigureSteps('oidc_clerk_dev', false)).toBeUndefined();
 expect(resolveConfigureSteps('oauth_custom_clerk_dev')).toBe(OidcCustomConfigureSteps);
 expect(resolveConfigureSteps('oidc_clerk_dev')).toBe(OidcCustomConfigureSteps);
 expect(resolveConfigureSteps('oidc_ghe_acme')).toBe(OidcCustomConfigureSteps);
 expect(resolveConfigureSteps('oidc_gitlab_ent_acme')).toBe(OidcCustomConfigureSteps);
 expect(resolveConfigureSteps('oidc_custom')).toBe(OidcCustomConfigureSteps);
 });

 it('dispatches SAML providers by exact literal', () => {
 expect(resolveConfigureSteps('saml_okta', false)).toBe(SamlOktaConfigureSteps);
 expect(resolveConfigureSteps('saml_custom', false)).toBe(SamlCustomConfigureSteps);
 expect(resolveConfigureSteps('saml_google', false)).toBe(SamlGoogleConfigureSteps);
 expect(resolveConfigureSteps('saml_microsoft', false)).toBe(SamlMicrosoftConfigureSteps);
 expect(resolveConfigureSteps('saml_okta')).toBe(SamlOktaConfigureSteps);
 expect(resolveConfigureSteps('saml_custom')).toBe(SamlCustomConfigureSteps);
 expect(resolveConfigureSteps('saml_google')).toBe(SamlGoogleConfigureSteps);
 expect(resolveConfigureSteps('saml_microsoft')).toBe(SamlMicrosoftConfigureSteps);
 });

 it('returns undefined for an unrecognized provider so the caller can degrade', () => {
 expect(resolveConfigureSteps('ldap_enterprise' as EnterpriseConnectionProviderType, true)).toBeUndefined();
 expect(resolveConfigureSteps('ldap_enterprise' as EnterpriseConnectionProviderType)).toBeUndefined();
 });
});

describe('ConfigureProviderStep', () => {
 beforeEach(() => {
 contextState.provider = undefined;
 contextState.isOIDCFlowEnabled = true;
 contextState.enterpriseConnection = undefined;
 updateConnection.mockReset();
 });
Expand DownExpand Up@@ -469,15 +461,4 @@ describe('ConfigureProviderStep', () => {

 expect(await screen.findByText(/unsupported provider/i)).toBeInTheDocument();
 });

 it('degrades to the unsupported-provider state for an existing OIDC connection when the flag is off', async () => {
 contextState.provider = 'oauth_custom_clerk_dev';
 contextState.isOIDCFlowEnabled = false;
 const { wrapper } = await createFixtures();

 renderStep(wrapper);

 expect(await screen.findByText(/unsupported provider/i)).toBeInTheDocument();
 expect(screen.queryByText(/create a new oidc application/i)).not.toBeInTheDocument();
 });
});

13 changes: 4 additions & 9 deletions
packages/ui/src/components/ConfigureSSO/steps/ConfigureStep/index.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -28,13 +28,8 @@ const STEPS_BY_SAML_PROVIDER: Record<SamlProviderType, ConfigureStepsComponent>

export const resolveConfigureSteps = (
 provider: EnterpriseConnectionProviderType,
 isOIDCFlowEnabled: boolean,
): ConfigureStepsComponent | undefined => {
 if (isOidcProvider(provider)) {
 return isOIDCFlowEnabled ? OidcCustomConfigureSteps : undefined;
 }
 return STEPS_BY_SAML_PROVIDER[provider];
};
): ConfigureStepsComponent | undefined =>
 isOidcProvider(provider) ? OidcCustomConfigureSteps : STEPS_BY_SAML_PROVIDER[provider];

export const ConfigureStep = (): JSX.Element => {
 const { organizationEnterpriseConnection: c } = useConfigureSSO();
Expand DownExpand Up@@ -68,13 +63,13 @@ export const ConfigureStep = (): JSX.Element => {
};

export const ConfigureProviderStep = (): JSX.Element | null => {
 const { organizationEnterpriseConnection: c, isOIDCFlowEnabled } = useConfigureSSO();
 const { organizationEnterpriseConnection: c } = useConfigureSSO();

 if (!c.provider) {
 return null;
 }

 const ConfigureSteps = resolveConfigureSteps(c.provider, isOIDCFlowEnabled);
 const ConfigureSteps = resolveConfigureSteps(c.provider);

 return (
 <Flow.Part part='configureCreateApp'>
Expand Down

8 changes: 1 addition & 7 deletions
packages/ui/src/components/ConfigureSSO/steps/SelectProviderStep.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -78,16 +78,10 @@ export const SelectProviderStep = (): JSX.Element => {
 organizationEnterpriseConnection: c,
 enterpriseConnectionMutations: { createConnection, changeProvider },
 contentRef,
 isOIDCFlowEnabled,
 } = useConfigureSSO();
 const { goNext, goPrev, isFirstStep } = useWizard();
 const { t } = useLocalizations();

 const providerGroups = React.useMemo(
 () => PROVIDER_GROUPS.filter(group => group.id !== 'oidc' || isOIDCFlowEnabled),
 [isOIDCFlowEnabled],
 );

 const currentCard = c.provider ? toProviderCard(c.provider) : null;

 const [selected, setSelected] = React.useState<ProviderType | null>(currentCard);
Expand DownExpand Up@@ -166,7 +160,7 @@ export const SelectProviderStep = (): JSX.Element => {

 <Step.Body>
 <Step.Section sx={theme => ({ gap: theme.space.$5 })}>
 {providerGroups.map(group => (
 {PROVIDER_GROUPS.map(group => (
 <Col
 key={group.id}
 elementDescriptor={descriptors.configureSSOProviderGroup}
Expand Down

29 changes: 8 additions & 21 deletions
packages/ui/src/components/ConfigureSSO/steps/__tests__/SelectProviderStep.test.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -25,7 +25,6 @@ const changeProvider = vi.fn();
const contextState = vi.hoisted(() => ({
 provider: undefined as 'saml_okta' | 'saml_custom' | 'saml_google' | undefined,
 hasConnection: false,
 isOIDCFlowEnabled: false,
}));

vi.mock('../../ConfigureSSOContext', () => ({
Expand All@@ -40,7 +39,6 @@ vi.mock('../../ConfigureSSOContext', () => ({
 provider: contextState.provider,
 hasConnection: contextState.hasConnection,
 },
 isOIDCFlowEnabled: contextState.isOIDCFlowEnabled,
 }),
}));

Expand All@@ -64,7 +62,6 @@ const resetMocks = () => {
 changeProvider.mockResolvedValue(undefined);
 contextState.provider = undefined;
 contextState.hasConnection = false;
 contextState.isOIDCFlowEnabled = false;
};

describe('SelectProviderStep', () => {
Expand DownExpand Up@@ -96,7 +93,7 @@ describe('SelectProviderStep', () => {
 // Each provider card is a <label> wrapping a visually-hidden native radio; the
 // aria-hidden icon span lives inside it.
 const iconSpans = Array.from(container.querySelectorAll('label span[aria-hidden]'));
 expect(iconSpans).toHaveLength(4);
 expect(iconSpans).toHaveLength(5);

 const collectedStyles = [
 ...Array.from(document.head.querySelectorAll('style')).map(s => s.textContent ?? ''),
Expand All@@ -106,26 +103,16 @@ describe('SelectProviderStep', () => {
 expect(collectedStyles).toMatch(/img\.clerk\.com\/static\/okta\.svg/);
 expect(collectedStyles).toMatch(/img\.clerk\.com\/static\/saml\.svg/);
 expect(collectedStyles).toMatch(/img\.clerk\.com\/static\/google\.svg/);
 expect(collectedStyles).toMatch(/img\.clerk\.com\/static\/oidc\.svg/);
 });

 describe('OIDC provider (experimental flag)', () => {
 it('hides the OIDC provider tile when the flag is off', async () => {
 resetMocks();
 const { wrapper } = await createFixtures();
 const { container } = renderStep(wrapper);

 expect(screen.getByRole('radio', { name: 'Okta Workforce' })).toBeInTheDocument();
 expect(container.querySelector('input[value="oidc_custom"]')).not.toBeInTheDocument();
 });

 it('shows the OIDC provider tile when the flag is on', async () => {
 resetMocks();
 contextState.isOIDCFlowEnabled = true;
 const { wrapper } = await createFixtures();
 const { container } = renderStep(wrapper);
 it('renders the OIDC provider tile', async () => {
 resetMocks();
 const { wrapper } = await createFixtures();
 const { container } = renderStep(wrapper);

expect(container.querySelector('input[value="oidc_custom"]')).toBeInTheDocument();
});
 expect(screen.getByRole('radio', { name: 'Okta Workforce' })).toBeInTheDocument();
expect(container.querySelector('input[value="oidc_custom"]')).toBeInTheDocument();
 });

 it('disables Continue when no provider is selected', async () => {
Expand Down
Loading

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

Skip to content
feat(ui): remove experimental gate from self-serve OIDC flow#9288

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

NicolasLopes7
merged 5 commits into

from

Jul 31, 2026
 Merged


feat(ui): remove experimental gate from self-serve OIDC flow
#9288
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
a164dc0

feat(ui): remove experimental gate from self-serve OIDC flow


NicolasLopes7 Jul 30, 2026
b32efd1

Merge branch 'main' into nicolas/remove-oidc-self-serve-flag


NicolasLopes7 Jul 30, 2026
558c427

test(ui): count the OIDC tile in the provider icon assertion


NicolasLopes7 Jul 30, 2026
6c0e230

Merge branch 'main' into nicolas/remove-oidc-self-serve-flag


wobsoriano Jul 30, 2026
abfbac2

Merge branch 'main' into nicolas/remove-oidc-self-serve-flag


NicolasLopes7 Jul 30, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


7 changes: 7 additions & 0 deletions
.changeset/quiet-moons-shine.md

View file


Open in desktop

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

Enable self-serve OIDC configuration for every application. Organization admins can now select an OIDC provider in the `<OrganizationProfile />` Security tab without the `experimental.oidcSelfServe` option, and existing OIDC connections open their configuration steps instead of the unsupported-provider state. The `experimental.oidcSelfServe` option no longer does anything and can be removed from `<ClerkProvider />` and `Clerk.load()`.

4 changes: 0 additions & 4 deletions
packages/shared/src/types/clerk.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1513,10 +1513,6 @@ export type ClerkOptions = ClerkOptionsNavigation &
 * directly with the provided Clerk instance. Used by React Native / Expo.
 */
 runtimeEnvironment: 'headless';
 /**
 * Temporary flag that gates the self-serve OIDC flow in `<ConfigureSSO />`. Remove once the self-serve OIDC flow reaches GA.
 */
 oidcSelfServe: boolean;
 },
 Record<string, any>
 >;
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
import type { EnterpriseConnectionResource, OrganizationDomainResource } from '@clerk/shared/types';
import React, { type PropsWithChildren } from 'react';

import { useOptions } from '@/contexts';

import type { OrganizationEnterpriseConnection } from './domain/organizationEnterpriseConnection';
import type {
 EnterpriseConnectionMutations,
Expand All@@ -28,8 +26,6 @@ export interface ConfigureSSOData {
 testRuns: TestRunsView;
 organizationDomains: OrganizationDomainResource[] | undefined;
 onExit?: () => void;
 /** Temporary gate for the self-serve OIDC flow; remove at OIDC GA. */
 isOIDCFlowEnabled: boolean;
}

interface ConfigureSSOProviderProps {
Expand DownExpand Up@@ -57,8 +53,6 @@ export const ConfigureSSOProvider = ({
 onExit,
 children,
}: PropsWithChildren<ConfigureSSOProviderProps>): JSX.Element => {
 const isOIDCFlowEnabled = useOptions().experimental?.oidcSelfServe ?? false;

 const value = React.useMemo<ConfigureSSOData>(
 () => ({
 contentRef,
Expand All@@ -69,7 +63,6 @@ export const ConfigureSSOProvider = ({
 enterpriseConnectionMutations,
 organizationDomainMutations,
 onExit,
 isOIDCFlowEnabled,
 }),
 [
 contentRef,
Expand All@@ -80,7 +73,6 @@ export const ConfigureSSOProvider = ({
 organizationDomains,
 enterpriseConnection,
 onExit,
 isOIDCFlowEnabled,
 ],
 );

Expand Down

39 changes: 10 additions & 29 deletions
packages/ui/src/components/ConfigureSSO/steps/ConfigureStep/__tests__/ConfigureStep.test.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,7 +14,6 @@ import type { EnterpriseConnectionProviderType } from '../../../types';
// left undefined so that footer self-hides in this isolated render.
const contextState = vi.hoisted(() => ({
 provider: undefined as string | undefined,
 isOIDCFlowEnabled: true,
 enterpriseConnection: undefined as
 | {
 id: string;
Expand DownExpand Up@@ -45,7 +44,6 @@ vi.mock('../../../ConfigureSSOContext', () => ({
 provider: contextState.provider,
 hasConnection: true,
 },
 isOIDCFlowEnabled: contextState.isOIDCFlowEnabled,
 }),
}));

Expand All@@ -63,34 +61,28 @@ const { createFixtures } = bindCreateFixtures('ConfigureSSO');

describe('resolveConfigureSteps', () => {
 it('dispatches custom and legacy OIDC provider keys to the OIDC sub-flow', () => {
 expect(resolveConfigureSteps('oauth_custom_clerk_dev', true)).toBe(OidcCustomConfigureSteps);
 expect(resolveConfigureSteps('oidc_clerk_dev', true)).toBe(OidcCustomConfigureSteps);
 expect(resolveConfigureSteps('oidc_ghe_acme', true)).toBe(OidcCustomConfigureSteps);
 expect(resolveConfigureSteps('oidc_gitlab_ent_acme', true)).toBe(OidcCustomConfigureSteps);
 expect(resolveConfigureSteps('oidc_custom', true)).toBe(OidcCustomConfigureSteps);
 });

 it('does not dispatch OIDC providers while the experimental flow is disabled', () => {
 expect(resolveConfigureSteps('oauth_custom_clerk_dev', false)).toBeUndefined();
 expect(resolveConfigureSteps('oidc_clerk_dev', false)).toBeUndefined();
 expect(resolveConfigureSteps('oauth_custom_clerk_dev')).toBe(OidcCustomConfigureSteps);
 expect(resolveConfigureSteps('oidc_clerk_dev')).toBe(OidcCustomConfigureSteps);
 expect(resolveConfigureSteps('oidc_ghe_acme')).toBe(OidcCustomConfigureSteps);
 expect(resolveConfigureSteps('oidc_gitlab_ent_acme')).toBe(OidcCustomConfigureSteps);
 expect(resolveConfigureSteps('oidc_custom')).toBe(OidcCustomConfigureSteps);
 });

 it('dispatches SAML providers by exact literal', () => {
 expect(resolveConfigureSteps('saml_okta', false)).toBe(SamlOktaConfigureSteps);
 expect(resolveConfigureSteps('saml_custom', false)).toBe(SamlCustomConfigureSteps);
 expect(resolveConfigureSteps('saml_google', false)).toBe(SamlGoogleConfigureSteps);
 expect(resolveConfigureSteps('saml_microsoft', false)).toBe(SamlMicrosoftConfigureSteps);
 expect(resolveConfigureSteps('saml_okta')).toBe(SamlOktaConfigureSteps);
 expect(resolveConfigureSteps('saml_custom')).toBe(SamlCustomConfigureSteps);
 expect(resolveConfigureSteps('saml_google')).toBe(SamlGoogleConfigureSteps);
 expect(resolveConfigureSteps('saml_microsoft')).toBe(SamlMicrosoftConfigureSteps);
 });

 it('returns undefined for an unrecognized provider so the caller can degrade', () => {
 expect(resolveConfigureSteps('ldap_enterprise' as EnterpriseConnectionProviderType, true)).toBeUndefined();
 expect(resolveConfigureSteps('ldap_enterprise' as EnterpriseConnectionProviderType)).toBeUndefined();
 });
});

describe('ConfigureProviderStep', () => {
 beforeEach(() => {
 contextState.provider = undefined;
 contextState.isOIDCFlowEnabled = true;
 contextState.enterpriseConnection = undefined;
 updateConnection.mockReset();
 });
Expand DownExpand Up@@ -469,15 +461,4 @@ describe('ConfigureProviderStep', () => {

 expect(await screen.findByText(/unsupported provider/i)).toBeInTheDocument();
 });

 it('degrades to the unsupported-provider state for an existing OIDC connection when the flag is off', async () => {
 contextState.provider = 'oauth_custom_clerk_dev';
 contextState.isOIDCFlowEnabled = false;
 const { wrapper } = await createFixtures();

 renderStep(wrapper);

 expect(await screen.findByText(/unsupported provider/i)).toBeInTheDocument();
 expect(screen.queryByText(/create a new oidc application/i)).not.toBeInTheDocument();
 });
});

13 changes: 4 additions & 9 deletions
packages/ui/src/components/ConfigureSSO/steps/ConfigureStep/index.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -28,13 +28,8 @@ const STEPS_BY_SAML_PROVIDER: Record<SamlProviderType, ConfigureStepsComponent>

export const resolveConfigureSteps = (
 provider: EnterpriseConnectionProviderType,
 isOIDCFlowEnabled: boolean,
): ConfigureStepsComponent | undefined => {
 if (isOidcProvider(provider)) {
 return isOIDCFlowEnabled ? OidcCustomConfigureSteps : undefined;
 }
 return STEPS_BY_SAML_PROVIDER[provider];
};
): ConfigureStepsComponent | undefined =>
 isOidcProvider(provider) ? OidcCustomConfigureSteps : STEPS_BY_SAML_PROVIDER[provider];

export const ConfigureStep = (): JSX.Element => {
 const { organizationEnterpriseConnection: c } = useConfigureSSO();
Expand DownExpand Up@@ -68,13 +63,13 @@ export const ConfigureStep = (): JSX.Element => {
};

export const ConfigureProviderStep = (): JSX.Element | null => {
 const { organizationEnterpriseConnection: c, isOIDCFlowEnabled } = useConfigureSSO();
 const { organizationEnterpriseConnection: c } = useConfigureSSO();

 if (!c.provider) {
 return null;
 }

 const ConfigureSteps = resolveConfigureSteps(c.provider, isOIDCFlowEnabled);
 const ConfigureSteps = resolveConfigureSteps(c.provider);

 return (
 <Flow.Part part='configureCreateApp'>
Expand Down

8 changes: 1 addition & 7 deletions
packages/ui/src/components/ConfigureSSO/steps/SelectProviderStep.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -78,16 +78,10 @@ export const SelectProviderStep = (): JSX.Element => {
 organizationEnterpriseConnection: c,
 enterpriseConnectionMutations: { createConnection, changeProvider },
 contentRef,
 isOIDCFlowEnabled,
 } = useConfigureSSO();
 const { goNext, goPrev, isFirstStep } = useWizard();
 const { t } = useLocalizations();

 const providerGroups = React.useMemo(
 () => PROVIDER_GROUPS.filter(group => group.id !== 'oidc' || isOIDCFlowEnabled),
 [isOIDCFlowEnabled],
 );

 const currentCard = c.provider ? toProviderCard(c.provider) : null;

 const [selected, setSelected] = React.useState<ProviderType | null>(currentCard);
Expand DownExpand Up@@ -166,7 +160,7 @@ export const SelectProviderStep = (): JSX.Element => {

 <Step.Body>
 <Step.Section sx={theme => ({ gap: theme.space.$5 })}>
 {providerGroups.map(group => (
 {PROVIDER_GROUPS.map(group => (
 <Col
 key={group.id}
 elementDescriptor={descriptors.configureSSOProviderGroup}
Expand Down

29 changes: 8 additions & 21 deletions
packages/ui/src/components/ConfigureSSO/steps/__tests__/SelectProviderStep.test.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -25,7 +25,6 @@ const changeProvider = vi.fn();
const contextState = vi.hoisted(() => ({
 provider: undefined as 'saml_okta' | 'saml_custom' | 'saml_google' | undefined,
 hasConnection: false,
 isOIDCFlowEnabled: false,
}));

vi.mock('../../ConfigureSSOContext', () => ({
Expand All@@ -40,7 +39,6 @@ vi.mock('../../ConfigureSSOContext', () => ({
 provider: contextState.provider,
 hasConnection: contextState.hasConnection,
 },
 isOIDCFlowEnabled: contextState.isOIDCFlowEnabled,
 }),
}));

Expand All@@ -64,7 +62,6 @@ const resetMocks = () => {
 changeProvider.mockResolvedValue(undefined);
 contextState.provider = undefined;
 contextState.hasConnection = false;
 contextState.isOIDCFlowEnabled = false;
};

describe('SelectProviderStep', () => {
Expand DownExpand Up@@ -96,7 +93,7 @@ describe('SelectProviderStep', () => {
 // Each provider card is a <label> wrapping a visually-hidden native radio; the
 // aria-hidden icon span lives inside it.
 const iconSpans = Array.from(container.querySelectorAll('label span[aria-hidden]'));
 expect(iconSpans).toHaveLength(4);
 expect(iconSpans).toHaveLength(5);

 const collectedStyles = [
 ...Array.from(document.head.querySelectorAll('style')).map(s => s.textContent ?? ''),
Expand All@@ -106,26 +103,16 @@ describe('SelectProviderStep', () => {
 expect(collectedStyles).toMatch(/img\.clerk\.com\/static\/okta\.svg/);
 expect(collectedStyles).toMatch(/img\.clerk\.com\/static\/saml\.svg/);
 expect(collectedStyles).toMatch(/img\.clerk\.com\/static\/google\.svg/);
 expect(collectedStyles).toMatch(/img\.clerk\.com\/static\/oidc\.svg/);
 });

 describe('OIDC provider (experimental flag)', () => {
 it('hides the OIDC provider tile when the flag is off', async () => {
 resetMocks();
 const { wrapper } = await createFixtures();
 const { container } = renderStep(wrapper);

 expect(screen.getByRole('radio', { name: 'Okta Workforce' })).toBeInTheDocument();
 expect(container.querySelector('input[value="oidc_custom"]')).not.toBeInTheDocument();
 });

 it('shows the OIDC provider tile when the flag is on', async () => {
 resetMocks();
 contextState.isOIDCFlowEnabled = true;
 const { wrapper } = await createFixtures();
 const { container } = renderStep(wrapper);
 it('renders the OIDC provider tile', async () => {
 resetMocks();
 const { wrapper } = await createFixtures();
 const { container } = renderStep(wrapper);

expect(container.querySelector('input[value="oidc_custom"]')).toBeInTheDocument();
});
 expect(screen.getByRole('radio', { name: 'Okta Workforce' })).toBeInTheDocument();
expect(container.querySelector('input[value="oidc_custom"]')).toBeInTheDocument();
 });

 it('disables Continue when no provider is selected', async () => {
Expand Down
Loading