Skip to content

fix(ui): preserve OIDC prompt across sign-up continuations#9541

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
zourzouvillys wants to merge 3 commits into
base:main
Choose a base branch
from
Open

fix(ui): preserve OIDC prompt across sign-up continuations #9541

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e34c624
fix(ui): preserve OIDC prompt after sign-up email-link verification
zourzouvillys Aug 25, 2026
e6d7db2
fix(ui): normalize OIDC prompt for combined sign-up flow
zourzouvillys Aug 25, 2026
a8cfc24
Merge branch 'main' into theo/fix-signup-email-link-oidc-prompt
wobsoriano Aug 25, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/wise-lions-prompt.md
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
'@clerk/ui': patch
---

Fix configured OIDC prompts being ignored by sign-up continuations, including enterprise SSO after email-link verification or direct combined-flow transfer and OAuth sign-ups embedded in `<SignIn withSignUp>`.
12 changes: 11 additions & 1 deletion packages/ui/src/common/EmailLinkVerify.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,14 +15,23 @@ export type EmailLinkVerifyProps = {
redirectUrlComplete?: string;
redirectUrl?: string;
ssoCallbackUrl?: string;
oidcPrompt?: string;
verifyEmailPath?: string;
verifyPhonePath?: string;
continuePath?: string;
texts: Record<EmailLinkUIStatus, { title: LocalizationKey; subtitle: LocalizationKey }>;
};

