Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/tall-banks-invite.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@clerk/ui': patch
---

Make verify domain step complete when any domain is verified.
16 changes: 10 additions & 6 deletions packages/ui/src/components/ConfigureSSO/ConfigureSSOWizard.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,10 @@ import { CardStateProvider } from '@/elements/contexts';

import { ConfigureSSOProvider } from './ConfigureSSOContext';
import { ConfigureSSOHeader } from './ConfigureSSOHeader';
import { areAllOrganizationDomainsVerified } from './domain/organizationEnterpriseConnection';
import {
areAllOrganizationDomainsVerified,
hasAnyOrganizationDomainsVerified,
} from './domain/organizationEnterpriseConnection';
import { Wizard, type WizardStepConfig } from './elements/Wizard';
import { ActivateStep, ConfigureStep, OrganizationDomainsStep, TestConfigurationStep } from './steps';

Expand All @@ -17,30 +20,31 @@ export const ConfigureSSOWizard = ({ title, forceInitialStep, ...props }: Config
const { organizationEnterpriseConnection: c, organizationDomains } = props;

const allDomainsVerified = areAllOrganizationDomainsVerified(organizationDomains);
const hasAnyDomainsVerified = hasAnyOrganizationDomainsVerified(organizationDomains);

const steps = React.useMemo<WizardStepConfig[]>(
() => [
{ id: 'verify-domain', label: 'Domains', isComplete: () => allDomainsVerified },
{ id: 'verify-domain', label: 'Domains', isComplete: () => hasAnyDomainsVerified },
{
id: 'configure',
label: 'Connection',
isReachable: () => allDomainsVerified || c.hasConnection,
isReachable: () => allDomainsVerified && c.hasConnection,
isComplete: () => c.hasMinimumConfiguration || c.isActive,
},
{
id: 'test',
label: 'Test',
isReachable: () => c.hasMinimumConfiguration || c.isActive,
isReachable: () => allDomainsVerified && (c.hasMinimumConfiguration || c.isActive),
isComplete: () => c.hasSuccessfulTestRun || c.isActive,
},
{
id: 'activate',
label: 'Activate',
isReachable: () => c.hasSuccessfulTestRun || c.isActive,
isReachable: () => allDomainsVerified && (c.hasSuccessfulTestRun || c.isActive),
isComplete: () => c.isActive,
},
],
[c, allDomainsVerified],
[c, allDomainsVerified, hasAnyDomainsVerified],
);

const initialStepId = forceInitialStep ? steps[0].id : undefined;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,9 @@ export const isEnterpriseConnectionConfigured = (
export const areAllOrganizationDomainsVerified = (domains: OrganizationDomainResource[] | null | undefined): boolean =>
!!domains?.length && domains.every(domain => domain.ownershipVerification?.status === 'verified');

export const hasAnyOrganizationDomainsVerified = (domains: OrganizationDomainResource[] | null | undefined): boolean =>
!!domains?.length && domains.some(domain => domain.ownershipVerification?.status === 'verified');

const connectionStatus = ({
hasConnection,
isActive,
Expand Down
Loading