Uh oh!
There was an error while loading. Please reload this page.
feat(ui,shared,localizations): Allow changing provider in self-serve SSO - #8881
Merged
iagodahlem merged 11 commits intoJun 19, 2026
Conversation
🦋 Changeset detectedLatest commit: 6838daf The changes in this PR will be included in the next version bump. This PR includes changesets to release 22 packages
Not sure what this means? Click here to learn what changesets are. Click here if you're a maintainer who wants to add another changeset to this PR |
The latest updates on your projects. Learn more about Vercel for GitHub.
|
Contributor
Note Reviews pausedIt looks like this branch is under active development. To avoid overwhelming you with review comments due to an influx of new commits, CodeRabbit has automatically paused this review. You can configure this behavior by changing the Use the following commands to manage reviews:
Use the checkboxes below for quick actions:
No actionable comments were generated in the recent review. 🎉 ℹ️ Recent review info⚙️ Run configurationConfiguration used: Repository YAML (base), Repository UI (inherited) Review profile: CHILL Plan: Pro Run ID: 📒 Files selected for processing (24)
💤 Files with no reviewable changes (22)
✅ Files skipped from review due to trivial changes (1)
🚧 Files skipped from review as they are similar to previous changes (1)
📝 WalkthroughWalkthroughAdds the ability to switch an enterprise SSO connection provider mid-wizard via a new ChangesSSO Provider Change Flow and SAML UI Revamp
Sequence Diagram(s)sequenceDiagram
participant User
participant SelectProviderStep
participant ChangeProviderDialog
participant handleConfirmChangeProvider
participant changeProvider
participant ClerkAPI as Clerk API
User->>SelectProviderStep: selects different provider
SelectProviderStep->>SelectProviderStep: handleContinue detects provider change
SelectProviderStep->>ChangeProviderDialog: open dialog with provider labels
User->>ChangeProviderDialog: clicks Confirm
ChangeProviderDialog->>handleConfirmChangeProvider: invoke callback
handleConfirmChangeProvider->>changeProvider: changeProvider(newProvider)
changeProvider->>ClerkAPI: deleteEnterpriseConnection()
changeProvider->>ClerkAPI: createEnterpriseConnection(newProvider, domains)
ClerkAPI-->>changeProvider: new connection resource
changeProvider-->>handleConfirmChangeProvider: resolved
handleConfirmChangeProvider->>SelectProviderStep: advance to configure-provider
Estimated code review effort🎯 4 (Complex) | ⏱️ ~60 minutes Possibly related PRs
🚥 Pre-merge checks | ✅ 5✅ Passed checks (5 passed)
✏️ Tip: You can configure your own custom pre-merge checks in the settings. ✨ Finishing Touches📝 Generate docstrings
Comment |
LauraBeatris
changed the base branch from
main
to
laura/orgs-1623-sdk-add-support-for-removing-domainsJune 16, 2026 17:33
@clerk/astro@clerk/backend@clerk/chrome-extension@clerk/clerk-js@clerk/eslint-plugin@clerk/expo@clerk/expo-passkeys@clerk/express@clerk/fastify@clerk/hono@clerk/localizations@clerk/nextjs@clerk/nuxt@clerk/react@clerk/react-router@clerk/shared@clerk/tanstack-react-start@clerk/testing@clerk/ui@clerk/upgrade@clerk/vuecommit: |
LauraBeatrisforce-pushed
the
laura/orgs-1632-sdk-update-select-provider-to-be-part-of-configure-step
branch
from
June 16, 2026 17:36
32a5d20 to
3b7f05fCompareLauraBeatrisforce-pushed
the
laura/orgs-1632-sdk-update-select-provider-to-be-part-of-configure-step
branch
from
June 16, 2026 17:40
3b7f05f to
ee5629aCompareLauraBeatrisforce-pushed
the
laura/orgs-1632-sdk-update-select-provider-to-be-part-of-configure-step
branch
from
June 16, 2026 17:41
ee5629a to
cbacb27CompareLauraBeatrisforce-pushed
the
laura/orgs-1632-sdk-update-select-provider-to-be-part-of-configure-step
branch
from
June 16, 2026 20:38
9115a35 to
be00b3dCompareLauraBeatris
marked this pull request as ready for review
June 16, 2026 20:39
LauraBeatrisforce-pushed
the
laura/orgs-1623-sdk-add-support-for-removing-domains
branch
from
June 16, 2026 22:10
1a593c1 to
09df811CompareLauraBeatrisforce-pushed
the
laura/orgs-1632-sdk-update-select-provider-to-be-part-of-configure-step
branch
from
June 16, 2026 22:11
a6dcad8 to
52a1916CompareLauraBeatrisforce-pushed
the
laura/orgs-1632-sdk-update-select-provider-to-be-part-of-configure-step
branch
from
June 18, 2026 14:52
5c897e1 to
14c62aaCompareLauraBeatrisforce-pushed
the
laura/orgs-1632-sdk-update-select-provider-to-be-part-of-configure-step
branch
from
June 18, 2026 14:53
14c62aa to
3840509CompareLauraBeatrisforce-pushed
the
laura/orgs-1632-sdk-update-select-provider-to-be-part-of-configure-step
branch
from
June 18, 2026 14:56
3840509 to
1c7b3ceCompareLauraBeatris
marked this pull request as ready for review
June 18, 2026 15:04
Contributor
API Changes Report
Summary
@clerk/sharedCurrent version: 4.19.1 Subpath |
Contributor
There was a problem hiding this comment.
Actionable comments posted: 2
Caution
Some comments are outside the diff and can’t be posted inline due to platform limitations.
⚠️ Outside diff range comments (1)
packages/ui/src/components/ConfigureSSO/steps/ConfigureStep/saml/SamlCustomConfigureSteps.tsx (1)
202-272:⚠️ Potential issue | 🔴 Critical | ⚡ Quick winCritical: Table column headers and cell data are mismatched.
The table header order is
attributeName(first column),userAttribute(second column), but the cell data order is reversed: the first<Td>rendersrows.${row.id}.userAttribute(line 243) and the second<Td>rendersrows.${row.id}.attributeName(line 264). This means the column headers do not match the data displayed beneath them, which will confuse users and display incorrect information.🔧 Proposed fix: Swap the cell localization keys to match header order
<Td> <Flex as='span' align='center' sx={theme => ({ gap: theme.space.$2 })} > <Text as='span' colorScheme='secondary' - sx={{ fontFamily: 'monospace' }} localizationKey={localizationKeys( - `configureSSO.configureStep.samlCustom.attributeMappingStep.attributeMappingTable.rows.${row.id}.userAttribute`,+ `configureSSO.configureStep.samlCustom.attributeMappingStep.attributeMappingTable.rows.${row.id}.attributeName`, )} /> <Badge ... /> </Flex> </Td> <Td> <Text as='span' + sx={{ fontFamily: 'monospace' }} localizationKey={localizationKeys( - `configureSSO.configureStep.samlCustom.attributeMappingStep.attributeMappingTable.rows.${row.id}.attributeName`,+ `configureSSO.configureStep.samlCustom.attributeMappingStep.attributeMappingTable.rows.${row.id}.userAttribute`, )} /> </Td>🤖 Prompt for AI Agents
Verify each finding against current code. Fix only still-valid issues, skip the rest with a brief reason, keep changes minimal, and validate. In `@packages/ui/src/components/ConfigureSSO/steps/ConfigureStep/saml/SamlCustomConfigureSteps.tsx` around lines 202 - 272, The CustomAttributeMappingTable component has mismatched column headers and cell data. The headers are ordered as attributeName (first) and userAttribute (second), but the first Td element renders userAttribute and the second Td renders attributeName, which is reversed. Swap the localization keys in the two Td elements so the first Td renders the attributeName localization key and the second Td renders the userAttribute localization key to align with the header order defined in the Thead section.
🤖 Prompt for all review comments with AI agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.
Inline comments:
In `@packages/localizations/src/en-US.ts`:
- Around line 553-556: Fix the grammatical error in the step2 property of the
Google Workspace SAML setup instructions. The phrase "In Select <bold>Add
app</bold>" reads incorrectly because of the leading "In ". Remove the "In "
prefix from the beginning of the step2 string so it reads "Select <bold>Add
app</bold>, then <bold>Add custom SAML app.</bold>" instead.
In
`@packages/ui/src/components/ConfigureSSO/hooks/useOrganizationEnterpriseConnection.ts`:
- Around line 230-240: The changeProvider function is recreating the enterprise
connection with all organizationDomains instead of preserving the domains from
the current enterpriseConnection, which can silently expand the domain scope
when switching providers. Before deleting the existing enterpriseConnection in
the changeProvider method, capture its current domains list, then pass those
preserved domains to the createEnterpriseConnection call instead of using
organizationDomains map.
---
Outside diff comments:
In
`@packages/ui/src/components/ConfigureSSO/steps/ConfigureStep/saml/SamlCustomConfigureSteps.tsx`:
- Around line 202-272: The CustomAttributeMappingTable component has mismatched
column headers and cell data. The headers are ordered as attributeName (first)
and userAttribute (second), but the first Td element renders userAttribute and
the second Td renders attributeName, which is reversed. Swap the localization
keys in the two Td elements so the first Td renders the attributeName
localization key and the second Td renders the userAttribute localization key to
align with the header order defined in the Thead section.
🪄 Autofix (Beta)
Fix all unresolved CodeRabbit comments on this PR:
- Push a commit to this branch (recommended)
- Create a new PR with the fixes
ℹ️ Review info
⚙️ Run configuration
Configuration used: Repository YAML (base), Repository UI (inherited)
Review profile: CHILL
Plan: Pro
Run ID: 2ffef148-c7b7-430d-bd57-464c37edcec5
📒 Files selected for processing (21)
.changeset/nine-lies-eat.mdpackages/localizations/src/en-US.tspackages/shared/src/types/localization.tspackages/ui/src/components/ConfigureSSO/ChangeProviderDialog.tsxpackages/ui/src/components/ConfigureSSO/ConfigureSSOWizard.tsxpackages/ui/src/components/ConfigureSSO/__tests__/ConfigureSSO.navigation.test.tsxpackages/ui/src/components/ConfigureSSO/hooks/useOrganizationEnterpriseConnection.tspackages/ui/src/components/ConfigureSSO/steps/ConfigureStep/index.tsxpackages/ui/src/components/ConfigureSSO/steps/ConfigureStep/saml/SamlCustomConfigureSteps.tsxpackages/ui/src/components/ConfigureSSO/steps/ConfigureStep/saml/SamlGoogleConfigureSteps.tsxpackages/ui/src/components/ConfigureSSO/steps/ConfigureStep/saml/SamlMicrosoftConfigureSteps.tsxpackages/ui/src/components/ConfigureSSO/steps/ConfigureStep/saml/SamlOktaConfigureSteps.tsxpackages/ui/src/components/ConfigureSSO/steps/ConfigureStep/saml/__tests__/SamlConfigureSteps.test.tsxpackages/ui/src/components/ConfigureSSO/steps/ConfigureStep/saml/shared/IdentityProviderConfigurationModes.tsxpackages/ui/src/components/ConfigureSSO/steps/SelectProviderStep.tsxpackages/ui/src/components/ConfigureSSO/steps/TestConfigurationStep.tsxpackages/ui/src/components/ConfigureSSO/steps/__tests__/SelectProviderStep.test.tsxpackages/ui/src/components/ConfigureSSO/types.tspackages/ui/src/components/OrganizationProfile/__tests__/OrganizationSecurityPage.test.tsxpackages/ui/src/customizables/elementDescriptors.tspackages/ui/src/internal/appearance.ts
💤 Files with no reviewable changes (1)
- packages/ui/src/components/ConfigureSSO/steps/ConfigureStep/saml/SamlOktaConfigureSteps.tsx
Uh oh!
There was an error while loading. Please reload this page.
Uh oh!
There was an error while loading. Please reload this page.
Contributor
There was a problem hiding this comment.
Actionable comments posted: 1
🤖 Prompt for all review comments with AI agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.
Inline comments:
In `@packages/ui/src/elements/Alert.tsx`:
- Around line 19-20: The Alert component props interface allows onDismiss to be
provided without a corresponding dismissLabel, which causes the dismiss button
at line 82 to have an undefined aria-label. Refactor the props type definition
to enforce that dismissLabel is required whenever onDismiss is provided. Use
TypeScript type constraints or a discriminated union pattern to ensure the two
props are coupled together, so that either both are provided or neither is
provided, guaranteeing the dismiss button always has an accessible label when
present.
🪄 Autofix (Beta)
Fix all unresolved CodeRabbit comments on this PR:
- Push a commit to this branch (recommended)
- Create a new PR with the fixes
ℹ️ Review info
⚙️ Run configuration
Configuration used: Repository YAML (base), Repository UI (inherited)
Review profile: CHILL
Plan: Pro
Run ID: 870ca114-5326-41f0-a5d3-68aab441d52a
📒 Files selected for processing (6)
packages/localizations/src/en-US.tspackages/shared/src/types/localization.tspackages/ui/src/components/ConfigureSSO/hooks/useOrganizationEnterpriseConnection.tspackages/ui/src/components/ConfigureSSO/steps/ConfigureStep/saml/shared/ActiveConnectionAlert.tsxpackages/ui/src/components/ConfigureSSO/steps/ConfigureStep/saml/shared/IdentityProviderConfigurationForm.tsxpackages/ui/src/elements/Alert.tsx
🚧 Files skipped from review as they are similar to previous changes (5)
- packages/ui/src/components/ConfigureSSO/steps/ConfigureStep/saml/shared/ActiveConnectionAlert.tsx
- packages/ui/src/components/ConfigureSSO/hooks/useOrganizationEnterpriseConnection.ts
- packages/ui/src/components/ConfigureSSO/steps/ConfigureStep/saml/shared/IdentityProviderConfigurationForm.tsx
- packages/shared/src/types/localization.ts
- packages/localizations/src/en-US.ts
Uh oh!
There was an error while loading. Please reload this page.
iagodahlem
approved these changes
Jun 19, 2026
1 task
9 tasks
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Description
This PR introduces the ability to change the provider on the self-serve SSO flow, which creates a new enterprise connection.
It allows going back from configure to the select provider step, as well as navigating from the domains step to the select provider again.
CleanShot.2026-06-18.at.11.59.03.mp4
Other changes
Checklist
pnpm testruns as expected.pnpm buildruns as expected.Type of change
Summary by CodeRabbit