Merged
7 changes: 7 additions & 0 deletions .changeset/upset-results-win.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
---
'@clerk/localizations': minor
'@clerk/clerk-js': minor
'@clerk/types': minor
---

Introduce experimental step to choose enterprise connection on sign-in/sign-up
2 changes: 2 additions & 0 deletions .typedoc/__tests__/__snapshots__/file-structure.test.ts.snap
Original file line numberDiff line numberDiff line change
Expand Up@@ -127,6 +127,8 @@ exports[`Typedoc output > should have a deliberate file structure 1`] = `
"types/sign-in-signal-value.mdx",
"types/sign-out.mdx",
"types/sign-up-authenticate-with-metamask-params.mdx",
"types/sign-up-enterprise-connection-json.mdx",
"types/sign-up-enterprise-connection-resource.mdx",
"types/sign-up-future-resource.mdx",
"types/sign-up-resource.mdx",
"types/signed-in-session-resource.mdx",
Expand Down
2 changes: 1 addition & 1 deletion packages/clerk-js/bundlewatch.config.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,7 +16,7 @@
{ "path": "./dist/organizationswitcher*.js", "maxSize": "5KB" },
{ "path": "./dist/organizationlist*.js", "maxSize": "5.5KB" },
{ "path": "./dist/signin*.js", "maxSize": "18KB" },
{ "path": "./dist/signup*.js", "maxSize": "8.86KB" },
{ "path": "./dist/signup*.js", "maxSize": "9.5KB" },
{ "path": "./dist/userbutton*.js", "maxSize": "5KB" },
{ "path": "./dist/userprofile*.js", "maxSize": "16KB" },
{ "path": "./dist/userverification*.js", "maxSize": "5KB" },
Expand Down
5 changes: 4 additions & 1 deletion packages/clerk-js/src/core/resources/SignIn.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -222,6 +222,7 @@ export class SignIn extends BaseResource implements SignInResource {
redirectUrl: params.redirectUrl,
actionCompleteRedirectUrl: params.actionCompleteRedirectUrl,
oidcPrompt: params.oidcPrompt,
enterpriseConnectionId: params.enterpriseConnectionId,
} as EnterpriseSSOConfig;
break;
default:
Expand DownExpand Up@@ -308,7 +309,8 @@ export class SignIn extends BaseResource implements SignInResource {
params: AuthenticateWithRedirectParams,
navigateCallback: (url: URL | string) => void,
): Promise<void> => {
const { strategy, redirectUrlComplete, identifier, oidcPrompt, continueSignIn } = params || {};
const { strategy, redirectUrlComplete, identifier, oidcPrompt, continueSignIn, enterpriseConnectionId } =
params || {};
const actionCompleteRedirectUrl = redirectUrlComplete;

const redirectUrl = SignIn.clerk.buildUrlWithAuth(params.redirectUrl);
Expand All@@ -328,6 +330,7 @@ export class SignIn extends BaseResource implements SignInResource {
redirectUrl,
actionCompleteRedirectUrl,
oidcPrompt,
enterpriseConnectionId,
});
}

Expand Down
34 changes: 34 additions & 0 deletions packages/clerk-js/src/core/resources/SignUp.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,6 +16,8 @@ import type {
PrepareWeb3WalletVerificationParams,
SignUpAuthenticateWithWeb3Params,
SignUpCreateParams,
SignUpEnterpriseConnectionJSON,
SignUpEnterpriseConnectionResource,
SignUpField,
SignUpFutureCreateParams,
SignUpFutureEmailCodeVerifyParams,
Expand DownExpand Up@@ -385,6 +387,7 @@ export class SignUp extends BaseResource implements SignUpResource {
emailAddress,
legalAccepted,
oidcPrompt,
enterpriseConnectionId,
} = params;

const redirectUrlWithAuthToken = SignUp.clerk.buildUrlWithAuth(redirectUrl);
Expand All@@ -398,6 +401,7 @@ export class SignUp extends BaseResource implements SignUpResource {
emailAddress,
legalAccepted,
oidcPrompt,
enterpriseConnectionId,
};
return continueSignUp && this.id ? this.update(authParams) : this.create(authParams);
};
Expand DownExpand Up@@ -551,6 +555,17 @@ export class SignUp extends BaseResource implements SignUpResource {

return false;
}

__experimental_getEnterpriseConnections = (): Promise<SignUpEnterpriseConnectionResource[]> => {
return BaseResource._fetch({
path: `/client/sign_ups/${this.id}/enterprise_connections`,
method: 'GET',
}).then(res => {
const enterpriseConnections = res?.response as unknown as SignUpEnterpriseConnectionJSON[];

return enterpriseConnections.map(enterpriseConnection => new SignUpEnterpriseConnection(enterpriseConnection));
});
};
Comment thread
LauraBeatris marked this conversation as resolved.
}

class SignUpFuture implements SignUpFutureResource {
Expand DownExpand Up@@ -889,3 +904,22 @@ class SignUpFuture implements SignUpFutureResource {
});
}
}

class SignUpEnterpriseConnection extends BaseResource implements SignUpEnterpriseConnectionResource {
id!: string;
name!: string;

constructor(data: SignUpEnterpriseConnectionJSON) {
super();
this.fromJSON(data);
}

protected fromJSON(data: SignUpEnterpriseConnectionJSON | null): this {
if (data) {
this.id = data.id;
this.name = data.name;
}

return this;
}
}
123 changes: 123 additions & 0 deletions packages/clerk-js/src/ui/common/ChooseEnterpriseConnectionCard.tsx
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,123 @@
import { useState } from 'react';

import type { LocalizationKey } from '@/ui/customizables';
import { descriptors, Flex, Grid, SimpleButton, Spinner, Text } from '@/ui/customizables';
import { Card } from '@/ui/elements/Card';
import { useCardState } from '@/ui/elements/contexts';
import { Header } from '@/ui/elements/Header';
import type { InternalTheme, PropsOfComponent } from '@/ui/styledSystem';

type ChooseEnterpriseConnectionCardProps = {
title: LocalizationKey;
subtitle: LocalizationKey;
onClick: (id: string) => Promise<void>;
enterpriseConnections: Array<{ id: string; name: string }>;
};

/**
* @experimental
*/
export const ChooseEnterpriseConnectionCard = ({
title,
subtitle,
onClick,
enterpriseConnections,
}: ChooseEnterpriseConnectionCardProps) => {
const card = useCardState();
Comment thread
LauraBeatris marked this conversation as resolved.

return (
<Card.Root>
<Card.Content>
<Header.Root showLogo>
<Header.Title localizationKey={title} />
<Header.Subtitle localizationKey={subtitle} />
</Header.Root>
<Card.Alert>{card.error}</Card.Alert>

<Grid
elementDescriptor={descriptors.enterpriseConnectionsRoot}
gap={2}
>
{enterpriseConnections?.map(({ id, name }) => (
<ChooseEnterpriseConnectionButton
key={id}
id={id}
label={name}
onClick={onClick}
/>
))}
</Grid>
</Card.Content>

<Card.Footer />
</Card.Root>
);
};

type ChooseEnterpriseConnectionButtonProps = Omit<PropsOfComponent<typeof SimpleButton>, 'onClick'> & {
id: string;
label?: string;
onClick: (id: string) => Promise<void>;
};

const ChooseEnterpriseConnectionButton = (props: ChooseEnterpriseConnectionButtonProps): JSX.Element => {

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Any way to reuse the SocialButtonBlock component vs creating this duplication?

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

I thought of not reusing since this is an experimental UI, and I wanted to minimize the changes for the core flows.

We could extract SocialButtonBlock to a UI component that receives custom descriptors, and rename it to a more generic approach for enterprise connections.

const { label, onClick, ...rest } = props;
const [isLoading, setIsLoading] = useState(false);

const handleClick = () => {
setIsLoading(true);
void onClick(props.id).catch(() => setIsLoading(false));
};

return (
<SimpleButton
elementDescriptor={descriptors.enterpriseConnectionButton}
variant='outline'
block
isLoading={isLoading}
hoverAsFocus
onClick={handleClick}
{...rest}
sx={(theme: InternalTheme) => [
{
gap: theme.space.$4,
position: 'relative',
justifyContent: 'flex-start',
},
(rest as any).sx,
]}
>
<Flex
justify='center'
align='center'
as='span'
gap={3}
sx={{
width: '100%',
overflow: 'hidden',
}}
>
{isLoading && (
<Flex
as='span'
center
sx={(theme: InternalTheme) => ({ flex: `0 0 ${theme.space.$4}` })}
>
<Spinner
size='sm'
elementDescriptor={descriptors.spinner}
/>
</Flex>
)}
<Text
elementDescriptor={descriptors.enterpriseConnectionButtonText}
as='span'
truncate
variant='buttonLarge'
>
{label}
</Text>
</Flex>
</SimpleButton>
);
};
11 changes: 11 additions & 0 deletions packages/clerk-js/src/ui/components/SignIn/SignInFactorOne.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -12,9 +12,11 @@ import { useAlternativeStrategies } from '../../hooks/useAlternativeStrategies';
import { localizationKeys } from '../../localization';
import { useRouter } from '../../router';
import { AlternativeMethods } from './AlternativeMethods';
import { hasMultipleEnterpriseConnections } from './shared';
import { SignInFactorOneAlternativePhoneCodeCard } from './SignInFactorOneAlternativePhoneCodeCard';
import { SignInFactorOneEmailCodeCard } from './SignInFactorOneEmailCodeCard';
import { SignInFactorOneEmailLinkCard } from './SignInFactorOneEmailLinkCard';
import { SignInFactorOneEnterpriseConnections } from './SignInFactorOneEnterpriseConnections';
import { SignInFactorOneForgotPasswordCard } from './SignInFactorOneForgotPasswordCard';
import { SignInFactorOnePasskey } from './SignInFactorOnePasskey';
import { SignInFactorOnePasswordCard } from './SignInFactorOnePasswordCard';
Expand DownExpand Up@@ -122,6 +124,15 @@ function SignInFactorOneInternal(): JSX.Element {
prevCurrentFactor: prev.currentFactor,
}));
};

/**
* Prompt to choose between a list of enterprise connections as supported first factors
* @experimental
*/
if (hasMultipleEnterpriseConnections(signIn.supportedFirstFactors)) {
return <SignInFactorOneEnterpriseConnections />;
}

if (showAllStrategies || showForgotPasswordStrategies) {
const canGoBack = factorHasLocalStrategy(currentFactor);

Expand Down
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,82 @@
import { useClerk } from '@clerk/shared/react/index';
import type { ComponentType } from 'react';

import { buildSSOCallbackURL, withRedirect } from '@/ui/common';
import { ChooseEnterpriseConnectionCard } from '@/ui/common/ChooseEnterpriseConnectionCard';
import { useCoreSignIn, useEnvironment, useSignInContext } from '@/ui/contexts';
import { Flow, localizationKeys } from '@/ui/customizables';
import { withCardStateProvider } from '@/ui/elements/contexts';
import type { AvailableComponentProps } from '@/ui/types';

import { hasMultipleEnterpriseConnections } from './shared';

/**
* @experimental
*/
const SignInFactorOneEnterpriseConnectionsInternal = () => {
const ctx = useSignInContext();
const { displayConfig } = useEnvironment();

const clerk = useClerk();
const signIn = clerk.client.signIn;

if (!hasMultipleEnterpriseConnections(signIn.supportedFirstFactors)) {
// This should not happen due to the HOC guard, but provides type safety
return null;
}
Comment thread
LauraBeatris marked this conversation as resolved.

const enterpriseConnections = signIn.supportedFirstFactors.map(ff => ({
id: ff.enterpriseConnectionId,
name: ff.enterpriseConnectionName,
}));

const handleEnterpriseSSO = (enterpriseConnectionId: string) => {
const redirectUrl = buildSSOCallbackURL(ctx, displayConfig.signInUrl);
const redirectUrlComplete = ctx.afterSignInUrl || '/';

return signIn.authenticateWithRedirect({
strategy: 'enterprise_sso',
redirectUrl,
redirectUrlComplete,
oidcPrompt: ctx.oidcPrompt,
continueSignIn: true,
enterpriseConnectionId,
});
};
Comment thread
LauraBeatris marked this conversation as resolved.
Comment thread
LauraBeatris marked this conversation as resolved.

return (
<Flow.Part part='enterpriseConnections'>
<ChooseEnterpriseConnectionCard
title={localizationKeys('signIn.enterpriseConnections.title')}
subtitle={localizationKeys('signIn.enterpriseConnections.subtitle')}
onClick={handleEnterpriseSSO}
enterpriseConnections={enterpriseConnections}
/>
</Flow.Part>
);
};

const withEnterpriseConnectionsGuard = <P extends AvailableComponentProps>(Component: ComponentType<P>) => {
const displayName = Component.displayName || Component.name || 'Component';
Component.displayName = displayName;

const HOC = (props: P) => {
const signIn = useCoreSignIn();
const signInCtx = useSignInContext();

return withRedirect(
Component,
() => !hasMultipleEnterpriseConnections(signIn.supportedFirstFactors),
({ clerk }) => signInCtx.signInUrl || clerk.buildSignInUrl(),
'There are no enterprise connections available to sign-in. Clerk is redirecting to the `signInUrl` instead.',
)(props);
Comment thread
LauraBeatris marked this conversation as resolved.
};
Comment thread
coderabbitai[bot] marked this conversation as resolved.

HOC.displayName = `withEnterpriseConnectionsGuard(${displayName})`;

return HOC;
};

export const SignInFactorOneEnterpriseConnections = withCardStateProvider(
withEnterpriseConnectionsGuard(SignInFactorOneEnterpriseConnectionsInternal),
);
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Skip to content
Merged
7 changes: 7 additions & 0 deletions .changeset/upset-results-win.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
---
'@clerk/localizations': minor
'@clerk/clerk-js': minor
'@clerk/types': minor
---

Introduce experimental step to choose enterprise connection on sign-in/sign-up
2 changes: 2 additions & 0 deletions .typedoc/__tests__/__snapshots__/file-structure.test.ts.snap
Original file line numberDiff line numberDiff line change
Expand Up@@ -127,6 +127,8 @@ exports[`Typedoc output > should have a deliberate file structure 1`] = `
"types/sign-in-signal-value.mdx",
"types/sign-out.mdx",
"types/sign-up-authenticate-with-metamask-params.mdx",
"types/sign-up-enterprise-connection-json.mdx",
"types/sign-up-enterprise-connection-resource.mdx",
"types/sign-up-future-resource.mdx",
"types/sign-up-resource.mdx",
"types/signed-in-session-resource.mdx",
Expand Down
2 changes: 1 addition & 1 deletion packages/clerk-js/bundlewatch.config.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,7 +16,7 @@
{ "path": "./dist/organizationswitcher*.js", "maxSize": "5KB" },
{ "path": "./dist/organizationlist*.js", "maxSize": "5.5KB" },
{ "path": "./dist/signin*.js", "maxSize": "18KB" },
{ "path": "./dist/signup*.js", "maxSize": "8.86KB" },
{ "path": "./dist/signup*.js", "maxSize": "9.5KB" },
{ "path": "./dist/userbutton*.js", "maxSize": "5KB" },
{ "path": "./dist/userprofile*.js", "maxSize": "16KB" },
{ "path": "./dist/userverification*.js", "maxSize": "5KB" },
Expand Down
5 changes: 4 additions & 1 deletion packages/clerk-js/src/core/resources/SignIn.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -222,6 +222,7 @@ export class SignIn extends BaseResource implements SignInResource {
redirectUrl: params.redirectUrl,
actionCompleteRedirectUrl: params.actionCompleteRedirectUrl,
oidcPrompt: params.oidcPrompt,
enterpriseConnectionId: params.enterpriseConnectionId,
} as EnterpriseSSOConfig;
break;
default:
Expand DownExpand Up@@ -308,7 +309,8 @@ export class SignIn extends BaseResource implements SignInResource {
params: AuthenticateWithRedirectParams,
navigateCallback: (url: URL | string) => void,
): Promise<void> => {
const { strategy, redirectUrlComplete, identifier, oidcPrompt, continueSignIn } = params || {};
const { strategy, redirectUrlComplete, identifier, oidcPrompt, continueSignIn, enterpriseConnectionId } =
params || {};
const actionCompleteRedirectUrl = redirectUrlComplete;

const redirectUrl = SignIn.clerk.buildUrlWithAuth(params.redirectUrl);
Expand All@@ -328,6 +330,7 @@ export class SignIn extends BaseResource implements SignInResource {
redirectUrl,
actionCompleteRedirectUrl,
oidcPrompt,
enterpriseConnectionId,
});
}

