Uh oh!
There was an error while loading. Please reload this page.
- Notifications
You must be signed in to change notification settings - Fork 469
feat(ui,shared,localizations): Allow changing provider in self-serve SSO#8881
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.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
iagodahlem
merged 11 commits into
main
from
laura/orgs-1632-sdk-update-select-provider-to-be-part-of-configure-stepJun 19, 2026
Uh oh!
There was an error while loading. Please reload this page.
Merged
Changes from all commits
Commits
Show all changes
11 commits
Select commit
Hold shift + click to select a range
6348fe1
Add localizations
LauraBeatris c3b6c3f
Add descriptors
LauraBeatris 39ec1ba
Move select-provider as part of configure step
LauraBeatris e90231b
Integrate change provider dialog
LauraBeatris 4bfb96f
Allow navigating back to select provider from configure
LauraBeatris 8b0a72c
Add changeset
LauraBeatris fd12b0f
Update copy according to the last UI prototype
LauraBeatris 5d807db
Improve attribute mapping table from Microsoft
LauraBeatris 5714662
Fix size of segment control for IdP metadata
LauraBeatris 85717e7
Display alert on IdP configuration form for active connection
LauraBeatris 6838daf
Add dismiss state for alert
LauraBeatris File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Uh oh!
There was an error while loading. Please reload this page.
Jump to
Jump to file
Failed to load files.
Loading
Uh oh!
There was an error while loading. Please reload this page.
Diff view
Diff view
There are no files selected for viewing
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,8 @@ | ||
| --- | ||
| '@clerk/localizations': patch | ||
| '@clerk/clerk-js': patch | ||
| '@clerk/shared': patch | ||
| '@clerk/ui': patch | ||
| --- | ||
| Allow changing enterprise connection provider between self-serve SSO steps |
Large diffs are not rendered by default.
Oops, something went wrong.
Uh oh!
There was an error while loading. Please reload this page.
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
97 changes: 97 additions & 0 deletions
97 packages/ui/src/components/ConfigureSSO/ChangeProviderDialog.tsx
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,97 @@ | ||
| import type { LocalizationKey } from '@/customizables'; | ||
| import { Button, Col, descriptors, Flex, Heading, localizationKeys, Text, useLocalizations } from '@/customizables'; | ||
| import { Card } from '@/elements/Card'; | ||
| import { withCardStateProvider } from '@/elements/contexts'; | ||
| import { Modal } from '@/elements/Modal'; | ||
| type ChangeProviderDialogProps = { | ||
| isOpen: boolean; | ||
| onClose: () => void; | ||
| onConfirm: () => void; | ||
| isSubmitting?: boolean; | ||
| nextProviderLabel: LocalizationKey; | ||
| currentProviderLabel: LocalizationKey; | ||
| contentRef: React.RefObject<HTMLDivElement>; | ||
| }; | ||
| export const ChangeProviderDialog = (props: ChangeProviderDialogProps): JSX.Element | null => { | ||
| if (!props.isOpen) { | ||
| return null; | ||
| } | ||
| return ( | ||
| <Modal | ||
| handleClose={props.onClose} | ||
| canCloseModal={false} | ||
| portalRoot={props.contentRef} | ||
| containerSx={t => ({ | ||
| alignItems: 'center', | ||
| position: 'absolute', | ||
| inset: 0, | ||
| width: 'auto', | ||
| height: 'auto', | ||
| backgroundColor: 'inherit', | ||
| backdropFilter: `blur(${t.sizes.$2})`, | ||
| })} | ||
| > | ||
| <ChangeProviderDialogContent {...props} /> | ||
| </Modal> | ||
| ); | ||
| }; | ||
| const ChangeProviderDialogContent = withCardStateProvider((props: ChangeProviderDialogProps) => { | ||
| const { onClose, onConfirm, isSubmitting, nextProviderLabel, currentProviderLabel } = props; | ||
| const { t } = useLocalizations(); | ||
| const nextProvider = t(nextProviderLabel); | ||
| const currentProvider = t(currentProviderLabel); | ||
| return ( | ||
| <Card.Root | ||
| elementDescriptor={descriptors.configureSSOChangeProviderDialog} | ||
| sx={t => ({ borderRadius: t.radii.$md })} | ||
| > | ||
| <Card.Content sx={t => ({ textAlign: 'start', padding: t.sizes.$5 })}> | ||
| <Col sx={t => ({ gap: t.space.$4 })}> | ||
| <Col sx={t => ({ gap: t.space.$2 })}> | ||
| <Heading | ||
| textVariant='h2' | ||
| localizationKey={localizationKeys('configureSSO.changeProviderDialog.title', { | ||
| provider: nextProvider, | ||
| })} | ||
| sx={t => ({ fontSize: t.fontSizes.$md })} | ||
| /> | ||
| <Text | ||
| as='p' | ||
| colorScheme='secondary' | ||
| localizationKey={localizationKeys('configureSSO.changeProviderDialog.subtitle', { | ||
| provider: nextProvider, | ||
| currentProvider, | ||
| })} | ||
| /> | ||
| </Col> | ||
| <Flex | ||
| justify='end' | ||
| sx={t => ({ gap: t.space.$3 })} | ||
| > | ||
| <Button | ||
| elementDescriptor={descriptors.configureSSOChangeProviderDialogCancelButton} | ||
| variant='ghost' | ||
| isDisabled={isSubmitting} | ||
| onClick={onClose} | ||
| localizationKey={localizationKeys('configureSSO.changeProviderDialog.cancelButton')} | ||
| /> | ||
| <Button | ||
| elementDescriptor={descriptors.configureSSOChangeProviderDialogConfirmButton} | ||
| variant='solid' | ||
| isLoading={isSubmitting} | ||
| onClick={onConfirm} | ||
| localizationKey={localizationKeys('configureSSO.changeProviderDialog.confirmButton')} | ||
| /> | ||
| </Flex> | ||
| </Col> | ||
| </Card.Content> | ||
| </Card.Root> | ||
| ); | ||
| }); |
20 changes: 5 additions & 15 deletions
20 packages/ui/src/components/ConfigureSSO/ConfigureSSOWizard.tsx
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
16 changes: 16 additions & 0 deletions
16 packages/ui/src/components/ConfigureSSO/__tests__/ConfigureSSO.navigation.test.tsx
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
22 changes: 22 additions & 0 deletions
22 packages/ui/src/components/ConfigureSSO/hooks/useOrganizationEnterpriseConnection.ts
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
Oops, something went wrong.
Uh oh!
There was an error while loading. Please reload this page.
Oops, something went wrong.
Uh oh!
There was an error while loading. Please reload this page.
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.
Uh oh!
There was an error while loading. Please reload this page.