File tree Expand file tree Collapse file tree
packages/ui/src/components/ConfigureSSO Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -107,17 +107,17 @@ const ConfigureSSOSteps = () => {
107107 < ResetCardErrorOnStepChange />
108108 < ConfigureSSOHeader />
109109
110- < Wizard . Step id = 'select-provider' >
111- < SelectProviderStep />
112- </ Wizard . Step >
113-
114110 < Wizard . Step
115111 id = 'verify-domain'
116112 label = 'Verify domain'
117113 >
118114 < VerifyDomainStep />
119115 </ Wizard . Step >
120116
117+ < Wizard . Step id = 'select-provider' >
118+ < SelectProviderStep />
119+ </ Wizard . Step >
120+
121121 < Wizard . Step
122122 id = 'configure'
123123 label = 'Configure'
Original file line number Diff line number Diff line change @@ -12,16 +12,10 @@ export const deriveInitialStep = (
1212) : WizardStepId => {
1313 const { isDomainTakenByOtherOrg, hasSuccessfulTestRun } = options ;
1414
15- // Go to the verify domain step in order to display warning
16- if ( isDomainTakenByOtherOrg ) {
15+ if ( isDomainTakenByOtherOrg || ! enterpriseConnection ) {
1716 return 'verify-domain' ;
1817 }
1918
20- // If no initial connection, go to the select provider step
21- if ( ! enterpriseConnection ) {
22- return 'select-provider' ;
23- }
24-
2519 // Connection is enabled, go to the confirmation step
2620 const isEnabled = enterpriseConnection ?. active ;
2721 if ( isEnabled ) {
Original file line number Diff line number Diff line change @@ -313,7 +313,6 @@ export const EnterVerificationCodeStep = ({
313313 emailAddressRef : React . MutableRefObject < EmailAddressResource | undefined > ;
314314} ) : JSX . Element | null => {
315315 const { user } = useUser ( ) ;
316- const { provider, createEnterpriseConnection } = useConfigureSSO ( ) ;
317316 const card = useCardState ( ) ;
318317 const { goNext, goPrev } = useWizard ( ) ;
319318 const primaryEmailAddress = user ?. primaryEmailAddress ;
@@ -357,18 +356,6 @@ export const EnterVerificationCodeStep = ({
357356 }
358357 }
359358
360- if ( ! provider ) {
361- void goNext ( ) ;
362- return ;
363- }
364-
365- try {
366- await createEnterpriseConnection ( provider , emailToVerify ) ;
367- } catch ( err ) {
368- handleError ( err as Error , [ ] , card . setError ) ;
369- return ;
370- }
371-
372359 void goNext ( ) ;
373360 } ,
374361 } ) ;
You can’t perform that action at this time.
0 commit comments