Expand Down
34 changes: 34 additions & 0 deletions packages/clerk-js/src/core/resources/SignUp.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,6 +16,8 @@ import type {
PrepareWeb3WalletVerificationParams,
SignUpAuthenticateWithWeb3Params,
SignUpCreateParams,
SignUpEnterpriseConnectionJSON,
SignUpEnterpriseConnectionResource,
SignUpField,
SignUpFutureCreateParams,
SignUpFutureEmailCodeVerifyParams,
Expand DownExpand Up@@ -385,6 +387,7 @@ export class SignUp extends BaseResource implements SignUpResource {
emailAddress,
legalAccepted,
oidcPrompt,
enterpriseConnectionId,
} = params;

const redirectUrlWithAuthToken = SignUp.clerk.buildUrlWithAuth(redirectUrl);
Expand All@@ -398,6 +401,7 @@ export class SignUp extends BaseResource implements SignUpResource {
emailAddress,
legalAccepted,
oidcPrompt,
enterpriseConnectionId,
};
return continueSignUp && this.id ? this.update(authParams) : this.create(authParams);
};
Expand DownExpand Up@@ -551,6 +555,17 @@ export class SignUp extends BaseResource implements SignUpResource {

return false;
}

__experimental_getEnterpriseConnections = (): Promise<SignUpEnterpriseConnectionResource[]> => {
return BaseResource._fetch({
path: `/client/sign_ups/${this.id}/enterprise_connections`,
method: 'GET',
}).then(res => {
const enterpriseConnections = res?.response as unknown as SignUpEnterpriseConnectionJSON[];

return enterpriseConnections.map(enterpriseConnection => new SignUpEnterpriseConnection(enterpriseConnection));
});
};
Comment thread
LauraBeatris marked this conversation as resolved.
}

class SignUpFuture implements SignUpFutureResource {
Expand DownExpand Up@@ -889,3 +904,22 @@ class SignUpFuture implements SignUpFutureResource {
});
}
}

class SignUpEnterpriseConnection extends BaseResource implements SignUpEnterpriseConnectionResource {
id!: string;
name!: string;

constructor(data: SignUpEnterpriseConnectionJSON) {
super();
this.fromJSON(data);
}

protected fromJSON(data: SignUpEnterpriseConnectionJSON | null): this {
if (data) {
this.id = data.id;
this.name = data.name;
}

return this;
}
}
123 changes: 123 additions & 0 deletions packages/clerk-js/src/ui/common/ChooseEnterpriseConnectionCard.tsx
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,123 @@
import { useState } from 'react';

import type { LocalizationKey } from '@/ui/customizables';
import { descriptors, Flex, Grid, SimpleButton, Spinner, Text } from '@/ui/customizables';
import { Card } from '@/ui/elements/Card';
import { useCardState } from '@/ui/elements/contexts';
import { Header } from '@/ui/elements/Header';
import type { InternalTheme, PropsOfComponent } from '@/ui/styledSystem';

type ChooseEnterpriseConnectionCardProps = {
title: LocalizationKey;
subtitle: LocalizationKey;
onClick: (id: string) => Promise<void>;
enterpriseConnections: Array<{ id: string; name: string }>;
};

/**
* @experimental
*/
export const ChooseEnterpriseConnectionCard = ({
title,
subtitle,
onClick,
enterpriseConnections,
}: ChooseEnterpriseConnectionCardProps) => {
const card = useCardState();
Comment thread
LauraBeatris marked this conversation as resolved.

return (
<Card.Root>
<Card.Content>
<Header.Root showLogo>
<Header.Title localizationKey={title} />
<Header.Subtitle localizationKey={subtitle} />
</Header.Root>
<Card.Alert>{card.error}</Card.Alert>

<Grid
elementDescriptor={descriptors.enterpriseConnectionsRoot}
gap={2}
>
{enterpriseConnections?.map(({ id, name }) => (
<ChooseEnterpriseConnectionButton
key={id}
id={id}
label={name}
onClick={onClick}
/>
))}
</Grid>
</Card.Content>

<Card.Footer />
</Card.Root>
);
};

type ChooseEnterpriseConnectionButtonProps = Omit<PropsOfComponent<typeof SimpleButton>, 'onClick'> & {
id: string;
label?: string;
onClick: (id: string) => Promise<void>;
};

const ChooseEnterpriseConnectionButton = (props: ChooseEnterpriseConnectionButtonProps): JSX.Element => {

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Any way to reuse the SocialButtonBlock component vs creating this duplication?

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

I thought of not reusing since this is an experimental UI, and I wanted to minimize the changes for the core flows.

We could extract SocialButtonBlock to a UI component that receives custom descriptors, and rename it to a more generic approach for enterprise connections.

const { label, onClick, ...rest } = props;
const [isLoading, setIsLoading] = useState(false);

const handleClick = () => {
setIsLoading(true);
void onClick(props.id).catch(() => setIsLoading(false));
};

return (
<SimpleButton
elementDescriptor={descriptors.enterpriseConnectionButton}
variant='outline'
block
isLoading={isLoading}
hoverAsFocus
onClick={handleClick}
{...rest}
sx={(theme: InternalTheme) => [
{
gap: theme.space.$4,
position: 'relative',
justifyContent: 'flex-start',
},
(rest as any).sx,
]}
>
<Flex
justify='center'
align='center'
as='span'
gap={3}
sx={{
width: '100%',
overflow: 'hidden',
}}
>
{isLoading && (
<Flex
as='span'
center
sx={(theme: InternalTheme) => ({ flex: `0 0 ${theme.space.$4}` })}
>
<Spinner
size='sm'
elementDescriptor={descriptors.spinner}
/>
</Flex>
)}
<Text
elementDescriptor={descriptors.enterpriseConnectionButtonText}
as='span'
truncate
variant='buttonLarge'
>
{label}
</Text>
</Flex>
</SimpleButton>
);
};
11 changes: 11 additions & 0 deletions packages/clerk-js/src/ui/components/SignIn/SignInFactorOne.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -12,9 +12,11 @@ import { useAlternativeStrategies } from '../../hooks/useAlternativeStrategies';
import { localizationKeys } from '../../localization';
import { useRouter } from '../../router';
import { AlternativeMethods } from './AlternativeMethods';
import { hasMultipleEnterpriseConnections } from './shared';
import { SignInFactorOneAlternativePhoneCodeCard } from './SignInFactorOneAlternativePhoneCodeCard';
import { SignInFactorOneEmailCodeCard } from './SignInFactorOneEmailCodeCard';
import { SignInFactorOneEmailLinkCard } from './SignInFactorOneEmailLinkCard';
import { SignInFactorOneEnterpriseConnections } from './SignInFactorOneEnterpriseConnections';
import { SignInFactorOneForgotPasswordCard } from './SignInFactorOneForgotPasswordCard';
import { SignInFactorOnePasskey } from './SignInFactorOnePasskey';
import { SignInFactorOnePasswordCard } from './SignInFactorOnePasswordCard';
Expand DownExpand Up@@ -122,6 +124,15 @@ function SignInFactorOneInternal(): JSX.Element {
prevCurrentFactor: prev.currentFactor,
}));
};

/**
* Prompt to choose between a list of enterprise connections as supported first factors
* @experimental
*/
if (hasMultipleEnterpriseConnections(signIn.supportedFirstFactors)) {
return <SignInFactorOneEnterpriseConnections />;
}

