Skip to content
Draft
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/lucky-tables-learn.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@clerk/ui': patch
---

Add wizard steps for the `<__experimental_ConfigureSSO />` component
9 changes: 9 additions & 0 deletions packages/clerk-js/src/core/clerk.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1457,6 +1457,15 @@ export class Clerk implements ClerkInterface {
return;
}

if (noUserExists(this)) {
if (this.#instanceType === 'development') {
throw new ClerkRuntimeError(warnings.cannotRenderConfigureSSOComponentWhenUserDoesNotExist, {
code: CANNOT_RENDER_USER_MISSING_ERROR_CODE,
});
}
return;
}

this.assertComponentsReady(this.#clerkUI);
const component = 'ConfigureSSO';
void this.#clerkUI
Expand Down
20 changes: 20 additions & 0 deletions packages/localizations/src/en-US.ts
Original file line number Diff line number Diff line change
Expand Up @@ -204,6 +204,26 @@ export const enUS: LocalizationResource = {
navbar: {
title: 'Configure Single Sign-On (SSO)',
},
verifyEmailDomainStep: {
Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'll replicate this across locales once I get a first pass on the PR review, just to avoid a huge diff

title: 'Verify email address',
subtitle: 'Verify the email address you want to enable the enterprise connection on.',
addEmailAddress: {
formTitle: 'We need your email',
formSubtitle: 'In order to start we will need your email address',
inputPlaceholder: 'name@company.com',
inputLabel: 'Email address',
},
emailCode: {
formTitle: 'Verify your email address',
formSubtitle: 'Enter the verification code sent to {{identifier}}',
resendButton: "Didn't receive a code? Resend",
verified: {
title: 'We got your email',
subtitle: "You've verified your email address with the following email",
inputLabel: 'Verified email address',
},
},
},
},
createOrganization: {
formButtonSubmit: 'Create organization',
Expand Down
2 changes: 2 additions & 0 deletions packages/shared/src/internal/clerk-js/warnings.ts
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,8 @@ const warnings = {
'The <APIKeys/> component cannot be rendered when organization API keys are disabled. Since organization API keys are disabled, this is no-op.',
cannotRenderOAuthConsentComponentWhenUserDoesNotExist:
'<OAuthConsent/> cannot render unless a user is signed in. Since no user is signed in, this is no-op.',
cannotRenderConfigureSSOComponentWhenUserDoesNotExist:
'<ConfigureSSO/> cannot render unless a user is signed in. Since no user is signed in, this is no-op.',
cannotRenderConfigureSSOComponentWhenDisabled:
'The <ConfigureSSO/> component cannot be rendered when self-serve SSO is disabled. Visit `https://dashboard.clerk.com` to enable the feature. Since self-serve SSO is disabled, this is no-op.',
cannotRenderConfigureSSOComponentWhenEmailAddressDisabled:
Expand Down
20 changes: 20 additions & 0 deletions packages/shared/src/types/localization.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1296,6 +1296,26 @@ export type __internal_LocalizationResource = {
navbar: {
title: LocalizationValue;
};
verifyEmailDomainStep: {
title: LocalizationValue;
subtitle: LocalizationValue;
addEmailAddress: {
formTitle: LocalizationValue;
formSubtitle: LocalizationValue;
inputPlaceholder: LocalizationValue;
inputLabel: LocalizationValue;
};
emailCode: {
formTitle: LocalizationValue;
formSubtitle: LocalizationValue<'identifier'>;
resendButton: LocalizationValue;
verified: {
title: LocalizationValue;
subtitle: LocalizationValue;
inputLabel: LocalizationValue;
};
};
};
};
apiKeys: {
formTitle: LocalizationValue;
Expand Down
112 changes: 102 additions & 10 deletions packages/ui/src/components/ConfigureSSO/ConfigureSSO.tsx
Original file line number Diff line number Diff line change
@@ -1,26 +1,28 @@
import { useOrganization } from '@clerk/shared/react/index';
import { __internal_useUserEnterpriseConnections, useOrganization, useUser } from '@clerk/shared/react';
import type { __experimental_ConfigureSSOProps } from '@clerk/shared/types';
import React from 'react';

import { useEnvironment, withCoreUserGuard } from '@/contexts';
import { Box, Col, Flex, Flow, Icon, localizationKeys, Text, useAppearance } from '@/customizables';
import { Box, Col, descriptors, Flex, Flow, Icon, localizationKeys, Text, useAppearance } from '@/customizables';
import { ApplicationLogo } from '@/elements/ApplicationLogo';
import { withCardStateProvider } from '@/elements/contexts';
import { NavBar, NavbarContextProvider } from '@/elements/Navbar';
import { ProfileCard } from '@/elements/ProfileCard';
import { BoxIcon } from '@/icons';
import { Route, Switch } from '@/router';

import { ConfigureSSOFlowProvider } from './ConfigureSSOContext';
import { ConfigureCreateApp, ConfirmationStep, ProvideEmail, TestConfigurationStep, VerifyDomainStep } from './steps';
import { ConfigureSSOWizard } from './wizard';

const ConfigureSSOInternal = () => {
return (
<Flow.Root flow='configureSSO'>
<Flow.Part>
<Switch>
<Route>
<AuthenticatedContent />
</Route>
</Switch>
</Flow.Part>
<Switch>
<Route>
<AuthenticatedContent />
</Route>
</Switch>
</Flow.Root>
);
};
Expand All @@ -32,6 +34,11 @@ const AuthenticatedContent = withCoreUserGuard(() => {
const { parsedOptions } = useAppearance();
const hasLogo = Boolean(parsedOptions.logoImageUrl || logoImageUrl);

const { data: enterpriseConnections, isLoading: isLoadingEnterpriseConnections } =
__internal_useUserEnterpriseConnections({ enabled: true });
// Currently FAPI only supports one enterprise connection per user
const enterpriseConnection = enterpriseConnections?.[0];

return (
<ProfileCard.Root
sx={t => ({ display: 'grid', gridTemplateColumns: '1fr 3fr', height: t.sizes.$176, overflow: 'hidden' })}
Expand Down Expand Up @@ -89,12 +96,97 @@ const AuthenticatedContent = withCoreUserGuard(() => {
routes={[]}
contentRef={contentRef}
/>
<ProfileCard.Content contentRef={contentRef} />
<Col
ref={contentRef}
elementDescriptor={descriptors.scrollBox}
sx={t => ({
backgroundColor: t.colors.$colorBackground,
position: 'relative',
borderRadius: t.radii.$lg,
width: '100%',
overflow: 'hidden',
borderWidth: t.borderWidths.$normal,
borderStyle: t.borderStyles.$solid,
borderColor: t.colors.$borderAlpha150,
marginBlock: '-1px',
marginInlineEnd: '-1px',
flex: 1,
})}
>
<ConfigureSSOFlowProvider
enterpriseConnection={enterpriseConnection}
isLoading={isLoadingEnterpriseConnections}
>
<ConfigureSSOSteps />
</ConfigureSSOFlowProvider>
</Col>
</NavbarContextProvider>
</ProfileCard.Root>
);
});

const ConfigureSSOSteps = () => {
const { user } = useUser();

const hasEmailAddress = Boolean(user?.emailAddresses?.length);

return (
<ConfigureSSOWizard>
<ConfigureSSOWizard.Step
id='verify-email-domain'
path='verify-email-domain'
label='Verify domain'
>
<ConfigureSSOWizard>
{!hasEmailAddress && (
<ConfigureSSOWizard.Step
id='provide-email'
path='provide-email'
>
<ProvideEmail />
</ConfigureSSOWizard.Step>
)}
<ConfigureSSOWizard.Step
id='verify-domain'
path='verify-domain'
>
<VerifyDomainStep />
</ConfigureSSOWizard.Step>
</ConfigureSSOWizard>
</ConfigureSSOWizard.Step>
<ConfigureSSOWizard.Step
id='configure'
path='configure'
label='Configure'
>
<ConfigureSSOWizard>
{/* TODO: Implement configure steps */}
<ConfigureSSOWizard.Step
id='create-app'
path='create-app'
>
<ConfigureCreateApp />
</ConfigureSSOWizard.Step>
</ConfigureSSOWizard>
</ConfigureSSOWizard.Step>
<ConfigureSSOWizard.Step
id='test'
path='test'
label='Test'
>
<TestConfigurationStep />
</ConfigureSSOWizard.Step>
<ConfigureSSOWizard.Step
id='confirmation'
path='confirmation'
label='Confirmation'
>
<ConfirmationStep />
</ConfigureSSOWizard.Step>
</ConfigureSSOWizard>
);
};

const OrganizationSidebarSubtitle = () => {
const { organization } = useOrganization();

Expand Down
52 changes: 52 additions & 0 deletions packages/ui/src/components/ConfigureSSO/ConfigureSSOContext.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
import type { EnterpriseConnectionResource } from '@clerk/shared/types';
import React, { type PropsWithChildren } from 'react';

/**
* Shared form state for the ConfigureSSO wizard, persisted across steps
*/
export interface ConfigureSSOData {
/**
* The enterprise connection from the user's primary email address domain
*/
enterpriseConnection: EnterpriseConnectionResource | undefined;
}

export interface ConfigureSSOContextValue extends ConfigureSSOData {
/**
* `true` while the parent is still fetching the user's enterprise
* connection
*/
isLoading: boolean;
}

interface ConfigureSSOFlowProviderProps {
enterpriseConnection: EnterpriseConnectionResource | undefined;
isLoading: boolean;
}

const ConfigureSSOFlowContext = React.createContext<ConfigureSSOContextValue | null>(null);
ConfigureSSOFlowContext.displayName = 'ConfigureSSOFlowContext';

export const ConfigureSSOFlowProvider = ({
enterpriseConnection,
isLoading,
children,
}: PropsWithChildren<ConfigureSSOFlowProviderProps>): JSX.Element => {
const value = React.useMemo<ConfigureSSOContextValue>(
() => ({
enterpriseConnection,
isLoading,
}),
[enterpriseConnection, isLoading],
);

return <ConfigureSSOFlowContext.Provider value={value}>{children}</ConfigureSSOFlowContext.Provider>;
};

export const useConfigureSSOFlow = (): ConfigureSSOContextValue => {
const ctx = React.useContext(ConfigureSSOFlowContext);
if (!ctx) {
throw new Error('useConfigureSSOFlow called outside <ConfigureSSOFlowProvider>.');
}
return ctx;
};
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
import { Flow, Text } from '@/customizables';

import { useConfigureSSOWizard, useRegisterContinueAction } from '../wizard';
import { StepLayout } from './StepLayout';

export const ConfigureCreateApp = (): JSX.Element => {
const { goNext } = useConfigureSSOWizard();

useRegisterContinueAction({
handler: () => goNext(),
});

return (
<Flow.Part part='configureCreateApp'>
<StepLayout
title='Configure Okta Workforce'
subtitle='Create a new enterprise application in your Okta Dashboard.'
>
<Text>UI goes here</Text>
</StepLayout>
</Flow.Part>
);
};
13 changes: 13 additions & 0 deletions packages/ui/src/components/ConfigureSSO/steps/ConfirmationStep.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
import { Flow, Text } from '@/customizables';

import { StepLayout } from './StepLayout';

export const ConfirmationStep = (): JSX.Element => {
return (
<Flow.Part part='sso-confirmation'>
<StepLayout>
<Text>UI goes here</Text>
</StepLayout>
</Flow.Part>
);
};
Loading
Loading