fix(clerk-js,types): Fix stale SignIn on authenticateWithRedirect for enterprise_sso#6160

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

Merged
LauraBeatris merged 2 commits into from
Jun 24, 2025
Merged

fix(clerk-js,types): Fix stale SignIn on authenticateWithRedirect for enterprise_sso#6160

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9104e7c
Create fresh SignIn on `authenticateWithRedirect` call
LauraBeatris Jun 19, 2025
b41e0fa
Add changeset
LauraBeatris Jun 19, 2025
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
8 changes: 8 additions & 0 deletions .changeset/grumpy-lamps-study.md
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
---
'@clerk/clerk-js': patch
'@clerk/types': patch
---

Fixes stale `SignIn` object on `authenticateWithRedirect` for `saml` and `enterprise_sso` custom flows

Previously, the same connection identifier would be used on every `authenticateWithRedirect` call leading to redirecting to the wrong identity provider
40 changes: 21 additions & 19 deletions packages/clerk-js/src/core/resources/SignIn.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -231,25 +231,27 @@ export class SignIn extends BaseResource implements SignInResource {
params: AuthenticateWithRedirectParams,
navigateCallback: (url: URL | string) => void,
): Promise<void> => {
const { strategy, redirectUrl, redirectUrlComplete, identifier, oidcPrompt } = params || {};

const { firstFactorVerification } =
(strategy === 'saml' || strategy === 'enterprise_sso') && this.id
? await this.prepareFirstFactor({
strategy,
redirectUrl: SignIn.clerk.buildUrlWithAuth(redirectUrl),
actionCompleteRedirectUrl: redirectUrlComplete,
oidcPrompt,
})
: await this.create({
strategy,
identifier,
redirectUrl: SignIn.clerk.buildUrlWithAuth(redirectUrl),
actionCompleteRedirectUrl: redirectUrlComplete,
oidcPrompt,
});

const { status, externalVerificationRedirectURL } = firstFactorVerification;
const { strategy, redirectUrl, redirectUrlComplete, identifier, oidcPrompt, continueSignIn } = params || {};

if (!this.id || !continueSignIn) {

@LauraBeatrisLauraBeatrisJun 19, 2025

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 found a PR comment a while ago (going to track it again to paste here) that the reasoning for not creating within here was to avoid issues if we created sign-in from AIOs.

My changes tackle exactly for this case, where SignIn provides continueSignIn as true

@panteliselefpanteliselefJun 23, 2025

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Is the issue only saml and enterprise_sso ?
I think adding a new property just makes things more complicated for the caller. My understanding is that now developers would need to pass both identifier and continueSignIn.

Can we get around this by checking if identifiers match ?

@LauraBeatrisLauraBeatrisJun 23, 2025

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.

enterprise_sso and saml since those rely on the identifier to query for the SSO connection.

They wouldn't have to pass continueSignIn to authenticateWithRedirect since it defaults to false, but it's being passed from SignInStart since it always creates a fresh sign-in:

javascript/packages/clerk-js/src/ui/components/SignIn/SignInStart.tsx

Lines 299 to 312 in e182055

constres=awaitsafePasswordSignInForEnterpriseSSOInstance(signIn.create(buildSignInParams(fields)),fields);
switch(res.status){
case'needs_identifier':
// Check if we need to initiate an enterprise sso flow
if(res.supportedFirstFactors?.some(ff=>ff.strategy==='saml'||ff.strategy==='enterprise_sso')){
awaitauthenticateWithEnterpriseSSO();
}
break;
case'needs_first_factor':
if(res.supportedFirstFactors?.every(ff=>ff.strategy==='enterprise_sso')){
awaitauthenticateWithEnterpriseSSO();
break;
}

@LauraBeatrisLauraBeatrisJun 23, 2025

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.

Can we get around this by checking if identifiers match ?

I guess this will work 🤔 but we still have the problem where SignInStart calls authenticateWithRedirect, so we cannot place this logic there otherwise it'd create two sign-ins.

@panteliselefpanteliselefJun 23, 2025

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

I see, is that because on needs_identifier we want to call prepare instead of create ?

@LauraBeatrisLauraBeatrisJun 23, 2025

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 see, is that because on needs_identifier we want to call prepare instead of create ?

Yeah, exactly, so SignInStart needs to handle the progressive flow. Custom flows also need to do so, so it's fair to also always create a fresh sign-in.

await this.create({
strategy,
identifier,
redirectUrl: SignIn.clerk.buildUrlWithAuth(redirectUrl),
actionCompleteRedirectUrl: redirectUrlComplete,
});
}

if (strategy === 'saml' || strategy === 'enterprise_sso') {
await this.prepareFirstFactor({
strategy,
redirectUrl: SignIn.clerk.buildUrlWithAuth(redirectUrl),
actionCompleteRedirectUrl: redirectUrlComplete,
oidcPrompt,
});
}

const { status, externalVerificationRedirectURL } = this.firstFactorVerification;

if (status === 'unverified' && externalVerificationRedirectURL) {
navigateCallback(externalVerificationRedirectURL);
Expand Down
1 change: 1 addition & 0 deletions packages/clerk-js/src/ui/components/SignIn/SignInStart.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -405,6 +405,7 @@ function SignInStartInternal(): JSX.Element {
redirectUrl,
redirectUrlComplete,
oidcPrompt: ctx.oidcPrompt,
continueSignIn: true,
});
};

Expand Down
2 changes: 2 additions & 0 deletions packages/clerk-js/src/ui/components/SignIn/__tests__/SignInStart.test.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -291,6 +291,7 @@ describe('SignInStart', () => {
strategy: 'enterprise_sso',
redirectUrl: 'http://localhost/#/sso-callback',
redirectUrlComplete: '/',
continueSignIn: true,
});
});
});
Expand All@@ -314,6 +315,7 @@ describe('SignInStart', () => {
strategy: 'enterprise_sso',
redirectUrl: 'http://localhost/#/sso-callback',
redirectUrlComplete: '/',
continueSignIn: true,
});
});
});
Expand Down
5 changes: 5 additions & 0 deletions packages/types/src/redirects.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -61,6 +61,11 @@ export type AuthenticateWithRedirectParams = {
*/
continueSignUp?: boolean;

/**
* Whether to continue existing SignIn (if present) or create a new SignIn.
*/
continueSignIn?: boolean;

/**
* One of the supported OAuth providers you can use to authenticate with, eg 'oauth_google'.
* Alternatively `saml` or `enterprise_sso`, to authenticate with Enterprise SSO.
Expand Down
, '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
fix(clerk-js,types): Fix stale SignIn on authenticateWithRedirect for enterprise_sso#6160

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

 Merged

LauraBeatris
merged 2 commits into

from

Jun 24, 2025
 Merged


fix(clerk-js,types): Fix stale SignIn on authenticateWithRedirect for enterprise_sso#6160
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
9104e7c

Create fresh SignIn on `authenticateWithRedirect` call


LauraBeatris Jun 19, 2025
b41e0fa

Add changeset


LauraBeatris Jun 19, 2025

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


8 changes: 8 additions & 0 deletions
.changeset/grumpy-lamps-study.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
---
'@clerk/clerk-js': patch
'@clerk/types': patch
---

Fixes stale `SignIn` object on `authenticateWithRedirect` for `saml` and `enterprise_sso` custom flows

Previously, the same connection identifier would be used on every `authenticateWithRedirect` call leading to redirecting to the wrong identity provider

40 changes: 21 additions & 19 deletions
packages/clerk-js/src/core/resources/SignIn.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -231,25 +231,27 @@ export class SignIn extends BaseResource implements SignInResource {
 params: AuthenticateWithRedirectParams,
 navigateCallback: (url: URL | string) => void,
 ): Promise<void> => {
 const { strategy, redirectUrl, redirectUrlComplete, identifier, oidcPrompt } = params || {};

 const { firstFactorVerification } =
 (strategy === 'saml' || strategy === 'enterprise_sso') && this.id
 ? await this.prepareFirstFactor({
 strategy,
 redirectUrl: SignIn.clerk.buildUrlWithAuth(redirectUrl),
 actionCompleteRedirectUrl: redirectUrlComplete,
 oidcPrompt,
 })
 : await this.create({
 strategy,
 identifier,
 redirectUrl: SignIn.clerk.buildUrlWithAuth(redirectUrl),
 actionCompleteRedirectUrl: redirectUrlComplete,
 oidcPrompt,
 });

 const { status, externalVerificationRedirectURL } = firstFactorVerification;
 const { strategy, redirectUrl, redirectUrlComplete, identifier, oidcPrompt, continueSignIn } = params || {};

 if (!this.id || !continueSignIn) {
@LauraBeatrisLauraBeatrisJun 19, 2025

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 found a PR comment a while ago (going to track it again to paste here) that the reasoning for not creating within here was to avoid issues if we created sign-in from AIOs.
My changes tackle exactly for this case, where SignIn provides continueSignIn as true
@panteliselefpanteliselefJun 23, 2025

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

Is the issue only saml and enterprise_sso ?

I think adding a new property just makes things more complicated for the caller. My understanding is that now developers would need to pass both identifier and continueSignIn.
Can we get around this by checking if identifiers match ?
@LauraBeatrisLauraBeatrisJun 23, 2025

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.

enterprise_sso and saml since those rely on the identifier to query for the SSO connection.
They wouldn't have to pass continueSignIn to authenticateWithRedirect since it defaults to false, but it's being passed from SignInStart since it always creates a fresh sign-in:
javascript/packages/clerk-js/src/ui/components/SignIn/SignInStart.tsx

Lines 299 to 312
in
e182055
constres=awaitsafePasswordSignInForEnterpriseSSOInstance(signIn.create(buildSignInParams(fields)),fields);
switch(res.status){
case'needs_identifier': 
// Check if we need to initiate an enterprise sso flow
if(res.supportedFirstFactors?.some(ff=>ff.strategy==='saml'||ff.strategy==='enterprise_sso')){
awaitauthenticateWithEnterpriseSSO();
}
break;
case'needs_first_factor': 
if(res.supportedFirstFactors?.every(ff=>ff.strategy==='enterprise_sso')){
awaitauthenticateWithEnterpriseSSO();
break;
}
@LauraBeatrisLauraBeatrisJun 23, 2025

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.

Can we get around this by checking if identifiers match ?
I guess this will work 🤔 but we still have the problem where SignInStart calls authenticateWithRedirect, so we cannot place this logic there otherwise it'd create two sign-ins.
@panteliselefpanteliselefJun 23, 2025

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

I see, is that because on needs_identifier we want to call prepare instead of create ?
@LauraBeatrisLauraBeatrisJun 23, 2025

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 see, is that because on needs_identifier we want to call prepare instead of create ?
Yeah, exactly, so SignInStart needs to handle the progressive flow. Custom flows also need to do so, so it's fair to also always create a fresh sign-in.
 await this.create({
 strategy,
 identifier,
 redirectUrl: SignIn.clerk.buildUrlWithAuth(redirectUrl),
 actionCompleteRedirectUrl: redirectUrlComplete,
 });
 }

 if (strategy === 'saml' || strategy === 'enterprise_sso') {
 await this.prepareFirstFactor({
 strategy,
 redirectUrl: SignIn.clerk.buildUrlWithAuth(redirectUrl),
 actionCompleteRedirectUrl: redirectUrlComplete,
 oidcPrompt,
 });
 }

 const { status, externalVerificationRedirectURL } = this.firstFactorVerification;

 if (status === 'unverified' && externalVerificationRedirectURL) {
 navigateCallback(externalVerificationRedirectURL);
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -405,6 +405,7 @@ function SignInStartInternal(): JSX.Element {
 redirectUrl,
 redirectUrlComplete,
 oidcPrompt: ctx.oidcPrompt,
 continueSignIn: true,
 });
 };

Expand Down

2 changes: 2 additions & 0 deletions
packages/clerk-js/src/ui/components/SignIn/__tests__/SignInStart.test.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -291,6 +291,7 @@ describe('SignInStart', () => {
 strategy: 'enterprise_sso',
 redirectUrl: 'http://localhost/#/sso-callback',
 redirectUrlComplete: '/',
 continueSignIn: true,
 });
 });
 });
Expand All@@ -314,6 +315,7 @@ describe('SignInStart', () => {
 strategy: 'enterprise_sso',
 redirectUrl: 'http://localhost/#/sso-callback',
 redirectUrlComplete: '/',
 continueSignIn: true,
 });
 });
 });
Expand Down

5 changes: 5 additions & 0 deletions
packages/types/src/redirects.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -61,6 +61,11 @@ export type AuthenticateWithRedirectParams = {
 */
 continueSignUp?: boolean;

 /**
 * Whether to continue existing SignIn (if present) or create a new SignIn.
 */
 continueSignIn?: boolean;

 /**
 * One of the supported OAuth providers you can use to authenticate with, eg 'oauth_google'.
 * Alternatively `saml` or `enterprise_sso`, to authenticate with Enterprise SSO.
Expand Down

, '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
fix(clerk-js,types): Fix stale SignIn on authenticateWithRedirect for enterprise_sso#6160

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

 Merged

LauraBeatris
merged 2 commits into

from

Jun 24, 2025
 Merged


fix(clerk-js,types): Fix stale SignIn on authenticateWithRedirect for enterprise_sso#6160
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
9104e7c

Create fresh SignIn on `authenticateWithRedirect` call


LauraBeatris Jun 19, 2025
b41e0fa

Add changeset


LauraBeatris Jun 19, 2025

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


8 changes: 8 additions & 0 deletions
.changeset/grumpy-lamps-study.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
---
'@clerk/clerk-js': patch
'@clerk/types': patch
---

Fixes stale `SignIn` object on `authenticateWithRedirect` for `saml` and `enterprise_sso` custom flows

Previously, the same connection identifier would be used on every `authenticateWithRedirect` call leading to redirecting to the wrong identity provider

40 changes: 21 additions & 19 deletions
packages/clerk-js/src/core/resources/SignIn.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -231,25 +231,27 @@ export class SignIn extends BaseResource implements SignInResource {
 params: AuthenticateWithRedirectParams,
 navigateCallback: (url: URL | string) => void,
 ): Promise<void> => {
 const { strategy, redirectUrl, redirectUrlComplete, identifier, oidcPrompt } = params || {};

 const { firstFactorVerification } =
 (strategy === 'saml' || strategy === 'enterprise_sso') && this.id
 ? await this.prepareFirstFactor({
 strategy,
 redirectUrl: SignIn.clerk.buildUrlWithAuth(redirectUrl),
 actionCompleteRedirectUrl: redirectUrlComplete,
 oidcPrompt,
 })
 : await this.create({
 strategy,
 identifier,
 redirectUrl: SignIn.clerk.buildUrlWithAuth(redirectUrl),
 actionCompleteRedirectUrl: redirectUrlComplete,
 oidcPrompt,
 });

 const { status, externalVerificationRedirectURL } = firstFactorVerification;
 const { strategy, redirectUrl, redirectUrlComplete, identifier, oidcPrompt, continueSignIn } = params || {};

 if (!this.id || !continueSignIn) {
@LauraBeatrisLauraBeatrisJun 19, 2025

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 found a PR comment a while ago (going to track it again to paste here) that the reasoning for not creating within here was to avoid issues if we created sign-in from AIOs.
My changes tackle exactly for this case, where SignIn provides continueSignIn as true
@panteliselefpanteliselefJun 23, 2025

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

Is the issue only saml and enterprise_sso ?

I think adding a new property just makes things more complicated for the caller. My understanding is that now developers would need to pass both identifier and continueSignIn.
Can we get around this by checking if identifiers match ?
@LauraBeatrisLauraBeatrisJun 23, 2025

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.

enterprise_sso and saml since those rely on the identifier to query for the SSO connection.
They wouldn't have to pass continueSignIn to authenticateWithRedirect since it defaults to false, but it's being passed from SignInStart since it always creates a fresh sign-in:
javascript/packages/clerk-js/src/ui/components/SignIn/SignInStart.tsx

Lines 299 to 312
in
e182055
constres=awaitsafePasswordSignInForEnterpriseSSOInstance(signIn.create(buildSignInParams(fields)),fields);
switch(res.status){
case'needs_identifier': 
// Check if we need to initiate an enterprise sso flow
if(res.supportedFirstFactors?.some(ff=>ff.strategy==='saml'||ff.strategy==='enterprise_sso')){
awaitauthenticateWithEnterpriseSSO();
}
break;
case'needs_first_factor': 
if(res.supportedFirstFactors?.every(ff=>ff.strategy==='enterprise_sso')){
awaitauthenticateWithEnterpriseSSO();
break;
}
@LauraBeatrisLauraBeatrisJun 23, 2025

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.

Can we get around this by checking if identifiers match ?
I guess this will work 🤔 but we still have the problem where SignInStart calls authenticateWithRedirect, so we cannot place this logic there otherwise it'd create two sign-ins.
@panteliselefpanteliselefJun 23, 2025

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

I see, is that because on needs_identifier we want to call prepare instead of create ?
@LauraBeatrisLauraBeatrisJun 23, 2025

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 see, is that because on needs_identifier we want to call prepare instead of create ?
Yeah, exactly, so SignInStart needs to handle the progressive flow. Custom flows also need to do so, so it's fair to also always create a fresh sign-in.
 await this.create({
 strategy,
 identifier,
 redirectUrl: SignIn.clerk.buildUrlWithAuth(redirectUrl),
 actionCompleteRedirectUrl: redirectUrlComplete,
 });
 }

 if (strategy === 'saml' || strategy === 'enterprise_sso') {
 await this.prepareFirstFactor({
 strategy,
 redirectUrl: SignIn.clerk.buildUrlWithAuth(redirectUrl),
 actionCompleteRedirectUrl: redirectUrlComplete,
 oidcPrompt,
 });
 }

 const { status, externalVerificationRedirectURL } = this.firstFactorVerification;

 if (status === 'unverified' && externalVerificationRedirectURL) {
 navigateCallback(externalVerificationRedirectURL);
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -405,6 +405,7 @@ function SignInStartInternal(): JSX.Element {
 redirectUrl,
 redirectUrlComplete,
 oidcPrompt: ctx.oidcPrompt,
 continueSignIn: true,
 });
 };

Expand Down

2 changes: 2 additions & 0 deletions
packages/clerk-js/src/ui/components/SignIn/__tests__/SignInStart.test.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -291,6 +291,7 @@ describe('SignInStart', () => {
 strategy: 'enterprise_sso',
 redirectUrl: 'http://localhost/#/sso-callback',
 redirectUrlComplete: '/',
 continueSignIn: true,
 });
 });
 });
Expand All@@ -314,6 +315,7 @@ describe('SignInStart', () => {
 strategy: 'enterprise_sso',
 redirectUrl: 'http://localhost/#/sso-callback',
 redirectUrlComplete: '/',
 continueSignIn: true,
 });
 });
 });
Expand Down

5 changes: 5 additions & 0 deletions
packages/types/src/redirects.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -61,6 +61,11 @@ export type AuthenticateWithRedirectParams = {
 */
 continueSignUp?: boolean;

 /**
 * Whether to continue existing SignIn (if present) or create a new SignIn.
 */
 continueSignIn?: boolean;

 /**
 * One of the supported OAuth providers you can use to authenticate with, eg 'oauth_google'.
 * Alternatively `saml` or `enterprise_sso`, to authenticate with Enterprise SSO.
Expand Down

, '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
fix(clerk-js,types): Fix stale SignIn on authenticateWithRedirect for enterprise_sso#6160

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

 Merged

LauraBeatris
merged 2 commits into

from

Jun 24, 2025
 Merged


fix(clerk-js,types): Fix stale SignIn on authenticateWithRedirect for enterprise_sso#6160
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
9104e7c

Create fresh SignIn on `authenticateWithRedirect` call


LauraBeatris Jun 19, 2025
b41e0fa

Add changeset


LauraBeatris Jun 19, 2025

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


8 changes: 8 additions & 0 deletions
.changeset/grumpy-lamps-study.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
---
'@clerk/clerk-js': patch
'@clerk/types': patch
---

Fixes stale `SignIn` object on `authenticateWithRedirect` for `saml` and `enterprise_sso` custom flows

Previously, the same connection identifier would be used on every `authenticateWithRedirect` call leading to redirecting to the wrong identity provider

40 changes: 21 additions & 19 deletions
packages/clerk-js/src/core/resources/SignIn.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -231,25 +231,27 @@ export class SignIn extends BaseResource implements SignInResource {
 params: AuthenticateWithRedirectParams,
 navigateCallback: (url: URL | string) => void,
 ): Promise<void> => {
 const { strategy, redirectUrl, redirectUrlComplete, identifier, oidcPrompt } = params || {};

 const { firstFactorVerification } =
 (strategy === 'saml' || strategy === 'enterprise_sso') && this.id
 ? await this.prepareFirstFactor({
 strategy,
 redirectUrl: SignIn.clerk.buildUrlWithAuth(redirectUrl),
 actionCompleteRedirectUrl: redirectUrlComplete,
 oidcPrompt,
 })
 : await this.create({
 strategy,
 identifier,
 redirectUrl: SignIn.clerk.buildUrlWithAuth(redirectUrl),
 actionCompleteRedirectUrl: redirectUrlComplete,
 oidcPrompt,
 });

 const { status, externalVerificationRedirectURL } = firstFactorVerification;
 const { strategy, redirectUrl, redirectUrlComplete, identifier, oidcPrompt, continueSignIn } = params || {};

 if (!this.id || !continueSignIn) {
@LauraBeatrisLauraBeatrisJun 19, 2025

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 found a PR comment a while ago (going to track it again to paste here) that the reasoning for not creating within here was to avoid issues if we created sign-in from AIOs.
My changes tackle exactly for this case, where SignIn provides continueSignIn as true
@panteliselefpanteliselefJun 23, 2025

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

Is the issue only saml and enterprise_sso ?

I think adding a new property just makes things more complicated for the caller. My understanding is that now developers would need to pass both identifier and continueSignIn.
Can we get around this by checking if identifiers match ?
@LauraBeatrisLauraBeatrisJun 23, 2025

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.

enterprise_sso and saml since those rely on the identifier to query for the SSO connection.
They wouldn't have to pass continueSignIn to authenticateWithRedirect since it defaults to false, but it's being passed from SignInStart since it always creates a fresh sign-in:
javascript/packages/clerk-js/src/ui/components/SignIn/SignInStart.tsx

Lines 299 to 312
in
e182055
constres=awaitsafePasswordSignInForEnterpriseSSOInstance(signIn.create(buildSignInParams(fields)),fields);
switch(res.status){
case'needs_identifier': 
// Check if we need to initiate an enterprise sso flow
if(res.supportedFirstFactors?.some(ff=>ff.strategy==='saml'||ff.strategy==='enterprise_sso')){
awaitauthenticateWithEnterpriseSSO();
}
break;
case'needs_first_factor': 
if(res.supportedFirstFactors?.every(ff=>ff.strategy==='enterprise_sso')){
awaitauthenticateWithEnterpriseSSO();
break;
}
@LauraBeatrisLauraBeatrisJun 23, 2025

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.

Can we get around this by checking if identifiers match ?
I guess this will work 🤔 but we still have the problem where SignInStart calls authenticateWithRedirect, so we cannot place this logic there otherwise it'd create two sign-ins.
@panteliselefpanteliselefJun 23, 2025

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

I see, is that because on needs_identifier we want to call prepare instead of create ?
@LauraBeatrisLauraBeatrisJun 23, 2025

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 see, is that because on needs_identifier we want to call prepare instead of create ?
Yeah, exactly, so SignInStart needs to handle the progressive flow. Custom flows also need to do so, so it's fair to also always create a fresh sign-in.
 await this.create({
 strategy,
 identifier,
 redirectUrl: SignIn.clerk.buildUrlWithAuth(redirectUrl),
 actionCompleteRedirectUrl: redirectUrlComplete,
 });
 }

 if (strategy === 'saml' || strategy === 'enterprise_sso') {
 await this.prepareFirstFactor({
 strategy,
 redirectUrl: SignIn.clerk.buildUrlWithAuth(redirectUrl),
 actionCompleteRedirectUrl: redirectUrlComplete,
 oidcPrompt,
 });
 }

 const { status, externalVerificationRedirectURL } = this.firstFactorVerification;

 if (status === 'unverified' && externalVerificationRedirectURL) {
 navigateCallback(externalVerificationRedirectURL);
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -405,6 +405,7 @@ function SignInStartInternal(): JSX.Element {
 redirectUrl,
 redirectUrlComplete,
 oidcPrompt: ctx.oidcPrompt,
 continueSignIn: true,
 });
 };

Expand Down

2 changes: 2 additions & 0 deletions
packages/clerk-js/src/ui/components/SignIn/__tests__/SignInStart.test.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -291,6 +291,7 @@ describe('SignInStart', () => {
 strategy: 'enterprise_sso',
 redirectUrl: 'http://localhost/#/sso-callback',
 redirectUrlComplete: '/',
 continueSignIn: true,
 });
 });
 });
Expand All@@ -314,6 +315,7 @@ describe('SignInStart', () => {
 strategy: 'enterprise_sso',
 redirectUrl: 'http://localhost/#/sso-callback',
 redirectUrlComplete: '/',
 continueSignIn: true,
 });
 });
 });
Expand Down

5 changes: 5 additions & 0 deletions
packages/types/src/redirects.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -61,6 +61,11 @@ export type AuthenticateWithRedirectParams = {
 */
 continueSignUp?: boolean;

 /**
 * Whether to continue existing SignIn (if present) or create a new SignIn.
 */
 continueSignIn?: boolean;

 /**
 * One of the supported OAuth providers you can use to authenticate with, eg 'oauth_google'.
 * Alternatively `saml` or `enterprise_sso`, to authenticate with Enterprise SSO.
Expand Down

, '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
fix(clerk-js,types): Fix stale SignIn on authenticateWithRedirect for enterprise_sso#6160

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

 Merged

LauraBeatris
merged 2 commits into

from

Jun 24, 2025
 Merged


fix(clerk-js,types): Fix stale SignIn on authenticateWithRedirect for enterprise_sso#6160
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
9104e7c

Create fresh SignIn on `authenticateWithRedirect` call


LauraBeatris Jun 19, 2025
b41e0fa

Add changeset


LauraBeatris Jun 19, 2025

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


8 changes: 8 additions & 0 deletions
.changeset/grumpy-lamps-study.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
---
'@clerk/clerk-js': patch
'@clerk/types': patch
---

Fixes stale `SignIn` object on `authenticateWithRedirect` for `saml` and `enterprise_sso` custom flows

Previously, the same connection identifier would be used on every `authenticateWithRedirect` call leading to redirecting to the wrong identity provider

40 changes: 21 additions & 19 deletions
packages/clerk-js/src/core/resources/SignIn.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -231,25 +231,27 @@ export class SignIn extends BaseResource implements SignInResource {
 params: AuthenticateWithRedirectParams,
 navigateCallback: (url: URL | string) => void,
 ): Promise<void> => {
 const { strategy, redirectUrl, redirectUrlComplete, identifier, oidcPrompt } = params || {};

 const { firstFactorVerification } =
 (strategy === 'saml' || strategy === 'enterprise_sso') && this.id
 ? await this.prepareFirstFactor({
 strategy,
 redirectUrl: SignIn.clerk.buildUrlWithAuth(redirectUrl),
 actionCompleteRedirectUrl: redirectUrlComplete,
 oidcPrompt,
 })
 : await this.create({
 strategy,
 identifier,
 redirectUrl: SignIn.clerk.buildUrlWithAuth(redirectUrl),
 actionCompleteRedirectUrl: redirectUrlComplete,
 oidcPrompt,
 });

 const { status, externalVerificationRedirectURL } = firstFactorVerification;
 const { strategy, redirectUrl, redirectUrlComplete, identifier, oidcPrompt, continueSignIn } = params || {};

 if (!this.id || !continueSignIn) {
@LauraBeatrisLauraBeatrisJun 19, 2025

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 found a PR comment a while ago (going to track it again to paste here) that the reasoning for not creating within here was to avoid issues if we created sign-in from AIOs.
My changes tackle exactly for this case, where SignIn provides continueSignIn as true
@panteliselefpanteliselefJun 23, 2025

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

Is the issue only saml and enterprise_sso ?

I think adding a new property just makes things more complicated for the caller. My understanding is that now developers would need to pass both identifier and continueSignIn.
Can we get around this by checking if identifiers match ?
@LauraBeatrisLauraBeatrisJun 23, 2025

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.

enterprise_sso and saml since those rely on the identifier to query for the SSO connection.
They wouldn't have to pass continueSignIn to authenticateWithRedirect since it defaults to false, but it's being passed from SignInStart since it always creates a fresh sign-in:
javascript/packages/clerk-js/src/ui/components/SignIn/SignInStart.tsx

Lines 299 to 312
in
e182055
constres=awaitsafePasswordSignInForEnterpriseSSOInstance(signIn.create(buildSignInParams(fields)),fields);
switch(res.status){
case'needs_identifier': 
// Check if we need to initiate an enterprise sso flow
if(res.supportedFirstFactors?.some(ff=>ff.strategy==='saml'||ff.strategy==='enterprise_sso')){
awaitauthenticateWithEnterpriseSSO();
}
break;
case'needs_first_factor': 
if(res.supportedFirstFactors?.every(ff=>ff.strategy==='enterprise_sso')){
awaitauthenticateWithEnterpriseSSO();
break;
}
@LauraBeatrisLauraBeatrisJun 23, 2025

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.

Can we get around this by checking if identifiers match ?
I guess this will work 🤔 but we still have the problem where SignInStart calls authenticateWithRedirect, so we cannot place this logic there otherwise it'd create two sign-ins.
@panteliselefpanteliselefJun 23, 2025

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

I see, is that because on needs_identifier we want to call prepare instead of create ?
@LauraBeatrisLauraBeatrisJun 23, 2025

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 see, is that because on needs_identifier we want to call prepare instead of create ?
Yeah, exactly, so SignInStart needs to handle the progressive flow. Custom flows also need to do so, so it's fair to also always create a fresh sign-in.
 await this.create({
 strategy,
 identifier,
 redirectUrl: SignIn.clerk.buildUrlWithAuth(redirectUrl),
 actionCompleteRedirectUrl: redirectUrlComplete,
 });
 }

 if (strategy === 'saml' || strategy === 'enterprise_sso') {
 await this.prepareFirstFactor({
 strategy,
 redirectUrl: SignIn.clerk.buildUrlWithAuth(redirectUrl),
 actionCompleteRedirectUrl: redirectUrlComplete,
 oidcPrompt,
 });
 }

 const { status, externalVerificationRedirectURL } = this.firstFactorVerification;

 if (status === 'unverified' && externalVerificationRedirectURL) {
 navigateCallback(externalVerificationRedirectURL);
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -405,6 +405,7 @@ function SignInStartInternal(): JSX.Element {
 redirectUrl,
 redirectUrlComplete,
 oidcPrompt: ctx.oidcPrompt,
 continueSignIn: true,
 });
 };

Expand Down

2 changes: 2 additions & 0 deletions
packages/clerk-js/src/ui/components/SignIn/__tests__/SignInStart.test.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -291,6 +291,7 @@ describe('SignInStart', () => {
 strategy: 'enterprise_sso',
 redirectUrl: 'http://localhost/#/sso-callback',
 redirectUrlComplete: '/',
 continueSignIn: true,
 });
 });
 });
Expand All@@ -314,6 +315,7 @@ describe('SignInStart', () => {
 strategy: 'enterprise_sso',
 redirectUrl: 'http://localhost/#/sso-callback',
 redirectUrlComplete: '/',
 continueSignIn: true,
 });
 });
 });
Expand Down

5 changes: 5 additions & 0 deletions
packages/types/src/redirects.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -61,6 +61,11 @@ export type AuthenticateWithRedirectParams = {
 */
 continueSignUp?: boolean;

 /**
 * Whether to continue existing SignIn (if present) or create a new SignIn.
 */
 continueSignIn?: boolean;

 /**
 * One of the supported OAuth providers you can use to authenticate with, eg 'oauth_google'.
 * Alternatively `saml` or `enterprise_sso`, to authenticate with Enterprise SSO.
Expand Down

, '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
fix(clerk-js,types): Fix stale SignIn on authenticateWithRedirect for enterprise_sso#6160

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

 Merged

LauraBeatris
merged 2 commits into

from

Jun 24, 2025
 Merged


fix(clerk-js,types): Fix stale SignIn on authenticateWithRedirect for enterprise_sso#6160
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
9104e7c

Create fresh SignIn on `authenticateWithRedirect` call


LauraBeatris Jun 19, 2025
b41e0fa

Add changeset


LauraBeatris Jun 19, 2025

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


8 changes: 8 additions & 0 deletions
.changeset/grumpy-lamps-study.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
---
'@clerk/clerk-js': patch
'@clerk/types': patch
---

Fixes stale `SignIn` object on `authenticateWithRedirect` for `saml` and `enterprise_sso` custom flows

Previously, the same connection identifier would be used on every `authenticateWithRedirect` call leading to redirecting to the wrong identity provider

40 changes: 21 additions & 19 deletions
packages/clerk-js/src/core/resources/SignIn.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -231,25 +231,27 @@ export class SignIn extends BaseResource implements SignInResource {
 params: AuthenticateWithRedirectParams,
 navigateCallback: (url: URL | string) => void,
 ): Promise<void> => {
 const { strategy, redirectUrl, redirectUrlComplete, identifier, oidcPrompt } = params || {};

 const { firstFactorVerification } =
 (strategy === 'saml' || strategy === 'enterprise_sso') && this.id
 ? await this.prepareFirstFactor({
 strategy,
 redirectUrl: SignIn.clerk.buildUrlWithAuth(redirectUrl),
 actionCompleteRedirectUrl: redirectUrlComplete,
 oidcPrompt,
 })
 : await this.create({
 strategy,
 identifier,
 redirectUrl: SignIn.clerk.buildUrlWithAuth(redirectUrl),
 actionCompleteRedirectUrl: redirectUrlComplete,
 oidcPrompt,
 });

 const { status, externalVerificationRedirectURL } = firstFactorVerification;
 const { strategy, redirectUrl, redirectUrlComplete, identifier, oidcPrompt, continueSignIn } = params || {};

 if (!this.id || !continueSignIn) {
@LauraBeatrisLauraBeatrisJun 19, 2025

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 found a PR comment a while ago (going to track it again to paste here) that the reasoning for not creating within here was to avoid issues if we created sign-in from AIOs.
My changes tackle exactly for this case, where SignIn provides continueSignIn as true
@panteliselefpanteliselefJun 23, 2025

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

Is the issue only saml and enterprise_sso ?

I think adding a new property just makes things more complicated for the caller. My understanding is that now developers would need to pass both identifier and continueSignIn.
Can we get around this by checking if identifiers match ?
@LauraBeatrisLauraBeatrisJun 23, 2025

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.

enterprise_sso and saml since those rely on the identifier to query for the SSO connection.
They wouldn't have to pass continueSignIn to authenticateWithRedirect since it defaults to false, but it's being passed from SignInStart since it always creates a fresh sign-in:
javascript/packages/clerk-js/src/ui/components/SignIn/SignInStart.tsx

Lines 299 to 312
in
e182055
constres=awaitsafePasswordSignInForEnterpriseSSOInstance(signIn.create(buildSignInParams(fields)),fields);
switch(res.status){
case'needs_identifier': 
// Check if we need to initiate an enterprise sso flow
if(res.supportedFirstFactors?.some(ff=>ff.strategy==='saml'||ff.strategy==='enterprise_sso')){
awaitauthenticateWithEnterpriseSSO();
}
break;
case'needs_first_factor': 
if(res.supportedFirstFactors?.every(ff=>ff.strategy==='enterprise_sso')){
awaitauthenticateWithEnterpriseSSO();
break;
}
@LauraBeatrisLauraBeatrisJun 23, 2025

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.

Can we get around this by checking if identifiers match ?
I guess this will work 🤔 but we still have the problem where SignInStart calls authenticateWithRedirect, so we cannot place this logic there otherwise it'd create two sign-ins.
@panteliselefpanteliselefJun 23, 2025

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

I see, is that because on needs_identifier we want to call prepare instead of create ?
@LauraBeatrisLauraBeatrisJun 23, 2025

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 see, is that because on needs_identifier we want to call prepare instead of create ?
Yeah, exactly, so SignInStart needs to handle the progressive flow. Custom flows also need to do so, so it's fair to also always create a fresh sign-in.
 await this.create({
 strategy,
 identifier,
 redirectUrl: SignIn.clerk.buildUrlWithAuth(redirectUrl),
 actionCompleteRedirectUrl: redirectUrlComplete,
 });
 }

 if (strategy === 'saml' || strategy === 'enterprise_sso') {
 await this.prepareFirstFactor({
 strategy,
 redirectUrl: SignIn.clerk.buildUrlWithAuth(redirectUrl),
 actionCompleteRedirectUrl: redirectUrlComplete,
 oidcPrompt,
 });
 }

 const { status, externalVerificationRedirectURL } = this.firstFactorVerification;

 if (status === 'unverified' && externalVerificationRedirectURL) {
 navigateCallback(externalVerificationRedirectURL);
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -405,6 +405,7 @@ function SignInStartInternal(): JSX.Element {
 redirectUrl,
 redirectUrlComplete,
 oidcPrompt: ctx.oidcPrompt,
 continueSignIn: true,
 });
 };

Expand Down

2 changes: 2 additions & 0 deletions
packages/clerk-js/src/ui/components/SignIn/__tests__/SignInStart.test.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -291,6 +291,7 @@ describe('SignInStart', () => {
 strategy: 'enterprise_sso',
 redirectUrl: 'http://localhost/#/sso-callback',
 redirectUrlComplete: '/',
 continueSignIn: true,
 });
 });
 });
Expand All@@ -314,6 +315,7 @@ describe('SignInStart', () => {
 strategy: 'enterprise_sso',
 redirectUrl: 'http://localhost/#/sso-callback',
 redirectUrlComplete: '/',
 continueSignIn: true,
 });
 });
 });
Expand Down

5 changes: 5 additions & 0 deletions
packages/types/src/redirects.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -61,6 +61,11 @@ export type AuthenticateWithRedirectParams = {
 */
 continueSignUp?: boolean;

 /**
 * Whether to continue existing SignIn (if present) or create a new SignIn.
 */
 continueSignIn?: boolean;

 /**
 * One of the supported OAuth providers you can use to authenticate with, eg 'oauth_google'.
 * Alternatively `saml` or `enterprise_sso`, to authenticate with Enterprise SSO.
Expand Down

, '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
fix(clerk-js,types): Fix stale SignIn on authenticateWithRedirect for enterprise_sso#6160

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

 Merged

LauraBeatris
merged 2 commits into

from

Jun 24, 2025
 Merged


fix(clerk-js,types): Fix stale SignIn on authenticateWithRedirect for enterprise_sso#6160
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
9104e7c

Create fresh SignIn on `authenticateWithRedirect` call


LauraBeatris Jun 19, 2025
b41e0fa

Add changeset


LauraBeatris Jun 19, 2025

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


8 changes: 8 additions & 0 deletions
.changeset/grumpy-lamps-study.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
---
'@clerk/clerk-js': patch
'@clerk/types': patch
---

Fixes stale `SignIn` object on `authenticateWithRedirect` for `saml` and `enterprise_sso` custom flows

Previously, the same connection identifier would be used on every `authenticateWithRedirect` call leading to redirecting to the wrong identity provider

40 changes: 21 additions & 19 deletions
packages/clerk-js/src/core/resources/SignIn.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -231,25 +231,27 @@ export class SignIn extends BaseResource implements SignInResource {
 params: AuthenticateWithRedirectParams,
 navigateCallback: (url: URL | string) => void,
 ): Promise<void> => {
 const { strategy, redirectUrl, redirectUrlComplete, identifier, oidcPrompt } = params || {};

 const { firstFactorVerification } =
 (strategy === 'saml' || strategy === 'enterprise_sso') && this.id
 ? await this.prepareFirstFactor({
 strategy,
 redirectUrl: SignIn.clerk.buildUrlWithAuth(redirectUrl),
 actionCompleteRedirectUrl: redirectUrlComplete,
 oidcPrompt,
 })
 : await this.create({
 strategy,
 identifier,
 redirectUrl: SignIn.clerk.buildUrlWithAuth(redirectUrl),
 actionCompleteRedirectUrl: redirectUrlComplete,
 oidcPrompt,
 });

 const { status, externalVerificationRedirectURL } = firstFactorVerification;
 const { strategy, redirectUrl, redirectUrlComplete, identifier, oidcPrompt, continueSignIn } = params || {};

 if (!this.id || !continueSignIn) {
@LauraBeatrisLauraBeatrisJun 19, 2025

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 found a PR comment a while ago (going to track it again to paste here) that the reasoning for not creating within here was to avoid issues if we created sign-in from AIOs.
My changes tackle exactly for this case, where SignIn provides continueSignIn as true
@panteliselefpanteliselefJun 23, 2025

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

Is the issue only saml and enterprise_sso ?

I think adding a new property just makes things more complicated for the caller. My understanding is that now developers would need to pass both identifier and continueSignIn.
Can we get around this by checking if identifiers match ?
@LauraBeatrisLauraBeatrisJun 23, 2025

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.

enterprise_sso and saml since those rely on the identifier to query for the SSO connection.
They wouldn't have to pass continueSignIn to authenticateWithRedirect since it defaults to false, but it's being passed from SignInStart since it always creates a fresh sign-in:
javascript/packages/clerk-js/src/ui/components/SignIn/SignInStart.tsx

Lines 299 to 312
in
e182055
constres=awaitsafePasswordSignInForEnterpriseSSOInstance(signIn.create(buildSignInParams(fields)),fields);
switch(res.status){
case'needs_identifier': 
// Check if we need to initiate an enterprise sso flow
if(res.supportedFirstFactors?.some(ff=>ff.strategy==='saml'||ff.strategy==='enterprise_sso')){
awaitauthenticateWithEnterpriseSSO();
}
break;
case'needs_first_factor': 
if(res.supportedFirstFactors?.every(ff=>ff.strategy==='enterprise_sso')){
awaitauthenticateWithEnterpriseSSO();
break;
}
@LauraBeatrisLauraBeatrisJun 23, 2025

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.

Can we get around this by checking if identifiers match ?
I guess this will work 🤔 but we still have the problem where SignInStart calls authenticateWithRedirect, so we cannot place this logic there otherwise it'd create two sign-ins.
@panteliselefpanteliselefJun 23, 2025

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

I see, is that because on needs_identifier we want to call prepare instead of create ?
@LauraBeatrisLauraBeatrisJun 23, 2025

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 see, is that because on needs_identifier we want to call prepare instead of create ?
Yeah, exactly, so SignInStart needs to handle the progressive flow. Custom flows also need to do so, so it's fair to also always create a fresh sign-in.
 await this.create({
 strategy,
 identifier,
 redirectUrl: SignIn.clerk.buildUrlWithAuth(redirectUrl),
 actionCompleteRedirectUrl: redirectUrlComplete,
 });
 }

 if (strategy === 'saml' || strategy === 'enterprise_sso') {
 await this.prepareFirstFactor({
 strategy,
 redirectUrl: SignIn.clerk.buildUrlWithAuth(redirectUrl),
 actionCompleteRedirectUrl: redirectUrlComplete,
 oidcPrompt,
 });
 }

 const { status, externalVerificationRedirectURL } = this.firstFactorVerification;

 if (status === 'unverified' && externalVerificationRedirectURL) {
 navigateCallback(externalVerificationRedirectURL);
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -405,6 +405,7 @@ function SignInStartInternal(): JSX.Element {
 redirectUrl,
 redirectUrlComplete,
 oidcPrompt: ctx.oidcPrompt,
 continueSignIn: true,
 });
 };

Expand Down

2 changes: 2 additions & 0 deletions
packages/clerk-js/src/ui/components/SignIn/__tests__/SignInStart.test.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -291,6 +291,7 @@ describe('SignInStart', () => {
 strategy: 'enterprise_sso',
 redirectUrl: 'http://localhost/#/sso-callback',
 redirectUrlComplete: '/',
 continueSignIn: true,
 });
 });
 });
Expand All@@ -314,6 +315,7 @@ describe('SignInStart', () => {
 strategy: 'enterprise_sso',
 redirectUrl: 'http://localhost/#/sso-callback',
 redirectUrlComplete: '/',
 continueSignIn: true,
 });
 });
 });
Expand Down

5 changes: 5 additions & 0 deletions
packages/types/src/redirects.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -61,6 +61,11 @@ export type AuthenticateWithRedirectParams = {
 */
 continueSignUp?: boolean;

 /**
 * Whether to continue existing SignIn (if present) or create a new SignIn.
 */
 continueSignIn?: boolean;

 /**
 * One of the supported OAuth providers you can use to authenticate with, eg 'oauth_google'.
 * Alternatively `saml` or `enterprise_sso`, to authenticate with Enterprise SSO.
Expand Down

, '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
fix(clerk-js,types): Fix stale SignIn on authenticateWithRedirect for enterprise_sso#6160

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

 Merged

LauraBeatris
merged 2 commits into

from

Jun 24, 2025
 Merged


fix(clerk-js,types): Fix stale SignIn on authenticateWithRedirect for enterprise_sso#6160
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
9104e7c

Create fresh SignIn on `authenticateWithRedirect` call


LauraBeatris Jun 19, 2025
b41e0fa

Add changeset


LauraBeatris Jun 19, 2025

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


8 changes: 8 additions & 0 deletions
.changeset/grumpy-lamps-study.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
---
'@clerk/clerk-js': patch
'@clerk/types': patch
---

Fixes stale `SignIn` object on `authenticateWithRedirect` for `saml` and `enterprise_sso` custom flows

Previously, the same connection identifier would be used on every `authenticateWithRedirect` call leading to redirecting to the wrong identity provider

40 changes: 21 additions & 19 deletions
packages/clerk-js/src/core/resources/SignIn.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -231,25 +231,27 @@ export class SignIn extends BaseResource implements SignInResource {
 params: AuthenticateWithRedirectParams,
 navigateCallback: (url: URL | string) => void,
 ): Promise<void> => {
 const { strategy, redirectUrl, redirectUrlComplete, identifier, oidcPrompt } = params || {};

 const { firstFactorVerification } =
 (strategy === 'saml' || strategy === 'enterprise_sso') && this.id
 ? await this.prepareFirstFactor({
 strategy,
 redirectUrl: SignIn.clerk.buildUrlWithAuth(redirectUrl),
 actionCompleteRedirectUrl: redirectUrlComplete,
 oidcPrompt,
 })
 : await this.create({
 strategy,
 identifier,
 redirectUrl: SignIn.clerk.buildUrlWithAuth(redirectUrl),
 actionCompleteRedirectUrl: redirectUrlComplete,
 oidcPrompt,
 });

 const { status, externalVerificationRedirectURL } = firstFactorVerification;
 const { strategy, redirectUrl, redirectUrlComplete, identifier, oidcPrompt, continueSignIn } = params || {};

 if (!this.id || !continueSignIn) {
@LauraBeatrisLauraBeatrisJun 19, 2025

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 found a PR comment a while ago (going to track it again to paste here) that the reasoning for not creating within here was to avoid issues if we created sign-in from AIOs.
My changes tackle exactly for this case, where SignIn provides continueSignIn as true
@panteliselefpanteliselefJun 23, 2025

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

Is the issue only saml and enterprise_sso ?

I think adding a new property just makes things more complicated for the caller. My understanding is that now developers would need to pass both identifier and continueSignIn.
Can we get around this by checking if identifiers match ?
@LauraBeatrisLauraBeatrisJun 23, 2025

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.

enterprise_sso and saml since those rely on the identifier to query for the SSO connection.
They wouldn't have to pass continueSignIn to authenticateWithRedirect since it defaults to false, but it's being passed from SignInStart since it always creates a fresh sign-in:
javascript/packages/clerk-js/src/ui/components/SignIn/SignInStart.tsx

Lines 299 to 312
in
e182055
constres=awaitsafePasswordSignInForEnterpriseSSOInstance(signIn.create(buildSignInParams(fields)),fields);
switch(res.status){
case'needs_identifier': 
// Check if we need to initiate an enterprise sso flow
if(res.supportedFirstFactors?.some(ff=>ff.strategy==='saml'||ff.strategy==='enterprise_sso')){
awaitauthenticateWithEnterpriseSSO();
}
break;
case'needs_first_factor': 
if(res.supportedFirstFactors?.every(ff=>ff.strategy==='enterprise_sso')){
awaitauthenticateWithEnterpriseSSO();
break;
}
@LauraBeatrisLauraBeatrisJun 23, 2025

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.

Can we get around this by checking if identifiers match ?
I guess this will work 🤔 but we still have the problem where SignInStart calls authenticateWithRedirect, so we cannot place this logic there otherwise it'd create two sign-ins.
@panteliselefpanteliselefJun 23, 2025

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

I see, is that because on needs_identifier we want to call prepare instead of create ?
@LauraBeatrisLauraBeatrisJun 23, 2025

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 see, is that because on needs_identifier we want to call prepare instead of create ?
Yeah, exactly, so SignInStart needs to handle the progressive flow. Custom flows also need to do so, so it's fair to also always create a fresh sign-in.
 await this.create({
 strategy,
 identifier,
 redirectUrl: SignIn.clerk.buildUrlWithAuth(redirectUrl),
 actionCompleteRedirectUrl: redirectUrlComplete,
 });
 }

 if (strategy === 'saml' || strategy === 'enterprise_sso') {
 await this.prepareFirstFactor({
 strategy,
 redirectUrl: SignIn.clerk.buildUrlWithAuth(redirectUrl),
 actionCompleteRedirectUrl: redirectUrlComplete,
 oidcPrompt,
 });
 }

 const { status, externalVerificationRedirectURL } = this.firstFactorVerification;

 if (status === 'unverified' && externalVerificationRedirectURL) {
 navigateCallback(externalVerificationRedirectURL);
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -405,6 +405,7 @@ function SignInStartInternal(): JSX.Element {
 redirectUrl,
 redirectUrlComplete,
 oidcPrompt: ctx.oidcPrompt,
 continueSignIn: true,
 });
 };

Expand Down

2 changes: 2 additions & 0 deletions
packages/clerk-js/src/ui/components/SignIn/__tests__/SignInStart.test.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -291,6 +291,7 @@ describe('SignInStart', () => {
 strategy: 'enterprise_sso',
 redirectUrl: 'http://localhost/#/sso-callback',
 redirectUrlComplete: '/',
 continueSignIn: true,
 });
 });
 });
Expand All@@ -314,6 +315,7 @@ describe('SignInStart', () => {
 strategy: 'enterprise_sso',
 redirectUrl: 'http://localhost/#/sso-callback',
 redirectUrlComplete: '/',
 continueSignIn: true,
 });
 });
 });
Expand Down

5 changes: 5 additions & 0 deletions
packages/types/src/redirects.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -61,6 +61,11 @@ export type AuthenticateWithRedirectParams = {
 */
 continueSignUp?: boolean;

 /**
 * Whether to continue existing SignIn (if present) or create a new SignIn.
 */
 continueSignIn?: boolean;

 /**
 * One of the supported OAuth providers you can use to authenticate with, eg 'oauth_google'.
 * Alternatively `saml` or `enterprise_sso`, to authenticate with Enterprise SSO.
Expand Down