if (showAllStrategies || showForgotPasswordStrategies) {
const canGoBack = factorHasLocalStrategy(currentFactor);

Expand Down
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,82 @@
import { useClerk } from '@clerk/shared/react/index';
import type { ComponentType } from 'react';

import { buildSSOCallbackURL, withRedirect } from '@/ui/common';
import { ChooseEnterpriseConnectionCard } from '@/ui/common/ChooseEnterpriseConnectionCard';
import { useCoreSignIn, useEnvironment, useSignInContext } from '@/ui/contexts';
import { Flow, localizationKeys } from '@/ui/customizables';
import { withCardStateProvider } from '@/ui/elements/contexts';
import type { AvailableComponentProps } from '@/ui/types';

import { hasMultipleEnterpriseConnections } from './shared';

/**
* @experimental
*/
const SignInFactorOneEnterpriseConnectionsInternal = () => {
const ctx = useSignInContext();
const { displayConfig } = useEnvironment();

const clerk = useClerk();
const signIn = clerk.client.signIn;

if (!hasMultipleEnterpriseConnections(signIn.supportedFirstFactors)) {
// This should not happen due to the HOC guard, but provides type safety
return null;
}
Comment thread
LauraBeatris marked this conversation as resolved.

const enterpriseConnections = signIn.supportedFirstFactors.map(ff => ({
id: ff.enterpriseConnectionId,
name: ff.enterpriseConnectionName,
}));

const handleEnterpriseSSO = (enterpriseConnectionId: string) => {
const redirectUrl = buildSSOCallbackURL(ctx, displayConfig.signInUrl);
const redirectUrlComplete = ctx.afterSignInUrl || '/';

return signIn.authenticateWithRedirect({
strategy: 'enterprise_sso',
redirectUrl,
redirectUrlComplete,
oidcPrompt: ctx.oidcPrompt,
continueSignIn: true,
enterpriseConnectionId,
});
};
Comment thread
LauraBeatris marked this conversation as resolved.
Comment thread
LauraBeatris marked this conversation as resolved.

return (
<Flow.Part part='enterpriseConnections'>
<ChooseEnterpriseConnectionCard
title={localizationKeys('signIn.enterpriseConnections.title')}
subtitle={localizationKeys('signIn.enterpriseConnections.subtitle')}
onClick={handleEnterpriseSSO}
enterpriseConnections={enterpriseConnections}
/>
</Flow.Part>
);
};

const withEnterpriseConnectionsGuard = <P extends AvailableComponentProps>(Component: ComponentType<P>) => {
const displayName = Component.displayName || Component.name || 'Component';
Component.displayName = displayName;

const HOC = (props: P) => {
const signIn = useCoreSignIn();
const signInCtx = useSignInContext();

return withRedirect(
Component,
() => !hasMultipleEnterpriseConnections(signIn.supportedFirstFactors),
({ clerk }) => signInCtx.signInUrl || clerk.buildSignInUrl(),
'There are no enterprise connections available to sign-in. Clerk is redirecting to the `signInUrl` instead.',
)(props);
Comment thread
LauraBeatris marked this conversation as resolved.
};
Comment thread
coderabbitai[bot] marked this conversation as resolved.

HOC.displayName = `withEnterpriseConnectionsGuard(${displayName})`;

return HOC;
};

export const SignInFactorOneEnterpriseConnections = withCardStateProvider(
withEnterpriseConnectionsGuard(SignInFactorOneEnterpriseConnectionsInternal),
);
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
7 changes: 7 additions & 0 deletions .changeset/upset-results-win.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
---
'@clerk/localizations': minor
'@clerk/clerk-js': minor
'@clerk/types': minor
---

Introduce experimental step to choose enterprise connection on sign-in/sign-up
2 changes: 2 additions & 0 deletions .typedoc/__tests__/__snapshots__/file-structure.test.ts.snap
Original file line numberDiff line numberDiff line change
Expand Up@@ -127,6 +127,8 @@ exports[`Typedoc output > should have a deliberate file structure 1`] = `
"types/sign-in-signal-value.mdx",
"types/sign-out.mdx",
"types/sign-up-authenticate-with-metamask-params.mdx",
"types/sign-up-enterprise-connection-json.mdx",
"types/sign-up-enterprise-connection-resource.mdx",
"types/sign-up-future-resource.mdx",
"types/sign-up-resource.mdx",
"types/signed-in-session-resource.mdx",
Expand Down
2 changes: 1 addition & 1 deletion packages/clerk-js/bundlewatch.config.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,7 +16,7 @@
{ "path": "./dist/organizationswitcher*.js", "maxSize": "5KB" },
{ "path": "./dist/organizationlist*.js", "maxSize": "5.5KB" },
{ "path": "./dist/signin*.js", "maxSize": "18KB" },
{ "path": "./dist/signup*.js", "maxSize": "8.86KB" },
{ "path": "./dist/signup*.js", "maxSize": "9.5KB" },
{ "path": "./dist/userbutton*.js", "maxSize": "5KB" },
{ "path": "./dist/userprofile*.js", "maxSize": "16KB" },
{ "path": "./dist/userverification*.js", "maxSize": "5KB" },
Expand Down
5 changes: 4 additions & 1 deletion packages/clerk-js/src/core/resources/SignIn.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -222,6 +222,7 @@ export class SignIn extends BaseResource implements SignInResource {
redirectUrl: params.redirectUrl,
actionCompleteRedirectUrl: params.actionCompleteRedirectUrl,
oidcPrompt: params.oidcPrompt,
enterpriseConnectionId: params.enterpriseConnectionId,
} as EnterpriseSSOConfig;
break;
default:
Expand DownExpand Up@@ -308,7 +309,8 @@ export class SignIn extends BaseResource implements SignInResource {
params: AuthenticateWithRedirectParams,
navigateCallback: (url: URL | string) => void,
): Promise<void> => {
const { strategy, redirectUrlComplete, identifier, oidcPrompt, continueSignIn } = params || {};
const { strategy, redirectUrlComplete, identifier, oidcPrompt, continueSignIn, enterpriseConnectionId } =
params || {};
const actionCompleteRedirectUrl = redirectUrlComplete;

const redirectUrl = SignIn.clerk.buildUrlWithAuth(params.redirectUrl);
Expand All@@ -328,6 +330,7 @@ export class SignIn extends BaseResource implements SignInResource {
redirectUrl,
actionCompleteRedirectUrl,
oidcPrompt,
enterpriseConnectionId,
});
}

Expand Down
34 changes: 34 additions & 0 deletions packages/clerk-js/src/core/resources/SignUp.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,6 +16,8 @@ import type {
PrepareWeb3WalletVerificationParams,
SignUpAuthenticateWithWeb3Params,
SignUpCreateParams,
SignUpEnterpriseConnectionJSON,
SignUpEnterpriseConnectionResource,
SignUpField,
SignUpFutureCreateParams,
SignUpFutureEmailCodeVerifyParams,
Expand DownExpand Up@@ -385,6 +387,7 @@ export class SignUp extends BaseResource implements SignUpResource {
emailAddress,
legalAccepted,
oidcPrompt,
enterpriseConnectionId,
} = params;

const redirectUrlWithAuthToken = SignUp.clerk.buildUrlWithAuth(redirectUrl);
Expand All@@ -398,6 +401,7 @@ export class SignUp extends BaseResource implements SignUpResource {
emailAddress,
legalAccepted,
oidcPrompt,
enterpriseConnectionId,
};
return continueSignUp && this.id ? this.update(authParams) : this.create(authParams);
};
Expand DownExpand Up@@ -551,6 +555,17 @@ export class SignUp extends BaseResource implements SignUpResource {

return false;
}

__experimental_getEnterpriseConnections = (): Promise<SignUpEnterpriseConnectionResource[]> => {
return BaseResource._fetch({
path: `/client/sign_ups/${this.id}/enterprise_connections`,
method: 'GET',
}).then(res => {
const enterpriseConnections = res?.response as unknown as SignUpEnterpriseConnectionJSON[];

return enterpriseConnections.map(enterpriseConnection => new SignUpEnterpriseConnection(enterpriseConnection));
});
};
Comment thread
LauraBeatris marked this conversation as resolved.
}

class SignUpFuture implements SignUpFutureResource {
Expand DownExpand Up@@ -889,3 +904,22 @@ class SignUpFuture implements SignUpFutureResource {
});
}
}

class SignUpEnterpriseConnection extends BaseResource implements SignUpEnterpriseConnectionResource {
id!: string;
name!: string;

constructor(data: SignUpEnterpriseConnectionJSON) {
super();
this.fromJSON(data);
}

protected fromJSON(data: SignUpEnterpriseConnectionJSON | null): this {
if (data) {
this.id = data.id;
this.name = data.name;
}

return this;
}
}
123 changes: 123 additions & 0 deletions packages/clerk-js/src/ui/common/ChooseEnterpriseConnectionCard.tsx
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,123 @@
import { useState } from 'react';

import type { LocalizationKey } from '@/ui/customizables';
import { descriptors, Flex, Grid, SimpleButton, Spinner, Text } from '@/ui/customizables';
import { Card } from '@/ui/elements/Card';
import { useCardState } from '@/ui/elements/contexts';
import { Header } from '@/ui/elements/Header';
import type { InternalTheme, PropsOfComponent } from '@/ui/styledSystem';

type ChooseEnterpriseConnectionCardProps = {
title: LocalizationKey;
subtitle: LocalizationKey;
onClick: (id: string) => Promise<void>;
enterpriseConnections: Array<{ id: string; name: string }>;
};

/**
* @experimental
*/
export const ChooseEnterpriseConnectionCard = ({
title,
subtitle,
onClick,
enterpriseConnections,
}: ChooseEnterpriseConnectionCardProps) => {
const card = useCardState();
Comment thread
LauraBeatris marked this conversation as resolved.

return (
<Card.Root>
<Card.Content>
<Header.Root showLogo>
<Header.Title localizationKey={title} />
<Header.Subtitle localizationKey={subtitle} />
</Header.Root>
<Card.Alert>{card.error}</Card.Alert>

<Grid
elementDescriptor={descriptors.enterpriseConnectionsRoot}
gap={2}
>
{enterpriseConnections?.map(({ id, name }) => (
<ChooseEnterpriseConnectionButton
key={id}
id={id}
label={name}
onClick={onClick}
/>
))}
</Grid>
</Card.Content>

<Card.Footer />
</Card.Root>
);
};

type ChooseEnterpriseConnectionButtonProps = Omit<PropsOfComponent<typeof SimpleButton>, 'onClick'> & {
id: string;
label?: string;
onClick: (id: string) => Promise<void>;
};

const ChooseEnterpriseConnectionButton = (props: ChooseEnterpriseConnectionButtonProps): JSX.Element => {

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Any way to reuse the SocialButtonBlock component vs creating this duplication?

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

I thought of not reusing since this is an experimental UI, and I wanted to minimize the changes for the core flows.

We could extract SocialButtonBlock to a UI component that receives custom descriptors, and rename it to a more generic approach for enterprise connections.

const { label, onClick, ...rest } = props;
const [isLoading, setIsLoading] = useState(false);

const handleClick = () => {
setIsLoading(true);
void onClick(props.id).catch(() => setIsLoading(false));
};

return (
<SimpleButton
elementDescriptor={descriptors.enterpriseConnectionButton}
variant='outline'
block
isLoading={isLoading}
hoverAsFocus
onClick={handleClick}
{...rest}
sx={(theme: InternalTheme) => [
{
gap: theme.space.$4,
position: 'relative',
justifyContent: 'flex-start',
},
(rest as any).sx,
]}
>
<Flex
justify='center'
align='center'
as='span'
gap={3}
sx={{
width: '100%',
overflow: 'hidden',
}}
>
{isLoading && (
<Flex
as='span'
center
sx={(theme: InternalTheme) => ({ flex: `0 0 ${theme.space.$4}` })}
>
<Spinner
size='sm'
elementDescriptor={descriptors.spinner}
/>
</Flex>
)}
<Text
elementDescriptor={descriptors.enterpriseConnectionButtonText}
as='span'
truncate
variant='buttonLarge'
>
{label}
</Text>
</Flex>
</SimpleButton>
);
};
11 changes: 11 additions & 0 deletions packages/clerk-js/src/ui/components/SignIn/SignInFactorOne.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -12,9 +12,11 @@ import { useAlternativeStrategies } from '../../hooks/useAlternativeStrategies';
import { localizationKeys } from '../../localization';
import { useRouter } from '../../router';
import { AlternativeMethods } from './AlternativeMethods';
import { hasMultipleEnterpriseConnections } from './shared';
import { SignInFactorOneAlternativePhoneCodeCard } from './SignInFactorOneAlternativePhoneCodeCard';
import { SignInFactorOneEmailCodeCard } from './SignInFactorOneEmailCodeCard';
import { SignInFactorOneEmailLinkCard } from './SignInFactorOneEmailLinkCard';
import { SignInFactorOneEnterpriseConnections } from './SignInFactorOneEnterpriseConnections';
import { SignInFactorOneForgotPasswordCard } from './SignInFactorOneForgotPasswordCard';
import { SignInFactorOnePasskey } from './SignInFactorOnePasskey';
import { SignInFactorOnePasswordCard } from './SignInFactorOnePasswordCard';
Expand DownExpand Up@@ -122,6 +124,15 @@ function SignInFactorOneInternal(): JSX.Element {
prevCurrentFactor: prev.currentFactor,
}));
};

/**
* Prompt to choose between a list of enterprise connections as supported first factors
* @experimental
*/
if (hasMultipleEnterpriseConnections(signIn.supportedFirstFactors)) {
return <SignInFactorOneEnterpriseConnections />;
}

if (showAllStrategies || showForgotPasswordStrategies) {
const canGoBack = factorHasLocalStrategy(currentFactor);

Expand Down
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,82 @@
import { useClerk } from '@clerk/shared/react/index';
import type { ComponentType } from 'react';

import { buildSSOCallbackURL, withRedirect } from '@/ui/common';
import { ChooseEnterpriseConnectionCard } from '@/ui/common/ChooseEnterpriseConnectionCard';
import { useCoreSignIn, useEnvironment, useSignInContext } from '@/ui/contexts';
import { Flow, localizationKeys } from '@/ui/customizables';
import { withCardStateProvider } from '@/ui/elements/contexts';
import type { AvailableComponentProps } from '@/ui/types';

import { hasMultipleEnterpriseConnections } from './shared';

/**
* @experimental
*/
const SignInFactorOneEnterpriseConnectionsInternal = () => {
const ctx = useSignInContext();
const { displayConfig } = useEnvironment();

const clerk = useClerk();
const signIn = clerk.client.signIn;

if (!hasMultipleEnterpriseConnections(signIn.supportedFirstFactors)) {
// This should not happen due to the HOC guard, but provides type safety
return null;
}
Comment thread
LauraBeatris marked this conversation as resolved.

const enterpriseConnections = signIn.supportedFirstFactors.map(ff => ({
id: ff.enterpriseConnectionId,
name: ff.enterpriseConnectionName,
}));

const handleEnterpriseSSO = (enterpriseConnectionId: string) => {
const redirectUrl = buildSSOCallbackURL(ctx, displayConfig.signInUrl);
const redirectUrlComplete = ctx.afterSignInUrl || '/';

return signIn.authenticateWithRedirect({
strategy: 'enterprise_sso',
redirectUrl,
redirectUrlComplete,
oidcPrompt: ctx.oidcPrompt,
continueSignIn: true,
enterpriseConnectionId,
});
};
Comment thread
LauraBeatris marked this conversation as resolved.
Comment thread
LauraBeatris marked this conversation as resolved.

return (
<Flow.Part part='enterpriseConnections'>
<ChooseEnterpriseConnectionCard
title={localizationKeys('signIn.enterpriseConnections.title')}
subtitle={localizationKeys('signIn.enterpriseConnections.subtitle')}
onClick={handleEnterpriseSSO}
enterpriseConnections={enterpriseConnections}
/>
</Flow.Part>
);
};

const withEnterpriseConnectionsGuard = <P extends AvailableComponentProps>(Component: ComponentType<P>) => {
const displayName = Component.displayName || Component.name || 'Component';
Component.displayName = displayName;

const HOC = (props: P) => {
const signIn = useCoreSignIn();
const signInCtx = useSignInContext();

return withRedirect(
Component,
() => !hasMultipleEnterpriseConnections(signIn.supportedFirstFactors),
({ clerk }) => signInCtx.signInUrl || clerk.buildSignInUrl(),
'There are no enterprise connections available to sign-in. Clerk is redirecting to the `signInUrl` instead.',
)(props);
Comment thread
LauraBeatris marked this conversation as resolved.
};
Comment thread
coderabbitai[bot] marked this conversation as resolved.

HOC.displayName = `withEnterpriseConnectionsGuard(${displayName})`;

return HOC;
};

export const SignInFactorOneEnterpriseConnections = withCardStateProvider(
withEnterpriseConnectionsGuard(SignInFactorOneEnterpriseConnectionsInternal),
);
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
7 changes: 7 additions & 0 deletions .changeset/upset-results-win.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
---
'@clerk/localizations': minor
'@clerk/clerk-js': minor
'@clerk/types': minor
---

Introduce experimental step to choose enterprise connection on sign-in/sign-up
2 changes: 2 additions & 0 deletions .typedoc/__tests__/__snapshots__/file-structure.test.ts.snap
Original file line numberDiff line numberDiff line change
Expand Up@@ -127,6 +127,8 @@ exports[`Typedoc output > should have a deliberate file structure 1`] = `
"types/sign-in-signal-value.mdx",
"types/sign-out.mdx",
"types/sign-up-authenticate-with-metamask-params.mdx",
"types/sign-up-enterprise-connection-json.mdx",
"types/sign-up-enterprise-connection-resource.mdx",
"types/sign-up-future-resource.mdx",
"types/sign-up-resource.mdx",
"types/signed-in-session-resource.mdx",
Expand Down
2 changes: 1 addition & 1 deletion packages/clerk-js/bundlewatch.config.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,7 +16,7 @@
{ "path": "./dist/organizationswitcher*.js", "maxSize": "5KB" },
{ "path": "./dist/organizationlist*.js", "maxSize": "5.5KB" },
{ "path": "./dist/signin*.js", "maxSize": "18KB" },
{ "path": "./dist/signup*.js", "maxSize": "8.86KB" },
{ "path": "./dist/signup*.js", "maxSize": "9.5KB" },
{ "path": "./dist/userbutton*.js", "maxSize": "5KB" },
{ "path": "./dist/userprofile*.js", "maxSize": "16KB" },
{ "path": "./dist/userverification*.js", "maxSize": "5KB" },
Expand Down
5 changes: 4 additions & 1 deletion packages/clerk-js/src/core/resources/SignIn.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -222,6 +222,7 @@ export class SignIn extends BaseResource implements SignInResource {
redirectUrl: params.redirectUrl,
actionCompleteRedirectUrl: params.actionCompleteRedirectUrl,
oidcPrompt: params.oidcPrompt,
enterpriseConnectionId: params.enterpriseConnectionId,
} as EnterpriseSSOConfig;
break;
default:
Expand DownExpand Up@@ -308,7 +309,8 @@ export class SignIn extends BaseResource implements SignInResource {
params: AuthenticateWithRedirectParams,
navigateCallback: (url: URL | string) => void,
): Promise<void> => {
const { strategy, redirectUrlComplete, identifier, oidcPrompt, continueSignIn } = params || {};
const { strategy, redirectUrlComplete, identifier, oidcPrompt, continueSignIn, enterpriseConnectionId } =
params || {};
const actionCompleteRedirectUrl = redirectUrlComplete;

const redirectUrl = SignIn.clerk.buildUrlWithAuth(params.redirectUrl);
Expand All@@ -328,6 +330,7 @@ export class SignIn extends BaseResource implements SignInResource {
redirectUrl,
actionCompleteRedirectUrl,
oidcPrompt,
enterpriseConnectionId,
});
}

