fix(clerk-js,types): Correctly determine destination first factor#6789

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
dstaley merged 5 commits into from
Sep 17, 2025
Merged

fix(clerk-js,types): Correctly determine destination first factor #6789

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e11f2eb
fix(clerk-js,types): Correctly determine destination first factor bas…
dstaley Sep 16, 2025
f2ea9b8
chore(clerk-js): Bump bundlewatch limits
dstaley Sep 16, 2025
562ae1c
chore(clerk-js): lint
dstaley Sep 16, 2025
49ecc42
Merge branch 'main' into ds.feat/signals-identifier-matching
nikosdouvlis Sep 17, 2025
e677163
Merge branch 'main' into ds.feat/signals-identifier-matching
dstaley Sep 17, 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
6 changes: 6 additions & 0 deletions .changeset/ready-days-relax.md
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
---
'@clerk/clerk-js': patch
'@clerk/types': patch
---

[Experimental] Correctly determine destination first factor based on identifier.
4 changes: 2 additions & 2 deletions packages/clerk-js/bundlewatch.config.json
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
{
"files": [
{ "path": "./dist/clerk.js", "maxSize": "819KB" },
{ "path": "./dist/clerk.js", "maxSize": "821KB" },
{ "path": "./dist/clerk.browser.js", "maxSize": "79KB" },
{ "path": "./dist/clerk.legacy.browser.js", "maxSize": "121KB" },
{ "path": "./dist/clerk.headless*.js", "maxSize": "61KB" },
{ "path": "./dist/clerk.headless*.js", "maxSize": "63KB" },
{ "path": "./dist/ui-common*.js", "maxSize": "117.1KB" },
{ "path": "./dist/ui-common*.legacy.*.js", "maxSize": "120KB" },
{ "path": "./dist/vendors*.js", "maxSize": "45KB" },
Expand Down
143 changes: 120 additions & 23 deletions packages/clerk-js/src/core/resources/SignIn.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,11 +15,14 @@ import type {
AuthenticateWithWeb3Params,
CreateEmailLinkFlowReturn,
EmailCodeConfig,
EmailCodeFactor,
EmailLinkConfig,
EmailLinkFactor,
EnterpriseSSOConfig,
PassKeyConfig,
PasskeyFactor,
PhoneCodeConfig,
PhoneCodeFactor,
PrepareFirstFactorParams,
PrepareSecondFactorParams,
ResetPasswordEmailCodeFactorConfig,
Expand DownExpand Up@@ -544,6 +547,11 @@ export class SignIn extends BaseResource implements SignInResource {
}
}

type SelectFirstFactorParams =
| { strategy: 'email_code'; emailAddressId?: string; phoneNumberId?: never }
| { strategy: 'email_link'; emailAddressId?: string; phoneNumberId?: never }
| { strategy: 'phone_code'; phoneNumberId?: string; emailAddressId?: never };

class SignInFuture implements SignInFutureResource {
emailCode = {
sendCode: this.sendEmailCode.bind(this),
Expand DownExpand Up@@ -692,22 +700,32 @@ class SignInFuture implements SignInFutureResource {
});
}

async sendEmailCode(params: SignInFutureEmailCodeSendParams): Promise<{ error: unknown }> {
const { email } = params;
async sendEmailCode(params: SignInFutureEmailCodeSendParams = {}): Promise<{ error: unknown }> {
const { emailAddress, emailAddressId } = params;
if (!this.resource.id && emailAddressId) {
throw new Error(
'signIn.emailCode.sendCode() cannot be called with an emailAddressId if an existing signIn does not exist.',
);
}

if (!this.resource.id && !emailAddress) {
throw new Error(
'signIn.emailCode.sendCode() cannot be called without an emailAddress if an existing signIn does not exist.',
);
}

return runAsyncResourceTask(this.resource, async () => {
if (!this.resource.id) {
await this.create({ identifier: email });
if (emailAddress) {
await this.create({ identifier: emailAddress });
}

const emailCodeFactor = this.resource.supportedFirstFactors?.find(f => f.strategy === 'email_code');

const emailCodeFactor = this.selectFirstFactor({ strategy: 'email_code', emailAddressId });
if (!emailCodeFactor) {
throw new Error('Email code factor not found');
}

const { emailAddressId } = emailCodeFactor;
await this.resource.__internal_basePost({
body: { emailAddressId, strategy: 'email_code' },
body: { emailAddressId: emailCodeFactor.emailAddressId, strategy: 'email_code' },
action: 'prepare_first_factor',
});
});
Expand All@@ -724,20 +742,29 @@ class SignInFuture implements SignInFutureResource {
}

async sendEmailLink(params: SignInFutureEmailLinkSendParams): Promise<{ error: unknown }> {
const { email, verificationUrl } = params;
const { emailAddress, verificationUrl, emailAddressId } = params;
if (!this.resource.id && emailAddressId) {
throw new Error(
'signIn.emailLink.sendLink() cannot be called with an emailAddressId if an existing signIn does not exist.',
);
}

if (!this.resource.id && !emailAddress) {
throw new Error(
'signIn.emailLink.sendLink() cannot be called without an emailAddress if an existing signIn does not exist.',
);
}

return runAsyncResourceTask(this.resource, async () => {
if (!this.resource.id) {
await this.create({ identifier: email });
if (emailAddress) {
await this.create({ identifier: emailAddress });
}

const emailLinkFactor = this.resource.supportedFirstFactors?.find(f => f.strategy === 'email_link');

const emailLinkFactor = this.selectFirstFactor({ strategy: 'email_link', emailAddressId });
if (!emailLinkFactor) {
throw new Error('Email link factor not found');
}

const { emailAddressId } = emailLinkFactor;

let absoluteVerificationUrl = verificationUrl;
try {
new URL(verificationUrl);
Expand All@@ -746,7 +773,11 @@ class SignInFuture implements SignInFutureResource {
}

await this.resource.__internal_basePost({
body: { emailAddressId, redirectUrl: absoluteVerificationUrl, strategy: 'email_link' },
body: {
emailAddressId: emailLinkFactor.emailAddressId,
redirectUrl: absoluteVerificationUrl,
strategy: 'email_link',
},
action: 'prepare_first_factor',
});
});
Expand All@@ -773,22 +804,32 @@ class SignInFuture implements SignInFutureResource {
});
}

async sendPhoneCode(params: SignInFuturePhoneCodeSendParams): Promise<{ error: unknown }> {
const { phoneNumber, channel = 'sms' } = params;
async sendPhoneCode(params: SignInFuturePhoneCodeSendParams = {}): Promise<{ error: unknown }> {
const { phoneNumber, phoneNumberId, channel = 'sms' } = params;
if (!this.resource.id && phoneNumberId) {
throw new Error(
'signIn.phoneCode.sendCode() cannot be called with an phoneNumberId if an existing signIn does not exist.',
);
}

if (!this.resource.id && !phoneNumber) {
throw new Error(
'signIn.phoneCode.sendCode() cannot be called without an phoneNumber if an existing signIn does not exist.',
);
}

return runAsyncResourceTask(this.resource, async () => {
if (!this.resource.id) {
if (phoneNumber) {
await this.create({ identifier: phoneNumber });
}

const phoneCodeFactor = this.resource.supportedFirstFactors?.find(f => f.strategy === 'phone_code');

const phoneCodeFactor = this.selectFirstFactor({ strategy: 'phone_code', phoneNumberId });
if (!phoneCodeFactor) {
throw new Error('Phone code factor not found');
}

const { phoneNumberId } = phoneCodeFactor;
await this.resource.__internal_basePost({
body: { phoneNumberId, strategy: 'phone_code', channel },
body: { phoneNumberId: phoneCodeFactor.phoneNumberId, strategy: 'phone_code', channel },
action: 'prepare_first_factor',
});
});
Expand DownExpand Up@@ -886,4 +927,60 @@ class SignInFuture implements SignInFutureResource {
await SignIn.clerk.setActive({ session: this.resource.createdSessionId, navigate });
});
}

private selectFirstFactor(
params: Extract<SelectFirstFactorParams, { strategy: 'email_code' }>,
): EmailCodeFactor | null;
private selectFirstFactor(
params: Extract<SelectFirstFactorParams, { strategy: 'email_link' }>,
): EmailLinkFactor | null;
private selectFirstFactor(
params: Extract<SelectFirstFactorParams, { strategy: 'phone_code' }>,
): PhoneCodeFactor | null;
private selectFirstFactor({
strategy,
emailAddressId,
phoneNumberId,
}: SelectFirstFactorParams): EmailCodeFactor | EmailLinkFactor | PhoneCodeFactor | null {
if (!this.resource.supportedFirstFactors) {
return null;
}

if (emailAddressId) {
const factor = this.resource.supportedFirstFactors.find(
f => f.strategy === strategy && f.emailAddressId === emailAddressId,
) as EmailCodeFactor | EmailLinkFactor;
if (factor) {
return factor;
}
}

if (phoneNumberId) {
const factor = this.resource.supportedFirstFactors.find(
f => f.strategy === strategy && f.phoneNumberId === phoneNumberId,
) as PhoneCodeFactor;
if (factor) {
return factor;
}
}

// Try to find a factor that matches the identifier.
const factorForIdentifier = this.resource.supportedFirstFactors.find(
f => f.strategy === strategy && f.safeIdentifier === this.resource.identifier,
) as EmailCodeFactor | EmailLinkFactor | PhoneCodeFactor;
if (factorForIdentifier) {
return factorForIdentifier;
}

// If no factor is found matching the identifier, try to find a factor that matches the strategy.
const factorForStrategy = this.resource.supportedFirstFactors.find(f => f.strategy === strategy) as
| EmailCodeFactor
| EmailLinkFactor
| PhoneCodeFactor;
if (factorForStrategy) {
return factorForStrategy;
}

return null;
}
}
95 changes: 95 additions & 0 deletions packages/clerk-js/src/core/resources/__tests__/SignIn.spec.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,95 @@
import { describe, expect, it, vi } from 'vitest';

import { BaseResource } from '../internal';
import { SignIn } from '../SignIn';

describe('SignIn', () => {
describe('SignInFuture', () => {
describe('selectFirstFactor', () => {
const signInCreatedJSON = {
id: 'test_id',

supported_first_factors: [
{ strategy: 'email_code', emailAddressId: 'email_address_0', safe_identifier: 'test+abc@clerk.com' },
{ strategy: 'email_code', emailAddressId: 'email_address_1', safe_identifier: 'test@clerk.com' },
{ strategy: 'phone_code', phoneNumberId: 'phone_number_1', safe_identifier: '+301234567890' },
],
};

const firstFactorPreparedJSON = {};

BaseResource._fetch = vi.fn().mockImplementation(({ method, path, body }) => {
if (method === 'POST' && path === '/client/sign_ins') {
return Promise.resolve({
client: null,
response: { ...signInCreatedJSON, identifier: body.identifier },
});
}

if (method === 'POST' && path === '/client/sign_ins/test_id/prepare_first_factor') {
return Promise.resolve({
client: null,
response: firstFactorPreparedJSON,
});
}

throw new Error('Unexpected call to BaseResource._fetch');
});

it('should select correct first factor by email address', async () => {
const signIn = new SignIn();
await signIn.__internal_future.emailCode.sendCode({ emailAddress: 'test@clerk.com' });
expect(BaseResource._fetch).toHaveBeenLastCalledWith({
method: 'POST',
path: '/client/sign_ins/test_id/prepare_first_factor',
body: {
emailAddressId: 'email_address_1',
strategy: 'email_code',
},
});
});

it('should select correct first factor by email address ID', async () => {
const signIn = new SignIn();
await signIn.__internal_future.create({ identifier: 'test@clerk.com' });
await signIn.__internal_future.emailCode.sendCode({ emailAddressId: 'email_address_1' });
expect(BaseResource._fetch).toHaveBeenLastCalledWith({
method: 'POST',
path: '/client/sign_ins/test_id/prepare_first_factor',
body: {
emailAddressId: 'email_address_1',
strategy: 'email_code',
},
});
});

it('should select correct first factor matching identifier when nothing is provided', async () => {
const signIn = new SignIn();
await signIn.__internal_future.create({ identifier: 'test@clerk.com' });
await signIn.__internal_future.emailCode.sendCode();
expect(BaseResource._fetch).toHaveBeenLastCalledWith({
method: 'POST',
path: '/client/sign_ins/test_id/prepare_first_factor',
body: {
emailAddressId: 'email_address_1',
strategy: 'email_code',
},
});
});

it('should select correct first factor when nothing is provided', async () => {
const signIn = new SignIn();
await signIn.__internal_future.create({ identifier: '+12255550000' });
await signIn.__internal_future.emailCode.sendCode();
expect(BaseResource._fetch).toHaveBeenLastCalledWith({
method: 'POST',
path: '/client/sign_ins/test_id/prepare_first_factor',
body: {
emailAddressId: 'email_address_0',
strategy: 'email_code',
},
});
});
});
});
});
42 changes: 31 additions & 11 deletions packages/types/src/signInFuture.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -38,14 +38,27 @@ export type SignInFuturePasswordParams =
email?: never;
};

export interface SignInFutureEmailCodeSendParams {
email: string;
}
export type SignInFutureEmailCodeSendParams =
| {
emailAddress?: string;
emailAddressId?: never;
}
| {
emailAddressId?: string;
emailAddress?: never;
};

export interface SignInFutureEmailLinkSendParams {
email: string;
verificationUrl: string;
}
export type SignInFutureEmailLinkSendParams =
| {
emailAddress?: string;
verificationUrl: string;
emailAddressId?: never;
}
| {
emailAddressId?: string;
verificationUrl: string;
emailAddress?: never;
};

export interface SignInFutureEmailCodeVerifyParams {
code: string;
Expand All@@ -56,10 +69,17 @@ export interface SignInFutureResetPasswordSubmitParams {
signOutOfOtherSessions?: boolean;
}

export interface SignInFuturePhoneCodeSendParams {
phoneNumber?: string;
channel?: PhoneCodeChannel;
}
export type SignInFuturePhoneCodeSendParams =
| {
phoneNumber?: string;
channel?: PhoneCodeChannel;
phoneNumberId?: never;
}
| {
phoneNumberId: string;
channel?: PhoneCodeChannel;
phoneNumber?: never;
};

export interface SignInFuturePhoneCodeVerifyParams {
code: string;
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
fix(clerk-js,types): Correctly determine destination first factor#6789

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

dstaley
merged 5 commits into

from

Sep 17, 2025
 Merged


fix(clerk-js,types): Correctly determine destination first factor
#6789
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
e11f2eb

fix(clerk-js,types): Correctly determine destination first factor bas…


dstaley Sep 16, 2025
f2ea9b8

chore(clerk-js): Bump bundlewatch limits


dstaley Sep 16, 2025
562ae1c

chore(clerk-js): lint


dstaley Sep 16, 2025
49ecc42

Merge branch 'main' into ds.feat/signals-identifier-matching


nikosdouvlis Sep 17, 2025
e677163

Merge branch 'main' into ds.feat/signals-identifier-matching


dstaley Sep 17, 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


6 changes: 6 additions & 0 deletions
.changeset/ready-days-relax.md

View file


Open in desktop

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

[Experimental] Correctly determine destination first factor based on identifier.

4 changes: 2 additions & 2 deletions
packages/clerk-js/bundlewatch.config.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
{
 "files": [
 { "path": "./dist/clerk.js", "maxSize": "819KB" },
 { "path": "./dist/clerk.js", "maxSize": "821KB" },
 { "path": "./dist/clerk.browser.js", "maxSize": "79KB" },
 { "path": "./dist/clerk.legacy.browser.js", "maxSize": "121KB" },
 { "path": "./dist/clerk.headless*.js", "maxSize": "61KB" },
 { "path": "./dist/clerk.headless*.js", "maxSize": "63KB" },
 { "path": "./dist/ui-common*.js", "maxSize": "117.1KB" },
 { "path": "./dist/ui-common*.legacy.*.js", "maxSize": "120KB" },
 { "path": "./dist/vendors*.js", "maxSize": "45KB" },
Expand Down

143 changes: 120 additions & 23 deletions
packages/clerk-js/src/core/resources/SignIn.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,11 +15,14 @@ import type {
 AuthenticateWithWeb3Params,
 CreateEmailLinkFlowReturn,
 EmailCodeConfig,
 EmailCodeFactor,
 EmailLinkConfig,
 EmailLinkFactor,
 EnterpriseSSOConfig,
 PassKeyConfig,
 PasskeyFactor,
 PhoneCodeConfig,
 PhoneCodeFactor,
 PrepareFirstFactorParams,
 PrepareSecondFactorParams,
 ResetPasswordEmailCodeFactorConfig,
Expand DownExpand Up@@ -544,6 +547,11 @@ export class SignIn extends BaseResource implements SignInResource {
 }
}

type SelectFirstFactorParams =
 | { strategy: 'email_code'; emailAddressId?: string; phoneNumberId?: never }
 | { strategy: 'email_link'; emailAddressId?: string; phoneNumberId?: never }
 | { strategy: 'phone_code'; phoneNumberId?: string; emailAddressId?: never };

class SignInFuture implements SignInFutureResource {
 emailCode = {
 sendCode: this.sendEmailCode.bind(this),
Expand DownExpand Up@@ -692,22 +700,32 @@ class SignInFuture implements SignInFutureResource {
 });
 }

 async sendEmailCode(params: SignInFutureEmailCodeSendParams): Promise<{ error: unknown }> {
 const { email } = params;
 async sendEmailCode(params: SignInFutureEmailCodeSendParams = {}): Promise<{ error: unknown }> {
 const { emailAddress, emailAddressId } = params;
 if (!this.resource.id && emailAddressId) {
 throw new Error(
 'signIn.emailCode.sendCode() cannot be called with an emailAddressId if an existing signIn does not exist.',
 );
 }

 if (!this.resource.id && !emailAddress) {
 throw new Error(
 'signIn.emailCode.sendCode() cannot be called without an emailAddress if an existing signIn does not exist.',
 );
 }

 return runAsyncResourceTask(this.resource, async () => {
 if (!this.resource.id) {
 await this.create({ identifier: email });
 if (emailAddress) {
 await this.create({ identifier: emailAddress });
 }

 const emailCodeFactor = this.resource.supportedFirstFactors?.find(f => f.strategy === 'email_code');

 const emailCodeFactor = this.selectFirstFactor({ strategy: 'email_code', emailAddressId });
 if (!emailCodeFactor) {
 throw new Error('Email code factor not found');
 }

 const { emailAddressId } = emailCodeFactor;
 await this.resource.__internal_basePost({
 body: { emailAddressId, strategy: 'email_code' },
 body: { emailAddressId: emailCodeFactor.emailAddressId, strategy: 'email_code' },
 action: 'prepare_first_factor',
 });
 });
Expand All@@ -724,20 +742,29 @@ class SignInFuture implements SignInFutureResource {
 }

 async sendEmailLink(params: SignInFutureEmailLinkSendParams): Promise<{ error: unknown }> {
 const { email, verificationUrl } = params;
 const { emailAddress, verificationUrl, emailAddressId } = params;
 if (!this.resource.id && emailAddressId) {
 throw new Error(
 'signIn.emailLink.sendLink() cannot be called with an emailAddressId if an existing signIn does not exist.',
 );
 }

 if (!this.resource.id && !emailAddress) {
 throw new Error(
 'signIn.emailLink.sendLink() cannot be called without an emailAddress if an existing signIn does not exist.',
 );
 }

 return runAsyncResourceTask(this.resource, async () => {
 if (!this.resource.id) {
 await this.create({ identifier: email });
 if (emailAddress) {
 await this.create({ identifier: emailAddress });
 }

 const emailLinkFactor = this.resource.supportedFirstFactors?.find(f => f.strategy === 'email_link');

 const emailLinkFactor = this.selectFirstFactor({ strategy: 'email_link', emailAddressId });
 if (!emailLinkFactor) {
 throw new Error('Email link factor not found');
 }

 const { emailAddressId } = emailLinkFactor;

 let absoluteVerificationUrl = verificationUrl;
 try {
 new URL(verificationUrl);
Expand All@@ -746,7 +773,11 @@ class SignInFuture implements SignInFutureResource {
 }

 await this.resource.__internal_basePost({
 body: { emailAddressId, redirectUrl: absoluteVerificationUrl, strategy: 'email_link' },
 body: {
 emailAddressId: emailLinkFactor.emailAddressId,
 redirectUrl: absoluteVerificationUrl,
 strategy: 'email_link',
 },
 action: 'prepare_first_factor',
 });
 });
Expand All@@ -773,22 +804,32 @@ class SignInFuture implements SignInFutureResource {
 });
 }

 async sendPhoneCode(params: SignInFuturePhoneCodeSendParams): Promise<{ error: unknown }> {
 const { phoneNumber, channel = 'sms' } = params;
 async sendPhoneCode(params: SignInFuturePhoneCodeSendParams = {}): Promise<{ error: unknown }> {
 const { phoneNumber, phoneNumberId, channel = 'sms' } = params;
 if (!this.resource.id && phoneNumberId) {
 throw new Error(
 'signIn.phoneCode.sendCode() cannot be called with an phoneNumberId if an existing signIn does not exist.',
 );
 }

 if (!this.resource.id && !phoneNumber) {
 throw new Error(
 'signIn.phoneCode.sendCode() cannot be called without an phoneNumber if an existing signIn does not exist.',
 );
 }

 return runAsyncResourceTask(this.resource, async () => {
 if (!this.resource.id) {
 if (phoneNumber) {
 await this.create({ identifier: phoneNumber });
 }

 const phoneCodeFactor = this.resource.supportedFirstFactors?.find(f => f.strategy === 'phone_code');

 const phoneCodeFactor = this.selectFirstFactor({ strategy: 'phone_code', phoneNumberId });
 if (!phoneCodeFactor) {
 throw new Error('Phone code factor not found');
 }

 const { phoneNumberId } = phoneCodeFactor;
 await this.resource.__internal_basePost({
 body: { phoneNumberId, strategy: 'phone_code', channel },
 body: { phoneNumberId: phoneCodeFactor.phoneNumberId, strategy: 'phone_code', channel },
 action: 'prepare_first_factor',
 });
 });
Expand DownExpand Up@@ -886,4 +927,60 @@ class SignInFuture implements SignInFutureResource {
 await SignIn.clerk.setActive({ session: this.resource.createdSessionId, navigate });
 });
 }

 private selectFirstFactor(
 params: Extract<SelectFirstFactorParams, { strategy: 'email_code' }>,
 ): EmailCodeFactor | null;
 private selectFirstFactor(
 params: Extract<SelectFirstFactorParams, { strategy: 'email_link' }>,
 ): EmailLinkFactor | null;
 private selectFirstFactor(
 params: Extract<SelectFirstFactorParams, { strategy: 'phone_code' }>,
 ): PhoneCodeFactor | null;
 private selectFirstFactor({
 strategy,
 emailAddressId,
 phoneNumberId,
 }: SelectFirstFactorParams): EmailCodeFactor | EmailLinkFactor | PhoneCodeFactor | null {
 if (!this.resource.supportedFirstFactors) {
 return null;
 }

 if (emailAddressId) {
 const factor = this.resource.supportedFirstFactors.find(
 f => f.strategy === strategy && f.emailAddressId === emailAddressId,
 ) as EmailCodeFactor | EmailLinkFactor;
 if (factor) {
 return factor;
 }
 }

 if (phoneNumberId) {
 const factor = this.resource.supportedFirstFactors.find(
 f => f.strategy === strategy && f.phoneNumberId === phoneNumberId,
 ) as PhoneCodeFactor;
 if (factor) {
 return factor;
 }
 }

 // Try to find a factor that matches the identifier.
 const factorForIdentifier = this.resource.supportedFirstFactors.find(
 f => f.strategy === strategy && f.safeIdentifier === this.resource.identifier,
 ) as EmailCodeFactor | EmailLinkFactor | PhoneCodeFactor;
 if (factorForIdentifier) {
 return factorForIdentifier;
 }

 // If no factor is found matching the identifier, try to find a factor that matches the strategy.
 const factorForStrategy = this.resource.supportedFirstFactors.find(f => f.strategy === strategy) as
 | EmailCodeFactor
 | EmailLinkFactor
 | PhoneCodeFactor;
 if (factorForStrategy) {
 return factorForStrategy;
 }

 return null;
 }
}

95 changes: 95 additions & 0 deletions
packages/clerk-js/src/core/resources/__tests__/SignIn.spec.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,95 @@
import { describe, expect, it, vi } from 'vitest';

import { BaseResource } from '../internal';
import { SignIn } from '../SignIn';

describe('SignIn', () => {
 describe('SignInFuture', () => {
 describe('selectFirstFactor', () => {
 const signInCreatedJSON = {
 id: 'test_id',

 supported_first_factors: [
 { strategy: 'email_code', emailAddressId: 'email_address_0', safe_identifier: 'test+abc@clerk.com' },
 { strategy: 'email_code', emailAddressId: 'email_address_1', safe_identifier: 'test@clerk.com' },
 { strategy: 'phone_code', phoneNumberId: 'phone_number_1', safe_identifier: '+301234567890' },
 ],
 };

 const firstFactorPreparedJSON = {};

 BaseResource._fetch = vi.fn().mockImplementation(({ method, path, body }) => {
 if (method === 'POST' && path === '/client/sign_ins') {
 return Promise.resolve({
 client: null,
 response: { ...signInCreatedJSON, identifier: body.identifier },
 });
 }

 if (method === 'POST' && path === '/client/sign_ins/test_id/prepare_first_factor') {
 return Promise.resolve({
 client: null,
 response: firstFactorPreparedJSON,
 });
 }

 throw new Error('Unexpected call to BaseResource._fetch');
 });

 it('should select correct first factor by email address', async () => {
 const signIn = new SignIn();
 await signIn.__internal_future.emailCode.sendCode({ emailAddress: 'test@clerk.com' });
 expect(BaseResource._fetch).toHaveBeenLastCalledWith({
 method: 'POST',
 path: '/client/sign_ins/test_id/prepare_first_factor',
 body: {
 emailAddressId: 'email_address_1',
 strategy: 'email_code',
 },
 });
 });

 it('should select correct first factor by email address ID', async () => {
 const signIn = new SignIn();
 await signIn.__internal_future.create({ identifier: 'test@clerk.com' });
 await signIn.__internal_future.emailCode.sendCode({ emailAddressId: 'email_address_1' });
 expect(BaseResource._fetch).toHaveBeenLastCalledWith({
 method: 'POST',
 path: '/client/sign_ins/test_id/prepare_first_factor',
 body: {
 emailAddressId: 'email_address_1',
 strategy: 'email_code',
 },
 });
 });

 it('should select correct first factor matching identifier when nothing is provided', async () => {
 const signIn = new SignIn();
 await signIn.__internal_future.create({ identifier: 'test@clerk.com' });
 await signIn.__internal_future.emailCode.sendCode();
 expect(BaseResource._fetch).toHaveBeenLastCalledWith({
 method: 'POST',
 path: '/client/sign_ins/test_id/prepare_first_factor',
 body: {
 emailAddressId: 'email_address_1',
 strategy: 'email_code',
 },
 });
 });

 it('should select correct first factor when nothing is provided', async () => {
 const signIn = new SignIn();
 await signIn.__internal_future.create({ identifier: '+12255550000' });
 await signIn.__internal_future.emailCode.sendCode();
 expect(BaseResource._fetch).toHaveBeenLastCalledWith({
 method: 'POST',
 path: '/client/sign_ins/test_id/prepare_first_factor',
 body: {
 emailAddressId: 'email_address_0',
 strategy: 'email_code',
 },
 });
 });
 });
 });
});

42 changes: 31 additions & 11 deletions
packages/types/src/signInFuture.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -38,14 +38,27 @@ export type SignInFuturePasswordParams =
 email?: never;
 };

export interface SignInFutureEmailCodeSendParams {
 email: string;
}
export type SignInFutureEmailCodeSendParams =
 | {
 emailAddress?: string;
 emailAddressId?: never;
 }
 | {
 emailAddressId?: string;
 emailAddress?: never;
 };

export interface SignInFutureEmailLinkSendParams {
 email: string;
 verificationUrl: string;
}
export type SignInFutureEmailLinkSendParams =
 | {
 emailAddress?: string;
 verificationUrl: string;
 emailAddressId?: never;
 }
 | {
 emailAddressId?: string;
 verificationUrl: string;
 emailAddress?: never;
 };

export interface SignInFutureEmailCodeVerifyParams {
 code: string;
Expand All@@ -56,10 +69,17 @@ export interface SignInFutureResetPasswordSubmitParams {
 signOutOfOtherSessions?: boolean;
}

export interface SignInFuturePhoneCodeSendParams {
 phoneNumber?: string;
 channel?: PhoneCodeChannel;
}
export type SignInFuturePhoneCodeSendParams =
 | {
 phoneNumber?: string;
 channel?: PhoneCodeChannel;
 phoneNumberId?: never;
 }
 | {
 phoneNumberId: string;
 channel?: PhoneCodeChannel;
 phoneNumber?: never;
 };

export interface SignInFuturePhoneCodeVerifyParams {
 code: string;
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
fix(clerk-js,types): Correctly determine destination first factor#6789

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

dstaley
merged 5 commits into

from

Sep 17, 2025
 Merged


fix(clerk-js,types): Correctly determine destination first factor
#6789
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
e11f2eb

fix(clerk-js,types): Correctly determine destination first factor bas…


dstaley Sep 16, 2025
f2ea9b8

chore(clerk-js): Bump bundlewatch limits


dstaley Sep 16, 2025
562ae1c

chore(clerk-js): lint


dstaley Sep 16, 2025
49ecc42

Merge branch 'main' into ds.feat/signals-identifier-matching


nikosdouvlis Sep 17, 2025
e677163

Merge branch 'main' into ds.feat/signals-identifier-matching


dstaley Sep 17, 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


6 changes: 6 additions & 0 deletions
.changeset/ready-days-relax.md

View file


Open in desktop

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

[Experimental] Correctly determine destination first factor based on identifier.

4 changes: 2 additions & 2 deletions
packages/clerk-js/bundlewatch.config.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
{
 "files": [
 { "path": "./dist/clerk.js", "maxSize": "819KB" },
 { "path": "./dist/clerk.js", "maxSize": "821KB" },
 { "path": "./dist/clerk.browser.js", "maxSize": "79KB" },
 { "path": "./dist/clerk.legacy.browser.js", "maxSize": "121KB" },
 { "path": "./dist/clerk.headless*.js", "maxSize": "61KB" },
 { "path": "./dist/clerk.headless*.js", "maxSize": "63KB" },
 { "path": "./dist/ui-common*.js", "maxSize": "117.1KB" },
 { "path": "./dist/ui-common*.legacy.*.js", "maxSize": "120KB" },
 { "path": "./dist/vendors*.js", "maxSize": "45KB" },
Expand Down

143 changes: 120 additions & 23 deletions
packages/clerk-js/src/core/resources/SignIn.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,11 +15,14 @@ import type {
 AuthenticateWithWeb3Params,
 CreateEmailLinkFlowReturn,
 EmailCodeConfig,
 EmailCodeFactor,
 EmailLinkConfig,
 EmailLinkFactor,
 EnterpriseSSOConfig,
 PassKeyConfig,
 PasskeyFactor,
 PhoneCodeConfig,
 PhoneCodeFactor,
 PrepareFirstFactorParams,
 PrepareSecondFactorParams,
 ResetPasswordEmailCodeFactorConfig,
Expand DownExpand Up@@ -544,6 +547,11 @@ export class SignIn extends BaseResource implements SignInResource {
 }
}

type SelectFirstFactorParams =
 | { strategy: 'email_code'; emailAddressId?: string; phoneNumberId?: never }
 | { strategy: 'email_link'; emailAddressId?: string; phoneNumberId?: never }
 | { strategy: 'phone_code'; phoneNumberId?: string; emailAddressId?: never };

class SignInFuture implements SignInFutureResource {
 emailCode = {
 sendCode: this.sendEmailCode.bind(this),
Expand DownExpand Up@@ -692,22 +700,32 @@ class SignInFuture implements SignInFutureResource {
 });
 }

 async sendEmailCode(params: SignInFutureEmailCodeSendParams): Promise<{ error: unknown }> {
 const { email } = params;
 async sendEmailCode(params: SignInFutureEmailCodeSendParams = {}): Promise<{ error: unknown }> {
 const { emailAddress, emailAddressId } = params;
 if (!this.resource.id && emailAddressId) {
 throw new Error(
 'signIn.emailCode.sendCode() cannot be called with an emailAddressId if an existing signIn does not exist.',
 );
 }

 if (!this.resource.id && !emailAddress) {
 throw new Error(
 'signIn.emailCode.sendCode() cannot be called without an emailAddress if an existing signIn does not exist.',
 );
 }

 return runAsyncResourceTask(this.resource, async () => {
 if (!this.resource.id) {
 await this.create({ identifier: email });
 if (emailAddress) {
 await this.create({ identifier: emailAddress });
 }

 const emailCodeFactor = this.resource.supportedFirstFactors?.find(f => f.strategy === 'email_code');

 const emailCodeFactor = this.selectFirstFactor({ strategy: 'email_code', emailAddressId });
 if (!emailCodeFactor) {
 throw new Error('Email code factor not found');
 }

 const { emailAddressId } = emailCodeFactor;
 await this.resource.__internal_basePost({
 body: { emailAddressId, strategy: 'email_code' },
 body: { emailAddressId: emailCodeFactor.emailAddressId, strategy: 'email_code' },
 action: 'prepare_first_factor',
 });
 });
Expand All@@ -724,20 +742,29 @@ class SignInFuture implements SignInFutureResource {
 }

 async sendEmailLink(params: SignInFutureEmailLinkSendParams): Promise<{ error: unknown }> {
 const { email, verificationUrl } = params;
 const { emailAddress, verificationUrl, emailAddressId } = params;
 if (!this.resource.id && emailAddressId) {
 throw new Error(
 'signIn.emailLink.sendLink() cannot be called with an emailAddressId if an existing signIn does not exist.',
 );
 }

 if (!this.resource.id && !emailAddress) {
 throw new Error(
 'signIn.emailLink.sendLink() cannot be called without an emailAddress if an existing signIn does not exist.',
 );
 }

 return runAsyncResourceTask(this.resource, async () => {
 if (!this.resource.id) {
 await this.create({ identifier: email });
 if (emailAddress) {
 await this.create({ identifier: emailAddress });
 }

 const emailLinkFactor = this.resource.supportedFirstFactors?.find(f => f.strategy === 'email_link');

 const emailLinkFactor = this.selectFirstFactor({ strategy: 'email_link', emailAddressId });
 if (!emailLinkFactor) {
 throw new Error('Email link factor not found');
 }

 const { emailAddressId } = emailLinkFactor;

 let absoluteVerificationUrl = verificationUrl;
 try {
 new URL(verificationUrl);
Expand All@@ -746,7 +773,11 @@ class SignInFuture implements SignInFutureResource {
 }

 await this.resource.__internal_basePost({
 body: { emailAddressId, redirectUrl: absoluteVerificationUrl, strategy: 'email_link' },
 body: {
 emailAddressId: emailLinkFactor.emailAddressId,
 redirectUrl: absoluteVerificationUrl,
 strategy: 'email_link',
 },
 action: 'prepare_first_factor',
 });
 });
Expand All@@ -773,22 +804,32 @@ class SignInFuture implements SignInFutureResource {
 });
 }

 async sendPhoneCode(params: SignInFuturePhoneCodeSendParams): Promise<{ error: unknown }> {
 const { phoneNumber, channel = 'sms' } = params;
 async sendPhoneCode(params: SignInFuturePhoneCodeSendParams = {}): Promise<{ error: unknown }> {
 const { phoneNumber, phoneNumberId, channel = 'sms' } = params;
 if (!this.resource.id && phoneNumberId) {
 throw new Error(
 'signIn.phoneCode.sendCode() cannot be called with an phoneNumberId if an existing signIn does not exist.',
 );
 }

 if (!this.resource.id && !phoneNumber) {
 throw new Error(
 'signIn.phoneCode.sendCode() cannot be called without an phoneNumber if an existing signIn does not exist.',
 );
 }

 return runAsyncResourceTask(this.resource, async () => {
 if (!this.resource.id) {
 if (phoneNumber) {
 await this.create({ identifier: phoneNumber });
 }

 const phoneCodeFactor = this.resource.supportedFirstFactors?.find(f => f.strategy === 'phone_code');

 const phoneCodeFactor = this.selectFirstFactor({ strategy: 'phone_code', phoneNumberId });
 if (!phoneCodeFactor) {
 throw new Error('Phone code factor not found');
 }

 const { phoneNumberId } = phoneCodeFactor;
 await this.resource.__internal_basePost({
 body: { phoneNumberId, strategy: 'phone_code', channel },
 body: { phoneNumberId: phoneCodeFactor.phoneNumberId, strategy: 'phone_code', channel },
 action: 'prepare_first_factor',
 });
 });
Expand DownExpand Up@@ -886,4 +927,60 @@ class SignInFuture implements SignInFutureResource {
 await SignIn.clerk.setActive({ session: this.resource.createdSessionId, navigate });
 });
 }

 private selectFirstFactor(
 params: Extract<SelectFirstFactorParams, { strategy: 'email_code' }>,
 ): EmailCodeFactor | null;
 private selectFirstFactor(
 params: Extract<SelectFirstFactorParams, { strategy: 'email_link' }>,
 ): EmailLinkFactor | null;
 private selectFirstFactor(
 params: Extract<SelectFirstFactorParams, { strategy: 'phone_code' }>,
 ): PhoneCodeFactor | null;
 private selectFirstFactor({
 strategy,
 emailAddressId,
 phoneNumberId,
 }: SelectFirstFactorParams): EmailCodeFactor | EmailLinkFactor | PhoneCodeFactor | null {
 if (!this.resource.supportedFirstFactors) {
 return null;
 }

 if (emailAddressId) {
 const factor = this.resource.supportedFirstFactors.find(
 f => f.strategy === strategy && f.emailAddressId === emailAddressId,
 ) as EmailCodeFactor | EmailLinkFactor;
 if (factor) {
 return factor;
 }
 }

 if (phoneNumberId) {
 const factor = this.resource.supportedFirstFactors.find(
 f => f.strategy === strategy && f.phoneNumberId === phoneNumberId,
 ) as PhoneCodeFactor;
 if (factor) {
 return factor;
 }
 }

 // Try to find a factor that matches the identifier.
 const factorForIdentifier = this.resource.supportedFirstFactors.find(
 f => f.strategy === strategy && f.safeIdentifier === this.resource.identifier,
 ) as EmailCodeFactor | EmailLinkFactor | PhoneCodeFactor;
 if (factorForIdentifier) {
 return factorForIdentifier;
 }

 // If no factor is found matching the identifier, try to find a factor that matches the strategy.
 const factorForStrategy = this.resource.supportedFirstFactors.find(f => f.strategy === strategy) as
 | EmailCodeFactor
 | EmailLinkFactor
 | PhoneCodeFactor;
 if (factorForStrategy) {
 return factorForStrategy;
 }

 return null;
 }
}

95 changes: 95 additions & 0 deletions
packages/clerk-js/src/core/resources/__tests__/SignIn.spec.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,95 @@
import { describe, expect, it, vi } from 'vitest';

import { BaseResource } from '../internal';
import { SignIn } from '../SignIn';

describe('SignIn', () => {
 describe('SignInFuture', () => {
 describe('selectFirstFactor', () => {
 const signInCreatedJSON = {
 id: 'test_id',

 supported_first_factors: [
 { strategy: 'email_code', emailAddressId: 'email_address_0', safe_identifier: 'test+abc@clerk.com' },
 { strategy: 'email_code', emailAddressId: 'email_address_1', safe_identifier: 'test@clerk.com' },
 { strategy: 'phone_code', phoneNumberId: 'phone_number_1', safe_identifier: '+301234567890' },
 ],
 };

 const firstFactorPreparedJSON = {};

 BaseResource._fetch = vi.fn().mockImplementation(({ method, path, body }) => {
 if (method === 'POST' && path === '/client/sign_ins') {
 return Promise.resolve({
 client: null,
 response: { ...signInCreatedJSON, identifier: body.identifier },
 });
 }

 if (method === 'POST' && path === '/client/sign_ins/test_id/prepare_first_factor') {
 return Promise.resolve({
 client: null,
 response: firstFactorPreparedJSON,
 });
 }

 throw new Error('Unexpected call to BaseResource._fetch');
 });

 it('should select correct first factor by email address', async () => {
 const signIn = new SignIn();
 await signIn.__internal_future.emailCode.sendCode({ emailAddress: 'test@clerk.com' });
 expect(BaseResource._fetch).toHaveBeenLastCalledWith({
 method: 'POST',
 path: '/client/sign_ins/test_id/prepare_first_factor',
 body: {
 emailAddressId: 'email_address_1',
 strategy: 'email_code',
 },
 });
 });

 it('should select correct first factor by email address ID', async () => {
 const signIn = new SignIn();
 await signIn.__internal_future.create({ identifier: 'test@clerk.com' });
 await signIn.__internal_future.emailCode.sendCode({ emailAddressId: 'email_address_1' });
 expect(BaseResource._fetch).toHaveBeenLastCalledWith({
 method: 'POST',
 path: '/client/sign_ins/test_id/prepare_first_factor',
 body: {
 emailAddressId: 'email_address_1',
 strategy: 'email_code',
 },
 });
 });

 it('should select correct first factor matching identifier when nothing is provided', async () => {
 const signIn = new SignIn();
 await signIn.__internal_future.create({ identifier: 'test@clerk.com' });
 await signIn.__internal_future.emailCode.sendCode();
 expect(BaseResource._fetch).toHaveBeenLastCalledWith({
 method: 'POST',
 path: '/client/sign_ins/test_id/prepare_first_factor',
 body: {
 emailAddressId: 'email_address_1',
 strategy: 'email_code',
 },
 });
 });

 it('should select correct first factor when nothing is provided', async () => {
 const signIn = new SignIn();
 await signIn.__internal_future.create({ identifier: '+12255550000' });
 await signIn.__internal_future.emailCode.sendCode();
 expect(BaseResource._fetch).toHaveBeenLastCalledWith({
 method: 'POST',
 path: '/client/sign_ins/test_id/prepare_first_factor',
 body: {
 emailAddressId: 'email_address_0',
 strategy: 'email_code',
 },
 });
 });
 });
 });
});

42 changes: 31 additions & 11 deletions
packages/types/src/signInFuture.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -38,14 +38,27 @@ export type SignInFuturePasswordParams =
 email?: never;
 };

export interface SignInFutureEmailCodeSendParams {
 email: string;
}
export type SignInFutureEmailCodeSendParams =
 | {
 emailAddress?: string;
 emailAddressId?: never;
 }
 | {
 emailAddressId?: string;
 emailAddress?: never;
 };

export interface SignInFutureEmailLinkSendParams {
 email: string;
 verificationUrl: string;
}
export type SignInFutureEmailLinkSendParams =
 | {
 emailAddress?: string;
 verificationUrl: string;
 emailAddressId?: never;
 }
 | {
 emailAddressId?: string;
 verificationUrl: string;
 emailAddress?: never;
 };

export interface SignInFutureEmailCodeVerifyParams {
 code: string;
Expand All@@ -56,10 +69,17 @@ export interface SignInFutureResetPasswordSubmitParams {
 signOutOfOtherSessions?: boolean;
}

export interface SignInFuturePhoneCodeSendParams {
 phoneNumber?: string;
 channel?: PhoneCodeChannel;
}
export type SignInFuturePhoneCodeSendParams =
 | {
 phoneNumber?: string;
 channel?: PhoneCodeChannel;
 phoneNumberId?: never;
 }
 | {
 phoneNumberId: string;
 channel?: PhoneCodeChannel;
 phoneNumber?: never;
 };

export interface SignInFuturePhoneCodeVerifyParams {
 code: string;
Expand Down
Loading

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

Skip to content
fix(clerk-js,types): Correctly determine destination first factor#6789

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

dstaley
merged 5 commits into

from

Sep 17, 2025
 Merged


fix(clerk-js,types): Correctly determine destination first factor
#6789
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
e11f2eb

fix(clerk-js,types): Correctly determine destination first factor bas…


dstaley Sep 16, 2025
f2ea9b8

chore(clerk-js): Bump bundlewatch limits


dstaley Sep 16, 2025
562ae1c

chore(clerk-js): lint


dstaley Sep 16, 2025
49ecc42

Merge branch 'main' into ds.feat/signals-identifier-matching


nikosdouvlis Sep 17, 2025
e677163

Merge branch 'main' into ds.feat/signals-identifier-matching


dstaley Sep 17, 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


6 changes: 6 additions & 0 deletions
.changeset/ready-days-relax.md

View file


Open in desktop

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

[Experimental] Correctly determine destination first factor based on identifier.

4 changes: 2 additions & 2 deletions
packages/clerk-js/bundlewatch.config.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
{
 "files": [
 { "path": "./dist/clerk.js", "maxSize": "819KB" },
 { "path": "./dist/clerk.js", "maxSize": "821KB" },
 { "path": "./dist/clerk.browser.js", "maxSize": "79KB" },
 { "path": "./dist/clerk.legacy.browser.js", "maxSize": "121KB" },
 { "path": "./dist/clerk.headless*.js", "maxSize": "61KB" },
 { "path": "./dist/clerk.headless*.js", "maxSize": "63KB" },
 { "path": "./dist/ui-common*.js", "maxSize": "117.1KB" },
 { "path": "./dist/ui-common*.legacy.*.js", "maxSize": "120KB" },
 { "path": "./dist/vendors*.js", "maxSize": "45KB" },
Expand Down

143 changes: 120 additions & 23 deletions
packages/clerk-js/src/core/resources/SignIn.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,11 +15,14 @@ import type {
 AuthenticateWithWeb3Params,
 CreateEmailLinkFlowReturn,
 EmailCodeConfig,
 EmailCodeFactor,
 EmailLinkConfig,
 EmailLinkFactor,
 EnterpriseSSOConfig,
 PassKeyConfig,
 PasskeyFactor,
 PhoneCodeConfig,
 PhoneCodeFactor,
 PrepareFirstFactorParams,
 PrepareSecondFactorParams,
 ResetPasswordEmailCodeFactorConfig,
Expand DownExpand Up@@ -544,6 +547,11 @@ export class SignIn extends BaseResource implements SignInResource {
 }
}

type SelectFirstFactorParams =
 | { strategy: 'email_code'; emailAddressId?: string; phoneNumberId?: never }
 | { strategy: 'email_link'; emailAddressId?: string; phoneNumberId?: never }
 | { strategy: 'phone_code'; phoneNumberId?: string; emailAddressId?: never };

class SignInFuture implements SignInFutureResource {
 emailCode = {
 sendCode: this.sendEmailCode.bind(this),
Expand DownExpand Up@@ -692,22 +700,32 @@ class SignInFuture implements SignInFutureResource {
 });
 }

 async sendEmailCode(params: SignInFutureEmailCodeSendParams): Promise<{ error: unknown }> {
 const { email } = params;
 async sendEmailCode(params: SignInFutureEmailCodeSendParams = {}): Promise<{ error: unknown }> {
 const { emailAddress, emailAddressId } = params;
 if (!this.resource.id && emailAddressId) {
 throw new Error(
 'signIn.emailCode.sendCode() cannot be called with an emailAddressId if an existing signIn does not exist.',
 );
 }

 if (!this.resource.id && !emailAddress) {
 throw new Error(
 'signIn.emailCode.sendCode() cannot be called without an emailAddress if an existing signIn does not exist.',
 );
 }

 return runAsyncResourceTask(this.resource, async () => {
 if (!this.resource.id) {
 await this.create({ identifier: email });
 if (emailAddress) {
 await this.create({ identifier: emailAddress });
 }

 const emailCodeFactor = this.resource.supportedFirstFactors?.find(f => f.strategy === 'email_code');

 const emailCodeFactor = this.selectFirstFactor({ strategy: 'email_code', emailAddressId });
 if (!emailCodeFactor) {
 throw new Error('Email code factor not found');
 }

 const { emailAddressId } = emailCodeFactor;
 await this.resource.__internal_basePost({
 body: { emailAddressId, strategy: 'email_code' },
 body: { emailAddressId: emailCodeFactor.emailAddressId, strategy: 'email_code' },
 action: 'prepare_first_factor',
 });
 });
Expand All@@ -724,20 +742,29 @@ class SignInFuture implements SignInFutureResource {
 }

 async sendEmailLink(params: SignInFutureEmailLinkSendParams): Promise<{ error: unknown }> {
 const { email, verificationUrl } = params;
 const { emailAddress, verificationUrl, emailAddressId } = params;
 if (!this.resource.id && emailAddressId) {
 throw new Error(
 'signIn.emailLink.sendLink() cannot be called with an emailAddressId if an existing signIn does not exist.',
 );
 }

 if (!this.resource.id && !emailAddress) {
 throw new Error(
 'signIn.emailLink.sendLink() cannot be called without an emailAddress if an existing signIn does not exist.',
 );
 }

 return runAsyncResourceTask(this.resource, async () => {
 if (!this.resource.id) {
 await this.create({ identifier: email });
 if (emailAddress) {
 await this.create({ identifier: emailAddress });
 }

 const emailLinkFactor = this.resource.supportedFirstFactors?.find(f => f.strategy === 'email_link');

 const emailLinkFactor = this.selectFirstFactor({ strategy: 'email_link', emailAddressId });
 if (!emailLinkFactor) {
 throw new Error('Email link factor not found');
 }

 const { emailAddressId } = emailLinkFactor;

 let absoluteVerificationUrl = verificationUrl;
 try {
 new URL(verificationUrl);
Expand All@@ -746,7 +773,11 @@ class SignInFuture implements SignInFutureResource {
 }

 await this.resource.__internal_basePost({
 body: { emailAddressId, redirectUrl: absoluteVerificationUrl, strategy: 'email_link' },
 body: {
 emailAddressId: emailLinkFactor.emailAddressId,
 redirectUrl: absoluteVerificationUrl,
 strategy: 'email_link',
 },
 action: 'prepare_first_factor',
 });
 });
Expand All@@ -773,22 +804,32 @@ class SignInFuture implements SignInFutureResource {
 });
 }

 async sendPhoneCode(params: SignInFuturePhoneCodeSendParams): Promise<{ error: unknown }> {
 const { phoneNumber, channel = 'sms' } = params;
 async sendPhoneCode(params: SignInFuturePhoneCodeSendParams = {}): Promise<{ error: unknown }> {
 const { phoneNumber, phoneNumberId, channel = 'sms' } = params;
 if (!this.resource.id && phoneNumberId) {
 throw new Error(
 'signIn.phoneCode.sendCode() cannot be called with an phoneNumberId if an existing signIn does not exist.',
 );
 }

 if (!this.resource.id && !phoneNumber) {
 throw new Error(
 'signIn.phoneCode.sendCode() cannot be called without an phoneNumber if an existing signIn does not exist.',
 );
 }

 return runAsyncResourceTask(this.resource, async () => {
 if (!this.resource.id) {
 if (phoneNumber) {
 await this.create({ identifier: phoneNumber });
 }

 const phoneCodeFactor = this.resource.supportedFirstFactors?.find(f => f.strategy === 'phone_code');

 const phoneCodeFactor = this.selectFirstFactor({ strategy: 'phone_code', phoneNumberId });
 if (!phoneCodeFactor) {
 throw new Error('Phone code factor not found');
 }

 const { phoneNumberId } = phoneCodeFactor;
 await this.resource.__internal_basePost({
 body: { phoneNumberId, strategy: 'phone_code', channel },
 body: { phoneNumberId: phoneCodeFactor.phoneNumberId, strategy: 'phone_code', channel },
 action: 'prepare_first_factor',
 });
 });
Expand DownExpand Up@@ -886,4 +927,60 @@ class SignInFuture implements SignInFutureResource {
 await SignIn.clerk.setActive({ session: this.resource.createdSessionId, navigate });
 });
 }

 private selectFirstFactor(
 params: Extract<SelectFirstFactorParams, { strategy: 'email_code' }>,
 ): EmailCodeFactor | null;
 private selectFirstFactor(
 params: Extract<SelectFirstFactorParams, { strategy: 'email_link' }>,
 ): EmailLinkFactor | null;
 private selectFirstFactor(
 params: Extract<SelectFirstFactorParams, { strategy: 'phone_code' }>,
 ): PhoneCodeFactor | null;
 private selectFirstFactor({
 strategy,
 emailAddressId,
 phoneNumberId,
 }: SelectFirstFactorParams): EmailCodeFactor | EmailLinkFactor | PhoneCodeFactor | null {
 if (!this.resource.supportedFirstFactors) {
 return null;
 }

 if (emailAddressId) {
 const factor = this.resource.supportedFirstFactors.find(
 f => f.strategy === strategy && f.emailAddressId === emailAddressId,
 ) as EmailCodeFactor | EmailLinkFactor;
 if (factor) {
 return factor;
 }
 }

 if (phoneNumberId) {
 const factor = this.resource.supportedFirstFactors.find(
 f => f.strategy === strategy && f.phoneNumberId === phoneNumberId,
 ) as PhoneCodeFactor;
 if (factor) {
 return factor;
 }
 }

 // Try to find a factor that matches the identifier.
 const factorForIdentifier = this.resource.supportedFirstFactors.find(
 f => f.strategy === strategy && f.safeIdentifier === this.resource.identifier,
 ) as EmailCodeFactor | EmailLinkFactor | PhoneCodeFactor;
 if (factorForIdentifier) {
 return factorForIdentifier;
 }

 // If no factor is found matching the identifier, try to find a factor that matches the strategy.
 const factorForStrategy = this.resource.supportedFirstFactors.find(f => f.strategy === strategy) as
 | EmailCodeFactor
 | EmailLinkFactor
 | PhoneCodeFactor;
 if (factorForStrategy) {
 return factorForStrategy;
 }

 return null;
 }
}

95 changes: 95 additions & 0 deletions
packages/clerk-js/src/core/resources/__tests__/SignIn.spec.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,95 @@
import { describe, expect, it, vi } from 'vitest';

import { BaseResource } from '../internal';
import { SignIn } from '../SignIn';

describe('SignIn', () => {
 describe('SignInFuture', () => {
 describe('selectFirstFactor', () => {
 const signInCreatedJSON = {
 id: 'test_id',

 supported_first_factors: [
 { strategy: 'email_code', emailAddressId: 'email_address_0', safe_identifier: 'test+abc@clerk.com' },
 { strategy: 'email_code', emailAddressId: 'email_address_1', safe_identifier: 'test@clerk.com' },
 { strategy: 'phone_code', phoneNumberId: 'phone_number_1', safe_identifier: '+301234567890' },
 ],
 };

 const firstFactorPreparedJSON = {};

 BaseResource._fetch = vi.fn().mockImplementation(({ method, path, body }) => {
 if (method === 'POST' && path === '/client/sign_ins') {
 return Promise.resolve({
 client: null,
 response: { ...signInCreatedJSON, identifier: body.identifier },
 });
 }

 if (method === 'POST' && path === '/client/sign_ins/test_id/prepare_first_factor') {
 return Promise.resolve({
 client: null,
 response: firstFactorPreparedJSON,
 });
 }

 throw new Error('Unexpected call to BaseResource._fetch');
 });

 it('should select correct first factor by email address', async () => {
 const signIn = new SignIn();
 await signIn.__internal_future.emailCode.sendCode({ emailAddress: 'test@clerk.com' });
 expect(BaseResource._fetch).toHaveBeenLastCalledWith({
 method: 'POST',
 path: '/client/sign_ins/test_id/prepare_first_factor',
 body: {
 emailAddressId: 'email_address_1',
 strategy: 'email_code',
 },
 });
 });

 it('should select correct first factor by email address ID', async () => {
 const signIn = new SignIn();
 await signIn.__internal_future.create({ identifier: 'test@clerk.com' });
 await signIn.__internal_future.emailCode.sendCode({ emailAddressId: 'email_address_1' });
 expect(BaseResource._fetch).toHaveBeenLastCalledWith({
 method: 'POST',
 path: '/client/sign_ins/test_id/prepare_first_factor',
 body: {
 emailAddressId: 'email_address_1',
 strategy: 'email_code',
 },
 });
 });

 it('should select correct first factor matching identifier when nothing is provided', async () => {
 const signIn = new SignIn();
 await signIn.__internal_future.create({ identifier: 'test@clerk.com' });
 await signIn.__internal_future.emailCode.sendCode();
 expect(BaseResource._fetch).toHaveBeenLastCalledWith({
 method: 'POST',
 path: '/client/sign_ins/test_id/prepare_first_factor',
 body: {
 emailAddressId: 'email_address_1',
 strategy: 'email_code',
 },
 });
 });

 it('should select correct first factor when nothing is provided', async () => {
 const signIn = new SignIn();
 await signIn.__internal_future.create({ identifier: '+12255550000' });
 await signIn.__internal_future.emailCode.sendCode();
 expect(BaseResource._fetch).toHaveBeenLastCalledWith({
 method: 'POST',
 path: '/client/sign_ins/test_id/prepare_first_factor',
 body: {
 emailAddressId: 'email_address_0',
 strategy: 'email_code',
 },
 });
 });
 });
 });
});

42 changes: 31 additions & 11 deletions
packages/types/src/signInFuture.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -38,14 +38,27 @@ export type SignInFuturePasswordParams =
 email?: never;
 };

export interface SignInFutureEmailCodeSendParams {
 email: string;
}
export type SignInFutureEmailCodeSendParams =
 | {
 emailAddress?: string;
 emailAddressId?: never;
 }
 | {
 emailAddressId?: string;
 emailAddress?: never;
 };

export interface SignInFutureEmailLinkSendParams {
 email: string;
 verificationUrl: string;
}
export type SignInFutureEmailLinkSendParams =
 | {
 emailAddress?: string;
 verificationUrl: string;
 emailAddressId?: never;
 }
 | {
 emailAddressId?: string;
 verificationUrl: string;
 emailAddress?: never;
 };

export interface SignInFutureEmailCodeVerifyParams {
 code: string;
Expand All@@ -56,10 +69,17 @@ export interface SignInFutureResetPasswordSubmitParams {
 signOutOfOtherSessions?: boolean;
}

export interface SignInFuturePhoneCodeSendParams {
 phoneNumber?: string;
 channel?: PhoneCodeChannel;
}
export type SignInFuturePhoneCodeSendParams =
 | {
 phoneNumber?: string;
 channel?: PhoneCodeChannel;
 phoneNumberId?: never;
 }
 | {
 phoneNumberId: string;
 channel?: PhoneCodeChannel;
 phoneNumber?: never;
 };

export interface SignInFuturePhoneCodeVerifyParams {
 code: string;
Expand Down
Loading

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

Skip to content
fix(clerk-js,types): Correctly determine destination first factor#6789

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

dstaley
merged 5 commits into

from

Sep 17, 2025
 Merged


fix(clerk-js,types): Correctly determine destination first factor
#6789
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
e11f2eb

fix(clerk-js,types): Correctly determine destination first factor bas…


dstaley Sep 16, 2025
f2ea9b8

chore(clerk-js): Bump bundlewatch limits


dstaley Sep 16, 2025
562ae1c

chore(clerk-js): lint


dstaley Sep 16, 2025
49ecc42

Merge branch 'main' into ds.feat/signals-identifier-matching


nikosdouvlis Sep 17, 2025
e677163

Merge branch 'main' into ds.feat/signals-identifier-matching


dstaley Sep 17, 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


6 changes: 6 additions & 0 deletions
.changeset/ready-days-relax.md

View file


Open in desktop

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

[Experimental] Correctly determine destination first factor based on identifier.

4 changes: 2 additions & 2 deletions
packages/clerk-js/bundlewatch.config.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
{
 "files": [
 { "path": "./dist/clerk.js", "maxSize": "819KB" },
 { "path": "./dist/clerk.js", "maxSize": "821KB" },
 { "path": "./dist/clerk.browser.js", "maxSize": "79KB" },
 { "path": "./dist/clerk.legacy.browser.js", "maxSize": "121KB" },
 { "path": "./dist/clerk.headless*.js", "maxSize": "61KB" },
 { "path": "./dist/clerk.headless*.js", "maxSize": "63KB" },
 { "path": "./dist/ui-common*.js", "maxSize": "117.1KB" },
 { "path": "./dist/ui-common*.legacy.*.js", "maxSize": "120KB" },
 { "path": "./dist/vendors*.js", "maxSize": "45KB" },
Expand Down

143 changes: 120 additions & 23 deletions
packages/clerk-js/src/core/resources/SignIn.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,11 +15,14 @@ import type {
 AuthenticateWithWeb3Params,
 CreateEmailLinkFlowReturn,
 EmailCodeConfig,
 EmailCodeFactor,
 EmailLinkConfig,
 EmailLinkFactor,
 EnterpriseSSOConfig,
 PassKeyConfig,
 PasskeyFactor,
 PhoneCodeConfig,
 PhoneCodeFactor,
 PrepareFirstFactorParams,
 PrepareSecondFactorParams,
 ResetPasswordEmailCodeFactorConfig,
Expand DownExpand Up@@ -544,6 +547,11 @@ export class SignIn extends BaseResource implements SignInResource {
 }
}

type SelectFirstFactorParams =
 | { strategy: 'email_code'; emailAddressId?: string; phoneNumberId?: never }
 | { strategy: 'email_link'; emailAddressId?: string; phoneNumberId?: never }
 | { strategy: 'phone_code'; phoneNumberId?: string; emailAddressId?: never };

class SignInFuture implements SignInFutureResource {
 emailCode = {
 sendCode: this.sendEmailCode.bind(this),
Expand DownExpand Up@@ -692,22 +700,32 @@ class SignInFuture implements SignInFutureResource {
 });
 }

 async sendEmailCode(params: SignInFutureEmailCodeSendParams): Promise<{ error: unknown }> {
 const { email } = params;
 async sendEmailCode(params: SignInFutureEmailCodeSendParams = {}): Promise<{ error: unknown }> {
 const { emailAddress, emailAddressId } = params;
 if (!this.resource.id && emailAddressId) {
 throw new Error(
 'signIn.emailCode.sendCode() cannot be called with an emailAddressId if an existing signIn does not exist.',
 );
 }

 if (!this.resource.id && !emailAddress) {
 throw new Error(
 'signIn.emailCode.sendCode() cannot be called without an emailAddress if an existing signIn does not exist.',
 );
 }

 return runAsyncResourceTask(this.resource, async () => {
 if (!this.resource.id) {
 await this.create({ identifier: email });
 if (emailAddress) {
 await this.create({ identifier: emailAddress });
 }

 const emailCodeFactor = this.resource.supportedFirstFactors?.find(f => f.strategy === 'email_code');

 const emailCodeFactor = this.selectFirstFactor({ strategy: 'email_code', emailAddressId });
 if (!emailCodeFactor) {
 throw new Error('Email code factor not found');
 }

 const { emailAddressId } = emailCodeFactor;
 await this.resource.__internal_basePost({
 body: { emailAddressId, strategy: 'email_code' },
 body: { emailAddressId: emailCodeFactor.emailAddressId, strategy: 'email_code' },
 action: 'prepare_first_factor',
 });
 });
Expand All@@ -724,20 +742,29 @@ class SignInFuture implements SignInFutureResource {
 }

 async sendEmailLink(params: SignInFutureEmailLinkSendParams): Promise<{ error: unknown }> {
 const { email, verificationUrl } = params;
 const { emailAddress, verificationUrl, emailAddressId } = params;
 if (!this.resource.id && emailAddressId) {
 throw new Error(
 'signIn.emailLink.sendLink() cannot be called with an emailAddressId if an existing signIn does not exist.',
 );
 }

 if (!this.resource.id && !emailAddress) {
 throw new Error(
 'signIn.emailLink.sendLink() cannot be called without an emailAddress if an existing signIn does not exist.',
 );
 }

 return runAsyncResourceTask(this.resource, async () => {
 if (!this.resource.id) {
 await this.create({ identifier: email });
 if (emailAddress) {
 await this.create({ identifier: emailAddress });
 }

 const emailLinkFactor = this.resource.supportedFirstFactors?.find(f => f.strategy === 'email_link');

 const emailLinkFactor = this.selectFirstFactor({ strategy: 'email_link', emailAddressId });
 if (!emailLinkFactor) {
 throw new Error('Email link factor not found');
 }

 const { emailAddressId } = emailLinkFactor;

 let absoluteVerificationUrl = verificationUrl;
 try {
 new URL(verificationUrl);
Expand All@@ -746,7 +773,11 @@ class SignInFuture implements SignInFutureResource {
 }

 await this.resource.__internal_basePost({
 body: { emailAddressId, redirectUrl: absoluteVerificationUrl, strategy: 'email_link' },
 body: {
 emailAddressId: emailLinkFactor.emailAddressId,
 redirectUrl: absoluteVerificationUrl,
 strategy: 'email_link',
 },
 action: 'prepare_first_factor',
 });
 });
Expand All@@ -773,22 +804,32 @@ class SignInFuture implements SignInFutureResource {
 });
 }

 async sendPhoneCode(params: SignInFuturePhoneCodeSendParams): Promise<{ error: unknown }> {
 const { phoneNumber, channel = 'sms' } = params;
 async sendPhoneCode(params: SignInFuturePhoneCodeSendParams = {}): Promise<{ error: unknown }> {
 const { phoneNumber, phoneNumberId, channel = 'sms' } = params;
 if (!this.resource.id && phoneNumberId) {
 throw new Error(
 'signIn.phoneCode.sendCode() cannot be called with an phoneNumberId if an existing signIn does not exist.',
 );
 }

 if (!this.resource.id && !phoneNumber) {
 throw new Error(
 'signIn.phoneCode.sendCode() cannot be called without an phoneNumber if an existing signIn does not exist.',
 );
 }

 return runAsyncResourceTask(this.resource, async () => {
 if (!this.resource.id) {
 if (phoneNumber) {
 await this.create({ identifier: phoneNumber });
 }

 const phoneCodeFactor = this.resource.supportedFirstFactors?.find(f => f.strategy === 'phone_code');

 const phoneCodeFactor = this.selectFirstFactor({ strategy: 'phone_code', phoneNumberId });
 if (!phoneCodeFactor) {
 throw new Error('Phone code factor not found');
 }

 const { phoneNumberId } = phoneCodeFactor;
 await this.resource.__internal_basePost({
 body: { phoneNumberId, strategy: 'phone_code', channel },
 body: { phoneNumberId: phoneCodeFactor.phoneNumberId, strategy: 'phone_code', channel },
 action: 'prepare_first_factor',
 });
 });
Expand DownExpand Up@@ -886,4 +927,60 @@ class SignInFuture implements SignInFutureResource {
 await SignIn.clerk.setActive({ session: this.resource.createdSessionId, navigate });
 });
 }

 private selectFirstFactor(
 params: Extract<SelectFirstFactorParams, { strategy: 'email_code' }>,
 ): EmailCodeFactor | null;
 private selectFirstFactor(
 params: Extract<SelectFirstFactorParams, { strategy: 'email_link' }>,
 ): EmailLinkFactor | null;
 private selectFirstFactor(
 params: Extract<SelectFirstFactorParams, { strategy: 'phone_code' }>,
 ): PhoneCodeFactor | null;
 private selectFirstFactor({
 strategy,
 emailAddressId,
 phoneNumberId,
 }: SelectFirstFactorParams): EmailCodeFactor | EmailLinkFactor | PhoneCodeFactor | null {
 if (!this.resource.supportedFirstFactors) {
 return null;
 }

 if (emailAddressId) {
 const factor = this.resource.supportedFirstFactors.find(
 f => f.strategy === strategy && f.emailAddressId === emailAddressId,
 ) as EmailCodeFactor | EmailLinkFactor;
 if (factor) {
 return factor;
 }
 }

 if (phoneNumberId) {
 const factor = this.resource.supportedFirstFactors.find(
 f => f.strategy === strategy && f.phoneNumberId === phoneNumberId,
 ) as PhoneCodeFactor;
 if (factor) {
 return factor;
 }
 }

 // Try to find a factor that matches the identifier.
 const factorForIdentifier = this.resource.supportedFirstFactors.find(
 f => f.strategy === strategy && f.safeIdentifier === this.resource.identifier,
 ) as EmailCodeFactor | EmailLinkFactor | PhoneCodeFactor;
 if (factorForIdentifier) {
 return factorForIdentifier;
 }

 // If no factor is found matching the identifier, try to find a factor that matches the strategy.
 const factorForStrategy = this.resource.supportedFirstFactors.find(f => f.strategy === strategy) as
 | EmailCodeFactor
 | EmailLinkFactor
 | PhoneCodeFactor;
 if (factorForStrategy) {
 return factorForStrategy;
 }

 return null;
 }
}

95 changes: 95 additions & 0 deletions
packages/clerk-js/src/core/resources/__tests__/SignIn.spec.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,95 @@
import { describe, expect, it, vi } from 'vitest';

import { BaseResource } from '../internal';
import { SignIn } from '../SignIn';

describe('SignIn', () => {
 describe('SignInFuture', () => {
 describe('selectFirstFactor', () => {
 const signInCreatedJSON = {
 id: 'test_id',

 supported_first_factors: [
 { strategy: 'email_code', emailAddressId: 'email_address_0', safe_identifier: 'test+abc@clerk.com' },
 { strategy: 'email_code', emailAddressId: 'email_address_1', safe_identifier: 'test@clerk.com' },
 { strategy: 'phone_code', phoneNumberId: 'phone_number_1', safe_identifier: '+301234567890' },
 ],
 };

 const firstFactorPreparedJSON = {};

 BaseResource._fetch = vi.fn().mockImplementation(({ method, path, body }) => {
 if (method === 'POST' && path === '/client/sign_ins') {
 return Promise.resolve({
 client: null,
 response: { ...signInCreatedJSON, identifier: body.identifier },
 });
 }

 if (method === 'POST' && path === '/client/sign_ins/test_id/prepare_first_factor') {
 return Promise.resolve({
 client: null,
 response: firstFactorPreparedJSON,
 });
 }

 throw new Error('Unexpected call to BaseResource._fetch');
 });

 it('should select correct first factor by email address', async () => {
 const signIn = new SignIn();
 await signIn.__internal_future.emailCode.sendCode({ emailAddress: 'test@clerk.com' });
 expect(BaseResource._fetch).toHaveBeenLastCalledWith({
 method: 'POST',
 path: '/client/sign_ins/test_id/prepare_first_factor',
 body: {
 emailAddressId: 'email_address_1',
 strategy: 'email_code',
 },
 });
 });

 it('should select correct first factor by email address ID', async () => {
 const signIn = new SignIn();
 await signIn.__internal_future.create({ identifier: 'test@clerk.com' });
 await signIn.__internal_future.emailCode.sendCode({ emailAddressId: 'email_address_1' });
 expect(BaseResource._fetch).toHaveBeenLastCalledWith({
 method: 'POST',
 path: '/client/sign_ins/test_id/prepare_first_factor',
 body: {
 emailAddressId: 'email_address_1',
 strategy: 'email_code',
 },
 });
 });

 it('should select correct first factor matching identifier when nothing is provided', async () => {
 const signIn = new SignIn();
 await signIn.__internal_future.create({ identifier: 'test@clerk.com' });
 await signIn.__internal_future.emailCode.sendCode();
 expect(BaseResource._fetch).toHaveBeenLastCalledWith({
 method: 'POST',
 path: '/client/sign_ins/test_id/prepare_first_factor',
 body: {
 emailAddressId: 'email_address_1',
 strategy: 'email_code',
 },
 });
 });

 it('should select correct first factor when nothing is provided', async () => {
 const signIn = new SignIn();
 await signIn.__internal_future.create({ identifier: '+12255550000' });
 await signIn.__internal_future.emailCode.sendCode();
 expect(BaseResource._fetch).toHaveBeenLastCalledWith({
 method: 'POST',
 path: '/client/sign_ins/test_id/prepare_first_factor',
 body: {
 emailAddressId: 'email_address_0',
 strategy: 'email_code',
 },
 });
 });
 });
 });
});

42 changes: 31 additions & 11 deletions
packages/types/src/signInFuture.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -38,14 +38,27 @@ export type SignInFuturePasswordParams =
 email?: never;
 };

export interface SignInFutureEmailCodeSendParams {
 email: string;
}
export type SignInFutureEmailCodeSendParams =
 | {
 emailAddress?: string;
 emailAddressId?: never;
 }
 | {
 emailAddressId?: string;
 emailAddress?: never;
 };

export interface SignInFutureEmailLinkSendParams {
 email: string;
 verificationUrl: string;
}
export type SignInFutureEmailLinkSendParams =
 | {
 emailAddress?: string;
 verificationUrl: string;
 emailAddressId?: never;
 }
 | {
 emailAddressId?: string;
 verificationUrl: string;
 emailAddress?: never;
 };

export interface SignInFutureEmailCodeVerifyParams {
 code: string;
Expand All@@ -56,10 +69,17 @@ export interface SignInFutureResetPasswordSubmitParams {
 signOutOfOtherSessions?: boolean;
}

export interface SignInFuturePhoneCodeSendParams {
 phoneNumber?: string;
 channel?: PhoneCodeChannel;
}
export type SignInFuturePhoneCodeSendParams =
 | {
 phoneNumber?: string;
 channel?: PhoneCodeChannel;
 phoneNumberId?: never;
 }
 | {
 phoneNumberId: string;
 channel?: PhoneCodeChannel;
 phoneNumber?: never;
 };

export interface SignInFuturePhoneCodeVerifyParams {
 code: string;
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
fix(clerk-js,types): Correctly determine destination first factor#6789

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

dstaley
merged 5 commits into

from

Sep 17, 2025
 Merged


fix(clerk-js,types): Correctly determine destination first factor
#6789
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
e11f2eb

fix(clerk-js,types): Correctly determine destination first factor bas…


dstaley Sep 16, 2025
f2ea9b8

chore(clerk-js): Bump bundlewatch limits


dstaley Sep 16, 2025
562ae1c

chore(clerk-js): lint


dstaley Sep 16, 2025
49ecc42

Merge branch 'main' into ds.feat/signals-identifier-matching


nikosdouvlis Sep 17, 2025
e677163

Merge branch 'main' into ds.feat/signals-identifier-matching


dstaley Sep 17, 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


6 changes: 6 additions & 0 deletions
.changeset/ready-days-relax.md

View file


Open in desktop

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

[Experimental] Correctly determine destination first factor based on identifier.

4 changes: 2 additions & 2 deletions
packages/clerk-js/bundlewatch.config.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
{
 "files": [
 { "path": "./dist/clerk.js", "maxSize": "819KB" },
 { "path": "./dist/clerk.js", "maxSize": "821KB" },
 { "path": "./dist/clerk.browser.js", "maxSize": "79KB" },
 { "path": "./dist/clerk.legacy.browser.js", "maxSize": "121KB" },
 { "path": "./dist/clerk.headless*.js", "maxSize": "61KB" },
 { "path": "./dist/clerk.headless*.js", "maxSize": "63KB" },
 { "path": "./dist/ui-common*.js", "maxSize": "117.1KB" },
 { "path": "./dist/ui-common*.legacy.*.js", "maxSize": "120KB" },
 { "path": "./dist/vendors*.js", "maxSize": "45KB" },
Expand Down

143 changes: 120 additions & 23 deletions
packages/clerk-js/src/core/resources/SignIn.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,11 +15,14 @@ import type {
 AuthenticateWithWeb3Params,
 CreateEmailLinkFlowReturn,
 EmailCodeConfig,
 EmailCodeFactor,
 EmailLinkConfig,
 EmailLinkFactor,
 EnterpriseSSOConfig,
 PassKeyConfig,
 PasskeyFactor,
 PhoneCodeConfig,
 PhoneCodeFactor,
 PrepareFirstFactorParams,
 PrepareSecondFactorParams,
 ResetPasswordEmailCodeFactorConfig,
Expand DownExpand Up@@ -544,6 +547,11 @@ export class SignIn extends BaseResource implements SignInResource {
 }
}

type SelectFirstFactorParams =
 | { strategy: 'email_code'; emailAddressId?: string; phoneNumberId?: never }
 | { strategy: 'email_link'; emailAddressId?: string; phoneNumberId?: never }
 | { strategy: 'phone_code'; phoneNumberId?: string; emailAddressId?: never };

class SignInFuture implements SignInFutureResource {
 emailCode = {
 sendCode: this.sendEmailCode.bind(this),
Expand DownExpand Up@@ -692,22 +700,32 @@ class SignInFuture implements SignInFutureResource {
 });
 }

 async sendEmailCode(params: SignInFutureEmailCodeSendParams): Promise<{ error: unknown }> {
 const { email } = params;
 async sendEmailCode(params: SignInFutureEmailCodeSendParams = {}): Promise<{ error: unknown }> {
 const { emailAddress, emailAddressId } = params;
 if (!this.resource.id && emailAddressId) {
 throw new Error(
 'signIn.emailCode.sendCode() cannot be called with an emailAddressId if an existing signIn does not exist.',
 );
 }

 if (!this.resource.id && !emailAddress) {
 throw new Error(
 'signIn.emailCode.sendCode() cannot be called without an emailAddress if an existing signIn does not exist.',
 );
 }

 return runAsyncResourceTask(this.resource, async () => {
 if (!this.resource.id) {
 await this.create({ identifier: email });
 if (emailAddress) {
 await this.create({ identifier: emailAddress });
 }

 const emailCodeFactor = this.resource.supportedFirstFactors?.find(f => f.strategy === 'email_code');

 const emailCodeFactor = this.selectFirstFactor({ strategy: 'email_code', emailAddressId });
 if (!emailCodeFactor) {
 throw new Error('Email code factor not found');
 }

 const { emailAddressId } = emailCodeFactor;
 await this.resource.__internal_basePost({
 body: { emailAddressId, strategy: 'email_code' },
 body: { emailAddressId: emailCodeFactor.emailAddressId, strategy: 'email_code' },
 action: 'prepare_first_factor',
 });
 });
Expand All@@ -724,20 +742,29 @@ class SignInFuture implements SignInFutureResource {
 }

 async sendEmailLink(params: SignInFutureEmailLinkSendParams): Promise<{ error: unknown }> {
 const { email, verificationUrl } = params;
 const { emailAddress, verificationUrl, emailAddressId } = params;
 if (!this.resource.id && emailAddressId) {
 throw new Error(
 'signIn.emailLink.sendLink() cannot be called with an emailAddressId if an existing signIn does not exist.',
 );
 }

 if (!this.resource.id && !emailAddress) {
 throw new Error(
 'signIn.emailLink.sendLink() cannot be called without an emailAddress if an existing signIn does not exist.',
 );
 }

 return runAsyncResourceTask(this.resource, async () => {
 if (!this.resource.id) {
 await this.create({ identifier: email });
 if (emailAddress) {
 await this.create({ identifier: emailAddress });
 }

 const emailLinkFactor = this.resource.supportedFirstFactors?.find(f => f.strategy === 'email_link');

 const emailLinkFactor = this.selectFirstFactor({ strategy: 'email_link', emailAddressId });
 if (!emailLinkFactor) {
 throw new Error('Email link factor not found');
 }

 const { emailAddressId } = emailLinkFactor;

 let absoluteVerificationUrl = verificationUrl;
 try {
 new URL(verificationUrl);
Expand All@@ -746,7 +773,11 @@ class SignInFuture implements SignInFutureResource {
 }

 await this.resource.__internal_basePost({
 body: { emailAddressId, redirectUrl: absoluteVerificationUrl, strategy: 'email_link' },
 body: {
 emailAddressId: emailLinkFactor.emailAddressId,
 redirectUrl: absoluteVerificationUrl,
 strategy: 'email_link',
 },
 action: 'prepare_first_factor',
 });
 });
Expand All@@ -773,22 +804,32 @@ class SignInFuture implements SignInFutureResource {
 });
 }

 async sendPhoneCode(params: SignInFuturePhoneCodeSendParams): Promise<{ error: unknown }> {
 const { phoneNumber, channel = 'sms' } = params;
 async sendPhoneCode(params: SignInFuturePhoneCodeSendParams = {}): Promise<{ error: unknown }> {
 const { phoneNumber, phoneNumberId, channel = 'sms' } = params;
 if (!this.resource.id && phoneNumberId) {
 throw new Error(
 'signIn.phoneCode.sendCode() cannot be called with an phoneNumberId if an existing signIn does not exist.',
 );
 }

 if (!this.resource.id && !phoneNumber) {
 throw new Error(
 'signIn.phoneCode.sendCode() cannot be called without an phoneNumber if an existing signIn does not exist.',
 );
 }

 return runAsyncResourceTask(this.resource, async () => {
 if (!this.resource.id) {
 if (phoneNumber) {
 await this.create({ identifier: phoneNumber });
 }

 const phoneCodeFactor = this.resource.supportedFirstFactors?.find(f => f.strategy === 'phone_code');

 const phoneCodeFactor = this.selectFirstFactor({ strategy: 'phone_code', phoneNumberId });
 if (!phoneCodeFactor) {
 throw new Error('Phone code factor not found');
 }

 const { phoneNumberId } = phoneCodeFactor;
 await this.resource.__internal_basePost({
 body: { phoneNumberId, strategy: 'phone_code', channel },
 body: { phoneNumberId: phoneCodeFactor.phoneNumberId, strategy: 'phone_code', channel },
 action: 'prepare_first_factor',
 });
 });
Expand DownExpand Up@@ -886,4 +927,60 @@ class SignInFuture implements SignInFutureResource {
 await SignIn.clerk.setActive({ session: this.resource.createdSessionId, navigate });
 });
 }

 private selectFirstFactor(
 params: Extract<SelectFirstFactorParams, { strategy: 'email_code' }>,
 ): EmailCodeFactor | null;
 private selectFirstFactor(
 params: Extract<SelectFirstFactorParams, { strategy: 'email_link' }>,
 ): EmailLinkFactor | null;
 private selectFirstFactor(
 params: Extract<SelectFirstFactorParams, { strategy: 'phone_code' }>,
 ): PhoneCodeFactor | null;
 private selectFirstFactor({
 strategy,
 emailAddressId,
 phoneNumberId,
 }: SelectFirstFactorParams): EmailCodeFactor | EmailLinkFactor | PhoneCodeFactor | null {
 if (!this.resource.supportedFirstFactors) {
 return null;
 }

 if (emailAddressId) {
 const factor = this.resource.supportedFirstFactors.find(
 f => f.strategy === strategy && f.emailAddressId === emailAddressId,
 ) as EmailCodeFactor | EmailLinkFactor;
 if (factor) {
 return factor;
 }
 }

 if (phoneNumberId) {
 const factor = this.resource.supportedFirstFactors.find(
 f => f.strategy === strategy && f.phoneNumberId === phoneNumberId,
 ) as PhoneCodeFactor;
 if (factor) {
 return factor;
 }
 }

 // Try to find a factor that matches the identifier.
 const factorForIdentifier = this.resource.supportedFirstFactors.find(
 f => f.strategy === strategy && f.safeIdentifier === this.resource.identifier,
 ) as EmailCodeFactor | EmailLinkFactor | PhoneCodeFactor;
 if (factorForIdentifier) {
 return factorForIdentifier;
 }

 // If no factor is found matching the identifier, try to find a factor that matches the strategy.
 const factorForStrategy = this.resource.supportedFirstFactors.find(f => f.strategy === strategy) as
 | EmailCodeFactor
 | EmailLinkFactor
 | PhoneCodeFactor;
 if (factorForStrategy) {
 return factorForStrategy;
 }

 return null;
 }
}

95 changes: 95 additions & 0 deletions
packages/clerk-js/src/core/resources/__tests__/SignIn.spec.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,95 @@
import { describe, expect, it, vi } from 'vitest';

import { BaseResource } from '../internal';
import { SignIn } from '../SignIn';

describe('SignIn', () => {
 describe('SignInFuture', () => {
 describe('selectFirstFactor', () => {
 const signInCreatedJSON = {
 id: 'test_id',

 supported_first_factors: [
 { strategy: 'email_code', emailAddressId: 'email_address_0', safe_identifier: 'test+abc@clerk.com' },
 { strategy: 'email_code', emailAddressId: 'email_address_1', safe_identifier: 'test@clerk.com' },
 { strategy: 'phone_code', phoneNumberId: 'phone_number_1', safe_identifier: '+301234567890' },
 ],
 };

 const firstFactorPreparedJSON = {};

 BaseResource._fetch = vi.fn().mockImplementation(({ method, path, body }) => {
 if (method === 'POST' && path === '/client/sign_ins') {
 return Promise.resolve({
 client: null,
 response: { ...signInCreatedJSON, identifier: body.identifier },
 });
 }

 if (method === 'POST' && path === '/client/sign_ins/test_id/prepare_first_factor') {
 return Promise.resolve({
 client: null,
 response: firstFactorPreparedJSON,
 });
 }

 throw new Error('Unexpected call to BaseResource._fetch');
 });

 it('should select correct first factor by email address', async () => {
 const signIn = new SignIn();
 await signIn.__internal_future.emailCode.sendCode({ emailAddress: 'test@clerk.com' });
 expect(BaseResource._fetch).toHaveBeenLastCalledWith({
 method: 'POST',
 path: '/client/sign_ins/test_id/prepare_first_factor',
 body: {
 emailAddressId: 'email_address_1',
 strategy: 'email_code',
 },
 });
 });

 it('should select correct first factor by email address ID', async () => {
 const signIn = new SignIn();
 await signIn.__internal_future.create({ identifier: 'test@clerk.com' });
 await signIn.__internal_future.emailCode.sendCode({ emailAddressId: 'email_address_1' });
 expect(BaseResource._fetch).toHaveBeenLastCalledWith({
 method: 'POST',
 path: '/client/sign_ins/test_id/prepare_first_factor',
 body: {
 emailAddressId: 'email_address_1',
 strategy: 'email_code',
 },
 });
 });

 it('should select correct first factor matching identifier when nothing is provided', async () => {
 const signIn = new SignIn();
 await signIn.__internal_future.create({ identifier: 'test@clerk.com' });
 await signIn.__internal_future.emailCode.sendCode();
 expect(BaseResource._fetch).toHaveBeenLastCalledWith({
 method: 'POST',
 path: '/client/sign_ins/test_id/prepare_first_factor',
 body: {
 emailAddressId: 'email_address_1',
 strategy: 'email_code',
 },
 });
 });

 it('should select correct first factor when nothing is provided', async () => {
 const signIn = new SignIn();
 await signIn.__internal_future.create({ identifier: '+12255550000' });
 await signIn.__internal_future.emailCode.sendCode();
 expect(BaseResource._fetch).toHaveBeenLastCalledWith({
 method: 'POST',
 path: '/client/sign_ins/test_id/prepare_first_factor',
 body: {
 emailAddressId: 'email_address_0',
 strategy: 'email_code',
 },
 });
 });
 });
 });
});

42 changes: 31 additions & 11 deletions
packages/types/src/signInFuture.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -38,14 +38,27 @@ export type SignInFuturePasswordParams =
 email?: never;
 };

export interface SignInFutureEmailCodeSendParams {
 email: string;
}
export type SignInFutureEmailCodeSendParams =
 | {
 emailAddress?: string;
 emailAddressId?: never;
 }
 | {
 emailAddressId?: string;
 emailAddress?: never;
 };

export interface SignInFutureEmailLinkSendParams {
 email: string;
 verificationUrl: string;
}
export type SignInFutureEmailLinkSendParams =
 | {
 emailAddress?: string;
 verificationUrl: string;
 emailAddressId?: never;
 }
 | {
 emailAddressId?: string;
 verificationUrl: string;
 emailAddress?: never;
 };

export interface SignInFutureEmailCodeVerifyParams {
 code: string;
Expand All@@ -56,10 +69,17 @@ export interface SignInFutureResetPasswordSubmitParams {
 signOutOfOtherSessions?: boolean;
}

export interface SignInFuturePhoneCodeSendParams {
 phoneNumber?: string;
 channel?: PhoneCodeChannel;
}
export type SignInFuturePhoneCodeSendParams =
 | {
 phoneNumber?: string;
 channel?: PhoneCodeChannel;
 phoneNumberId?: never;
 }
 | {
 phoneNumberId: string;
 channel?: PhoneCodeChannel;
 phoneNumber?: never;
 };

export interface SignInFuturePhoneCodeVerifyParams {
 code: string;
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
fix(clerk-js,types): Correctly determine destination first factor#6789

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

dstaley
merged 5 commits into

from

Sep 17, 2025
 Merged


fix(clerk-js,types): Correctly determine destination first factor
#6789
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
e11f2eb

fix(clerk-js,types): Correctly determine destination first factor bas…


dstaley Sep 16, 2025
f2ea9b8

chore(clerk-js): Bump bundlewatch limits


dstaley Sep 16, 2025
562ae1c

chore(clerk-js): lint


dstaley Sep 16, 2025
49ecc42

Merge branch 'main' into ds.feat/signals-identifier-matching


nikosdouvlis Sep 17, 2025
e677163

Merge branch 'main' into ds.feat/signals-identifier-matching


dstaley Sep 17, 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


6 changes: 6 additions & 0 deletions
.changeset/ready-days-relax.md

View file


Open in desktop

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

[Experimental] Correctly determine destination first factor based on identifier.

4 changes: 2 additions & 2 deletions
packages/clerk-js/bundlewatch.config.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
{
 "files": [
 { "path": "./dist/clerk.js", "maxSize": "819KB" },
 { "path": "./dist/clerk.js", "maxSize": "821KB" },
 { "path": "./dist/clerk.browser.js", "maxSize": "79KB" },
 { "path": "./dist/clerk.legacy.browser.js", "maxSize": "121KB" },
 { "path": "./dist/clerk.headless*.js", "maxSize": "61KB" },
 { "path": "./dist/clerk.headless*.js", "maxSize": "63KB" },
 { "path": "./dist/ui-common*.js", "maxSize": "117.1KB" },
 { "path": "./dist/ui-common*.legacy.*.js", "maxSize": "120KB" },
 { "path": "./dist/vendors*.js", "maxSize": "45KB" },
Expand Down

143 changes: 120 additions & 23 deletions
packages/clerk-js/src/core/resources/SignIn.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,11 +15,14 @@ import type {
 AuthenticateWithWeb3Params,
 CreateEmailLinkFlowReturn,
 EmailCodeConfig,
 EmailCodeFactor,
 EmailLinkConfig,
 EmailLinkFactor,
 EnterpriseSSOConfig,
 PassKeyConfig,
 PasskeyFactor,
 PhoneCodeConfig,
 PhoneCodeFactor,
 PrepareFirstFactorParams,
 PrepareSecondFactorParams,
 ResetPasswordEmailCodeFactorConfig,
Expand DownExpand Up@@ -544,6 +547,11 @@ export class SignIn extends BaseResource implements SignInResource {
 }
}

type SelectFirstFactorParams =
 | { strategy: 'email_code'; emailAddressId?: string; phoneNumberId?: never }
 | { strategy: 'email_link'; emailAddressId?: string; phoneNumberId?: never }
 | { strategy: 'phone_code'; phoneNumberId?: string; emailAddressId?: never };

class SignInFuture implements SignInFutureResource {
 emailCode = {
 sendCode: this.sendEmailCode.bind(this),
Expand DownExpand Up@@ -692,22 +700,32 @@ class SignInFuture implements SignInFutureResource {
 });
 }

 async sendEmailCode(params: SignInFutureEmailCodeSendParams): Promise<{ error: unknown }> {
 const { email } = params;
 async sendEmailCode(params: SignInFutureEmailCodeSendParams = {}): Promise<{ error: unknown }> {
 const { emailAddress, emailAddressId } = params;
 if (!this.resource.id && emailAddressId) {
 throw new Error(
 'signIn.emailCode.sendCode() cannot be called with an emailAddressId if an existing signIn does not exist.',
 );
 }

 if (!this.resource.id && !emailAddress) {
 throw new Error(
 'signIn.emailCode.sendCode() cannot be called without an emailAddress if an existing signIn does not exist.',
 );
 }

 return runAsyncResourceTask(this.resource, async () => {
 if (!this.resource.id) {
 await this.create({ identifier: email });
 if (emailAddress) {
 await this.create({ identifier: emailAddress });
 }

 const emailCodeFactor = this.resource.supportedFirstFactors?.find(f => f.strategy === 'email_code');

 const emailCodeFactor = this.selectFirstFactor({ strategy: 'email_code', emailAddressId });
 if (!emailCodeFactor) {
 throw new Error('Email code factor not found');
 }

 const { emailAddressId } = emailCodeFactor;
 await this.resource.__internal_basePost({
 body: { emailAddressId, strategy: 'email_code' },
 body: { emailAddressId: emailCodeFactor.emailAddressId, strategy: 'email_code' },
 action: 'prepare_first_factor',
 });
 });
Expand All@@ -724,20 +742,29 @@ class SignInFuture implements SignInFutureResource {
 }

 async sendEmailLink(params: SignInFutureEmailLinkSendParams): Promise<{ error: unknown }> {
 const { email, verificationUrl } = params;
 const { emailAddress, verificationUrl, emailAddressId } = params;
 if (!this.resource.id && emailAddressId) {
 throw new Error(
 'signIn.emailLink.sendLink() cannot be called with an emailAddressId if an existing signIn does not exist.',
 );
 }

 if (!this.resource.id && !emailAddress) {
 throw new Error(
 'signIn.emailLink.sendLink() cannot be called without an emailAddress if an existing signIn does not exist.',
 );
 }

 return runAsyncResourceTask(this.resource, async () => {
 if (!this.resource.id) {
 await this.create({ identifier: email });
 if (emailAddress) {
 await this.create({ identifier: emailAddress });
 }

 const emailLinkFactor = this.resource.supportedFirstFactors?.find(f => f.strategy === 'email_link');

 const emailLinkFactor = this.selectFirstFactor({ strategy: 'email_link', emailAddressId });
 if (!emailLinkFactor) {
 throw new Error('Email link factor not found');
 }

 const { emailAddressId } = emailLinkFactor;

 let absoluteVerificationUrl = verificationUrl;
 try {
 new URL(verificationUrl);
Expand All@@ -746,7 +773,11 @@ class SignInFuture implements SignInFutureResource {
 }

 await this.resource.__internal_basePost({
 body: { emailAddressId, redirectUrl: absoluteVerificationUrl, strategy: 'email_link' },
 body: {
 emailAddressId: emailLinkFactor.emailAddressId,
 redirectUrl: absoluteVerificationUrl,
 strategy: 'email_link',
 },
 action: 'prepare_first_factor',
 });
 });
Expand All@@ -773,22 +804,32 @@ class SignInFuture implements SignInFutureResource {
 });
 }

 async sendPhoneCode(params: SignInFuturePhoneCodeSendParams): Promise<{ error: unknown }> {
 const { phoneNumber, channel = 'sms' } = params;
 async sendPhoneCode(params: SignInFuturePhoneCodeSendParams = {}): Promise<{ error: unknown }> {
 const { phoneNumber, phoneNumberId, channel = 'sms' } = params;
 if (!this.resource.id && phoneNumberId) {
 throw new Error(
 'signIn.phoneCode.sendCode() cannot be called with an phoneNumberId if an existing signIn does not exist.',
 );
 }

 if (!this.resource.id && !phoneNumber) {
 throw new Error(
 'signIn.phoneCode.sendCode() cannot be called without an phoneNumber if an existing signIn does not exist.',
 );
 }

 return runAsyncResourceTask(this.resource, async () => {
 if (!this.resource.id) {
 if (phoneNumber) {
 await this.create({ identifier: phoneNumber });
 }

 const phoneCodeFactor = this.resource.supportedFirstFactors?.find(f => f.strategy === 'phone_code');

 const phoneCodeFactor = this.selectFirstFactor({ strategy: 'phone_code', phoneNumberId });
 if (!phoneCodeFactor) {
 throw new Error('Phone code factor not found');
 }

 const { phoneNumberId } = phoneCodeFactor;
 await this.resource.__internal_basePost({
 body: { phoneNumberId, strategy: 'phone_code', channel },
 body: { phoneNumberId: phoneCodeFactor.phoneNumberId, strategy: 'phone_code', channel },
 action: 'prepare_first_factor',
 });
 });
Expand DownExpand Up@@ -886,4 +927,60 @@ class SignInFuture implements SignInFutureResource {
 await SignIn.clerk.setActive({ session: this.resource.createdSessionId, navigate });
 });
 }

 private selectFirstFactor(
 params: Extract<SelectFirstFactorParams, { strategy: 'email_code' }>,
 ): EmailCodeFactor | null;
 private selectFirstFactor(
 params: Extract<SelectFirstFactorParams, { strategy: 'email_link' }>,
 ): EmailLinkFactor | null;
 private selectFirstFactor(
 params: Extract<SelectFirstFactorParams, { strategy: 'phone_code' }>,
 ): PhoneCodeFactor | null;
 private selectFirstFactor({
 strategy,
 emailAddressId,
 phoneNumberId,
 }: SelectFirstFactorParams): EmailCodeFactor | EmailLinkFactor | PhoneCodeFactor | null {
 if (!this.resource.supportedFirstFactors) {
 return null;
 }

 if (emailAddressId) {
 const factor = this.resource.supportedFirstFactors.find(
 f => f.strategy === strategy && f.emailAddressId === emailAddressId,
 ) as EmailCodeFactor | EmailLinkFactor;
 if (factor) {
 return factor;
 }
 }

 if (phoneNumberId) {
 const factor = this.resource.supportedFirstFactors.find(
 f => f.strategy === strategy && f.phoneNumberId === phoneNumberId,
 ) as PhoneCodeFactor;
 if (factor) {
 return factor;
 }
 }

 // Try to find a factor that matches the identifier.
 const factorForIdentifier = this.resource.supportedFirstFactors.find(
 f => f.strategy === strategy && f.safeIdentifier === this.resource.identifier,
 ) as EmailCodeFactor | EmailLinkFactor | PhoneCodeFactor;
 if (factorForIdentifier) {
 return factorForIdentifier;
 }

 // If no factor is found matching the identifier, try to find a factor that matches the strategy.
 const factorForStrategy = this.resource.supportedFirstFactors.find(f => f.strategy === strategy) as
 | EmailCodeFactor
 | EmailLinkFactor
 | PhoneCodeFactor;
 if (factorForStrategy) {
 return factorForStrategy;
 }

 return null;
 }
}

95 changes: 95 additions & 0 deletions
packages/clerk-js/src/core/resources/__tests__/SignIn.spec.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,95 @@
import { describe, expect, it, vi } from 'vitest';

import { BaseResource } from '../internal';
import { SignIn } from '../SignIn';

describe('SignIn', () => {
 describe('SignInFuture', () => {
 describe('selectFirstFactor', () => {
 const signInCreatedJSON = {
 id: 'test_id',

 supported_first_factors: [
 { strategy: 'email_code', emailAddressId: 'email_address_0', safe_identifier: 'test+abc@clerk.com' },
 { strategy: 'email_code', emailAddressId: 'email_address_1', safe_identifier: 'test@clerk.com' },
 { strategy: 'phone_code', phoneNumberId: 'phone_number_1', safe_identifier: '+301234567890' },
 ],
 };

 const firstFactorPreparedJSON = {};

 BaseResource._fetch = vi.fn().mockImplementation(({ method, path, body }) => {
 if (method === 'POST' && path === '/client/sign_ins') {
 return Promise.resolve({
 client: null,
 response: { ...signInCreatedJSON, identifier: body.identifier },
 });
 }

 if (method === 'POST' && path === '/client/sign_ins/test_id/prepare_first_factor') {
 return Promise.resolve({
 client: null,
 response: firstFactorPreparedJSON,
 });
 }

 throw new Error('Unexpected call to BaseResource._fetch');
 });

 it('should select correct first factor by email address', async () => {
 const signIn = new SignIn();
 await signIn.__internal_future.emailCode.sendCode({ emailAddress: 'test@clerk.com' });
 expect(BaseResource._fetch).toHaveBeenLastCalledWith({
 method: 'POST',
 path: '/client/sign_ins/test_id/prepare_first_factor',
 body: {
 emailAddressId: 'email_address_1',
 strategy: 'email_code',
 },
 });
 });

 it('should select correct first factor by email address ID', async () => {
 const signIn = new SignIn();
 await signIn.__internal_future.create({ identifier: 'test@clerk.com' });
 await signIn.__internal_future.emailCode.sendCode({ emailAddressId: 'email_address_1' });
 expect(BaseResource._fetch).toHaveBeenLastCalledWith({
 method: 'POST',
 path: '/client/sign_ins/test_id/prepare_first_factor',
 body: {
 emailAddressId: 'email_address_1',
 strategy: 'email_code',
 },
 });
 });

 it('should select correct first factor matching identifier when nothing is provided', async () => {
 const signIn = new SignIn();
 await signIn.__internal_future.create({ identifier: 'test@clerk.com' });
 await signIn.__internal_future.emailCode.sendCode();
 expect(BaseResource._fetch).toHaveBeenLastCalledWith({
 method: 'POST',
 path: '/client/sign_ins/test_id/prepare_first_factor',
 body: {
 emailAddressId: 'email_address_1',
 strategy: 'email_code',
 },
 });
 });

 it('should select correct first factor when nothing is provided', async () => {
 const signIn = new SignIn();
 await signIn.__internal_future.create({ identifier: '+12255550000' });
 await signIn.__internal_future.emailCode.sendCode();
 expect(BaseResource._fetch).toHaveBeenLastCalledWith({
 method: 'POST',
 path: '/client/sign_ins/test_id/prepare_first_factor',
 body: {
 emailAddressId: 'email_address_0',
 strategy: 'email_code',
 },
 });
 });
 });
 });
});

42 changes: 31 additions & 11 deletions
packages/types/src/signInFuture.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -38,14 +38,27 @@ export type SignInFuturePasswordParams =
 email?: never;
 };

export interface SignInFutureEmailCodeSendParams {
 email: string;
}
export type SignInFutureEmailCodeSendParams =
 | {
 emailAddress?: string;
 emailAddressId?: never;
 }
 | {
 emailAddressId?: string;
 emailAddress?: never;
 };

export interface SignInFutureEmailLinkSendParams {
 email: string;
 verificationUrl: string;
}
export type SignInFutureEmailLinkSendParams =
 | {
 emailAddress?: string;
 verificationUrl: string;
 emailAddressId?: never;
 }
 | {
 emailAddressId?: string;
 verificationUrl: string;
 emailAddress?: never;
 };

export interface SignInFutureEmailCodeVerifyParams {
 code: string;
Expand All@@ -56,10 +69,17 @@ export interface SignInFutureResetPasswordSubmitParams {
 signOutOfOtherSessions?: boolean;
}

export interface SignInFuturePhoneCodeSendParams {
 phoneNumber?: string;
 channel?: PhoneCodeChannel;
}
export type SignInFuturePhoneCodeSendParams =
 | {
 phoneNumber?: string;
 channel?: PhoneCodeChannel;
 phoneNumberId?: never;
 }
 | {
 phoneNumberId: string;
 channel?: PhoneCodeChannel;
 phoneNumber?: never;
 };

export interface SignInFuturePhoneCodeVerifyParams {
 code: string;
Expand Down
Loading

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

Skip to content
fix(clerk-js,types): Correctly determine destination first factor#6789

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

dstaley
merged 5 commits into

from

Sep 17, 2025
 Merged


fix(clerk-js,types): Correctly determine destination first factor
#6789
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
e11f2eb

fix(clerk-js,types): Correctly determine destination first factor bas…


dstaley Sep 16, 2025
f2ea9b8

chore(clerk-js): Bump bundlewatch limits


dstaley Sep 16, 2025
562ae1c

chore(clerk-js): lint


dstaley Sep 16, 2025
49ecc42

Merge branch 'main' into ds.feat/signals-identifier-matching


nikosdouvlis Sep 17, 2025
e677163

Merge branch 'main' into ds.feat/signals-identifier-matching


dstaley Sep 17, 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


6 changes: 6 additions & 0 deletions
.changeset/ready-days-relax.md

View file


Open in desktop

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

[Experimental] Correctly determine destination first factor based on identifier.

4 changes: 2 additions & 2 deletions
packages/clerk-js/bundlewatch.config.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
{
 "files": [
 { "path": "./dist/clerk.js", "maxSize": "819KB" },
 { "path": "./dist/clerk.js", "maxSize": "821KB" },
 { "path": "./dist/clerk.browser.js", "maxSize": "79KB" },
 { "path": "./dist/clerk.legacy.browser.js", "maxSize": "121KB" },
 { "path": "./dist/clerk.headless*.js", "maxSize": "61KB" },
 { "path": "./dist/clerk.headless*.js", "maxSize": "63KB" },
 { "path": "./dist/ui-common*.js", "maxSize": "117.1KB" },
 { "path": "./dist/ui-common*.legacy.*.js", "maxSize": "120KB" },
 { "path": "./dist/vendors*.js", "maxSize": "45KB" },
Expand Down

143 changes: 120 additions & 23 deletions
packages/clerk-js/src/core/resources/SignIn.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,11 +15,14 @@ import type {
 AuthenticateWithWeb3Params,
 CreateEmailLinkFlowReturn,
 EmailCodeConfig,
 EmailCodeFactor,
 EmailLinkConfig,
 EmailLinkFactor,
 EnterpriseSSOConfig,
 PassKeyConfig,
 PasskeyFactor,
 PhoneCodeConfig,
 PhoneCodeFactor,
 PrepareFirstFactorParams,
 PrepareSecondFactorParams,
 ResetPasswordEmailCodeFactorConfig,
Expand DownExpand Up@@ -544,6 +547,11 @@ export class SignIn extends BaseResource implements SignInResource {
 }
}

type SelectFirstFactorParams =
 | { strategy: 'email_code'; emailAddressId?: string; phoneNumberId?: never }
 | { strategy: 'email_link'; emailAddressId?: string; phoneNumberId?: never }
 | { strategy: 'phone_code'; phoneNumberId?: string; emailAddressId?: never };

class SignInFuture implements SignInFutureResource {
 emailCode = {
 sendCode: this.sendEmailCode.bind(this),
Expand DownExpand Up@@ -692,22 +700,32 @@ class SignInFuture implements SignInFutureResource {
 });
 }

 async sendEmailCode(params: SignInFutureEmailCodeSendParams): Promise<{ error: unknown }> {
 const { email } = params;
 async sendEmailCode(params: SignInFutureEmailCodeSendParams = {}): Promise<{ error: unknown }> {
 const { emailAddress, emailAddressId } = params;
 if (!this.resource.id && emailAddressId) {
 throw new Error(
 'signIn.emailCode.sendCode() cannot be called with an emailAddressId if an existing signIn does not exist.',
 );
 }

 if (!this.resource.id && !emailAddress) {
 throw new Error(
 'signIn.emailCode.sendCode() cannot be called without an emailAddress if an existing signIn does not exist.',
 );
 }

 return runAsyncResourceTask(this.resource, async () => {
 if (!this.resource.id) {
 await this.create({ identifier: email });
 if (emailAddress) {
 await this.create({ identifier: emailAddress });
 }

 const emailCodeFactor = this.resource.supportedFirstFactors?.find(f => f.strategy === 'email_code');

 const emailCodeFactor = this.selectFirstFactor({ strategy: 'email_code', emailAddressId });
 if (!emailCodeFactor) {
 throw new Error('Email code factor not found');
 }

 const { emailAddressId } = emailCodeFactor;
 await this.resource.__internal_basePost({
 body: { emailAddressId, strategy: 'email_code' },
 body: { emailAddressId: emailCodeFactor.emailAddressId, strategy: 'email_code' },
 action: 'prepare_first_factor',
 });
 });
Expand All@@ -724,20 +742,29 @@ class SignInFuture implements SignInFutureResource {
 }

 async sendEmailLink(params: SignInFutureEmailLinkSendParams): Promise<{ error: unknown }> {
 const { email, verificationUrl } = params;
 const { emailAddress, verificationUrl, emailAddressId } = params;
 if (!this.resource.id && emailAddressId) {
 throw new Error(
 'signIn.emailLink.sendLink() cannot be called with an emailAddressId if an existing signIn does not exist.',
 );
 }

 if (!this.resource.id && !emailAddress) {
 throw new Error(
 'signIn.emailLink.sendLink() cannot be called without an emailAddress if an existing signIn does not exist.',
 );
 }

 return runAsyncResourceTask(this.resource, async () => {
 if (!this.resource.id) {
 await this.create({ identifier: email });
 if (emailAddress) {
 await this.create({ identifier: emailAddress });
 }

 const emailLinkFactor = this.resource.supportedFirstFactors?.find(f => f.strategy === 'email_link');

 const emailLinkFactor = this.selectFirstFactor({ strategy: 'email_link', emailAddressId });
 if (!emailLinkFactor) {
 throw new Error('Email link factor not found');
 }

 const { emailAddressId } = emailLinkFactor;

 let absoluteVerificationUrl = verificationUrl;
 try {
 new URL(verificationUrl);
Expand All@@ -746,7 +773,11 @@ class SignInFuture implements SignInFutureResource {
 }

 await this.resource.__internal_basePost({
 body: { emailAddressId, redirectUrl: absoluteVerificationUrl, strategy: 'email_link' },
 body: {
 emailAddressId: emailLinkFactor.emailAddressId,
 redirectUrl: absoluteVerificationUrl,
 strategy: 'email_link',
 },
 action: 'prepare_first_factor',
 });
 });
Expand All@@ -773,22 +804,32 @@ class SignInFuture implements SignInFutureResource {
 });
 }

 async sendPhoneCode(params: SignInFuturePhoneCodeSendParams): Promise<{ error: unknown }> {
 const { phoneNumber, channel = 'sms' } = params;
 async sendPhoneCode(params: SignInFuturePhoneCodeSendParams = {}): Promise<{ error: unknown }> {
 const { phoneNumber, phoneNumberId, channel = 'sms' } = params;
 if (!this.resource.id && phoneNumberId) {
 throw new Error(
 'signIn.phoneCode.sendCode() cannot be called with an phoneNumberId if an existing signIn does not exist.',
 );
 }

 if (!this.resource.id && !phoneNumber) {
 throw new Error(
 'signIn.phoneCode.sendCode() cannot be called without an phoneNumber if an existing signIn does not exist.',
 );
 }

 return runAsyncResourceTask(this.resource, async () => {
 if (!this.resource.id) {
 if (phoneNumber) {
 await this.create({ identifier: phoneNumber });
 }

 const phoneCodeFactor = this.resource.supportedFirstFactors?.find(f => f.strategy === 'phone_code');

 const phoneCodeFactor = this.selectFirstFactor({ strategy: 'phone_code', phoneNumberId });
 if (!phoneCodeFactor) {
 throw new Error('Phone code factor not found');
 }

 const { phoneNumberId } = phoneCodeFactor;
 await this.resource.__internal_basePost({
 body: { phoneNumberId, strategy: 'phone_code', channel },
 body: { phoneNumberId: phoneCodeFactor.phoneNumberId, strategy: 'phone_code', channel },
 action: 'prepare_first_factor',
 });
 });
Expand DownExpand Up@@ -886,4 +927,60 @@ class SignInFuture implements SignInFutureResource {
 await SignIn.clerk.setActive({ session: this.resource.createdSessionId, navigate });
 });
 }

 private selectFirstFactor(
 params: Extract<SelectFirstFactorParams, { strategy: 'email_code' }>,
 ): EmailCodeFactor | null;
 private selectFirstFactor(
 params: Extract<SelectFirstFactorParams, { strategy: 'email_link' }>,
 ): EmailLinkFactor | null;
 private selectFirstFactor(
 params: Extract<SelectFirstFactorParams, { strategy: 'phone_code' }>,
 ): PhoneCodeFactor | null;
 private selectFirstFactor({
 strategy,
 emailAddressId,
 phoneNumberId,
 }: SelectFirstFactorParams): EmailCodeFactor | EmailLinkFactor | PhoneCodeFactor | null {
 if (!this.resource.supportedFirstFactors) {
 return null;
 }

 if (emailAddressId) {
 const factor = this.resource.supportedFirstFactors.find(
 f => f.strategy === strategy && f.emailAddressId === emailAddressId,
 ) as EmailCodeFactor | EmailLinkFactor;
 if (factor) {
 return factor;
 }
 }

 if (phoneNumberId) {
 const factor = this.resource.supportedFirstFactors.find(
 f => f.strategy === strategy && f.phoneNumberId === phoneNumberId,
 ) as PhoneCodeFactor;
 if (factor) {
 return factor;
 }
 }

 // Try to find a factor that matches the identifier.
 const factorForIdentifier = this.resource.supportedFirstFactors.find(
 f => f.strategy === strategy && f.safeIdentifier === this.resource.identifier,
 ) as EmailCodeFactor | EmailLinkFactor | PhoneCodeFactor;
 if (factorForIdentifier) {
 return factorForIdentifier;
 }

 // If no factor is found matching the identifier, try to find a factor that matches the strategy.
 const factorForStrategy = this.resource.supportedFirstFactors.find(f => f.strategy === strategy) as
 | EmailCodeFactor
 | EmailLinkFactor
 | PhoneCodeFactor;
 if (factorForStrategy) {
 return factorForStrategy;
 }

 return null;
 }
}

95 changes: 95 additions & 0 deletions
packages/clerk-js/src/core/resources/__tests__/SignIn.spec.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,95 @@
import { describe, expect, it, vi } from 'vitest';

import { BaseResource } from '../internal';
import { SignIn } from '../SignIn';

describe('SignIn', () => {
 describe('SignInFuture', () => {
 describe('selectFirstFactor', () => {
 const signInCreatedJSON = {
 id: 'test_id',

 supported_first_factors: [
 { strategy: 'email_code', emailAddressId: 'email_address_0', safe_identifier: 'test+abc@clerk.com' },
 { strategy: 'email_code', emailAddressId: 'email_address_1', safe_identifier: 'test@clerk.com' },
 { strategy: 'phone_code', phoneNumberId: 'phone_number_1', safe_identifier: '+301234567890' },
 ],
 };

 const firstFactorPreparedJSON = {};

 BaseResource._fetch = vi.fn().mockImplementation(({ method, path, body }) => {
 if (method === 'POST' && path === '/client/sign_ins') {
 return Promise.resolve({
 client: null,
 response: { ...signInCreatedJSON, identifier: body.identifier },
 });
 }

 if (method === 'POST' && path === '/client/sign_ins/test_id/prepare_first_factor') {
 return Promise.resolve({
 client: null,
 response: firstFactorPreparedJSON,
 });
 }

 throw new Error('Unexpected call to BaseResource._fetch');
 });

 it('should select correct first factor by email address', async () => {
 const signIn = new SignIn();
 await signIn.__internal_future.emailCode.sendCode({ emailAddress: 'test@clerk.com' });
 expect(BaseResource._fetch).toHaveBeenLastCalledWith({
 method: 'POST',
 path: '/client/sign_ins/test_id/prepare_first_factor',
 body: {
 emailAddressId: 'email_address_1',
 strategy: 'email_code',
 },
 });
 });

 it('should select correct first factor by email address ID', async () => {
 const signIn = new SignIn();
 await signIn.__internal_future.create({ identifier: 'test@clerk.com' });
 await signIn.__internal_future.emailCode.sendCode({ emailAddressId: 'email_address_1' });
 expect(BaseResource._fetch).toHaveBeenLastCalledWith({
 method: 'POST',
 path: '/client/sign_ins/test_id/prepare_first_factor',
 body: {
 emailAddressId: 'email_address_1',
 strategy: 'email_code',
 },
 });
 });

 it('should select correct first factor matching identifier when nothing is provided', async () => {
 const signIn = new SignIn();
 await signIn.__internal_future.create({ identifier: 'test@clerk.com' });
 await signIn.__internal_future.emailCode.sendCode();
 expect(BaseResource._fetch).toHaveBeenLastCalledWith({
 method: 'POST',
 path: '/client/sign_ins/test_id/prepare_first_factor',
 body: {
 emailAddressId: 'email_address_1',
 strategy: 'email_code',
 },
 });
 });

 it('should select correct first factor when nothing is provided', async () => {
 const signIn = new SignIn();
 await signIn.__internal_future.create({ identifier: '+12255550000' });
 await signIn.__internal_future.emailCode.sendCode();
 expect(BaseResource._fetch).toHaveBeenLastCalledWith({
 method: 'POST',
 path: '/client/sign_ins/test_id/prepare_first_factor',
 body: {
 emailAddressId: 'email_address_0',
 strategy: 'email_code',
 },
 });
 });
 });
 });
});

42 changes: 31 additions & 11 deletions
packages/types/src/signInFuture.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -38,14 +38,27 @@ export type SignInFuturePasswordParams =
 email?: never;
 };

export interface SignInFutureEmailCodeSendParams {
 email: string;
}
export type SignInFutureEmailCodeSendParams =
 | {
 emailAddress?: string;
 emailAddressId?: never;
 }
 | {
 emailAddressId?: string;
 emailAddress?: never;
 };

export interface SignInFutureEmailLinkSendParams {
 email: string;
 verificationUrl: string;
}
export type SignInFutureEmailLinkSendParams =
 | {
 emailAddress?: string;
 verificationUrl: string;
 emailAddressId?: never;
 }
 | {
 emailAddressId?: string;
 verificationUrl: string;
 emailAddress?: never;
 };

export interface SignInFutureEmailCodeVerifyParams {
 code: string;
Expand All@@ -56,10 +69,17 @@ export interface SignInFutureResetPasswordSubmitParams {
 signOutOfOtherSessions?: boolean;
}

export interface SignInFuturePhoneCodeSendParams {
 phoneNumber?: string;
 channel?: PhoneCodeChannel;
}
export type SignInFuturePhoneCodeSendParams =
 | {
 phoneNumber?: string;
 channel?: PhoneCodeChannel;
 phoneNumberId?: never;
 }
 | {
 phoneNumberId: string;
 channel?: PhoneCodeChannel;
 phoneNumber?: never;
 };

export interface SignInFuturePhoneCodeVerifyParams {
 code: string;
Expand Down
Loading