export const EmailLinkVerify = (props: EmailLinkVerifyProps) => {
const { redirectUrl, redirectUrlComplete, ssoCallbackUrl, verifyEmailPath, verifyPhonePath, continuePath } = props;
const {
redirectUrl,
redirectUrlComplete,
ssoCallbackUrl,
oidcPrompt,
verifyEmailPath,
verifyPhonePath,
continuePath,
} = props;
const { handleEmailLinkVerification } = useClerk();
const { navigate } = useRouter();
const signUp = useCoreSignUp();
Expand DownExpand Up@@ -53,6 +62,7 @@ export const EmailLinkVerify = (props: EmailLinkVerifyProps) => {
navigate,
redirectUrl: ssoCallbackUrl,
redirectUrlComplete: redirectUrlComplete || '/',
oidcPrompt,
});
} catch (err: any) {
if (
Expand Down
1 change: 1 addition & 0 deletions packages/ui/src/components/SignIn/SignInStart.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -535,6 +535,7 @@ function SignInStartInternal(): JSX.Element {
signUpMode: userSettings.signUp.mode,
redirectUrl,
redirectUrlComplete,
oidcPrompt: ctx.oidcPrompt,
navigateOnSetActive,
passwordEnabled: userSettings.attributes.password?.required ?? false,
alternativePhoneCodeChannel:
Expand Down
9 changes: 7 additions & 2 deletions packages/ui/src/components/SignIn/__tests__/handleCombinedFlowTransfer.test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -22,7 +22,7 @@ describe('handleCombinedFlowTransfer', () => {
vi.resetAllMocks();
});

it('should call completeSignUpFlow', async () => {
it('should pass the OIDC prompt to completeSignUpFlow', async () => {
const mockClerk = {
client: {
signUp: {
Expand All@@ -42,9 +42,14 @@ describe('handleCombinedFlowTransfer', () => {
afterSignUpUrl: 'https://test.com',
passwordEnabled: false,
navigateOnSetActive: vi.fn(),
oidcPrompt: 'select_account',
});

expect(mockCompleteSignUpFlow).toHaveBeenCalled();
expect(mockCompleteSignUpFlow).toHaveBeenCalledWith(
expect.objectContaining({
oidcPrompt: 'select_account',
}),
);
});

it('should pass unsafeMetadata to signUp.create', async () => {
Expand Down
3 changes: 3 additions & 0 deletions packages/ui/src/components/SignIn/handleCombinedFlowTransfer.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,7 @@ type HandleCombinedFlowTransferProps = {
handleError: (err: any) => void;
redirectUrl?: string;
redirectUrlComplete?: string;
oidcPrompt?: string;
passwordEnabled: boolean;
alternativePhoneCodeChannel?: PhoneCodeChannel | null;
navigateOnSetActive: (opts: {
Expand All@@ -48,6 +49,7 @@ export function handleCombinedFlowTransfer({
handleError,
redirectUrl,
redirectUrlComplete,
oidcPrompt,
passwordEnabled,
navigateOnSetActive,
alternativePhoneCodeChannel,
Expand DownExpand Up@@ -111,6 +113,7 @@ export function handleCombinedFlowTransfer({
navigate,
redirectUrl,
redirectUrlComplete,
oidcPrompt,
});
})
.catch(err => handleError(err));
Expand Down
2 changes: 2 additions & 0 deletions packages/ui/src/components/SignIn/index.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -118,6 +118,7 @@ function SignInRoutes(): JSX.Element {
<SignUpEmailLinkFlowComplete
redirectUrlComplete={signUpContext.afterSignUpUrl}
ssoCallbackUrl={signUpContext.ssoCallbackUrl}
oidcPrompt={signUpContext.oidcPrompt}
verifyEmailPath='../verify-email-address'
verifyPhonePath='../verify-phone-number'
continuePath='../continue'
Expand DownExpand Up@@ -177,6 +178,7 @@ function SignInRoot() {
componentName: 'SignUp',
emailLinkRedirectUrl: signInContext.emailLinkRedirectUrl,
ssoCallbackUrl: signInContext.ssoCallbackUrl,
oidcPrompt: signInContext.oidcPrompt,
forceRedirectUrl: signInContext.signUpForceRedirectUrl,
fallbackRedirectUrl: signInContext.signUpFallbackRedirectUrl,
signInUrl: signInContext.signInUrl,
Expand Down
26 changes: 26 additions & 0 deletions packages/ui/src/components/SignUp/__tests__/SignUpEmailLinkFlowComplete.test.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -37,6 +37,32 @@ describe('SignUpEmailLinkFlowComplete', () => {
await waitFor(() => expect(fixtures.clerk.handleEmailLinkVerification).toHaveBeenCalled());
screen.getByText(/success/i);
});

it('preserves the OIDC prompt when continuing through enterprise SSO', async () => {
const { wrapper, fixtures } = await createFixtures(f => {
f.withEmailAddress({ required: true });
});
fixtures.signUp.status = 'missing_requirements';
fixtures.signUp.missingFields = ['enterprise_sso'];

render(
<SignUpEmailLinkFlowComplete
redirectUrlComplete='https://example.com/complete'
ssoCallbackUrl='https://example.com/sso-callback'
oidcPrompt='select_account'
/>,
{ wrapper },
);

await waitFor(() => expect(fixtures.signUp.authenticateWithRedirect).toHaveBeenCalled(), { timeout: 3_000 });
expect(fixtures.signUp.authenticateWithRedirect).toHaveBeenCalledWith({
strategy: 'enterprise_sso',
redirectUrl: 'https://example.com/sso-callback',
redirectUrlComplete: 'https://example.com/complete',
continueSignUp: true,
oidcPrompt: 'select_account',
});
});
});

describe('Error messages', () => {
Expand Down
1 change: 1 addition & 0 deletions packages/ui/src/components/SignUp/index.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -72,6 +72,7 @@ function SignUpRoutes(): JSX.Element {
<SignUpEmailLinkFlowComplete
redirectUrlComplete={signUpContext.afterSignUpUrl}
ssoCallbackUrl={signUpContext.ssoCallbackUrl}
oidcPrompt={signUpContext.oidcPrompt}
verifyEmailPath='../verify-email-address'
verifyPhonePath='../verify-phone-number'
/>
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
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;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
fix(ui): preserve OIDC prompt across sign-up continuations by zourzouvillys · Pull Request #9541 · clerk/javascript · GitHub
Skip to content
fix(ui): preserve OIDC prompt across sign-up continuations#9541

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Open

zourzouvillys
wants to merge
3
commits into

base:main
Choose a base branch

from

 Open


fix(ui): preserve OIDC prompt across sign-up continuations
#9541
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
e34c624

fix(ui): preserve OIDC prompt after sign-up email-link verification


zourzouvillys Aug 25, 2026
e6d7db2

fix(ui): normalize OIDC prompt for combined sign-up flow


zourzouvillys Aug 25, 2026
a8cfc24

Merge branch 'main' into theo/fix-signup-email-link-oidc-prompt


wobsoriano Aug 25, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


5 changes: 5 additions & 0 deletions
.changeset/wise-lions-prompt.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
'@clerk/ui': patch
---

Fix configured OIDC prompts being ignored by sign-up continuations, including enterprise SSO after email-link verification or direct combined-flow transfer and OAuth sign-ups embedded in `<SignIn withSignUp>`.

12 changes: 11 additions & 1 deletion
packages/ui/src/common/EmailLinkVerify.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,14 +15,23 @@ export type EmailLinkVerifyProps = {
 redirectUrlComplete?: string;
 redirectUrl?: string;
 ssoCallbackUrl?: string;
 oidcPrompt?: string;
 verifyEmailPath?: string;
 verifyPhonePath?: string;
 continuePath?: string;
 texts: Record<EmailLinkUIStatus, { title: LocalizationKey; subtitle: LocalizationKey }>;
};

export const EmailLinkVerify = (props: EmailLinkVerifyProps) => {
 const { redirectUrl, redirectUrlComplete, ssoCallbackUrl, verifyEmailPath, verifyPhonePath, continuePath } = props;
 const {
 redirectUrl,
 redirectUrlComplete,
 ssoCallbackUrl,
 oidcPrompt,
 verifyEmailPath,
 verifyPhonePath,
 continuePath,
 } = props;
 const { handleEmailLinkVerification } = useClerk();
 const { navigate } = useRouter();
 const signUp = useCoreSignUp();
Expand DownExpand Up@@ -53,6 +62,7 @@ export const EmailLinkVerify = (props: EmailLinkVerifyProps) => {
 navigate,
 redirectUrl: ssoCallbackUrl,
 redirectUrlComplete: redirectUrlComplete || '/',
 oidcPrompt,
 });
 } catch (err: any) {
 if (
Expand Down

1 change: 1 addition & 0 deletions
packages/ui/src/components/SignIn/SignInStart.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -535,6 +535,7 @@ function SignInStartInternal(): JSX.Element {
 signUpMode: userSettings.signUp.mode,
 redirectUrl,
 redirectUrlComplete,
 oidcPrompt: ctx.oidcPrompt,
 navigateOnSetActive,
 passwordEnabled: userSettings.attributes.password?.required ?? false,
 alternativePhoneCodeChannel:
Expand Down

9 changes: 7 additions & 2 deletions
packages/ui/src/components/SignIn/__tests__/handleCombinedFlowTransfer.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,7 +22,7 @@ describe('handleCombinedFlowTransfer', () => {
 vi.resetAllMocks();
 });

 it('should call completeSignUpFlow', async () => {
 it('should pass the OIDC prompt to completeSignUpFlow', async () => {
 const mockClerk = {
 client: {
 signUp: {
Expand All@@ -42,9 +42,14 @@ describe('handleCombinedFlowTransfer', () => {
 afterSignUpUrl: 'https://test.com',
 passwordEnabled: false,
 navigateOnSetActive: vi.fn(),
 oidcPrompt: 'select_account',
 });

 expect(mockCompleteSignUpFlow).toHaveBeenCalled();
 expect(mockCompleteSignUpFlow).toHaveBeenCalledWith(
 expect.objectContaining({
 oidcPrompt: 'select_account',
 }),
 );
 });

 it('should pass unsafeMetadata to signUp.create', async () => {
Expand Down

3 changes: 3 additions & 0 deletions
packages/ui/src/components/SignIn/handleCombinedFlowTransfer.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,7 @@ type HandleCombinedFlowTransferProps = {
 handleError: (err: any) => void;
 redirectUrl?: string;
 redirectUrlComplete?: string;
 oidcPrompt?: string;
 passwordEnabled: boolean;
 alternativePhoneCodeChannel?: PhoneCodeChannel | null;
 navigateOnSetActive: (opts: {
Expand All@@ -48,6 +49,7 @@ export function handleCombinedFlowTransfer({
 handleError,
 redirectUrl,
 redirectUrlComplete,
 oidcPrompt,
 passwordEnabled,
 navigateOnSetActive,
 alternativePhoneCodeChannel,
Expand DownExpand Up@@ -111,6 +113,7 @@ export function handleCombinedFlowTransfer({
 navigate,
 redirectUrl,
 redirectUrlComplete,
 oidcPrompt,
 });
 })
 .catch(err => handleError(err));
Expand Down

2 changes: 2 additions & 0 deletions
packages/ui/src/components/SignIn/index.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -118,6 +118,7 @@ function SignInRoutes(): JSX.Element {
 <SignUpEmailLinkFlowComplete
 redirectUrlComplete={signUpContext.afterSignUpUrl}
 ssoCallbackUrl={signUpContext.ssoCallbackUrl}
 oidcPrompt={signUpContext.oidcPrompt}
 verifyEmailPath='../verify-email-address'
 verifyPhonePath='../verify-phone-number'
 continuePath='../continue'
Expand DownExpand Up@@ -177,6 +178,7 @@ function SignInRoot() {
 componentName: 'SignUp',
 emailLinkRedirectUrl: signInContext.emailLinkRedirectUrl,
 ssoCallbackUrl: signInContext.ssoCallbackUrl,
 oidcPrompt: signInContext.oidcPrompt,
 forceRedirectUrl: signInContext.signUpForceRedirectUrl,
 fallbackRedirectUrl: signInContext.signUpFallbackRedirectUrl,
 signInUrl: signInContext.signInUrl,
Expand Down

26 changes: 26 additions & 0 deletions
packages/ui/src/components/SignUp/__tests__/SignUpEmailLinkFlowComplete.test.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -37,6 +37,32 @@ describe('SignUpEmailLinkFlowComplete', () => {
 await waitFor(() => expect(fixtures.clerk.handleEmailLinkVerification).toHaveBeenCalled());
 screen.getByText(/success/i);
 });

 it('preserves the OIDC prompt when continuing through enterprise SSO', async () => {
 const { wrapper, fixtures } = await createFixtures(f => {
 f.withEmailAddress({ required: true });
 });
 fixtures.signUp.status = 'missing_requirements';
 fixtures.signUp.missingFields = ['enterprise_sso'];

 render(
 <SignUpEmailLinkFlowComplete
 redirectUrlComplete='https://example.com/complete'
 ssoCallbackUrl='https://example.com/sso-callback'
 oidcPrompt='select_account'
 />,
 { wrapper },
 );

 await waitFor(() => expect(fixtures.signUp.authenticateWithRedirect).toHaveBeenCalled(), { timeout: 3_000 });
 expect(fixtures.signUp.authenticateWithRedirect).toHaveBeenCalledWith({
 strategy: 'enterprise_sso',
 redirectUrl: 'https://example.com/sso-callback',
 redirectUrlComplete: 'https://example.com/complete',
 continueSignUp: true,
 oidcPrompt: 'select_account',
 });
 });
 });

 describe('Error messages', () => {
Expand Down

1 change: 1 addition & 0 deletions
packages/ui/src/components/SignUp/index.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -72,6 +72,7 @@ function SignUpRoutes(): JSX.Element {
 <SignUpEmailLinkFlowComplete
 redirectUrlComplete={signUpContext.afterSignUpUrl}
 ssoCallbackUrl={signUpContext.ssoCallbackUrl}
 oidcPrompt={signUpContext.oidcPrompt}
 verifyEmailPath='../verify-email-address'
 verifyPhonePath='../verify-phone-number'
 />
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Force GitHub README to respect dark mode
(function() {
var style = document.createElement('style');
style.textContent = '
.markdown-body {
color-scheme: dark light;
}
.markdown-body pre { background: #161b22 !important; }
.markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }
.markdown-body table th, .markdown-body table td { border-color: #30363d !important; }
.markdown-body img { background: #0d1117; }
.markdown-body blockquote { border-left-color: #8b949e; }
.markdown-body hr { border-color: #30363d; }
';
document.head.appendChild(style);
})();
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
fix(ui): preserve OIDC prompt across sign-up continuations by zourzouvillys · Pull Request #9541 · clerk/javascript · GitHub
Skip to content
fix(ui): preserve OIDC prompt across sign-up continuations#9541

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Open

zourzouvillys
wants to merge
3
commits into

base:main
Choose a base branch

from

 Open


fix(ui): preserve OIDC prompt across sign-up continuations
#9541
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
e34c624

fix(ui): preserve OIDC prompt after sign-up email-link verification


zourzouvillys Aug 25, 2026
e6d7db2

fix(ui): normalize OIDC prompt for combined sign-up flow


zourzouvillys Aug 25, 2026
a8cfc24

Merge branch 'main' into theo/fix-signup-email-link-oidc-prompt


wobsoriano Aug 25, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


5 changes: 5 additions & 0 deletions
.changeset/wise-lions-prompt.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
'@clerk/ui': patch
---

Fix configured OIDC prompts being ignored by sign-up continuations, including enterprise SSO after email-link verification or direct combined-flow transfer and OAuth sign-ups embedded in `<SignIn withSignUp>`.

12 changes: 11 additions & 1 deletion
packages/ui/src/common/EmailLinkVerify.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,14 +15,23 @@ export type EmailLinkVerifyProps = {
 redirectUrlComplete?: string;
 redirectUrl?: string;
 ssoCallbackUrl?: string;
 oidcPrompt?: string;
 verifyEmailPath?: string;
 verifyPhonePath?: string;
 continuePath?: string;
 texts: Record<EmailLinkUIStatus, { title: LocalizationKey; subtitle: LocalizationKey }>;
};

export const EmailLinkVerify = (props: EmailLinkVerifyProps) => {
 const { redirectUrl, redirectUrlComplete, ssoCallbackUrl, verifyEmailPath, verifyPhonePath, continuePath } = props;
 const {
 redirectUrl,
 redirectUrlComplete,
 ssoCallbackUrl,
 oidcPrompt,
 verifyEmailPath,
 verifyPhonePath,
 continuePath,
 } = props;
 const { handleEmailLinkVerification } = useClerk();
 const { navigate } = useRouter();
 const signUp = useCoreSignUp();
Expand DownExpand Up@@ -53,6 +62,7 @@ export const EmailLinkVerify = (props: EmailLinkVerifyProps) => {
 navigate,
 redirectUrl: ssoCallbackUrl,
 redirectUrlComplete: redirectUrlComplete || '/',
 oidcPrompt,
 });
 } catch (err: any) {
 if (
Expand Down

1 change: 1 addition & 0 deletions
packages/ui/src/components/SignIn/SignInStart.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -535,6 +535,7 @@ function SignInStartInternal(): JSX.Element {
 signUpMode: userSettings.signUp.mode,
 redirectUrl,
 redirectUrlComplete,
 oidcPrompt: ctx.oidcPrompt,
 navigateOnSetActive,
 passwordEnabled: userSettings.attributes.password?.required ?? false,
 alternativePhoneCodeChannel:
Expand Down

9 changes: 7 additions & 2 deletions
packages/ui/src/components/SignIn/__tests__/handleCombinedFlowTransfer.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,7 +22,7 @@ describe('handleCombinedFlowTransfer', () => {
 vi.resetAllMocks();
 });

 it('should call completeSignUpFlow', async () => {
 it('should pass the OIDC prompt to completeSignUpFlow', async () => {
 const mockClerk = {
 client: {
 signUp: {
Expand All@@ -42,9 +42,14 @@ describe('handleCombinedFlowTransfer', () => {
 afterSignUpUrl: 'https://test.com',
 passwordEnabled: false,
 navigateOnSetActive: vi.fn(),
 oidcPrompt: 'select_account',
 });

 expect(mockCompleteSignUpFlow).toHaveBeenCalled();
 expect(mockCompleteSignUpFlow).toHaveBeenCalledWith(
 expect.objectContaining({
 oidcPrompt: 'select_account',
 }),
 );
 });

 it('should pass unsafeMetadata to signUp.create', async () => {
Expand Down

3 changes: 3 additions & 0 deletions
packages/ui/src/components/SignIn/handleCombinedFlowTransfer.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,7 @@ type HandleCombinedFlowTransferProps = {
 handleError: (err: any) => void;
 redirectUrl?: string;
 redirectUrlComplete?: string;
 oidcPrompt?: string;
 passwordEnabled: boolean;
 alternativePhoneCodeChannel?: PhoneCodeChannel | null;
 navigateOnSetActive: (opts: {
Expand All@@ -48,6 +49,7 @@ export function handleCombinedFlowTransfer({
 handleError,
 redirectUrl,
 redirectUrlComplete,
 oidcPrompt,
 passwordEnabled,
 navigateOnSetActive,
 alternativePhoneCodeChannel,
Expand DownExpand Up@@ -111,6 +113,7 @@ export function handleCombinedFlowTransfer({
 navigate,
 redirectUrl,
 redirectUrlComplete,
 oidcPrompt,
 });
 })
 .catch(err => handleError(err));
Expand Down

2 changes: 2 additions & 0 deletions
packages/ui/src/components/SignIn/index.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -118,6 +118,7 @@ function SignInRoutes(): JSX.Element {
 <SignUpEmailLinkFlowComplete
 redirectUrlComplete={signUpContext.afterSignUpUrl}
 ssoCallbackUrl={signUpContext.ssoCallbackUrl}
 oidcPrompt={signUpContext.oidcPrompt}
 verifyEmailPath='../verify-email-address'
 verifyPhonePath='../verify-phone-number'
 continuePath='../continue'
Expand DownExpand Up@@ -177,6 +178,7 @@ function SignInRoot() {
 componentName: 'SignUp',
 emailLinkRedirectUrl: signInContext.emailLinkRedirectUrl,
 ssoCallbackUrl: signInContext.ssoCallbackUrl,
 oidcPrompt: signInContext.oidcPrompt,
 forceRedirectUrl: signInContext.signUpForceRedirectUrl,
 fallbackRedirectUrl: signInContext.signUpFallbackRedirectUrl,
 signInUrl: signInContext.signInUrl,
Expand Down

26 changes: 26 additions & 0 deletions
packages/ui/src/components/SignUp/__tests__/SignUpEmailLinkFlowComplete.test.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -37,6 +37,32 @@ describe('SignUpEmailLinkFlowComplete', () => {
 await waitFor(() => expect(fixtures.clerk.handleEmailLinkVerification).toHaveBeenCalled());
 screen.getByText(/success/i);
 });

 it('preserves the OIDC prompt when continuing through enterprise SSO', async () => {
 const { wrapper, fixtures } = await createFixtures(f => {
 f.withEmailAddress({ required: true });
 });
 fixtures.signUp.status = 'missing_requirements';
 fixtures.signUp.missingFields = ['enterprise_sso'];

 render(
 <SignUpEmailLinkFlowComplete
 redirectUrlComplete='https://example.com/complete'
 ssoCallbackUrl='https://example.com/sso-callback'
 oidcPrompt='select_account'
 />,
 { wrapper },
 );

 await waitFor(() => expect(fixtures.signUp.authenticateWithRedirect).toHaveBeenCalled(), { timeout: 3_000 });
 expect(fixtures.signUp.authenticateWithRedirect).toHaveBeenCalledWith({
 strategy: 'enterprise_sso',
 redirectUrl: 'https://example.com/sso-callback',
 redirectUrlComplete: 'https://example.com/complete',
 continueSignUp: true,
 oidcPrompt: 'select_account',
 });
 });
 });

 describe('Error messages', () => {
Expand Down

1 change: 1 addition & 0 deletions
packages/ui/src/components/SignUp/index.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -72,6 +72,7 @@ function SignUpRoutes(): JSX.Element {
 <SignUpEmailLinkFlowComplete
 redirectUrlComplete={signUpContext.afterSignUpUrl}
 ssoCallbackUrl={signUpContext.ssoCallbackUrl}
 oidcPrompt={signUpContext.oidcPrompt}
 verifyEmailPath='../verify-email-address'
 verifyPhonePath='../verify-phone-number'
 />
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Highlight search terms from Google/DuckDuckGo/Bing referrer
(function() {
var ref = document.referrer;
var terms = [];
if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {
var url = new URL(ref);
var q = url.searchParams.get('q') || url.searchParams.get('p');
if (q) {
terms = q.split(/\s+/).filter(function(t) { return t.length > 2; });
}
}
if (terms.length === 0) return;
var style = document.createElement('style');
style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';
document.head.appendChild(style);
function highlight(node) {
if (node.nodeType === 3) { // text node
var text = node.textContent;
var found = false;
terms.forEach(function(term) {
var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi');
if (regex.test(text)) {
found = true;
var frag = document.createDocumentFragment();
var parts = text.split(regex);
parts.forEach(function(part, i) {
if (i % 2 === 0) {
frag.appendChild(document.createTextNode(part));
} else {
var span = document.createElement('span');
span.className = 'userscript-highlight';
span.textContent = part;
frag.appendChild(span);
}
});
node.parentNode.replaceChild(frag, node);
}
});
} else if (node.nodeType === 1 && node.childNodes) { // element
var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];
if (!skipTags.includes(node.tagName)) {
Array.from(node.childNodes).forEach(highlight);
}
}
}
highlight(document.body);
// Re-highlight on dynamic content
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1 || node.nodeType === 3) highlight(node);
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
fix(ui): preserve OIDC prompt across sign-up continuations by zourzouvillys · Pull Request #9541 · clerk/javascript · GitHub
Skip to content
fix(ui): preserve OIDC prompt across sign-up continuations#9541

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Open

zourzouvillys
wants to merge
3
commits into

base:main
Choose a base branch

from

 Open


fix(ui): preserve OIDC prompt across sign-up continuations
#9541
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
e34c624

fix(ui): preserve OIDC prompt after sign-up email-link verification


zourzouvillys Aug 25, 2026
e6d7db2

fix(ui): normalize OIDC prompt for combined sign-up flow


zourzouvillys Aug 25, 2026
a8cfc24

Merge branch 'main' into theo/fix-signup-email-link-oidc-prompt


wobsoriano Aug 25, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


5 changes: 5 additions & 0 deletions
.changeset/wise-lions-prompt.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
'@clerk/ui': patch
---

Fix configured OIDC prompts being ignored by sign-up continuations, including enterprise SSO after email-link verification or direct combined-flow transfer and OAuth sign-ups embedded in `<SignIn withSignUp>`.

12 changes: 11 additions & 1 deletion
packages/ui/src/common/EmailLinkVerify.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,14 +15,23 @@ export type EmailLinkVerifyProps = {
 redirectUrlComplete?: string;
 redirectUrl?: string;
 ssoCallbackUrl?: string;
 oidcPrompt?: string;
 verifyEmailPath?: string;
 verifyPhonePath?: string;
 continuePath?: string;
 texts: Record<EmailLinkUIStatus, { title: LocalizationKey; subtitle: LocalizationKey }>;
};

export const EmailLinkVerify = (props: EmailLinkVerifyProps) => {
 const { redirectUrl, redirectUrlComplete, ssoCallbackUrl, verifyEmailPath, verifyPhonePath, continuePath } = props;
 const {
 redirectUrl,
 redirectUrlComplete,
 ssoCallbackUrl,
 oidcPrompt,
 verifyEmailPath,
 verifyPhonePath,
 continuePath,
 } = props;
 const { handleEmailLinkVerification } = useClerk();
 const { navigate } = useRouter();
 const signUp = useCoreSignUp();
Expand DownExpand Up@@ -53,6 +62,7 @@ export const EmailLinkVerify = (props: EmailLinkVerifyProps) => {
 navigate,
 redirectUrl: ssoCallbackUrl,
 redirectUrlComplete: redirectUrlComplete || '/',
 oidcPrompt,
 });
 } catch (err: any) {
 if (
Expand Down

1 change: 1 addition & 0 deletions
packages/ui/src/components/SignIn/SignInStart.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -535,6 +535,7 @@ function SignInStartInternal(): JSX.Element {
 signUpMode: userSettings.signUp.mode,
 redirectUrl,
 redirectUrlComplete,
 oidcPrompt: ctx.oidcPrompt,
 navigateOnSetActive,
 passwordEnabled: userSettings.attributes.password?.required ?? false,
 alternativePhoneCodeChannel:
Expand Down

9 changes: 7 additions & 2 deletions
packages/ui/src/components/SignIn/__tests__/handleCombinedFlowTransfer.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,7 +22,7 @@ describe('handleCombinedFlowTransfer', () => {
 vi.resetAllMocks();
 });

 it('should call completeSignUpFlow', async () => {
 it('should pass the OIDC prompt to completeSignUpFlow', async () => {
 const mockClerk = {
 client: {
 signUp: {
Expand All@@ -42,9 +42,14 @@ describe('handleCombinedFlowTransfer', () => {
 afterSignUpUrl: 'https://test.com',
 passwordEnabled: false,
 navigateOnSetActive: vi.fn(),
 oidcPrompt: 'select_account',
 });

 expect(mockCompleteSignUpFlow).toHaveBeenCalled();
 expect(mockCompleteSignUpFlow).toHaveBeenCalledWith(
 expect.objectContaining({
 oidcPrompt: 'select_account',
 }),
 );
 });

 it('should pass unsafeMetadata to signUp.create', async () => {
Expand Down

3 changes: 3 additions & 0 deletions
packages/ui/src/components/SignIn/handleCombinedFlowTransfer.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,7 @@ type HandleCombinedFlowTransferProps = {
 handleError: (err: any) => void;
 redirectUrl?: string;
 redirectUrlComplete?: string;
 oidcPrompt?: string;
 passwordEnabled: boolean;
 alternativePhoneCodeChannel?: PhoneCodeChannel | null;
 navigateOnSetActive: (opts: {
Expand All@@ -48,6 +49,7 @@ export function handleCombinedFlowTransfer({
 handleError,
 redirectUrl,
 redirectUrlComplete,
 oidcPrompt,
 passwordEnabled,
 navigateOnSetActive,
 alternativePhoneCodeChannel,
Expand DownExpand Up@@ -111,6 +113,7 @@ export function handleCombinedFlowTransfer({
 navigate,
 redirectUrl,
 redirectUrlComplete,
 oidcPrompt,
 });
 })
 .catch(err => handleError(err));
Expand Down

2 changes: 2 additions & 0 deletions
packages/ui/src/components/SignIn/index.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -118,6 +118,7 @@ function SignInRoutes(): JSX.Element {
 <SignUpEmailLinkFlowComplete
 redirectUrlComplete={signUpContext.afterSignUpUrl}
 ssoCallbackUrl={signUpContext.ssoCallbackUrl}
 oidcPrompt={signUpContext.oidcPrompt}
 verifyEmailPath='../verify-email-address'
 verifyPhonePath='../verify-phone-number'
 continuePath='../continue'
Expand DownExpand Up@@ -177,6 +178,7 @@ function SignInRoot() {
 componentName: 'SignUp',
 emailLinkRedirectUrl: signInContext.emailLinkRedirectUrl,
 ssoCallbackUrl: signInContext.ssoCallbackUrl,
 oidcPrompt: signInContext.oidcPrompt,
 forceRedirectUrl: signInContext.signUpForceRedirectUrl,
 fallbackRedirectUrl: signInContext.signUpFallbackRedirectUrl,
 signInUrl: signInContext.signInUrl,
Expand Down

26 changes: 26 additions & 0 deletions
packages/ui/src/components/SignUp/__tests__/SignUpEmailLinkFlowComplete.test.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -37,6 +37,32 @@ describe('SignUpEmailLinkFlowComplete', () => {
 await waitFor(() => expect(fixtures.clerk.handleEmailLinkVerification).toHaveBeenCalled());
 screen.getByText(/success/i);
 });

 it('preserves the OIDC prompt when continuing through enterprise SSO', async () => {
 const { wrapper, fixtures } = await createFixtures(f => {
 f.withEmailAddress({ required: true });
 });
 fixtures.signUp.status = 'missing_requirements';
 fixtures.signUp.missingFields = ['enterprise_sso'];

 render(
 <SignUpEmailLinkFlowComplete
 redirectUrlComplete='https://example.com/complete'
 ssoCallbackUrl='https://example.com/sso-callback'
 oidcPrompt='select_account'
 />,
 { wrapper },
 );

 await waitFor(() => expect(fixtures.signUp.authenticateWithRedirect).toHaveBeenCalled(), { timeout: 3_000 });
 expect(fixtures.signUp.authenticateWithRedirect).toHaveBeenCalledWith({
 strategy: 'enterprise_sso',
 redirectUrl: 'https://example.com/sso-callback',
 redirectUrlComplete: 'https://example.com/complete',
 continueSignUp: true,
 oidcPrompt: 'select_account',
 });
 });
 });

 describe('Error messages', () => {
Expand Down

1 change: 1 addition & 0 deletions
packages/ui/src/components/SignUp/index.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -72,6 +72,7 @@ function SignUpRoutes(): JSX.Element {
 <SignUpEmailLinkFlowComplete
 redirectUrlComplete={signUpContext.afterSignUpUrl}
 ssoCallbackUrl={signUpContext.ssoCallbackUrl}
 oidcPrompt={signUpContext.oidcPrompt}
 verifyEmailPath='../verify-email-address'
 verifyPhonePath='../verify-phone-number'
 />
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Strip utm_, fbclid, gclid, etc. from all links on page
(function() {
var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',
'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',
'ref', 'ref_src', 'source', 'medium', 'campaign'];
function cleanUrl(url) {
try {
var u = new URL(url, window.location.origin);
var changed = false;
trackingParams.forEach(function(p) {
if (u.searchParams.has(p)) {
u.searchParams.delete(p);
changed = true;
}
});
return changed ? u.toString() : url;
} catch (e) {
return url;
}
}
function cleanLinks() {
document.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
cleanLinks();
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1) {
if (node.tagName === 'A') cleanLinks();
node.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '
fix(ui): preserve OIDC prompt across sign-up continuations by zourzouvillys · Pull Request #9541 · clerk/javascript · GitHub
Skip to content
fix(ui): preserve OIDC prompt across sign-up continuations#9541

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Open

zourzouvillys
wants to merge
3
commits into

base:main
Choose a base branch

from

 Open


fix(ui): preserve OIDC prompt across sign-up continuations
#9541
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
e34c624

fix(ui): preserve OIDC prompt after sign-up email-link verification


zourzouvillys Aug 25, 2026
e6d7db2

fix(ui): normalize OIDC prompt for combined sign-up flow


zourzouvillys Aug 25, 2026
a8cfc24

Merge branch 'main' into theo/fix-signup-email-link-oidc-prompt


wobsoriano Aug 25, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


5 changes: 5 additions & 0 deletions
.changeset/wise-lions-prompt.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
'@clerk/ui': patch
---

Fix configured OIDC prompts being ignored by sign-up continuations, including enterprise SSO after email-link verification or direct combined-flow transfer and OAuth sign-ups embedded in `<SignIn withSignUp>`.

12 changes: 11 additions & 1 deletion
packages/ui/src/common/EmailLinkVerify.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,14 +15,23 @@ export type EmailLinkVerifyProps = {
 redirectUrlComplete?: string;
 redirectUrl?: string;
 ssoCallbackUrl?: string;
 oidcPrompt?: string;
 verifyEmailPath?: string;
 verifyPhonePath?: string;
 continuePath?: string;
 texts: Record<EmailLinkUIStatus, { title: LocalizationKey; subtitle: LocalizationKey }>;
};

export const EmailLinkVerify = (props: EmailLinkVerifyProps) => {
 const { redirectUrl, redirectUrlComplete, ssoCallbackUrl, verifyEmailPath, verifyPhonePath, continuePath } = props;
 const {
 redirectUrl,
 redirectUrlComplete,
 ssoCallbackUrl,
 oidcPrompt,
 verifyEmailPath,
 verifyPhonePath,
 continuePath,
 } = props;
 const { handleEmailLinkVerification } = useClerk();
 const { navigate } = useRouter();
 const signUp = useCoreSignUp();
Expand DownExpand Up@@ -53,6 +62,7 @@ export const EmailLinkVerify = (props: EmailLinkVerifyProps) => {
 navigate,
 redirectUrl: ssoCallbackUrl,
 redirectUrlComplete: redirectUrlComplete || '/',
 oidcPrompt,
 });
 } catch (err: any) {
 if (
Expand Down

1 change: 1 addition & 0 deletions
packages/ui/src/components/SignIn/SignInStart.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -535,6 +535,7 @@ function SignInStartInternal(): JSX.Element {
 signUpMode: userSettings.signUp.mode,
 redirectUrl,
 redirectUrlComplete,
 oidcPrompt: ctx.oidcPrompt,
 navigateOnSetActive,
 passwordEnabled: userSettings.attributes.password?.required ?? false,
 alternativePhoneCodeChannel:
Expand Down

9 changes: 7 additions & 2 deletions
packages/ui/src/components/SignIn/__tests__/handleCombinedFlowTransfer.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,7 +22,7 @@ describe('handleCombinedFlowTransfer', () => {
 vi.resetAllMocks();
 });

 it('should call completeSignUpFlow', async () => {
 it('should pass the OIDC prompt to completeSignUpFlow', async () => {
 const mockClerk = {
 client: {
 signUp: {
Expand All@@ -42,9 +42,14 @@ describe('handleCombinedFlowTransfer', () => {
 afterSignUpUrl: 'https://test.com',
 passwordEnabled: false,
 navigateOnSetActive: vi.fn(),
 oidcPrompt: 'select_account',
 });

 expect(mockCompleteSignUpFlow).toHaveBeenCalled();
 expect(mockCompleteSignUpFlow).toHaveBeenCalledWith(
 expect.objectContaining({
 oidcPrompt: 'select_account',
 }),
 );
 });

 it('should pass unsafeMetadata to signUp.create', async () => {
Expand Down

3 changes: 3 additions & 0 deletions
packages/ui/src/components/SignIn/handleCombinedFlowTransfer.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,7 @@ type HandleCombinedFlowTransferProps = {
 handleError: (err: any) => void;
 redirectUrl?: string;
 redirectUrlComplete?: string;
 oidcPrompt?: string;
 passwordEnabled: boolean;
 alternativePhoneCodeChannel?: PhoneCodeChannel | null;
 navigateOnSetActive: (opts: {
Expand All@@ -48,6 +49,7 @@ export function handleCombinedFlowTransfer({
 handleError,
 redirectUrl,
 redirectUrlComplete,
 oidcPrompt,
 passwordEnabled,
 navigateOnSetActive,
 alternativePhoneCodeChannel,
Expand DownExpand Up@@ -111,6 +113,7 @@ export function handleCombinedFlowTransfer({
 navigate,
 redirectUrl,
 redirectUrlComplete,
 oidcPrompt,
 });
 })
 .catch(err => handleError(err));
Expand Down

2 changes: 2 additions & 0 deletions
packages/ui/src/components/SignIn/index.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -118,6 +118,7 @@ function SignInRoutes(): JSX.Element {
 <SignUpEmailLinkFlowComplete
 redirectUrlComplete={signUpContext.afterSignUpUrl}
 ssoCallbackUrl={signUpContext.ssoCallbackUrl}
 oidcPrompt={signUpContext.oidcPrompt}
 verifyEmailPath='../verify-email-address'
 verifyPhonePath='../verify-phone-number'
 continuePath='../continue'
Expand DownExpand Up@@ -177,6 +178,7 @@ function SignInRoot() {
 componentName: 'SignUp',
 emailLinkRedirectUrl: signInContext.emailLinkRedirectUrl,
 ssoCallbackUrl: signInContext.ssoCallbackUrl,
 oidcPrompt: signInContext.oidcPrompt,
 forceRedirectUrl: signInContext.signUpForceRedirectUrl,
 fallbackRedirectUrl: signInContext.signUpFallbackRedirectUrl,
 signInUrl: signInContext.signInUrl,
Expand Down

26 changes: 26 additions & 0 deletions
packages/ui/src/components/SignUp/__tests__/SignUpEmailLinkFlowComplete.test.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -37,6 +37,32 @@ describe('SignUpEmailLinkFlowComplete', () => {
 await waitFor(() => expect(fixtures.clerk.handleEmailLinkVerification).toHaveBeenCalled());
 screen.getByText(/success/i);
 });

 it('preserves the OIDC prompt when continuing through enterprise SSO', async () => {
 const { wrapper, fixtures } = await createFixtures(f => {
 f.withEmailAddress({ required: true });
 });
 fixtures.signUp.status = 'missing_requirements';
 fixtures.signUp.missingFields = ['enterprise_sso'];

 render(
 <SignUpEmailLinkFlowComplete
 redirectUrlComplete='https://example.com/complete'
 ssoCallbackUrl='https://example.com/sso-callback'
 oidcPrompt='select_account'
 />,
 { wrapper },
 );

 await waitFor(() => expect(fixtures.signUp.authenticateWithRedirect).toHaveBeenCalled(), { timeout: 3_000 });
 expect(fixtures.signUp.authenticateWithRedirect).toHaveBeenCalledWith({
 strategy: 'enterprise_sso',
 redirectUrl: 'https://example.com/sso-callback',
 redirectUrlComplete: 'https://example.com/complete',
 continueSignUp: true,
 oidcPrompt: 'select_account',
 });
 });
 });

 describe('Error messages', () => {
Expand Down

1 change: 1 addition & 0 deletions
packages/ui/src/components/SignUp/index.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -72,6 +72,7 @@ function SignUpRoutes(): JSX.Element {
 <SignUpEmailLinkFlowComplete
 redirectUrlComplete={signUpContext.afterSignUpUrl}
 ssoCallbackUrl={signUpContext.ssoCallbackUrl}
 oidcPrompt={signUpContext.oidcPrompt}
 verifyEmailPath='../verify-email-address'
 verifyPhonePath='../verify-phone-number'
 />
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
fix(ui): preserve OIDC prompt across sign-up continuations by zourzouvillys · Pull Request #9541 · clerk/javascript · GitHub
Skip to content
fix(ui): preserve OIDC prompt across sign-up continuations#9541

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Open

zourzouvillys
wants to merge
3
commits into

base:main
Choose a base branch

from

 Open


fix(ui): preserve OIDC prompt across sign-up continuations
#9541
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
e34c624

fix(ui): preserve OIDC prompt after sign-up email-link verification


zourzouvillys Aug 25, 2026
e6d7db2

fix(ui): normalize OIDC prompt for combined sign-up flow


zourzouvillys Aug 25, 2026
a8cfc24

Merge branch 'main' into theo/fix-signup-email-link-oidc-prompt


wobsoriano Aug 25, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


5 changes: 5 additions & 0 deletions
.changeset/wise-lions-prompt.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
'@clerk/ui': patch
---

Fix configured OIDC prompts being ignored by sign-up continuations, including enterprise SSO after email-link verification or direct combined-flow transfer and OAuth sign-ups embedded in `<SignIn withSignUp>`.

12 changes: 11 additions & 1 deletion
packages/ui/src/common/EmailLinkVerify.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,14 +15,23 @@ export type EmailLinkVerifyProps = {
 redirectUrlComplete?: string;
 redirectUrl?: string;
 ssoCallbackUrl?: string;
 oidcPrompt?: string;
 verifyEmailPath?: string;
 verifyPhonePath?: string;
 continuePath?: string;
 texts: Record<EmailLinkUIStatus, { title: LocalizationKey; subtitle: LocalizationKey }>;
};

export const EmailLinkVerify = (props: EmailLinkVerifyProps) => {
 const { redirectUrl, redirectUrlComplete, ssoCallbackUrl, verifyEmailPath, verifyPhonePath, continuePath } = props;
 const {
 redirectUrl,
 redirectUrlComplete,
 ssoCallbackUrl,
 oidcPrompt,
 verifyEmailPath,
 verifyPhonePath,
 continuePath,
 } = props;
 const { handleEmailLinkVerification } = useClerk();
 const { navigate } = useRouter();
 const signUp = useCoreSignUp();
Expand DownExpand Up@@ -53,6 +62,7 @@ export const EmailLinkVerify = (props: EmailLinkVerifyProps) => {
 navigate,
 redirectUrl: ssoCallbackUrl,
 redirectUrlComplete: redirectUrlComplete || '/',
 oidcPrompt,
 });
 } catch (err: any) {
 if (
Expand Down

1 change: 1 addition & 0 deletions
packages/ui/src/components/SignIn/SignInStart.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -535,6 +535,7 @@ function SignInStartInternal(): JSX.Element {
 signUpMode: userSettings.signUp.mode,
 redirectUrl,
 redirectUrlComplete,
 oidcPrompt: ctx.oidcPrompt,
 navigateOnSetActive,
 passwordEnabled: userSettings.attributes.password?.required ?? false,
 alternativePhoneCodeChannel:
Expand Down

9 changes: 7 additions & 2 deletions
packages/ui/src/components/SignIn/__tests__/handleCombinedFlowTransfer.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,7 +22,7 @@ describe('handleCombinedFlowTransfer', () => {
 vi.resetAllMocks();
 });

 it('should call completeSignUpFlow', async () => {
 it('should pass the OIDC prompt to completeSignUpFlow', async () => {
 const mockClerk = {
 client: {
 signUp: {
Expand All@@ -42,9 +42,14 @@ describe('handleCombinedFlowTransfer', () => {
 afterSignUpUrl: 'https://test.com',
 passwordEnabled: false,
 navigateOnSetActive: vi.fn(),
 oidcPrompt: 'select_account',
 });

 expect(mockCompleteSignUpFlow).toHaveBeenCalled();
 expect(mockCompleteSignUpFlow).toHaveBeenCalledWith(
 expect.objectContaining({
 oidcPrompt: 'select_account',
 }),
 );
 });

 it('should pass unsafeMetadata to signUp.create', async () => {
Expand Down

3 changes: 3 additions & 0 deletions
packages/ui/src/components/SignIn/handleCombinedFlowTransfer.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,7 @@ type HandleCombinedFlowTransferProps = {
 handleError: (err: any) => void;
 redirectUrl?: string;
 redirectUrlComplete?: string;
 oidcPrompt?: string;
 passwordEnabled: boolean;
 alternativePhoneCodeChannel?: PhoneCodeChannel | null;
 navigateOnSetActive: (opts: {
Expand All@@ -48,6 +49,7 @@ export function handleCombinedFlowTransfer({
 handleError,
 redirectUrl,
 redirectUrlComplete,
 oidcPrompt,
 passwordEnabled,
 navigateOnSetActive,
 alternativePhoneCodeChannel,
Expand DownExpand Up@@ -111,6 +113,7 @@ export function handleCombinedFlowTransfer({
 navigate,
 redirectUrl,
 redirectUrlComplete,
 oidcPrompt,
 });
 })
 .catch(err => handleError(err));
Expand Down

2 changes: 2 additions & 0 deletions
packages/ui/src/components/SignIn/index.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -118,6 +118,7 @@ function SignInRoutes(): JSX.Element {
 <SignUpEmailLinkFlowComplete
 redirectUrlComplete={signUpContext.afterSignUpUrl}
 ssoCallbackUrl={signUpContext.ssoCallbackUrl}
 oidcPrompt={signUpContext.oidcPrompt}
 verifyEmailPath='../verify-email-address'
 verifyPhonePath='../verify-phone-number'
 continuePath='../continue'
Expand DownExpand Up@@ -177,6 +178,7 @@ function SignInRoot() {
 componentName: 'SignUp',
 emailLinkRedirectUrl: signInContext.emailLinkRedirectUrl,
 ssoCallbackUrl: signInContext.ssoCallbackUrl,
 oidcPrompt: signInContext.oidcPrompt,
 forceRedirectUrl: signInContext.signUpForceRedirectUrl,
 fallbackRedirectUrl: signInContext.signUpFallbackRedirectUrl,
 signInUrl: signInContext.signInUrl,
Expand Down

26 changes: 26 additions & 0 deletions
packages/ui/src/components/SignUp/__tests__/SignUpEmailLinkFlowComplete.test.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -37,6 +37,32 @@ describe('SignUpEmailLinkFlowComplete', () => {
 await waitFor(() => expect(fixtures.clerk.handleEmailLinkVerification).toHaveBeenCalled());
 screen.getByText(/success/i);
 });

 it('preserves the OIDC prompt when continuing through enterprise SSO', async () => {
 const { wrapper, fixtures } = await createFixtures(f => {
 f.withEmailAddress({ required: true });
 });
 fixtures.signUp.status = 'missing_requirements';
 fixtures.signUp.missingFields = ['enterprise_sso'];

 render(
 <SignUpEmailLinkFlowComplete
 redirectUrlComplete='https://example.com/complete'
 ssoCallbackUrl='https://example.com/sso-callback'
 oidcPrompt='select_account'
 />,
 { wrapper },
 );

 await waitFor(() => expect(fixtures.signUp.authenticateWithRedirect).toHaveBeenCalled(), { timeout: 3_000 });
 expect(fixtures.signUp.authenticateWithRedirect).toHaveBeenCalledWith({
 strategy: 'enterprise_sso',
 redirectUrl: 'https://example.com/sso-callback',
 redirectUrlComplete: 'https://example.com/complete',
 continueSignUp: true,
 oidcPrompt: 'select_account',
 });
 });
 });

 describe('Error messages', () => {
Expand Down

1 change: 1 addition & 0 deletions
packages/ui/src/components/SignUp/index.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -72,6 +72,7 @@ function SignUpRoutes(): JSX.Element {
 <SignUpEmailLinkFlowComplete
 redirectUrlComplete={signUpContext.afterSignUpUrl}
 ssoCallbackUrl={signUpContext.ssoCallbackUrl}
 oidcPrompt={signUpContext.oidcPrompt}
 verifyEmailPath='../verify-email-address'
 verifyPhonePath='../verify-phone-number'
 />
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
fix(ui): preserve OIDC prompt across sign-up continuations by zourzouvillys · Pull Request #9541 · clerk/javascript · GitHub
Skip to content
fix(ui): preserve OIDC prompt across sign-up continuations#9541

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Open

zourzouvillys
wants to merge
3
commits into

base:main
Choose a base branch

from

 Open


fix(ui): preserve OIDC prompt across sign-up continuations
#9541
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
e34c624

fix(ui): preserve OIDC prompt after sign-up email-link verification


zourzouvillys Aug 25, 2026
e6d7db2

fix(ui): normalize OIDC prompt for combined sign-up flow


zourzouvillys Aug 25, 2026
a8cfc24

Merge branch 'main' into theo/fix-signup-email-link-oidc-prompt


wobsoriano Aug 25, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


5 changes: 5 additions & 0 deletions
.changeset/wise-lions-prompt.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
'@clerk/ui': patch
---

Fix configured OIDC prompts being ignored by sign-up continuations, including enterprise SSO after email-link verification or direct combined-flow transfer and OAuth sign-ups embedded in `<SignIn withSignUp>`.

12 changes: 11 additions & 1 deletion
packages/ui/src/common/EmailLinkVerify.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,14 +15,23 @@ export type EmailLinkVerifyProps = {
 redirectUrlComplete?: string;
 redirectUrl?: string;
 ssoCallbackUrl?: string;
 oidcPrompt?: string;
 verifyEmailPath?: string;
 verifyPhonePath?: string;
 continuePath?: string;
 texts: Record<EmailLinkUIStatus, { title: LocalizationKey; subtitle: LocalizationKey }>;
};

export const EmailLinkVerify = (props: EmailLinkVerifyProps) => {
 const { redirectUrl, redirectUrlComplete, ssoCallbackUrl, verifyEmailPath, verifyPhonePath, continuePath } = props;
 const {
 redirectUrl,
 redirectUrlComplete,
 ssoCallbackUrl,
 oidcPrompt,
 verifyEmailPath,
 verifyPhonePath,
 continuePath,
 } = props;
 const { handleEmailLinkVerification } = useClerk();
 const { navigate } = useRouter();
 const signUp = useCoreSignUp();
Expand DownExpand Up@@ -53,6 +62,7 @@ export const EmailLinkVerify = (props: EmailLinkVerifyProps) => {
 navigate,
 redirectUrl: ssoCallbackUrl,
 redirectUrlComplete: redirectUrlComplete || '/',
 oidcPrompt,
 });
 } catch (err: any) {
 if (
Expand Down

1 change: 1 addition & 0 deletions
packages/ui/src/components/SignIn/SignInStart.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -535,6 +535,7 @@ function SignInStartInternal(): JSX.Element {
 signUpMode: userSettings.signUp.mode,
 redirectUrl,
 redirectUrlComplete,
 oidcPrompt: ctx.oidcPrompt,
 navigateOnSetActive,
 passwordEnabled: userSettings.attributes.password?.required ?? false,
 alternativePhoneCodeChannel:
Expand Down

9 changes: 7 additions & 2 deletions
packages/ui/src/components/SignIn/__tests__/handleCombinedFlowTransfer.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,7 +22,7 @@ describe('handleCombinedFlowTransfer', () => {
 vi.resetAllMocks();
 });

 it('should call completeSignUpFlow', async () => {
 it('should pass the OIDC prompt to completeSignUpFlow', async () => {
 const mockClerk = {
 client: {
 signUp: {
Expand All@@ -42,9 +42,14 @@ describe('handleCombinedFlowTransfer', () => {
 afterSignUpUrl: 'https://test.com',
 passwordEnabled: false,
 navigateOnSetActive: vi.fn(),
 oidcPrompt: 'select_account',
 });

 expect(mockCompleteSignUpFlow).toHaveBeenCalled();
 expect(mockCompleteSignUpFlow).toHaveBeenCalledWith(
 expect.objectContaining({
 oidcPrompt: 'select_account',
 }),
 );
 });

 it('should pass unsafeMetadata to signUp.create', async () => {
Expand Down

3 changes: 3 additions & 0 deletions
packages/ui/src/components/SignIn/handleCombinedFlowTransfer.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,7 @@ type HandleCombinedFlowTransferProps = {
 handleError: (err: any) => void;
 redirectUrl?: string;
 redirectUrlComplete?: string;
 oidcPrompt?: string;
 passwordEnabled: boolean;
 alternativePhoneCodeChannel?: PhoneCodeChannel | null;
 navigateOnSetActive: (opts: {
Expand All@@ -48,6 +49,7 @@ export function handleCombinedFlowTransfer({
 handleError,
 redirectUrl,
 redirectUrlComplete,
 oidcPrompt,
 passwordEnabled,
 navigateOnSetActive,
 alternativePhoneCodeChannel,
Expand DownExpand Up@@ -111,6 +113,7 @@ export function handleCombinedFlowTransfer({
 navigate,
 redirectUrl,
 redirectUrlComplete,
 oidcPrompt,
 });
 })
 .catch(err => handleError(err));
Expand Down

2 changes: 2 additions & 0 deletions
packages/ui/src/components/SignIn/index.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -118,6 +118,7 @@ function SignInRoutes(): JSX.Element {
 <SignUpEmailLinkFlowComplete
 redirectUrlComplete={signUpContext.afterSignUpUrl}
 ssoCallbackUrl={signUpContext.ssoCallbackUrl}
 oidcPrompt={signUpContext.oidcPrompt}
 verifyEmailPath='../verify-email-address'
 verifyPhonePath='../verify-phone-number'
 continuePath='../continue'
Expand DownExpand Up@@ -177,6 +178,7 @@ function SignInRoot() {
 componentName: 'SignUp',
 emailLinkRedirectUrl: signInContext.emailLinkRedirectUrl,
 ssoCallbackUrl: signInContext.ssoCallbackUrl,
 oidcPrompt: signInContext.oidcPrompt,
 forceRedirectUrl: signInContext.signUpForceRedirectUrl,
 fallbackRedirectUrl: signInContext.signUpFallbackRedirectUrl,
 signInUrl: signInContext.signInUrl,
Expand Down

26 changes: 26 additions & 0 deletions
packages/ui/src/components/SignUp/__tests__/SignUpEmailLinkFlowComplete.test.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -37,6 +37,32 @@ describe('SignUpEmailLinkFlowComplete', () => {
 await waitFor(() => expect(fixtures.clerk.handleEmailLinkVerification).toHaveBeenCalled());
 screen.getByText(/success/i);
 });

 it('preserves the OIDC prompt when continuing through enterprise SSO', async () => {
 const { wrapper, fixtures } = await createFixtures(f => {
 f.withEmailAddress({ required: true });
 });
 fixtures.signUp.status = 'missing_requirements';
 fixtures.signUp.missingFields = ['enterprise_sso'];

 render(
 <SignUpEmailLinkFlowComplete
 redirectUrlComplete='https://example.com/complete'
 ssoCallbackUrl='https://example.com/sso-callback'
 oidcPrompt='select_account'
 />,
 { wrapper },
 );

 await waitFor(() => expect(fixtures.signUp.authenticateWithRedirect).toHaveBeenCalled(), { timeout: 3_000 });
 expect(fixtures.signUp.authenticateWithRedirect).toHaveBeenCalledWith({
 strategy: 'enterprise_sso',
 redirectUrl: 'https://example.com/sso-callback',
 redirectUrlComplete: 'https://example.com/complete',
 continueSignUp: true,
 oidcPrompt: 'select_account',
 });
 });
 });

 describe('Error messages', () => {
Expand Down

1 change: 1 addition & 0 deletions
packages/ui/src/components/SignUp/index.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -72,6 +72,7 @@ function SignUpRoutes(): JSX.Element {
 <SignUpEmailLinkFlowComplete
 redirectUrlComplete={signUpContext.afterSignUpUrl}
 ssoCallbackUrl={signUpContext.ssoCallbackUrl}
 oidcPrompt={signUpContext.oidcPrompt}
 verifyEmailPath='../verify-email-address'
 verifyPhonePath='../verify-phone-number'
 />
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Universal Dark Mode - works on any site
(function() {
var enabled = true;
function applyDarkMode() {
if (!enabled) return;
// Create style element if it doesn't exist
var style = document.getElementById('universal-dark-mode-style');
if (!style) {
style = document.createElement('style');
style.id = 'universal-dark-mode-style';
document.head.appendChild(style);
}
// Dark mode CSS - inverts colors but preserves images/video
style.textContent = '
/* Invert everything except media */
html {
filter: invert(1) hue-rotate(180deg) !important;
background: #1a1a2e !important;
}
/* Restore images, videos, iframes, canvas */
img, video, iframe, canvas, svg, picture, [style*="background-image"] {
filter: invert(1) hue-rotate(180deg) !important;
}
/* Preserve specific elements that should not be inverted */
.no-dark-mode, .no-dark-mode *,
[data-theme="light"], [data-theme="light"],
.ace_editor, .ace_editor *,
.CodeMirror, .CodeMirror *,
.monaco-editor, .monaco-editor *,
.markdown-body pre, .markdown-body pre *,
.highlight, .highlight *,
pre code, pre code * {
filter: none !important;
}
/* Fix common UI elements */
.modal, .popup, .dropdown-menu, .tooltip, .popover {
filter: invert(1) hue-rotate(180deg) !important;
background: #2d2d44 !important;
border-color: #444 !important;
}
/* Scrollbars */
::-webkit-scrollbar { background: #1a1a2e !important; }
::-webkit-scrollbar-thumb { background: #444 !important; }
::-webkit-scrollbar-thumb:hover { background: #555 !important; }
/* Selection */
::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
';
}
function removeDarkMode() {
var style = document.getElementById('universal-dark-mode-style');
if (style) style.remove();
}
// Toggle with Alt+Shift+D
document.addEventListener('keydown', function(e) {
if (e.altKey && e.shiftKey && e.key === 'D') {
e.preventDefault();
enabled = !enabled;
if (enabled) {
applyDarkMode();
console.log('[Universal Dark Mode] Enabled');
} else {
removeDarkMode();
console.log('[Universal Dark Mode] Disabled');
}
}
});
// Apply on load
applyDarkMode();
// Re-apply on dynamic content
var observer = new MutationObserver(function(mutations) {
if (enabled && !document.getElementById('universal-dark-mode-style')) {
applyDarkMode();
}
});
observer.observe(document.head, { childList: true });
console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');
})();
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();
fix(ui): preserve OIDC prompt across sign-up continuations by zourzouvillys · Pull Request #9541 · clerk/javascript · GitHub
Skip to content
fix(ui): preserve OIDC prompt across sign-up continuations#9541

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Open

zourzouvillys
wants to merge
3
commits into

base:main
Choose a base branch

from

 Open


fix(ui): preserve OIDC prompt across sign-up continuations
#9541
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
e34c624

fix(ui): preserve OIDC prompt after sign-up email-link verification


zourzouvillys Aug 25, 2026
e6d7db2

fix(ui): normalize OIDC prompt for combined sign-up flow


zourzouvillys Aug 25, 2026
a8cfc24

Merge branch 'main' into theo/fix-signup-email-link-oidc-prompt


wobsoriano Aug 25, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


5 changes: 5 additions & 0 deletions
.changeset/wise-lions-prompt.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
'@clerk/ui': patch
---

Fix configured OIDC prompts being ignored by sign-up continuations, including enterprise SSO after email-link verification or direct combined-flow transfer and OAuth sign-ups embedded in `<SignIn withSignUp>`.

12 changes: 11 additions & 1 deletion
packages/ui/src/common/EmailLinkVerify.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,14 +15,23 @@ export type EmailLinkVerifyProps = {
 redirectUrlComplete?: string;
 redirectUrl?: string;
 ssoCallbackUrl?: string;
 oidcPrompt?: string;
 verifyEmailPath?: string;
 verifyPhonePath?: string;
 continuePath?: string;
 texts: Record<EmailLinkUIStatus, { title: LocalizationKey; subtitle: LocalizationKey }>;
};

export const EmailLinkVerify = (props: EmailLinkVerifyProps) => {
 const { redirectUrl, redirectUrlComplete, ssoCallbackUrl, verifyEmailPath, verifyPhonePath, continuePath } = props;
 const {
 redirectUrl,
 redirectUrlComplete,
 ssoCallbackUrl,
 oidcPrompt,
 verifyEmailPath,
 verifyPhonePath,
 continuePath,
 } = props;
 const { handleEmailLinkVerification } = useClerk();
 const { navigate } = useRouter();
 const signUp = useCoreSignUp();
Expand DownExpand Up@@ -53,6 +62,7 @@ export const EmailLinkVerify = (props: EmailLinkVerifyProps) => {
 navigate,
 redirectUrl: ssoCallbackUrl,
 redirectUrlComplete: redirectUrlComplete || '/',
 oidcPrompt,
 });
 } catch (err: any) {
 if (
Expand Down

1 change: 1 addition & 0 deletions
packages/ui/src/components/SignIn/SignInStart.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -535,6 +535,7 @@ function SignInStartInternal(): JSX.Element {
 signUpMode: userSettings.signUp.mode,
 redirectUrl,
 redirectUrlComplete,
 oidcPrompt: ctx.oidcPrompt,
 navigateOnSetActive,
 passwordEnabled: userSettings.attributes.password?.required ?? false,
 alternativePhoneCodeChannel:
Expand Down

9 changes: 7 additions & 2 deletions
packages/ui/src/components/SignIn/__tests__/handleCombinedFlowTransfer.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,7 +22,7 @@ describe('handleCombinedFlowTransfer', () => {
 vi.resetAllMocks();
 });

 it('should call completeSignUpFlow', async () => {
 it('should pass the OIDC prompt to completeSignUpFlow', async () => {
 const mockClerk = {
 client: {
 signUp: {
Expand All@@ -42,9 +42,14 @@ describe('handleCombinedFlowTransfer', () => {
 afterSignUpUrl: 'https://test.com',
 passwordEnabled: false,
 navigateOnSetActive: vi.fn(),
 oidcPrompt: 'select_account',
 });

 expect(mockCompleteSignUpFlow).toHaveBeenCalled();
 expect(mockCompleteSignUpFlow).toHaveBeenCalledWith(
 expect.objectContaining({
 oidcPrompt: 'select_account',
 }),
 );
 });

 it('should pass unsafeMetadata to signUp.create', async () => {
Expand Down

3 changes: 3 additions & 0 deletions
packages/ui/src/components/SignIn/handleCombinedFlowTransfer.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,7 @@ type HandleCombinedFlowTransferProps = {
 handleError: (err: any) => void;
 redirectUrl?: string;
 redirectUrlComplete?: string;
 oidcPrompt?: string;
 passwordEnabled: boolean;
 alternativePhoneCodeChannel?: PhoneCodeChannel | null;
 navigateOnSetActive: (opts: {
Expand All@@ -48,6 +49,7 @@ export function handleCombinedFlowTransfer({
 handleError,
 redirectUrl,
 redirectUrlComplete,
 oidcPrompt,
 passwordEnabled,
 navigateOnSetActive,
 alternativePhoneCodeChannel,
Expand DownExpand Up@@ -111,6 +113,7 @@ export function handleCombinedFlowTransfer({
 navigate,
 redirectUrl,
 redirectUrlComplete,
 oidcPrompt,
 });
 })
 .catch(err => handleError(err));
Expand Down

2 changes: 2 additions & 0 deletions
packages/ui/src/components/SignIn/index.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -118,6 +118,7 @@ function SignInRoutes(): JSX.Element {
 <SignUpEmailLinkFlowComplete
 redirectUrlComplete={signUpContext.afterSignUpUrl}
 ssoCallbackUrl={signUpContext.ssoCallbackUrl}
 oidcPrompt={signUpContext.oidcPrompt}
 verifyEmailPath='../verify-email-address'
 verifyPhonePath='../verify-phone-number'
 continuePath='../continue'
Expand DownExpand Up@@ -177,6 +178,7 @@ function SignInRoot() {
 componentName: 'SignUp',
 emailLinkRedirectUrl: signInContext.emailLinkRedirectUrl,
 ssoCallbackUrl: signInContext.ssoCallbackUrl,
 oidcPrompt: signInContext.oidcPrompt,
 forceRedirectUrl: signInContext.signUpForceRedirectUrl,
 fallbackRedirectUrl: signInContext.signUpFallbackRedirectUrl,
 signInUrl: signInContext.signInUrl,
Expand Down

26 changes: 26 additions & 0 deletions
packages/ui/src/components/SignUp/__tests__/SignUpEmailLinkFlowComplete.test.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -37,6 +37,32 @@ describe('SignUpEmailLinkFlowComplete', () => {
 await waitFor(() => expect(fixtures.clerk.handleEmailLinkVerification).toHaveBeenCalled());
 screen.getByText(/success/i);
 });

 it('preserves the OIDC prompt when continuing through enterprise SSO', async () => {
 const { wrapper, fixtures } = await createFixtures(f => {
 f.withEmailAddress({ required: true });
 });
 fixtures.signUp.status = 'missing_requirements';
 fixtures.signUp.missingFields = ['enterprise_sso'];

 render(
 <SignUpEmailLinkFlowComplete
 redirectUrlComplete='https://example.com/complete'
 ssoCallbackUrl='https://example.com/sso-callback'
 oidcPrompt='select_account'
 />,
 { wrapper },
 );

 await waitFor(() => expect(fixtures.signUp.authenticateWithRedirect).toHaveBeenCalled(), { timeout: 3_000 });
 expect(fixtures.signUp.authenticateWithRedirect).toHaveBeenCalledWith({
 strategy: 'enterprise_sso',
 redirectUrl: 'https://example.com/sso-callback',
 redirectUrlComplete: 'https://example.com/complete',
 continueSignUp: true,
 oidcPrompt: 'select_account',
 });
 });
 });

 describe('Error messages', () => {
Expand Down

1 change: 1 addition & 0 deletions
packages/ui/src/components/SignUp/index.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -72,6 +72,7 @@ function SignUpRoutes(): JSX.Element {
 <SignUpEmailLinkFlowComplete
 redirectUrlComplete={signUpContext.afterSignUpUrl}
 ssoCallbackUrl={signUpContext.ssoCallbackUrl}
 oidcPrompt={signUpContext.oidcPrompt}
 verifyEmailPath='../verify-email-address'
 verifyPhonePath='../verify-phone-number'
 />
Expand Down
Loading