Expand Down
34 changes: 34 additions & 0 deletions packages/clerk-js/src/core/resources/SignUp.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,6 +16,8 @@ import type {
PrepareWeb3WalletVerificationParams,
SignUpAuthenticateWithWeb3Params,
SignUpCreateParams,
SignUpEnterpriseConnectionJSON,
SignUpEnterpriseConnectionResource,
SignUpField,
SignUpFutureCreateParams,
SignUpFutureEmailCodeVerifyParams,
Expand DownExpand Up@@ -385,6 +387,7 @@ export class SignUp extends BaseResource implements SignUpResource {
emailAddress,
legalAccepted,
oidcPrompt,
enterpriseConnectionId,
} = params;

const redirectUrlWithAuthToken = SignUp.clerk.buildUrlWithAuth(redirectUrl);
Expand All@@ -398,6 +401,7 @@ export class SignUp extends BaseResource implements SignUpResource {
emailAddress,
legalAccepted,
oidcPrompt,
enterpriseConnectionId,
};
return continueSignUp && this.id ? this.update(authParams) : this.create(authParams);
};
Expand DownExpand Up@@ -551,6 +555,17 @@ export class SignUp extends BaseResource implements SignUpResource {

return false;
}

__experimental_getEnterpriseConnections = (): Promise<SignUpEnterpriseConnectionResource[]> => {
return BaseResource._fetch({
path: `/client/sign_ups/${this.id}/enterprise_connections`,
method: 'GET',
}).then(res => {
const enterpriseConnections = res?.response as unknown as SignUpEnterpriseConnectionJSON[];

return enterpriseConnections.map(enterpriseConnection => new SignUpEnterpriseConnection(enterpriseConnection));
});
};
Comment thread
LauraBeatris marked this conversation as resolved.
}

class SignUpFuture implements SignUpFutureResource {
Expand DownExpand Up@@ -889,3 +904,22 @@ class SignUpFuture implements SignUpFutureResource {
});
}
}

class SignUpEnterpriseConnection extends BaseResource implements SignUpEnterpriseConnectionResource {
id!: string;
name!: string;

constructor(data: SignUpEnterpriseConnectionJSON) {
super();
this.fromJSON(data);
}

protected fromJSON(data: SignUpEnterpriseConnectionJSON | null): this {
if (data) {
this.id = data.id;
this.name = data.name;
}

return this;
}
}
123 changes: 123 additions & 0 deletions packages/clerk-js/src/ui/common/ChooseEnterpriseConnectionCard.tsx
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,123 @@
import { useState } from 'react';

import type { LocalizationKey } from '@/ui/customizables';
import { descriptors, Flex, Grid, SimpleButton, Spinner, Text } from '@/ui/customizables';
import { Card } from '@/ui/elements/Card';
import { useCardState } from '@/ui/elements/contexts';
import { Header } from '@/ui/elements/Header';
import type { InternalTheme, PropsOfComponent } from '@/ui/styledSystem';

type ChooseEnterpriseConnectionCardProps = {
title: LocalizationKey;
subtitle: LocalizationKey;
onClick: (id: string) => Promise<void>;
enterpriseConnections: Array<{ id: string; name: string }>;
};

/**
* @experimental
*/
export const ChooseEnterpriseConnectionCard = ({
title,
subtitle,
onClick,
enterpriseConnections,
}: ChooseEnterpriseConnectionCardProps) => {
const card = useCardState();
Comment thread
LauraBeatris marked this conversation as resolved.

return (
<Card.Root>
<Card.Content>
<Header.Root showLogo>
<Header.Title localizationKey={title} />
<Header.Subtitle localizationKey={subtitle} />
</Header.Root>
<Card.Alert>{card.error}</Card.Alert>

<Grid
elementDescriptor={descriptors.enterpriseConnectionsRoot}
gap={2}
>
{enterpriseConnections?.map(({ id, name }) => (
<ChooseEnterpriseConnectionButton
key={id}
id={id}
label={name}
onClick={onClick}
/>
))}
</Grid>
</Card.Content>

<Card.Footer />
</Card.Root>
);
};

type ChooseEnterpriseConnectionButtonProps = Omit<PropsOfComponent<typeof SimpleButton>, 'onClick'> & {
id: string;
label?: string;
onClick: (id: string) => Promise<void>;
};

const ChooseEnterpriseConnectionButton = (props: ChooseEnterpriseConnectionButtonProps): JSX.Element => {

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Any way to reuse the SocialButtonBlock component vs creating this duplication?

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

I thought of not reusing since this is an experimental UI, and I wanted to minimize the changes for the core flows.

We could extract SocialButtonBlock to a UI component that receives custom descriptors, and rename it to a more generic approach for enterprise connections.

const { label, onClick, ...rest } = props;
const [isLoading, setIsLoading] = useState(false);

const handleClick = () => {
setIsLoading(true);
void onClick(props.id).catch(() => setIsLoading(false));
};

return (
<SimpleButton
elementDescriptor={descriptors.enterpriseConnectionButton}
variant='outline'
block
isLoading={isLoading}
hoverAsFocus
onClick={handleClick}
{...rest}
sx={(theme: InternalTheme) => [
{
gap: theme.space.$4,
position: 'relative',
justifyContent: 'flex-start',
},
(rest as any).sx,
]}
>
<Flex
justify='center'
align='center'
as='span'
gap={3}
sx={{
width: '100%',
overflow: 'hidden',
}}
>
{isLoading && (
<Flex
as='span'
center
sx={(theme: InternalTheme) => ({ flex: `0 0 ${theme.space.$4}` })}
>
<Spinner
size='sm'
elementDescriptor={descriptors.spinner}
/>
</Flex>
)}
<Text
elementDescriptor={descriptors.enterpriseConnectionButtonText}
as='span'
truncate
variant='buttonLarge'
>
{label}
</Text>
</Flex>
</SimpleButton>
);
};
11 changes: 11 additions & 0 deletions packages/clerk-js/src/ui/components/SignIn/SignInFactorOne.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -12,9 +12,11 @@ import { useAlternativeStrategies } from '../../hooks/useAlternativeStrategies';
import { localizationKeys } from '../../localization';
import { useRouter } from '../../router';
import { AlternativeMethods } from './AlternativeMethods';
import { hasMultipleEnterpriseConnections } from './shared';
import { SignInFactorOneAlternativePhoneCodeCard } from './SignInFactorOneAlternativePhoneCodeCard';
import { SignInFactorOneEmailCodeCard } from './SignInFactorOneEmailCodeCard';
import { SignInFactorOneEmailLinkCard } from './SignInFactorOneEmailLinkCard';
import { SignInFactorOneEnterpriseConnections } from './SignInFactorOneEnterpriseConnections';
import { SignInFactorOneForgotPasswordCard } from './SignInFactorOneForgotPasswordCard';
import { SignInFactorOnePasskey } from './SignInFactorOnePasskey';
import { SignInFactorOnePasswordCard } from './SignInFactorOnePasswordCard';
Expand DownExpand Up@@ -122,6 +124,15 @@ function SignInFactorOneInternal(): JSX.Element {
prevCurrentFactor: prev.currentFactor,
}));
};

/**
* Prompt to choose between a list of enterprise connections as supported first factors
* @experimental
*/
if (hasMultipleEnterpriseConnections(signIn.supportedFirstFactors)) {
return <SignInFactorOneEnterpriseConnections />;
}

if (showAllStrategies || showForgotPasswordStrategies) {
const canGoBack = factorHasLocalStrategy(currentFactor);

Expand Down
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,82 @@
import { useClerk } from '@clerk/shared/react/index';
import type { ComponentType } from 'react';

import { buildSSOCallbackURL, withRedirect } from '@/ui/common';
import { ChooseEnterpriseConnectionCard } from '@/ui/common/ChooseEnterpriseConnectionCard';
import { useCoreSignIn, useEnvironment, useSignInContext } from '@/ui/contexts';
import { Flow, localizationKeys } from '@/ui/customizables';
import { withCardStateProvider } from '@/ui/elements/contexts';
import type { AvailableComponentProps } from '@/ui/types';

import { hasMultipleEnterpriseConnections } from './shared';

/**
* @experimental
*/
const SignInFactorOneEnterpriseConnectionsInternal = () => {
const ctx = useSignInContext();
const { displayConfig } = useEnvironment();

const clerk = useClerk();
const signIn = clerk.client.signIn;

if (!hasMultipleEnterpriseConnections(signIn.supportedFirstFactors)) {
// This should not happen due to the HOC guard, but provides type safety
return null;
}
Comment thread
LauraBeatris marked this conversation as resolved.

const enterpriseConnections = signIn.supportedFirstFactors.map(ff => ({
id: ff.enterpriseConnectionId,
name: ff.enterpriseConnectionName,
}));

const handleEnterpriseSSO = (enterpriseConnectionId: string) => {
const redirectUrl = buildSSOCallbackURL(ctx, displayConfig.signInUrl);
const redirectUrlComplete = ctx.afterSignInUrl || '/';

return signIn.authenticateWithRedirect({
strategy: 'enterprise_sso',
redirectUrl,
redirectUrlComplete,
oidcPrompt: ctx.oidcPrompt,
continueSignIn: true,
enterpriseConnectionId,
});
};
Comment thread
LauraBeatris marked this conversation as resolved.
Comment thread
LauraBeatris marked this conversation as resolved.

return (
<Flow.Part part='enterpriseConnections'>
<ChooseEnterpriseConnectionCard
title={localizationKeys('signIn.enterpriseConnections.title')}
subtitle={localizationKeys('signIn.enterpriseConnections.subtitle')}
onClick={handleEnterpriseSSO}
enterpriseConnections={enterpriseConnections}
/>
</Flow.Part>
);
};

const withEnterpriseConnectionsGuard = <P extends AvailableComponentProps>(Component: ComponentType<P>) => {
const displayName = Component.displayName || Component.name || 'Component';
Component.displayName = displayName;

const HOC = (props: P) => {
const signIn = useCoreSignIn();
const signInCtx = useSignInContext();

return withRedirect(
Component,
() => !hasMultipleEnterpriseConnections(signIn.supportedFirstFactors),
({ clerk }) => signInCtx.signInUrl || clerk.buildSignInUrl(),
'There are no enterprise connections available to sign-in. Clerk is redirecting to the `signInUrl` instead.',
)(props);
Comment thread
LauraBeatris marked this conversation as resolved.
};
Comment thread
coderabbitai[bot] marked this conversation as resolved.

HOC.displayName = `withEnterpriseConnectionsGuard(${displayName})`;

return HOC;
};

export const SignInFactorOneEnterpriseConnections = withCardStateProvider(
withEnterpriseConnectionsGuard(SignInFactorOneEnterpriseConnectionsInternal),
);
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content
Merged
7 changes: 7 additions & 0 deletions .changeset/upset-results-win.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
---
'@clerk/localizations': minor
'@clerk/clerk-js': minor
'@clerk/types': minor
---

Introduce experimental step to choose enterprise connection on sign-in/sign-up
2 changes: 2 additions & 0 deletions .typedoc/__tests__/__snapshots__/file-structure.test.ts.snap
Original file line numberDiff line numberDiff line change
Expand Up@@ -127,6 +127,8 @@ exports[`Typedoc output > should have a deliberate file structure 1`] = `
"types/sign-in-signal-value.mdx",
"types/sign-out.mdx",
"types/sign-up-authenticate-with-metamask-params.mdx",
"types/sign-up-enterprise-connection-json.mdx",
"types/sign-up-enterprise-connection-resource.mdx",
"types/sign-up-future-resource.mdx",
"types/sign-up-resource.mdx",
"types/signed-in-session-resource.mdx",
Expand Down
2 changes: 1 addition & 1 deletion packages/clerk-js/bundlewatch.config.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,7 +16,7 @@
{ "path": "./dist/organizationswitcher*.js", "maxSize": "5KB" },
{ "path": "./dist/organizationlist*.js", "maxSize": "5.5KB" },
{ "path": "./dist/signin*.js", "maxSize": "18KB" },
{ "path": "./dist/signup*.js", "maxSize": "8.86KB" },
{ "path": "./dist/signup*.js", "maxSize": "9.5KB" },
{ "path": "./dist/userbutton*.js", "maxSize": "5KB" },
{ "path": "./dist/userprofile*.js", "maxSize": "16KB" },
{ "path": "./dist/userverification*.js", "maxSize": "5KB" },
Expand Down
5 changes: 4 additions & 1 deletion packages/clerk-js/src/core/resources/SignIn.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -222,6 +222,7 @@ export class SignIn extends BaseResource implements SignInResource {
redirectUrl: params.redirectUrl,
actionCompleteRedirectUrl: params.actionCompleteRedirectUrl,
oidcPrompt: params.oidcPrompt,
enterpriseConnectionId: params.enterpriseConnectionId,
} as EnterpriseSSOConfig;
break;
default:
Expand DownExpand Up@@ -308,7 +309,8 @@ export class SignIn extends BaseResource implements SignInResource {
params: AuthenticateWithRedirectParams,
navigateCallback: (url: URL | string) => void,
): Promise<void> => {
const { strategy, redirectUrlComplete, identifier, oidcPrompt, continueSignIn } = params || {};
const { strategy, redirectUrlComplete, identifier, oidcPrompt, continueSignIn, enterpriseConnectionId } =
params || {};
const actionCompleteRedirectUrl = redirectUrlComplete;

const redirectUrl = SignIn.clerk.buildUrlWithAuth(params.redirectUrl);
Expand All@@ -328,6 +330,7 @@ export class SignIn extends BaseResource implements SignInResource {
redirectUrl,
actionCompleteRedirectUrl,
oidcPrompt,
enterpriseConnectionId,
});
}

Expand Down
34 changes: 34 additions & 0 deletions packages/clerk-js/src/core/resources/SignUp.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,6 +16,8 @@ import type {
PrepareWeb3WalletVerificationParams,
SignUpAuthenticateWithWeb3Params,
SignUpCreateParams,
SignUpEnterpriseConnectionJSON,
SignUpEnterpriseConnectionResource,
SignUpField,
SignUpFutureCreateParams,
SignUpFutureEmailCodeVerifyParams,
Expand DownExpand Up@@ -385,6 +387,7 @@ export class SignUp extends BaseResource implements SignUpResource {
emailAddress,
legalAccepted,
oidcPrompt,
enterpriseConnectionId,
} = params;

const redirectUrlWithAuthToken = SignUp.clerk.buildUrlWithAuth(redirectUrl);
Expand All@@ -398,6 +401,7 @@ export class SignUp extends BaseResource implements SignUpResource {
emailAddress,
legalAccepted,
oidcPrompt,
enterpriseConnectionId,
};
return continueSignUp && this.id ? this.update(authParams) : this.create(authParams);
};
Expand DownExpand Up@@ -551,6 +555,17 @@ export class SignUp extends BaseResource implements SignUpResource {

return false;
}

__experimental_getEnterpriseConnections = (): Promise<SignUpEnterpriseConnectionResource[]> => {
return BaseResource._fetch({
path: `/client/sign_ups/${this.id}/enterprise_connections`,
method: 'GET',
}).then(res => {
const enterpriseConnections = res?.response as unknown as SignUpEnterpriseConnectionJSON[];

return enterpriseConnections.map(enterpriseConnection => new SignUpEnterpriseConnection(enterpriseConnection));
});
};
Comment thread
LauraBeatris marked this conversation as resolved.
}

class SignUpFuture implements SignUpFutureResource {
Expand DownExpand Up@@ -889,3 +904,22 @@ class SignUpFuture implements SignUpFutureResource {
});
}
}

class SignUpEnterpriseConnection extends BaseResource implements SignUpEnterpriseConnectionResource {
id!: string;
name!: string;

constructor(data: SignUpEnterpriseConnectionJSON) {
super();
this.fromJSON(data);
}

protected fromJSON(data: SignUpEnterpriseConnectionJSON | null): this {
if (data) {
this.id = data.id;
this.name = data.name;
}

return this;
}
}
123 changes: 123 additions & 0 deletions packages/clerk-js/src/ui/common/ChooseEnterpriseConnectionCard.tsx
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,123 @@
import { useState } from 'react';

import type { LocalizationKey } from '@/ui/customizables';
import { descriptors, Flex, Grid, SimpleButton, Spinner, Text } from '@/ui/customizables';
import { Card } from '@/ui/elements/Card';
import { useCardState } from '@/ui/elements/contexts';
import { Header } from '@/ui/elements/Header';
import type { InternalTheme, PropsOfComponent } from '@/ui/styledSystem';

type ChooseEnterpriseConnectionCardProps = {
title: LocalizationKey;
subtitle: LocalizationKey;
onClick: (id: string) => Promise<void>;
enterpriseConnections: Array<{ id: string; name: string }>;
};

/**
* @experimental
*/
export const ChooseEnterpriseConnectionCard = ({
title,
subtitle,
onClick,
enterpriseConnections,
}: ChooseEnterpriseConnectionCardProps) => {
const card = useCardState();
Comment thread
LauraBeatris marked this conversation as resolved.

return (
<Card.Root>
<Card.Content>
<Header.Root showLogo>
<Header.Title localizationKey={title} />
<Header.Subtitle localizationKey={subtitle} />
</Header.Root>
<Card.Alert>{card.error}</Card.Alert>

<Grid
elementDescriptor={descriptors.enterpriseConnectionsRoot}
gap={2}
>
{enterpriseConnections?.map(({ id, name }) => (
<ChooseEnterpriseConnectionButton
key={id}
id={id}
label={name}
onClick={onClick}
/>
))}
</Grid>
</Card.Content>

<Card.Footer />
</Card.Root>
);
};

type ChooseEnterpriseConnectionButtonProps = Omit<PropsOfComponent<typeof SimpleButton>, 'onClick'> & {
id: string;
label?: string;
onClick: (id: string) => Promise<void>;
};

const ChooseEnterpriseConnectionButton = (props: ChooseEnterpriseConnectionButtonProps): JSX.Element => {

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Any way to reuse the SocialButtonBlock component vs creating this duplication?

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

I thought of not reusing since this is an experimental UI, and I wanted to minimize the changes for the core flows.

We could extract SocialButtonBlock to a UI component that receives custom descriptors, and rename it to a more generic approach for enterprise connections.

const { label, onClick, ...rest } = props;
const [isLoading, setIsLoading] = useState(false);

const handleClick = () => {
setIsLoading(true);
void onClick(props.id).catch(() => setIsLoading(false));
};

return (
<SimpleButton
elementDescriptor={descriptors.enterpriseConnectionButton}
variant='outline'
block
isLoading={isLoading}
hoverAsFocus
onClick={handleClick}
{...rest}
sx={(theme: InternalTheme) => [
{
gap: theme.space.$4,
position: 'relative',
justifyContent: 'flex-start',
},
(rest as any).sx,
]}
>
<Flex
justify='center'
align='center'
as='span'
gap={3}
sx={{
width: '100%',
overflow: 'hidden',
}}
>
{isLoading && (
<Flex
as='span'
center
sx={(theme: InternalTheme) => ({ flex: `0 0 ${theme.space.$4}` })}
>
<Spinner
size='sm'
elementDescriptor={descriptors.spinner}
/>
</Flex>
)}
<Text
elementDescriptor={descriptors.enterpriseConnectionButtonText}
as='span'
truncate
variant='buttonLarge'
>
{label}
</Text>
</Flex>
</SimpleButton>
);
};
11 changes: 11 additions & 0 deletions packages/clerk-js/src/ui/components/SignIn/SignInFactorOne.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -12,9 +12,11 @@ import { useAlternativeStrategies } from '../../hooks/useAlternativeStrategies';
import { localizationKeys } from '../../localization';
import { useRouter } from '../../router';
import { AlternativeMethods } from './AlternativeMethods';
import { hasMultipleEnterpriseConnections } from './shared';
import { SignInFactorOneAlternativePhoneCodeCard } from './SignInFactorOneAlternativePhoneCodeCard';
import { SignInFactorOneEmailCodeCard } from './SignInFactorOneEmailCodeCard';
import { SignInFactorOneEmailLinkCard } from './SignInFactorOneEmailLinkCard';
import { SignInFactorOneEnterpriseConnections } from './SignInFactorOneEnterpriseConnections';
import { SignInFactorOneForgotPasswordCard } from './SignInFactorOneForgotPasswordCard';
import { SignInFactorOnePasskey } from './SignInFactorOnePasskey';
import { SignInFactorOnePasswordCard } from './SignInFactorOnePasswordCard';
Expand DownExpand Up@@ -122,6 +124,15 @@ function SignInFactorOneInternal(): JSX.Element {
prevCurrentFactor: prev.currentFactor,
}));
};

/**
* Prompt to choose between a list of enterprise connections as supported first factors
* @experimental
*/
if (hasMultipleEnterpriseConnections(signIn.supportedFirstFactors)) {
return <SignInFactorOneEnterpriseConnections />;
}

if (showAllStrategies || showForgotPasswordStrategies) {
const canGoBack = factorHasLocalStrategy(currentFactor);

Expand Down
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,82 @@
import { useClerk } from '@clerk/shared/react/index';
import type { ComponentType } from 'react';

import { buildSSOCallbackURL, withRedirect } from '@/ui/common';
import { ChooseEnterpriseConnectionCard } from '@/ui/common/ChooseEnterpriseConnectionCard';
import { useCoreSignIn, useEnvironment, useSignInContext } from '@/ui/contexts';
import { Flow, localizationKeys } from '@/ui/customizables';
import { withCardStateProvider } from '@/ui/elements/contexts';
import type { AvailableComponentProps } from '@/ui/types';

import { hasMultipleEnterpriseConnections } from './shared';

/**
* @experimental
*/
const SignInFactorOneEnterpriseConnectionsInternal = () => {
const ctx = useSignInContext();
const { displayConfig } = useEnvironment();

const clerk = useClerk();
const signIn = clerk.client.signIn;

if (!hasMultipleEnterpriseConnections(signIn.supportedFirstFactors)) {
// This should not happen due to the HOC guard, but provides type safety
return null;
}
Comment thread
LauraBeatris marked this conversation as resolved.

const enterpriseConnections = signIn.supportedFirstFactors.map(ff => ({
id: ff.enterpriseConnectionId,
name: ff.enterpriseConnectionName,
}));

const handleEnterpriseSSO = (enterpriseConnectionId: string) => {
const redirectUrl = buildSSOCallbackURL(ctx, displayConfig.signInUrl);
const redirectUrlComplete = ctx.afterSignInUrl || '/';

return signIn.authenticateWithRedirect({
strategy: 'enterprise_sso',
redirectUrl,
redirectUrlComplete,
oidcPrompt: ctx.oidcPrompt,
continueSignIn: true,
enterpriseConnectionId,
});
};
Comment thread
LauraBeatris marked this conversation as resolved.
Comment thread
LauraBeatris marked this conversation as resolved.

return (
<Flow.Part part='enterpriseConnections'>
<ChooseEnterpriseConnectionCard
title={localizationKeys('signIn.enterpriseConnections.title')}
subtitle={localizationKeys('signIn.enterpriseConnections.subtitle')}
onClick={handleEnterpriseSSO}
enterpriseConnections={enterpriseConnections}
/>
</Flow.Part>
);
};

const withEnterpriseConnectionsGuard = <P extends AvailableComponentProps>(Component: ComponentType<P>) => {
const displayName = Component.displayName || Component.name || 'Component';
Component.displayName = displayName;

const HOC = (props: P) => {
const signIn = useCoreSignIn();
const signInCtx = useSignInContext();

return withRedirect(
Component,
() => !hasMultipleEnterpriseConnections(signIn.supportedFirstFactors),
({ clerk }) => signInCtx.signInUrl || clerk.buildSignInUrl(),
'There are no enterprise connections available to sign-in. Clerk is redirecting to the `signInUrl` instead.',
)(props);
Comment thread
LauraBeatris marked this conversation as resolved.
};
Comment thread
coderabbitai[bot] marked this conversation as resolved.

HOC.displayName = `withEnterpriseConnectionsGuard(${displayName})`;

return HOC;
};

export const SignInFactorOneEnterpriseConnections = withCardStateProvider(
withEnterpriseConnectionsGuard(SignInFactorOneEnterpriseConnectionsInternal),
);
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
7 changes: 7 additions & 0 deletions .changeset/upset-results-win.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
---
'@clerk/localizations': minor
'@clerk/clerk-js': minor
'@clerk/types': minor
---

Introduce experimental step to choose enterprise connection on sign-in/sign-up
2 changes: 2 additions & 0 deletions .typedoc/__tests__/__snapshots__/file-structure.test.ts.snap
Original file line numberDiff line numberDiff line change
Expand Up@@ -127,6 +127,8 @@ exports[`Typedoc output > should have a deliberate file structure 1`] = `
"types/sign-in-signal-value.mdx",
"types/sign-out.mdx",
"types/sign-up-authenticate-with-metamask-params.mdx",
"types/sign-up-enterprise-connection-json.mdx",
"types/sign-up-enterprise-connection-resource.mdx",
"types/sign-up-future-resource.mdx",
"types/sign-up-resource.mdx",
"types/signed-in-session-resource.mdx",
Expand Down
2 changes: 1 addition & 1 deletion packages/clerk-js/bundlewatch.config.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,7 +16,7 @@
{ "path": "./dist/organizationswitcher*.js", "maxSize": "5KB" },
{ "path": "./dist/organizationlist*.js", "maxSize": "5.5KB" },
{ "path": "./dist/signin*.js", "maxSize": "18KB" },
{ "path": "./dist/signup*.js", "maxSize": "8.86KB" },
{ "path": "./dist/signup*.js", "maxSize": "9.5KB" },
{ "path": "./dist/userbutton*.js", "maxSize": "5KB" },
{ "path": "./dist/userprofile*.js", "maxSize": "16KB" },
{ "path": "./dist/userverification*.js", "maxSize": "5KB" },
Expand Down
5 changes: 4 additions & 1 deletion packages/clerk-js/src/core/resources/SignIn.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -222,6 +222,7 @@ export class SignIn extends BaseResource implements SignInResource {
redirectUrl: params.redirectUrl,
actionCompleteRedirectUrl: params.actionCompleteRedirectUrl,
oidcPrompt: params.oidcPrompt,
enterpriseConnectionId: params.enterpriseConnectionId,
} as EnterpriseSSOConfig;
break;
default:
Expand DownExpand Up@@ -308,7 +309,8 @@ export class SignIn extends BaseResource implements SignInResource {
params: AuthenticateWithRedirectParams,
navigateCallback: (url: URL | string) => void,
): Promise<void> => {
const { strategy, redirectUrlComplete, identifier, oidcPrompt, continueSignIn } = params || {};
const { strategy, redirectUrlComplete, identifier, oidcPrompt, continueSignIn, enterpriseConnectionId } =
params || {};
const actionCompleteRedirectUrl = redirectUrlComplete;

const redirectUrl = SignIn.clerk.buildUrlWithAuth(params.redirectUrl);
Expand All@@ -328,6 +330,7 @@ export class SignIn extends BaseResource implements SignInResource {
redirectUrl,
actionCompleteRedirectUrl,
oidcPrompt,
enterpriseConnectionId,
});
}

Expand Down
34 changes: 34 additions & 0 deletions packages/clerk-js/src/core/resources/SignUp.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,6 +16,8 @@ import type {
PrepareWeb3WalletVerificationParams,
SignUpAuthenticateWithWeb3Params,
SignUpCreateParams,
SignUpEnterpriseConnectionJSON,
SignUpEnterpriseConnectionResource,
SignUpField,
SignUpFutureCreateParams,
SignUpFutureEmailCodeVerifyParams,
Expand DownExpand Up@@ -385,6 +387,7 @@ export class SignUp extends BaseResource implements SignUpResource {
emailAddress,
legalAccepted,
oidcPrompt,
enterpriseConnectionId,
} = params;

const redirectUrlWithAuthToken = SignUp.clerk.buildUrlWithAuth(redirectUrl);
Expand All@@ -398,6 +401,7 @@ export class SignUp extends BaseResource implements SignUpResource {
emailAddress,
legalAccepted,
oidcPrompt,
enterpriseConnectionId,
};
return continueSignUp && this.id ? this.update(authParams) : this.create(authParams);
};
Expand DownExpand Up@@ -551,6 +555,17 @@ export class SignUp extends BaseResource implements SignUpResource {

return false;
}

__experimental_getEnterpriseConnections = (): Promise<SignUpEnterpriseConnectionResource[]> => {
return BaseResource._fetch({
path: `/client/sign_ups/${this.id}/enterprise_connections`,
method: 'GET',
}).then(res => {
const enterpriseConnections = res?.response as unknown as SignUpEnterpriseConnectionJSON[];

return enterpriseConnections.map(enterpriseConnection => new SignUpEnterpriseConnection(enterpriseConnection));
});
};
Comment thread
LauraBeatris marked this conversation as resolved.
}

class SignUpFuture implements SignUpFutureResource {
Expand DownExpand Up@@ -889,3 +904,22 @@ class SignUpFuture implements SignUpFutureResource {
});
}
}

class SignUpEnterpriseConnection extends BaseResource implements SignUpEnterpriseConnectionResource {
id!: string;
name!: string;

constructor(data: SignUpEnterpriseConnectionJSON) {
super();
this.fromJSON(data);
}

protected fromJSON(data: SignUpEnterpriseConnectionJSON | null): this {
if (data) {
this.id = data.id;
this.name = data.name;
}

return this;
}
}
123 changes: 123 additions & 0 deletions packages/clerk-js/src/ui/common/ChooseEnterpriseConnectionCard.tsx
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,123 @@
import { useState } from 'react';

import type { LocalizationKey } from '@/ui/customizables';
import { descriptors, Flex, Grid, SimpleButton, Spinner, Text } from '@/ui/customizables';
import { Card } from '@/ui/elements/Card';
import { useCardState } from '@/ui/elements/contexts';
import { Header } from '@/ui/elements/Header';
import type { InternalTheme, PropsOfComponent } from '@/ui/styledSystem';

type ChooseEnterpriseConnectionCardProps = {
title: LocalizationKey;
subtitle: LocalizationKey;
onClick: (id: string) => Promise<void>;
enterpriseConnections: Array<{ id: string; name: string }>;
};

/**
* @experimental
*/
export const ChooseEnterpriseConnectionCard = ({
title,
subtitle,
onClick,
enterpriseConnections,
}: ChooseEnterpriseConnectionCardProps) => {
const card = useCardState();
Comment thread
LauraBeatris marked this conversation as resolved.

return (
<Card.Root>
<Card.Content>
<Header.Root showLogo>
<Header.Title localizationKey={title} />
<Header.Subtitle localizationKey={subtitle} />
</Header.Root>
<Card.Alert>{card.error}</Card.Alert>

<Grid
elementDescriptor={descriptors.enterpriseConnectionsRoot}
gap={2}
>
{enterpriseConnections?.map(({ id, name }) => (
<ChooseEnterpriseConnectionButton
key={id}
id={id}
label={name}
onClick={onClick}
/>
))}
</Grid>
</Card.Content>

<Card.Footer />
</Card.Root>
);
};

type ChooseEnterpriseConnectionButtonProps = Omit<PropsOfComponent<typeof SimpleButton>, 'onClick'> & {
id: string;
label?: string;
onClick: (id: string) => Promise<void>;
};

const ChooseEnterpriseConnectionButton = (props: ChooseEnterpriseConnectionButtonProps): JSX.Element => {

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Any way to reuse the SocialButtonBlock component vs creating this duplication?

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

I thought of not reusing since this is an experimental UI, and I wanted to minimize the changes for the core flows.

We could extract SocialButtonBlock to a UI component that receives custom descriptors, and rename it to a more generic approach for enterprise connections.

const { label, onClick, ...rest } = props;
const [isLoading, setIsLoading] = useState(false);

const handleClick = () => {
setIsLoading(true);
void onClick(props.id).catch(() => setIsLoading(false));
};

return (
<SimpleButton
elementDescriptor={descriptors.enterpriseConnectionButton}
variant='outline'
block
isLoading={isLoading}
hoverAsFocus
onClick={handleClick}
{...rest}
sx={(theme: InternalTheme) => [
{
gap: theme.space.$4,
position: 'relative',
justifyContent: 'flex-start',
},
(rest as any).sx,
]}
>
<Flex
justify='center'
align='center'
as='span'
gap={3}
sx={{
width: '100%',
overflow: 'hidden',
}}
>
{isLoading && (
<Flex
as='span'
center
sx={(theme: InternalTheme) => ({ flex: `0 0 ${theme.space.$4}` })}
>
<Spinner
size='sm'
elementDescriptor={descriptors.spinner}
/>
</Flex>
)}
<Text
elementDescriptor={descriptors.enterpriseConnectionButtonText}
as='span'
truncate
variant='buttonLarge'
>
{label}
</Text>
</Flex>
</SimpleButton>
);
};
11 changes: 11 additions & 0 deletions packages/clerk-js/src/ui/components/SignIn/SignInFactorOne.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -12,9 +12,11 @@ import { useAlternativeStrategies } from '../../hooks/useAlternativeStrategies';
import { localizationKeys } from '../../localization';
import { useRouter } from '../../router';
import { AlternativeMethods } from './AlternativeMethods';
import { hasMultipleEnterpriseConnections } from './shared';
import { SignInFactorOneAlternativePhoneCodeCard } from './SignInFactorOneAlternativePhoneCodeCard';
import { SignInFactorOneEmailCodeCard } from './SignInFactorOneEmailCodeCard';
import { SignInFactorOneEmailLinkCard } from './SignInFactorOneEmailLinkCard';
import { SignInFactorOneEnterpriseConnections } from './SignInFactorOneEnterpriseConnections';
import { SignInFactorOneForgotPasswordCard } from './SignInFactorOneForgotPasswordCard';
import { SignInFactorOnePasskey } from './SignInFactorOnePasskey';
import { SignInFactorOnePasswordCard } from './SignInFactorOnePasswordCard';
Expand DownExpand Up@@ -122,6 +124,15 @@ function SignInFactorOneInternal(): JSX.Element {
prevCurrentFactor: prev.currentFactor,
}));
};

/**
* Prompt to choose between a list of enterprise connections as supported first factors
* @experimental
*/
if (hasMultipleEnterpriseConnections(signIn.supportedFirstFactors)) {
return <SignInFactorOneEnterpriseConnections />;
}

if (showAllStrategies || showForgotPasswordStrategies) {
const canGoBack = factorHasLocalStrategy(currentFactor);

Expand Down
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,82 @@
import { useClerk } from '@clerk/shared/react/index';
import type { ComponentType } from 'react';

import { buildSSOCallbackURL, withRedirect } from '@/ui/common';
import { ChooseEnterpriseConnectionCard } from '@/ui/common/ChooseEnterpriseConnectionCard';
import { useCoreSignIn, useEnvironment, useSignInContext } from '@/ui/contexts';
import { Flow, localizationKeys } from '@/ui/customizables';
import { withCardStateProvider } from '@/ui/elements/contexts';
import type { AvailableComponentProps } from '@/ui/types';

import { hasMultipleEnterpriseConnections } from './shared';

/**
* @experimental
*/
const SignInFactorOneEnterpriseConnectionsInternal = () => {
const ctx = useSignInContext();
const { displayConfig } = useEnvironment();

const clerk = useClerk();
const signIn = clerk.client.signIn;

if (!hasMultipleEnterpriseConnections(signIn.supportedFirstFactors)) {
// This should not happen due to the HOC guard, but provides type safety
return null;
}
Comment thread
LauraBeatris marked this conversation as resolved.

const enterpriseConnections = signIn.supportedFirstFactors.map(ff => ({
id: ff.enterpriseConnectionId,
name: ff.enterpriseConnectionName,
}));

const handleEnterpriseSSO = (enterpriseConnectionId: string) => {
const redirectUrl = buildSSOCallbackURL(ctx, displayConfig.signInUrl);
const redirectUrlComplete = ctx.afterSignInUrl || '/';

return signIn.authenticateWithRedirect({
strategy: 'enterprise_sso',
redirectUrl,
redirectUrlComplete,
oidcPrompt: ctx.oidcPrompt,
continueSignIn: true,
enterpriseConnectionId,
});
};
Comment thread
LauraBeatris marked this conversation as resolved.
Comment thread
LauraBeatris marked this conversation as resolved.

return (
<Flow.Part part='enterpriseConnections'>
<ChooseEnterpriseConnectionCard
title={localizationKeys('signIn.enterpriseConnections.title')}
subtitle={localizationKeys('signIn.enterpriseConnections.subtitle')}
onClick={handleEnterpriseSSO}
enterpriseConnections={enterpriseConnections}
/>
</Flow.Part>
);
};

const withEnterpriseConnectionsGuard = <P extends AvailableComponentProps>(Component: ComponentType<P>) => {
const displayName = Component.displayName || Component.name || 'Component';
Component.displayName = displayName;

const HOC = (props: P) => {
const signIn = useCoreSignIn();
const signInCtx = useSignInContext();

return withRedirect(
Component,
() => !hasMultipleEnterpriseConnections(signIn.supportedFirstFactors),
({ clerk }) => signInCtx.signInUrl || clerk.buildSignInUrl(),
'There are no enterprise connections available to sign-in. Clerk is redirecting to the `signInUrl` instead.',
)(props);
Comment thread
LauraBeatris marked this conversation as resolved.
};
Comment thread
coderabbitai[bot] marked this conversation as resolved.

HOC.displayName = `withEnterpriseConnectionsGuard(${displayName})`;

return HOC;
};

export const SignInFactorOneEnterpriseConnections = withCardStateProvider(
withEnterpriseConnectionsGuard(SignInFactorOneEnterpriseConnectionsInternal),
);
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
7 changes: 7 additions & 0 deletions .changeset/upset-results-win.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
---
'@clerk/localizations': minor
'@clerk/clerk-js': minor
'@clerk/types': minor
---

Introduce experimental step to choose enterprise connection on sign-in/sign-up
2 changes: 2 additions & 0 deletions .typedoc/__tests__/__snapshots__/file-structure.test.ts.snap
Original file line numberDiff line numberDiff line change
Expand Up@@ -127,6 +127,8 @@ exports[`Typedoc output > should have a deliberate file structure 1`] = `
"types/sign-in-signal-value.mdx",
"types/sign-out.mdx",
"types/sign-up-authenticate-with-metamask-params.mdx",
"types/sign-up-enterprise-connection-json.mdx",
"types/sign-up-enterprise-connection-resource.mdx",
"types/sign-up-future-resource.mdx",
"types/sign-up-resource.mdx",
"types/signed-in-session-resource.mdx",
Expand Down
2 changes: 1 addition & 1 deletion packages/clerk-js/bundlewatch.config.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,7 +16,7 @@
{ "path": "./dist/organizationswitcher*.js", "maxSize": "5KB" },
{ "path": "./dist/organizationlist*.js", "maxSize": "5.5KB" },
{ "path": "./dist/signin*.js", "maxSize": "18KB" },
{ "path": "./dist/signup*.js", "maxSize": "8.86KB" },
{ "path": "./dist/signup*.js", "maxSize": "9.5KB" },
{ "path": "./dist/userbutton*.js", "maxSize": "5KB" },
{ "path": "./dist/userprofile*.js", "maxSize": "16KB" },
{ "path": "./dist/userverification*.js", "maxSize": "5KB" },
Expand Down
5 changes: 4 additions & 1 deletion packages/clerk-js/src/core/resources/SignIn.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -222,6 +222,7 @@ export class SignIn extends BaseResource implements SignInResource {
redirectUrl: params.redirectUrl,
actionCompleteRedirectUrl: params.actionCompleteRedirectUrl,
oidcPrompt: params.oidcPrompt,
enterpriseConnectionId: params.enterpriseConnectionId,
} as EnterpriseSSOConfig;
break;
default:
Expand DownExpand Up@@ -308,7 +309,8 @@ export class SignIn extends BaseResource implements SignInResource {
params: AuthenticateWithRedirectParams,
navigateCallback: (url: URL | string) => void,
): Promise<void> => {
const { strategy, redirectUrlComplete, identifier, oidcPrompt, continueSignIn } = params || {};
const { strategy, redirectUrlComplete, identifier, oidcPrompt, continueSignIn, enterpriseConnectionId } =
params || {};
const actionCompleteRedirectUrl = redirectUrlComplete;

const redirectUrl = SignIn.clerk.buildUrlWithAuth(params.redirectUrl);
Expand All@@ -328,6 +330,7 @@ export class SignIn extends BaseResource implements SignInResource {
redirectUrl,
actionCompleteRedirectUrl,
oidcPrompt,
enterpriseConnectionId,
});
}

Expand Down
34 changes: 34 additions & 0 deletions packages/clerk-js/src/core/resources/SignUp.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,6 +16,8 @@ import type {
PrepareWeb3WalletVerificationParams,
SignUpAuthenticateWithWeb3Params,
SignUpCreateParams,
SignUpEnterpriseConnectionJSON,
SignUpEnterpriseConnectionResource,
SignUpField,
SignUpFutureCreateParams,
SignUpFutureEmailCodeVerifyParams,
Expand DownExpand Up@@ -385,6 +387,7 @@ export class SignUp extends BaseResource implements SignUpResource {
emailAddress,
legalAccepted,
oidcPrompt,
enterpriseConnectionId,
} = params;

const redirectUrlWithAuthToken = SignUp.clerk.buildUrlWithAuth(redirectUrl);
Expand All@@ -398,6 +401,7 @@ export class SignUp extends BaseResource implements SignUpResource {
emailAddress,
legalAccepted,
oidcPrompt,
enterpriseConnectionId,
};
return continueSignUp && this.id ? this.update(authParams) : this.create(authParams);
};
Expand DownExpand Up@@ -551,6 +555,17 @@ export class SignUp extends BaseResource implements SignUpResource {

return false;
}

__experimental_getEnterpriseConnections = (): Promise<SignUpEnterpriseConnectionResource[]> => {
return BaseResource._fetch({
path: `/client/sign_ups/${this.id}/enterprise_connections`,
method: 'GET',
}).then(res => {
const enterpriseConnections = res?.response as unknown as SignUpEnterpriseConnectionJSON[];

return enterpriseConnections.map(enterpriseConnection => new SignUpEnterpriseConnection(enterpriseConnection));
});
};
Comment thread
LauraBeatris marked this conversation as resolved.
}

class SignUpFuture implements SignUpFutureResource {
Expand DownExpand Up@@ -889,3 +904,22 @@ class SignUpFuture implements SignUpFutureResource {
});
}
}

class SignUpEnterpriseConnection extends BaseResource implements SignUpEnterpriseConnectionResource {
id!: string;
name!: string;

constructor(data: SignUpEnterpriseConnectionJSON) {
super();
this.fromJSON(data);
}

protected fromJSON(data: SignUpEnterpriseConnectionJSON | null): this {
if (data) {
this.id = data.id;
this.name = data.name;
}

return this;
}
}
123 changes: 123 additions & 0 deletions packages/clerk-js/src/ui/common/ChooseEnterpriseConnectionCard.tsx
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,123 @@
import { useState } from 'react';

import type { LocalizationKey } from '@/ui/customizables';
import { descriptors, Flex, Grid, SimpleButton, Spinner, Text } from '@/ui/customizables';
import { Card } from '@/ui/elements/Card';
import { useCardState } from '@/ui/elements/contexts';
import { Header } from '@/ui/elements/Header';
import type { InternalTheme, PropsOfComponent } from '@/ui/styledSystem';

type ChooseEnterpriseConnectionCardProps = {
title: LocalizationKey;
subtitle: LocalizationKey;
onClick: (id: string) => Promise<void>;
enterpriseConnections: Array<{ id: string; name: string }>;
};

/**
* @experimental
*/
export const ChooseEnterpriseConnectionCard = ({
title,
subtitle,
onClick,
enterpriseConnections,
}: ChooseEnterpriseConnectionCardProps) => {
const card = useCardState();
Comment thread
LauraBeatris marked this conversation as resolved.

return (
<Card.Root>
<Card.Content>
<Header.Root showLogo>
<Header.Title localizationKey={title} />
<Header.Subtitle localizationKey={subtitle} />
</Header.Root>
<Card.Alert>{card.error}</Card.Alert>

<Grid
elementDescriptor={descriptors.enterpriseConnectionsRoot}
gap={2}
>
{enterpriseConnections?.map(({ id, name }) => (
<ChooseEnterpriseConnectionButton
key={id}
id={id}
label={name}
onClick={onClick}
/>
))}
</Grid>
</Card.Content>

<Card.Footer />
</Card.Root>
);
};

type ChooseEnterpriseConnectionButtonProps = Omit<PropsOfComponent<typeof SimpleButton>, 'onClick'> & {
id: string;
label?: string;
onClick: (id: string) => Promise<void>;
};

const ChooseEnterpriseConnectionButton = (props: ChooseEnterpriseConnectionButtonProps): JSX.Element => {

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Any way to reuse the SocialButtonBlock component vs creating this duplication?

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

I thought of not reusing since this is an experimental UI, and I wanted to minimize the changes for the core flows.

We could extract SocialButtonBlock to a UI component that receives custom descriptors, and rename it to a more generic approach for enterprise connections.

const { label, onClick, ...rest } = props;
const [isLoading, setIsLoading] = useState(false);

const handleClick = () => {
setIsLoading(true);
void onClick(props.id).catch(() => setIsLoading(false));
};

return (
<SimpleButton
elementDescriptor={descriptors.enterpriseConnectionButton}
variant='outline'
block
isLoading={isLoading}
hoverAsFocus
onClick={handleClick}
{...rest}
sx={(theme: InternalTheme) => [
{
gap: theme.space.$4,
position: 'relative',
justifyContent: 'flex-start',
},
(rest as any).sx,
]}
>
<Flex
justify='center'
align='center'
as='span'
gap={3}
sx={{
width: '100%',
overflow: 'hidden',
}}
>
{isLoading && (
<Flex
as='span'
center
sx={(theme: InternalTheme) => ({ flex: `0 0 ${theme.space.$4}` })}
>
<Spinner
size='sm'
elementDescriptor={descriptors.spinner}
/>
</Flex>
)}
<Text
elementDescriptor={descriptors.enterpriseConnectionButtonText}
as='span'
truncate
variant='buttonLarge'
>
{label}
</Text>
</Flex>
</SimpleButton>
);
};
11 changes: 11 additions & 0 deletions packages/clerk-js/src/ui/components/SignIn/SignInFactorOne.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -12,9 +12,11 @@ import { useAlternativeStrategies } from '../../hooks/useAlternativeStrategies';
import { localizationKeys } from '../../localization';
import { useRouter } from '../../router';
import { AlternativeMethods } from './AlternativeMethods';
import { hasMultipleEnterpriseConnections } from './shared';
import { SignInFactorOneAlternativePhoneCodeCard } from './SignInFactorOneAlternativePhoneCodeCard';
import { SignInFactorOneEmailCodeCard } from './SignInFactorOneEmailCodeCard';
import { SignInFactorOneEmailLinkCard } from './SignInFactorOneEmailLinkCard';
import { SignInFactorOneEnterpriseConnections } from './SignInFactorOneEnterpriseConnections';
import { SignInFactorOneForgotPasswordCard } from './SignInFactorOneForgotPasswordCard';
import { SignInFactorOnePasskey } from './SignInFactorOnePasskey';
import { SignInFactorOnePasswordCard } from './SignInFactorOnePasswordCard';
Expand DownExpand Up@@ -122,6 +124,15 @@ function SignInFactorOneInternal(): JSX.Element {
prevCurrentFactor: prev.currentFactor,
}));
};

/**
* Prompt to choose between a list of enterprise connections as supported first factors
* @experimental
*/
if (hasMultipleEnterpriseConnections(signIn.supportedFirstFactors)) {
return <SignInFactorOneEnterpriseConnections />;
}

if (showAllStrategies || showForgotPasswordStrategies) {
const canGoBack = factorHasLocalStrategy(currentFactor);

Expand Down
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,82 @@
import { useClerk } from '@clerk/shared/react/index';
import type { ComponentType } from 'react';

import { buildSSOCallbackURL, withRedirect } from '@/ui/common';
import { ChooseEnterpriseConnectionCard } from '@/ui/common/ChooseEnterpriseConnectionCard';
import { useCoreSignIn, useEnvironment, useSignInContext } from '@/ui/contexts';
import { Flow, localizationKeys } from '@/ui/customizables';
import { withCardStateProvider } from '@/ui/elements/contexts';
import type { AvailableComponentProps } from '@/ui/types';

import { hasMultipleEnterpriseConnections } from './shared';

/**
* @experimental
*/
const SignInFactorOneEnterpriseConnectionsInternal = () => {
const ctx = useSignInContext();
const { displayConfig } = useEnvironment();

const clerk = useClerk();
const signIn = clerk.client.signIn;

if (!hasMultipleEnterpriseConnections(signIn.supportedFirstFactors)) {
// This should not happen due to the HOC guard, but provides type safety
return null;
}
Comment thread
LauraBeatris marked this conversation as resolved.

const enterpriseConnections = signIn.supportedFirstFactors.map(ff => ({
id: ff.enterpriseConnectionId,
name: ff.enterpriseConnectionName,
}));

const handleEnterpriseSSO = (enterpriseConnectionId: string) => {
const redirectUrl = buildSSOCallbackURL(ctx, displayConfig.signInUrl);
const redirectUrlComplete = ctx.afterSignInUrl || '/';

return signIn.authenticateWithRedirect({
strategy: 'enterprise_sso',
redirectUrl,
redirectUrlComplete,
oidcPrompt: ctx.oidcPrompt,
continueSignIn: true,
enterpriseConnectionId,
});
};
Comment thread
LauraBeatris marked this conversation as resolved.
Comment thread
LauraBeatris marked this conversation as resolved.

return (
<Flow.Part part='enterpriseConnections'>
<ChooseEnterpriseConnectionCard
title={localizationKeys('signIn.enterpriseConnections.title')}
subtitle={localizationKeys('signIn.enterpriseConnections.subtitle')}
onClick={handleEnterpriseSSO}
enterpriseConnections={enterpriseConnections}
/>
</Flow.Part>
);
};

const withEnterpriseConnectionsGuard = <P extends AvailableComponentProps>(Component: ComponentType<P>) => {
const displayName = Component.displayName || Component.name || 'Component';
Component.displayName = displayName;

const HOC = (props: P) => {
const signIn = useCoreSignIn();
const signInCtx = useSignInContext();

return withRedirect(
Component,
() => !hasMultipleEnterpriseConnections(signIn.supportedFirstFactors),
({ clerk }) => signInCtx.signInUrl || clerk.buildSignInUrl(),
'There are no enterprise connections available to sign-in. Clerk is redirecting to the `signInUrl` instead.',
)(props);
Comment thread
LauraBeatris marked this conversation as resolved.
};
Comment thread
coderabbitai[bot] marked this conversation as resolved.

HOC.displayName = `withEnterpriseConnectionsGuard(${displayName})`;

return HOC;
};

export const SignInFactorOneEnterpriseConnections = withCardStateProvider(
withEnterpriseConnectionsGuard(SignInFactorOneEnterpriseConnectionsInternal),
);
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content
Merged
7 changes: 7 additions & 0 deletions .changeset/upset-results-win.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
---
'@clerk/localizations': minor
'@clerk/clerk-js': minor
'@clerk/types': minor
---

Introduce experimental step to choose enterprise connection on sign-in/sign-up
2 changes: 2 additions & 0 deletions .typedoc/__tests__/__snapshots__/file-structure.test.ts.snap
Original file line numberDiff line numberDiff line change
Expand Up@@ -127,6 +127,8 @@ exports[`Typedoc output > should have a deliberate file structure 1`] = `
"types/sign-in-signal-value.mdx",
"types/sign-out.mdx",
"types/sign-up-authenticate-with-metamask-params.mdx",
"types/sign-up-enterprise-connection-json.mdx",
"types/sign-up-enterprise-connection-resource.mdx",
"types/sign-up-future-resource.mdx",
"types/sign-up-resource.mdx",
"types/signed-in-session-resource.mdx",
Expand Down
2 changes: 1 addition & 1 deletion packages/clerk-js/bundlewatch.config.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,7 +16,7 @@
{ "path": "./dist/organizationswitcher*.js", "maxSize": "5KB" },
{ "path": "./dist/organizationlist*.js", "maxSize": "5.5KB" },
{ "path": "./dist/signin*.js", "maxSize": "18KB" },
{ "path": "./dist/signup*.js", "maxSize": "8.86KB" },
{ "path": "./dist/signup*.js", "maxSize": "9.5KB" },
{ "path": "./dist/userbutton*.js", "maxSize": "5KB" },
{ "path": "./dist/userprofile*.js", "maxSize": "16KB" },
{ "path": "./dist/userverification*.js", "maxSize": "5KB" },
Expand Down
5 changes: 4 additions & 1 deletion packages/clerk-js/src/core/resources/SignIn.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -222,6 +222,7 @@ export class SignIn extends BaseResource implements SignInResource {
redirectUrl: params.redirectUrl,
actionCompleteRedirectUrl: params.actionCompleteRedirectUrl,
oidcPrompt: params.oidcPrompt,
enterpriseConnectionId: params.enterpriseConnectionId,
} as EnterpriseSSOConfig;
break;
default:
Expand DownExpand Up@@ -308,7 +309,8 @@ export class SignIn extends BaseResource implements SignInResource {
params: AuthenticateWithRedirectParams,
navigateCallback: (url: URL | string) => void,
): Promise<void> => {
const { strategy, redirectUrlComplete, identifier, oidcPrompt, continueSignIn } = params || {};
const { strategy, redirectUrlComplete, identifier, oidcPrompt, continueSignIn, enterpriseConnectionId } =
params || {};
const actionCompleteRedirectUrl = redirectUrlComplete;

const redirectUrl = SignIn.clerk.buildUrlWithAuth(params.redirectUrl);
Expand All@@ -328,6 +330,7 @@ export class SignIn extends BaseResource implements SignInResource {
redirectUrl,
actionCompleteRedirectUrl,
oidcPrompt,
enterpriseConnectionId,
});
}

Expand Down
34 changes: 34 additions & 0 deletions packages/clerk-js/src/core/resources/SignUp.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,6 +16,8 @@ import type {
PrepareWeb3WalletVerificationParams,
SignUpAuthenticateWithWeb3Params,
SignUpCreateParams,
SignUpEnterpriseConnectionJSON,
SignUpEnterpriseConnectionResource,
SignUpField,
SignUpFutureCreateParams,
SignUpFutureEmailCodeVerifyParams,
Expand DownExpand Up@@ -385,6 +387,7 @@ export class SignUp extends BaseResource implements SignUpResource {
emailAddress,
legalAccepted,
oidcPrompt,
enterpriseConnectionId,
} = params;

const redirectUrlWithAuthToken = SignUp.clerk.buildUrlWithAuth(redirectUrl);
Expand All@@ -398,6 +401,7 @@ export class SignUp extends BaseResource implements SignUpResource {
emailAddress,
legalAccepted,
oidcPrompt,
enterpriseConnectionId,
};
return continueSignUp && this.id ? this.update(authParams) : this.create(authParams);
};
Expand DownExpand Up@@ -551,6 +555,17 @@ export class SignUp extends BaseResource implements SignUpResource {

return false;
}

__experimental_getEnterpriseConnections = (): Promise<SignUpEnterpriseConnectionResource[]> => {
return BaseResource._fetch({
path: `/client/sign_ups/${this.id}/enterprise_connections`,
method: 'GET',
}).then(res => {
const enterpriseConnections = res?.response as unknown as SignUpEnterpriseConnectionJSON[];

return enterpriseConnections.map(enterpriseConnection => new SignUpEnterpriseConnection(enterpriseConnection));
});
};
Comment thread
LauraBeatris marked this conversation as resolved.
}

class SignUpFuture implements SignUpFutureResource {
Expand DownExpand Up@@ -889,3 +904,22 @@ class SignUpFuture implements SignUpFutureResource {
});
}
}

class SignUpEnterpriseConnection extends BaseResource implements SignUpEnterpriseConnectionResource {
id!: string;
name!: string;

constructor(data: SignUpEnterpriseConnectionJSON) {
super();
this.fromJSON(data);
}

protected fromJSON(data: SignUpEnterpriseConnectionJSON | null): this {
if (data) {
this.id = data.id;
this.name = data.name;
}

return this;
}
}
123 changes: 123 additions & 0 deletions packages/clerk-js/src/ui/common/ChooseEnterpriseConnectionCard.tsx
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,123 @@
import { useState } from 'react';

import type { LocalizationKey } from '@/ui/customizables';
import { descriptors, Flex, Grid, SimpleButton, Spinner, Text } from '@/ui/customizables';
import { Card } from '@/ui/elements/Card';
import { useCardState } from '@/ui/elements/contexts';
import { Header } from '@/ui/elements/Header';
import type { InternalTheme, PropsOfComponent } from '@/ui/styledSystem';

type ChooseEnterpriseConnectionCardProps = {
title: LocalizationKey;
subtitle: LocalizationKey;
onClick: (id: string) => Promise<void>;
enterpriseConnections: Array<{ id: string; name: string }>;
};

/**
* @experimental
*/
export const ChooseEnterpriseConnectionCard = ({
title,
subtitle,
onClick,
enterpriseConnections,
}: ChooseEnterpriseConnectionCardProps) => {
const card = useCardState();
Comment thread
LauraBeatris marked this conversation as resolved.

return (
<Card.Root>
<Card.Content>
<Header.Root showLogo>
<Header.Title localizationKey={title} />
<Header.Subtitle localizationKey={subtitle} />
</Header.Root>
<Card.Alert>{card.error}</Card.Alert>

<Grid
elementDescriptor={descriptors.enterpriseConnectionsRoot}
gap={2}
>
{enterpriseConnections?.map(({ id, name }) => (
<ChooseEnterpriseConnectionButton
key={id}
id={id}
label={name}
onClick={onClick}
/>
))}
</Grid>
</Card.Content>

<Card.Footer />
</Card.Root>
);
};

type ChooseEnterpriseConnectionButtonProps = Omit<PropsOfComponent<typeof SimpleButton>, 'onClick'> & {
id: string;
label?: string;
onClick: (id: string) => Promise<void>;
};

const ChooseEnterpriseConnectionButton = (props: ChooseEnterpriseConnectionButtonProps): JSX.Element => {

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Any way to reuse the SocialButtonBlock component vs creating this duplication?

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

I thought of not reusing since this is an experimental UI, and I wanted to minimize the changes for the core flows.

We could extract SocialButtonBlock to a UI component that receives custom descriptors, and rename it to a more generic approach for enterprise connections.

const { label, onClick, ...rest } = props;
const [isLoading, setIsLoading] = useState(false);

const handleClick = () => {
setIsLoading(true);
void onClick(props.id).catch(() => setIsLoading(false));
};

return (
<SimpleButton
elementDescriptor={descriptors.enterpriseConnectionButton}
variant='outline'
block
isLoading={isLoading}
hoverAsFocus
onClick={handleClick}
{...rest}
sx={(theme: InternalTheme) => [
{
gap: theme.space.$4,
position: 'relative',
justifyContent: 'flex-start',
},
(rest as any).sx,
]}
>
<Flex
justify='center'
align='center'
as='span'
gap={3}
sx={{
width: '100%',
overflow: 'hidden',
}}
>
{isLoading && (
<Flex
as='span'
center
sx={(theme: InternalTheme) => ({ flex: `0 0 ${theme.space.$4}` })}
>
<Spinner
size='sm'
elementDescriptor={descriptors.spinner}
/>
</Flex>
)}
<Text
elementDescriptor={descriptors.enterpriseConnectionButtonText}
as='span'
truncate
variant='buttonLarge'
>
{label}
</Text>
</Flex>
</SimpleButton>
);
};
11 changes: 11 additions & 0 deletions packages/clerk-js/src/ui/components/SignIn/SignInFactorOne.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -12,9 +12,11 @@ import { useAlternativeStrategies } from '../../hooks/useAlternativeStrategies';
import { localizationKeys } from '../../localization';
import { useRouter } from '../../router';
import { AlternativeMethods } from './AlternativeMethods';
import { hasMultipleEnterpriseConnections } from './shared';
import { SignInFactorOneAlternativePhoneCodeCard } from './SignInFactorOneAlternativePhoneCodeCard';
import { SignInFactorOneEmailCodeCard } from './SignInFactorOneEmailCodeCard';
import { SignInFactorOneEmailLinkCard } from './SignInFactorOneEmailLinkCard';
import { SignInFactorOneEnterpriseConnections } from './SignInFactorOneEnterpriseConnections';
import { SignInFactorOneForgotPasswordCard } from './SignInFactorOneForgotPasswordCard';
import { SignInFactorOnePasskey } from './SignInFactorOnePasskey';
import { SignInFactorOnePasswordCard } from './SignInFactorOnePasswordCard';
Expand DownExpand Up@@ -122,6 +124,15 @@ function SignInFactorOneInternal(): JSX.Element {
prevCurrentFactor: prev.currentFactor,
}));
};

/**
* Prompt to choose between a list of enterprise connections as supported first factors
* @experimental
*/
if (hasMultipleEnterpriseConnections(signIn.supportedFirstFactors)) {
return <SignInFactorOneEnterpriseConnections />;
}

if (showAllStrategies || showForgotPasswordStrategies) {
const canGoBack = factorHasLocalStrategy(currentFactor);

Expand Down
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,82 @@
import { useClerk } from '@clerk/shared/react/index';
import type { ComponentType } from 'react';

import { buildSSOCallbackURL, withRedirect } from '@/ui/common';
import { ChooseEnterpriseConnectionCard } from '@/ui/common/ChooseEnterpriseConnectionCard';
import { useCoreSignIn, useEnvironment, useSignInContext } from '@/ui/contexts';
import { Flow, localizationKeys } from '@/ui/customizables';
import { withCardStateProvider } from '@/ui/elements/contexts';
import type { AvailableComponentProps } from '@/ui/types';

import { hasMultipleEnterpriseConnections } from './shared';

/**
* @experimental
*/
const SignInFactorOneEnterpriseConnectionsInternal = () => {
const ctx = useSignInContext();
const { displayConfig } = useEnvironment();

const clerk = useClerk();
const signIn = clerk.client.signIn;

if (!hasMultipleEnterpriseConnections(signIn.supportedFirstFactors)) {
// This should not happen due to the HOC guard, but provides type safety
return null;
}
Comment thread
LauraBeatris marked this conversation as resolved.

const enterpriseConnections = signIn.supportedFirstFactors.map(ff => ({
id: ff.enterpriseConnectionId,
name: ff.enterpriseConnectionName,
}));

const handleEnterpriseSSO = (enterpriseConnectionId: string) => {
const redirectUrl = buildSSOCallbackURL(ctx, displayConfig.signInUrl);
const redirectUrlComplete = ctx.afterSignInUrl || '/';

return signIn.authenticateWithRedirect({
strategy: 'enterprise_sso',
redirectUrl,
redirectUrlComplete,
oidcPrompt: ctx.oidcPrompt,
continueSignIn: true,
enterpriseConnectionId,
});
};
Comment thread
LauraBeatris marked this conversation as resolved.
Comment thread
LauraBeatris marked this conversation as resolved.

return (
<Flow.Part part='enterpriseConnections'>
<ChooseEnterpriseConnectionCard
title={localizationKeys('signIn.enterpriseConnections.title')}
subtitle={localizationKeys('signIn.enterpriseConnections.subtitle')}
onClick={handleEnterpriseSSO}
enterpriseConnections={enterpriseConnections}
/>
</Flow.Part>
);
};

const withEnterpriseConnectionsGuard = <P extends AvailableComponentProps>(Component: ComponentType<P>) => {
const displayName = Component.displayName || Component.name || 'Component';
Component.displayName = displayName;

const HOC = (props: P) => {
const signIn = useCoreSignIn();
const signInCtx = useSignInContext();

return withRedirect(
Component,
() => !hasMultipleEnterpriseConnections(signIn.supportedFirstFactors),
({ clerk }) => signInCtx.signInUrl || clerk.buildSignInUrl(),
'There are no enterprise connections available to sign-in. Clerk is redirecting to the `signInUrl` instead.',
)(props);
Comment thread
LauraBeatris marked this conversation as resolved.
};
Comment thread
coderabbitai[bot] marked this conversation as resolved.

HOC.displayName = `withEnterpriseConnectionsGuard(${displayName})`;

return HOC;
};

export const SignInFactorOneEnterpriseConnections = withCardStateProvider(
withEnterpriseConnectionsGuard(SignInFactorOneEnterpriseConnectionsInternal),
);
Loading
Loading