Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions .changeset/strict-needles-taste.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
---
'@clerk/clerk-js': minor
'@clerk/shared': minor
---

Support `sign_up_if_missing` on SignIn.create, including captcha
2 changes: 1 addition & 1 deletion packages/clerk-js/bundlewatch.config.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,7 +5,7 @@
{ "path": "./dist/clerk.chips.browser.js", "maxSize": "66KB" },
{ "path": "./dist/clerk.legacy.browser.js", "maxSize": "108KB" },
{ "path": "./dist/clerk.no-rhc.js", "maxSize": "307KB" },
{ "path": "./dist/clerk.native.js", "maxSize": "65KB" },
{ "path": "./dist/clerk.native.js", "maxSize": "66KB" },
{ "path": "./dist/vendors*.js", "maxSize": "7KB" },
{ "path": "./dist/coinbase*.js", "maxSize": "36KB" },
{ "path": "./dist/base-account-sdk*.js", "maxSize": "203KB" },
Expand Down
140 changes: 135 additions & 5 deletions packages/clerk-js/src/core/resources/SignIn.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,6 +16,7 @@ import type {
AuthenticateWithPopupParams,
AuthenticateWithRedirectParams,
AuthenticateWithWeb3Params,
CaptchaWidgetType,
ClientTrustState,
CreateEmailLinkFlowReturn,
EmailCodeConfig,
Expand DownExpand Up@@ -82,6 +83,7 @@ import {
_futureAuthenticateWithPopup,
wrapWithPopupRoutes,
} from '../../utils/authenticateWithPopup';
import { CaptchaChallenge } from '../../utils/captcha/CaptchaChallenge';
import { runAsyncResourceTask } from '../../utils/runAsyncResourceTask';
import { loadZxcvbn } from '../../utils/zxcvbn';
import {
Expand DownExpand Up@@ -164,12 +166,34 @@ export class SignIn extends BaseResource implements SignInResource {
this.fromJSON(data);
}

create = (params: SignInCreateParams): Promise<SignInResource> => {
create = async (params: SignInCreateParams): Promise<SignInResource> => {
debugLogger.debug('SignIn.create', { id: this.id, strategy: 'strategy' in params ? params.strategy : undefined });
const locale = getBrowserLocale();

let body: Record<string, unknown> = { ...params };

// Inject browser locale
const browserLocale = getBrowserLocale();
if (browserLocale) {
body.locale = browserLocale;
}

if (
this.shouldRequireCaptcha(params) &&
!__BUILD_DISABLE_RHC__ &&
!this.clientBypass() &&
!this.shouldBypassCaptchaForAttempt(params)
) {
const captchaChallenge = new CaptchaChallenge(SignIn.clerk);
const captchaParams = await captchaChallenge.managedOrInvisible({ action: 'signin' });
if (!captchaParams) {
throw new ClerkRuntimeError('', { code: 'captcha_unavailable' });
}
body = { ...body, ...captchaParams };
}

return this._basePost({
path: this.pathRoot,
body: locale ? { locale, ...params } : params,
body: body,
});
};

Expand DownExpand Up@@ -576,6 +600,43 @@ export class SignIn extends BaseResource implements SignInResource {
return this;
}

private clientBypass() {
return SignIn.clerk.client?.captchaBypass;
}

/**
* Determines whether captcha is required for sign in based on the provided params.
* Add new conditions here as captcha requirements evolve.
*/
private shouldRequireCaptcha(params: SignInCreateParams): boolean {
if ('signUpIfMissing' in params && params.signUpIfMissing) {
return true;
}

return false;
}

/**
* We delegate bot detection to the following providers, instead of relying on turnstile exclusively
*/
protected shouldBypassCaptchaForAttempt(params: SignInCreateParams) {
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
const captchaOauthBypass = SignIn.clerk.__internal_environment!.displayConfig.captchaOauthBypass;

// Check transfer strategy against bypass list
if (params.transfer && SignIn.clerk.client?.signUp?.verifications?.externalAccount?.status === 'transferable') {
const signUpStrategy = SignIn.clerk.client.signUp.verifications.externalAccount.strategy;
return signUpStrategy ? captchaOauthBypass.some(strategy => strategy === signUpStrategy) : false;
}

// Check direct strategy against bypass list
if ('strategy' in params && params.strategy) {
return captchaOauthBypass.some(strategy => strategy === params.strategy);
}

return false;
}

public __internal_updateFromJSON(data: SignInJSON | SignInJSONSnapshot | null): this {
return this.fromJSON(data);
}
Expand DownExpand Up@@ -814,11 +875,80 @@ class SignInFuture implements SignInFutureResource {
});
}

/**
* Determines whether captcha is required for sign in based on the provided params.
* Add new conditions here as captcha requirements evolve.
*/
private shouldRequireCaptcha(params: { signUpIfMissing?: boolean }): boolean {
if (params.signUpIfMissing) {
return true;
}

return false;
}

private shouldBypassCaptchaForAttempt(params: { strategy?: string; transfer?: boolean }) {
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
const captchaOauthBypass = SignIn.clerk.__internal_environment!.displayConfig.captchaOauthBypass;

// Check transfer strategy against bypass list
if (params.transfer && SignIn.clerk.client?.signUp?.verifications?.externalAccount?.status === 'transferable') {
const signUpStrategy = SignIn.clerk.client.signUp.verifications.externalAccount.strategy;
return signUpStrategy ? captchaOauthBypass.some(strategy => strategy === signUpStrategy) : false;
}

// Check direct strategy against bypass list
if (params.strategy) {
return captchaOauthBypass.some(strategy => strategy === params.strategy);
}

return false;
}

private async getCaptchaToken(
params: { strategy?: string; transfer?: boolean; signUpIfMissing?: boolean } = {},
): Promise<{
captchaToken?: string;
captchaWidgetType?: CaptchaWidgetType;
captchaError?: unknown;
}> {
if (
!this.shouldRequireCaptcha(params) ||
__BUILD_DISABLE_RHC__ ||
SignIn.clerk.client?.captchaBypass ||
this.shouldBypassCaptchaForAttempt(params)
) {
return {
captchaToken: undefined,
captchaWidgetType: undefined,
captchaError: undefined,
};
}

const captchaChallenge = new CaptchaChallenge(SignIn.clerk);
const response = await captchaChallenge.managedOrInvisible({ action: 'signin' });
if (!response) {
throw new Error('Captcha challenge failed');
}

const { captchaError, captchaToken, captchaWidgetType } = response;
return { captchaToken, captchaWidgetType, captchaError };
}

private async _create(params: SignInFutureCreateParams): Promise<void> {
const locale = getBrowserLocale();
const { captchaToken, captchaWidgetType, captchaError } = await this.getCaptchaToken(params);

const body: Record<string, unknown> = {
...params,
captchaToken,
captchaWidgetType,
captchaError,
locale: getBrowserLocale() || undefined,
};

await this.#resource.__internal_basePost({
path: this.#resource.pathRoot,
body: locale ? { locale, ...params } : params,
body,
});
}

Expand Down
51 changes: 24 additions & 27 deletions packages/clerk-js/src/core/resources/SignUp.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -173,13 +173,6 @@ export class SignUp extends BaseResource implements SignUpResource {
finalParams = { ...finalParams, ...captchaParams };
}

if (finalParams.transfer && this.shouldBypassCaptchaForAttempt(finalParams)) {

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

I cleaned up this code path, which is pointless: On a transfer, the backend already pulls the strategy from the transfer and ignores any strategy included in the query params. We don't need the SDK to also pull the strategy from the transfer and include it in the query params.

const strategy = SignUp.clerk.client?.signIn.firstFactorVerification.strategy;
if (strategy) {
finalParams = { ...finalParams, strategy: strategy as SignUpCreateParams['strategy'] };
}
}

return this._basePost({
path: this.pathRoot,
body: normalizeUnsafeMetadata(finalParams),
Expand DownExpand Up@@ -561,22 +554,24 @@ export class SignUp extends BaseResource implements SignUpResource {
* We delegate bot detection to the following providers, instead of relying on turnstile exclusively
*/
protected shouldBypassCaptchaForAttempt(params: SignUpCreateParams) {
if (!params.strategy) {
return false;
}

// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
const captchaOauthBypass = SignUp.clerk.__internal_environment!.displayConfig.captchaOauthBypass;

if (captchaOauthBypass.some(strategy => strategy === params.strategy)) {
// For transfers, inspect the SignIn strategy to determine bypass logic
if (params.transfer && SignUp.clerk.client?.signIn?.firstFactorVerification?.status === 'transferable') {
const signInStrategy = SignUp.clerk.client.signIn.firstFactorVerification.strategy;

// OAuth transfer: Check if strategy is in bypass list
if (signInStrategy?.startsWith('oauth_')) {
return captchaOauthBypass.some(strategy => strategy === signInStrategy);
}

// Non-OAuth transfer (signUpIfMissing): Captcha already validated during SignIn
return true;
}

if (
params.transfer &&
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
captchaOauthBypass.some(strategy => strategy === SignUp.clerk.client!.signIn.firstFactorVerification.strategy)
) {
// For direct SignUp (not transfer), check OAuth bypass
if (params.strategy && captchaOauthBypass.some(strategy => strategy === params.strategy)) {
return true;
}

Expand DownExpand Up@@ -787,22 +782,24 @@ class SignUpFuture implements SignUpFutureResource {
}

private shouldBypassCaptchaForAttempt(params: { strategy?: string; transfer?: boolean }) {
if (!params.strategy) {
return false;
}

// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
const captchaOauthBypass = SignUp.clerk.__internal_environment!.displayConfig.captchaOauthBypass;

if (captchaOauthBypass.some(strategy => strategy === params.strategy)) {
// For transfers, inspect the SignIn strategy to determine bypass logic
if (params.transfer && SignUp.clerk.client?.signIn?.firstFactorVerification?.status === 'transferable') {
const signInStrategy = SignUp.clerk.client.signIn.firstFactorVerification.strategy;

// OAuth transfer: Check if strategy is in bypass list
if (signInStrategy?.startsWith('oauth_')) {
return captchaOauthBypass.some(strategy => strategy === signInStrategy);
}

// Non-OAuth transfer (signUpIfMissing): Captcha already validated during SignIn
return true;
}

if (
params.transfer &&
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
captchaOauthBypass.some(strategy => strategy === SignUp.clerk.client!.signIn.firstFactorVerification.strategy)
) {
// For direct SignUp (not transfer), check OAuth bypass
if (params.strategy && captchaOauthBypass.some(strategy => strategy === params.strategy)) {
return true;
}

Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
feat(clerk-js): Add signUpIfMissing for SignIn by dmoerner · Pull Request #7749 · clerk/javascript · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions .changeset/strict-needles-taste.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
---
'@clerk/clerk-js': minor
'@clerk/shared': minor
---

Support `sign_up_if_missing` on SignIn.create, including captcha
2 changes: 1 addition & 1 deletion packages/clerk-js/bundlewatch.config.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,7 +5,7 @@
{ "path": "./dist/clerk.chips.browser.js", "maxSize": "66KB" },
{ "path": "./dist/clerk.legacy.browser.js", "maxSize": "108KB" },
{ "path": "./dist/clerk.no-rhc.js", "maxSize": "307KB" },
{ "path": "./dist/clerk.native.js", "maxSize": "65KB" },
{ "path": "./dist/clerk.native.js", "maxSize": "66KB" },
{ "path": "./dist/vendors*.js", "maxSize": "7KB" },
{ "path": "./dist/coinbase*.js", "maxSize": "36KB" },
{ "path": "./dist/base-account-sdk*.js", "maxSize": "203KB" },
Expand Down
140 changes: 135 additions & 5 deletions packages/clerk-js/src/core/resources/SignIn.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,6 +16,7 @@ import type {
AuthenticateWithPopupParams,
AuthenticateWithRedirectParams,
AuthenticateWithWeb3Params,
CaptchaWidgetType,
ClientTrustState,
CreateEmailLinkFlowReturn,
EmailCodeConfig,
Expand DownExpand Up@@ -82,6 +83,7 @@ import {
_futureAuthenticateWithPopup,
wrapWithPopupRoutes,
} from '../../utils/authenticateWithPopup';
import { CaptchaChallenge } from '../../utils/captcha/CaptchaChallenge';
import { runAsyncResourceTask } from '../../utils/runAsyncResourceTask';
import { loadZxcvbn } from '../../utils/zxcvbn';
import {
Expand DownExpand Up@@ -164,12 +166,34 @@ export class SignIn extends BaseResource implements SignInResource {
this.fromJSON(data);
}

create = (params: SignInCreateParams): Promise<SignInResource> => {
create = async (params: SignInCreateParams): Promise<SignInResource> => {
debugLogger.debug('SignIn.create', { id: this.id, strategy: 'strategy' in params ? params.strategy : undefined });
const locale = getBrowserLocale();

let body: Record<string, unknown> = { ...params };

// Inject browser locale
const browserLocale = getBrowserLocale();
if (browserLocale) {
body.locale = browserLocale;
}

if (
this.shouldRequireCaptcha(params) &&
!__BUILD_DISABLE_RHC__ &&
!this.clientBypass() &&
!this.shouldBypassCaptchaForAttempt(params)
) {
const captchaChallenge = new CaptchaChallenge(SignIn.clerk);
const captchaParams = await captchaChallenge.managedOrInvisible({ action: 'signin' });
if (!captchaParams) {
throw new ClerkRuntimeError('', { code: 'captcha_unavailable' });
}
body = { ...body, ...captchaParams };
}

return this._basePost({
path: this.pathRoot,
body: locale ? { locale, ...params } : params,
body: body,
});
};

Expand DownExpand Up@@ -576,6 +600,43 @@ export class SignIn extends BaseResource implements SignInResource {
return this;
}

private clientBypass() {
return SignIn.clerk.client?.captchaBypass;
}

/**
* Determines whether captcha is required for sign in based on the provided params.
* Add new conditions here as captcha requirements evolve.
*/
private shouldRequireCaptcha(params: SignInCreateParams): boolean {
if ('signUpIfMissing' in params && params.signUpIfMissing) {
return true;
}

return false;
}

/**
* We delegate bot detection to the following providers, instead of relying on turnstile exclusively
*/
protected shouldBypassCaptchaForAttempt(params: SignInCreateParams) {
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
const captchaOauthBypass = SignIn.clerk.__internal_environment!.displayConfig.captchaOauthBypass;

// Check transfer strategy against bypass list
if (params.transfer && SignIn.clerk.client?.signUp?.verifications?.externalAccount?.status === 'transferable') {
const signUpStrategy = SignIn.clerk.client.signUp.verifications.externalAccount.strategy;
return signUpStrategy ? captchaOauthBypass.some(strategy => strategy === signUpStrategy) : false;
}

// Check direct strategy against bypass list
if ('strategy' in params && params.strategy) {
return captchaOauthBypass.some(strategy => strategy === params.strategy);
}

return false;
}

public __internal_updateFromJSON(data: SignInJSON | SignInJSONSnapshot | null): this {
return this.fromJSON(data);
}
Expand DownExpand Up@@ -814,11 +875,80 @@ class SignInFuture implements SignInFutureResource {
});
}

/**
* Determines whether captcha is required for sign in based on the provided params.
* Add new conditions here as captcha requirements evolve.
*/
private shouldRequireCaptcha(params: { signUpIfMissing?: boolean }): boolean {
if (params.signUpIfMissing) {
return true;
}

return false;
}

private shouldBypassCaptchaForAttempt(params: { strategy?: string; transfer?: boolean }) {
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
const captchaOauthBypass = SignIn.clerk.__internal_environment!.displayConfig.captchaOauthBypass;

// Check transfer strategy against bypass list
if (params.transfer && SignIn.clerk.client?.signUp?.verifications?.externalAccount?.status === 'transferable') {
const signUpStrategy = SignIn.clerk.client.signUp.verifications.externalAccount.strategy;
return signUpStrategy ? captchaOauthBypass.some(strategy => strategy === signUpStrategy) : false;
}

// Check direct strategy against bypass list
if (params.strategy) {
return captchaOauthBypass.some(strategy => strategy === params.strategy);
}

return false;
}

private async getCaptchaToken(
params: { strategy?: string; transfer?: boolean; signUpIfMissing?: boolean } = {},
): Promise<{
captchaToken?: string;
captchaWidgetType?: CaptchaWidgetType;
captchaError?: unknown;
}> {
if (
!this.shouldRequireCaptcha(params) ||
__BUILD_DISABLE_RHC__ ||
SignIn.clerk.client?.captchaBypass ||
this.shouldBypassCaptchaForAttempt(params)
) {
return {
captchaToken: undefined,
captchaWidgetType: undefined,
captchaError: undefined,
};
}

const captchaChallenge = new CaptchaChallenge(SignIn.clerk);
const response = await captchaChallenge.managedOrInvisible({ action: 'signin' });
if (!response) {
throw new Error('Captcha challenge failed');
}

const { captchaError, captchaToken, captchaWidgetType } = response;
return { captchaToken, captchaWidgetType, captchaError };
}

private async _create(params: SignInFutureCreateParams): Promise<void> {
const locale = getBrowserLocale();
const { captchaToken, captchaWidgetType, captchaError } = await this.getCaptchaToken(params);

const body: Record<string, unknown> = {
...params,
captchaToken,
captchaWidgetType,
captchaError,
locale: getBrowserLocale() || undefined,
};

await this.#resource.__internal_basePost({
path: this.#resource.pathRoot,
body: locale ? { locale, ...params } : params,
body,
});
}

Expand Down
51 changes: 24 additions & 27 deletions packages/clerk-js/src/core/resources/SignUp.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -173,13 +173,6 @@ export class SignUp extends BaseResource implements SignUpResource {
finalParams = { ...finalParams, ...captchaParams };
}

if (finalParams.transfer && this.shouldBypassCaptchaForAttempt(finalParams)) {

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

I cleaned up this code path, which is pointless: On a transfer, the backend already pulls the strategy from the transfer and ignores any strategy included in the query params. We don't need the SDK to also pull the strategy from the transfer and include it in the query params.

const strategy = SignUp.clerk.client?.signIn.firstFactorVerification.strategy;
if (strategy) {
finalParams = { ...finalParams, strategy: strategy as SignUpCreateParams['strategy'] };
}
}

return this._basePost({
path: this.pathRoot,
body: normalizeUnsafeMetadata(finalParams),
Expand DownExpand Up@@ -561,22 +554,24 @@ export class SignUp extends BaseResource implements SignUpResource {
* We delegate bot detection to the following providers, instead of relying on turnstile exclusively
*/
protected shouldBypassCaptchaForAttempt(params: SignUpCreateParams) {
if (!params.strategy) {
return false;
}

// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
const captchaOauthBypass = SignUp.clerk.__internal_environment!.displayConfig.captchaOauthBypass;

if (captchaOauthBypass.some(strategy => strategy === params.strategy)) {
// For transfers, inspect the SignIn strategy to determine bypass logic
if (params.transfer && SignUp.clerk.client?.signIn?.firstFactorVerification?.status === 'transferable') {
const signInStrategy = SignUp.clerk.client.signIn.firstFactorVerification.strategy;

// OAuth transfer: Check if strategy is in bypass list
if (signInStrategy?.startsWith('oauth_')) {
return captchaOauthBypass.some(strategy => strategy === signInStrategy);
}

// Non-OAuth transfer (signUpIfMissing): Captcha already validated during SignIn
return true;
}

if (
params.transfer &&
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
captchaOauthBypass.some(strategy => strategy === SignUp.clerk.client!.signIn.firstFactorVerification.strategy)
) {
// For direct SignUp (not transfer), check OAuth bypass
if (params.strategy && captchaOauthBypass.some(strategy => strategy === params.strategy)) {
return true;
}

Expand DownExpand Up@@ -787,22 +782,24 @@ class SignUpFuture implements SignUpFutureResource {
}

private shouldBypassCaptchaForAttempt(params: { strategy?: string; transfer?: boolean }) {
if (!params.strategy) {
return false;
}

// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
const captchaOauthBypass = SignUp.clerk.__internal_environment!.displayConfig.captchaOauthBypass;

if (captchaOauthBypass.some(strategy => strategy === params.strategy)) {
// For transfers, inspect the SignIn strategy to determine bypass logic
if (params.transfer && SignUp.clerk.client?.signIn?.firstFactorVerification?.status === 'transferable') {
const signInStrategy = SignUp.clerk.client.signIn.firstFactorVerification.strategy;

// OAuth transfer: Check if strategy is in bypass list
if (signInStrategy?.startsWith('oauth_')) {
return captchaOauthBypass.some(strategy => strategy === signInStrategy);
}

// Non-OAuth transfer (signUpIfMissing): Captcha already validated during SignIn
return true;
}

if (
params.transfer &&
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
captchaOauthBypass.some(strategy => strategy === SignUp.clerk.client!.signIn.firstFactorVerification.strategy)
) {
// For direct SignUp (not transfer), check OAuth bypass
if (params.strategy && captchaOauthBypass.some(strategy => strategy === params.strategy)) {
return true;
}

Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Force GitHub README to respect dark mode (function() { var style = document.createElement('style'); style.textContent = ' .markdown-body { color-scheme: dark light; } .markdown-body pre { background: #161b22 !important; } .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; } .markdown-body table th, .markdown-body table td { border-color: #30363d !important; } .markdown-body img { background: #0d1117; } .markdown-body blockquote { border-left-color: #8b949e; } .markdown-body hr { border-color: #30363d; } '; document.head.appendChild(style); })(); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' feat(clerk-js): Add signUpIfMissing for SignIn by dmoerner · Pull Request #7749 · clerk/javascript · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions .changeset/strict-needles-taste.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
---
'@clerk/clerk-js': minor
'@clerk/shared': minor
---

Support `sign_up_if_missing` on SignIn.create, including captcha
2 changes: 1 addition & 1 deletion packages/clerk-js/bundlewatch.config.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,7 +5,7 @@
{ "path": "./dist/clerk.chips.browser.js", "maxSize": "66KB" },
{ "path": "./dist/clerk.legacy.browser.js", "maxSize": "108KB" },
{ "path": "./dist/clerk.no-rhc.js", "maxSize": "307KB" },
{ "path": "./dist/clerk.native.js", "maxSize": "65KB" },
{ "path": "./dist/clerk.native.js", "maxSize": "66KB" },
{ "path": "./dist/vendors*.js", "maxSize": "7KB" },
{ "path": "./dist/coinbase*.js", "maxSize": "36KB" },
{ "path": "./dist/base-account-sdk*.js", "maxSize": "203KB" },
Expand Down
140 changes: 135 additions & 5 deletions packages/clerk-js/src/core/resources/SignIn.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,6 +16,7 @@ import type {
AuthenticateWithPopupParams,
AuthenticateWithRedirectParams,
AuthenticateWithWeb3Params,
CaptchaWidgetType,
ClientTrustState,
CreateEmailLinkFlowReturn,
EmailCodeConfig,
Expand DownExpand Up@@ -82,6 +83,7 @@ import {
_futureAuthenticateWithPopup,
wrapWithPopupRoutes,
} from '../../utils/authenticateWithPopup';
import { CaptchaChallenge } from '../../utils/captcha/CaptchaChallenge';
import { runAsyncResourceTask } from '../../utils/runAsyncResourceTask';
import { loadZxcvbn } from '../../utils/zxcvbn';
import {
Expand DownExpand Up@@ -164,12 +166,34 @@ export class SignIn extends BaseResource implements SignInResource {
this.fromJSON(data);
}

create = (params: SignInCreateParams): Promise<SignInResource> => {
create = async (params: SignInCreateParams): Promise<SignInResource> => {
debugLogger.debug('SignIn.create', { id: this.id, strategy: 'strategy' in params ? params.strategy : undefined });
const locale = getBrowserLocale();

let body: Record<string, unknown> = { ...params };

// Inject browser locale
const browserLocale = getBrowserLocale();
if (browserLocale) {
body.locale = browserLocale;
}

if (
this.shouldRequireCaptcha(params) &&
!__BUILD_DISABLE_RHC__ &&
!this.clientBypass() &&
!this.shouldBypassCaptchaForAttempt(params)
) {
const captchaChallenge = new CaptchaChallenge(SignIn.clerk);
const captchaParams = await captchaChallenge.managedOrInvisible({ action: 'signin' });
if (!captchaParams) {
throw new ClerkRuntimeError('', { code: 'captcha_unavailable' });
}
body = { ...body, ...captchaParams };
}

return this._basePost({
path: this.pathRoot,
body: locale ? { locale, ...params } : params,
body: body,
});
};

Expand DownExpand Up@@ -576,6 +600,43 @@ export class SignIn extends BaseResource implements SignInResource {
return this;
}

private clientBypass() {
return SignIn.clerk.client?.captchaBypass;
}

/**
* Determines whether captcha is required for sign in based on the provided params.
* Add new conditions here as captcha requirements evolve.
*/
private shouldRequireCaptcha(params: SignInCreateParams): boolean {
if ('signUpIfMissing' in params && params.signUpIfMissing) {
return true;
}

return false;
}

/**
* We delegate bot detection to the following providers, instead of relying on turnstile exclusively
*/
protected shouldBypassCaptchaForAttempt(params: SignInCreateParams) {
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
const captchaOauthBypass = SignIn.clerk.__internal_environment!.displayConfig.captchaOauthBypass;

// Check transfer strategy against bypass list
if (params.transfer && SignIn.clerk.client?.signUp?.verifications?.externalAccount?.status === 'transferable') {
const signUpStrategy = SignIn.clerk.client.signUp.verifications.externalAccount.strategy;
return signUpStrategy ? captchaOauthBypass.some(strategy => strategy === signUpStrategy) : false;
}

// Check direct strategy against bypass list
if ('strategy' in params && params.strategy) {
return captchaOauthBypass.some(strategy => strategy === params.strategy);
}

return false;
}

public __internal_updateFromJSON(data: SignInJSON | SignInJSONSnapshot | null): this {
return this.fromJSON(data);
}
Expand DownExpand Up@@ -814,11 +875,80 @@ class SignInFuture implements SignInFutureResource {
});
}

/**
* Determines whether captcha is required for sign in based on the provided params.
* Add new conditions here as captcha requirements evolve.
*/
private shouldRequireCaptcha(params: { signUpIfMissing?: boolean }): boolean {
if (params.signUpIfMissing) {
return true;
}

return false;
}

private shouldBypassCaptchaForAttempt(params: { strategy?: string; transfer?: boolean }) {
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
const captchaOauthBypass = SignIn.clerk.__internal_environment!.displayConfig.captchaOauthBypass;

// Check transfer strategy against bypass list
if (params.transfer && SignIn.clerk.client?.signUp?.verifications?.externalAccount?.status === 'transferable') {
const signUpStrategy = SignIn.clerk.client.signUp.verifications.externalAccount.strategy;
return signUpStrategy ? captchaOauthBypass.some(strategy => strategy === signUpStrategy) : false;
}

// Check direct strategy against bypass list
if (params.strategy) {
return captchaOauthBypass.some(strategy => strategy === params.strategy);
}

return false;
}

private async getCaptchaToken(
params: { strategy?: string; transfer?: boolean; signUpIfMissing?: boolean } = {},
): Promise<{
captchaToken?: string;
captchaWidgetType?: CaptchaWidgetType;
captchaError?: unknown;
}> {
if (
!this.shouldRequireCaptcha(params) ||
__BUILD_DISABLE_RHC__ ||
SignIn.clerk.client?.captchaBypass ||
this.shouldBypassCaptchaForAttempt(params)
) {
return {
captchaToken: undefined,
captchaWidgetType: undefined,
captchaError: undefined,
};
}

const captchaChallenge = new CaptchaChallenge(SignIn.clerk);
const response = await captchaChallenge.managedOrInvisible({ action: 'signin' });
if (!response) {
throw new Error('Captcha challenge failed');
}

const { captchaError, captchaToken, captchaWidgetType } = response;
return { captchaToken, captchaWidgetType, captchaError };
}

private async _create(params: SignInFutureCreateParams): Promise<void> {
const locale = getBrowserLocale();
const { captchaToken, captchaWidgetType, captchaError } = await this.getCaptchaToken(params);

const body: Record<string, unknown> = {
...params,
captchaToken,
captchaWidgetType,
captchaError,
locale: getBrowserLocale() || undefined,
};

await this.#resource.__internal_basePost({
path: this.#resource.pathRoot,
body: locale ? { locale, ...params } : params,
body,
});
}

Expand Down
51 changes: 24 additions & 27 deletions packages/clerk-js/src/core/resources/SignUp.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -173,13 +173,6 @@ export class SignUp extends BaseResource implements SignUpResource {
finalParams = { ...finalParams, ...captchaParams };
}

if (finalParams.transfer && this.shouldBypassCaptchaForAttempt(finalParams)) {

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

I cleaned up this code path, which is pointless: On a transfer, the backend already pulls the strategy from the transfer and ignores any strategy included in the query params. We don't need the SDK to also pull the strategy from the transfer and include it in the query params.

const strategy = SignUp.clerk.client?.signIn.firstFactorVerification.strategy;
if (strategy) {
finalParams = { ...finalParams, strategy: strategy as SignUpCreateParams['strategy'] };
}
}

return this._basePost({
path: this.pathRoot,
body: normalizeUnsafeMetadata(finalParams),
Expand DownExpand Up@@ -561,22 +554,24 @@ export class SignUp extends BaseResource implements SignUpResource {
* We delegate bot detection to the following providers, instead of relying on turnstile exclusively
*/
protected shouldBypassCaptchaForAttempt(params: SignUpCreateParams) {
if (!params.strategy) {
return false;
}

// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
const captchaOauthBypass = SignUp.clerk.__internal_environment!.displayConfig.captchaOauthBypass;

if (captchaOauthBypass.some(strategy => strategy === params.strategy)) {
// For transfers, inspect the SignIn strategy to determine bypass logic
if (params.transfer && SignUp.clerk.client?.signIn?.firstFactorVerification?.status === 'transferable') {
const signInStrategy = SignUp.clerk.client.signIn.firstFactorVerification.strategy;

// OAuth transfer: Check if strategy is in bypass list
if (signInStrategy?.startsWith('oauth_')) {
return captchaOauthBypass.some(strategy => strategy === signInStrategy);
}

// Non-OAuth transfer (signUpIfMissing): Captcha already validated during SignIn
return true;
}

if (
params.transfer &&
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
captchaOauthBypass.some(strategy => strategy === SignUp.clerk.client!.signIn.firstFactorVerification.strategy)
) {
// For direct SignUp (not transfer), check OAuth bypass
if (params.strategy && captchaOauthBypass.some(strategy => strategy === params.strategy)) {
return true;
}

Expand DownExpand Up@@ -787,22 +782,24 @@ class SignUpFuture implements SignUpFutureResource {
}

private shouldBypassCaptchaForAttempt(params: { strategy?: string; transfer?: boolean }) {
if (!params.strategy) {
return false;
}

// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
const captchaOauthBypass = SignUp.clerk.__internal_environment!.displayConfig.captchaOauthBypass;

if (captchaOauthBypass.some(strategy => strategy === params.strategy)) {
// For transfers, inspect the SignIn strategy to determine bypass logic
if (params.transfer && SignUp.clerk.client?.signIn?.firstFactorVerification?.status === 'transferable') {
const signInStrategy = SignUp.clerk.client.signIn.firstFactorVerification.strategy;

// OAuth transfer: Check if strategy is in bypass list
if (signInStrategy?.startsWith('oauth_')) {
return captchaOauthBypass.some(strategy => strategy === signInStrategy);
}

// Non-OAuth transfer (signUpIfMissing): Captcha already validated during SignIn
return true;
}

if (
params.transfer &&
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
captchaOauthBypass.some(strategy => strategy === SignUp.clerk.client!.signIn.firstFactorVerification.strategy)
) {
// For direct SignUp (not transfer), check OAuth bypass
if (params.strategy && captchaOauthBypass.some(strategy => strategy === params.strategy)) {
return true;
}

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

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions .changeset/strict-needles-taste.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
---
'@clerk/clerk-js': minor
'@clerk/shared': minor
---

Support `sign_up_if_missing` on SignIn.create, including captcha
2 changes: 1 addition & 1 deletion packages/clerk-js/bundlewatch.config.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,7 +5,7 @@
{ "path": "./dist/clerk.chips.browser.js", "maxSize": "66KB" },
{ "path": "./dist/clerk.legacy.browser.js", "maxSize": "108KB" },
{ "path": "./dist/clerk.no-rhc.js", "maxSize": "307KB" },
{ "path": "./dist/clerk.native.js", "maxSize": "65KB" },
{ "path": "./dist/clerk.native.js", "maxSize": "66KB" },
{ "path": "./dist/vendors*.js", "maxSize": "7KB" },
{ "path": "./dist/coinbase*.js", "maxSize": "36KB" },
{ "path": "./dist/base-account-sdk*.js", "maxSize": "203KB" },
Expand Down
140 changes: 135 additions & 5 deletions packages/clerk-js/src/core/resources/SignIn.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,6 +16,7 @@ import type {
AuthenticateWithPopupParams,
AuthenticateWithRedirectParams,
AuthenticateWithWeb3Params,
CaptchaWidgetType,
ClientTrustState,
CreateEmailLinkFlowReturn,
EmailCodeConfig,
Expand DownExpand Up@@ -82,6 +83,7 @@ import {
_futureAuthenticateWithPopup,
wrapWithPopupRoutes,
} from '../../utils/authenticateWithPopup';
import { CaptchaChallenge } from '../../utils/captcha/CaptchaChallenge';
import { runAsyncResourceTask } from '../../utils/runAsyncResourceTask';
import { loadZxcvbn } from '../../utils/zxcvbn';
import {
Expand DownExpand Up@@ -164,12 +166,34 @@ export class SignIn extends BaseResource implements SignInResource {
this.fromJSON(data);
}

create = (params: SignInCreateParams): Promise<SignInResource> => {
create = async (params: SignInCreateParams): Promise<SignInResource> => {
debugLogger.debug('SignIn.create', { id: this.id, strategy: 'strategy' in params ? params.strategy : undefined });
const locale = getBrowserLocale();

let body: Record<string, unknown> = { ...params };

// Inject browser locale
const browserLocale = getBrowserLocale();
if (browserLocale) {
body.locale = browserLocale;
}

if (
this.shouldRequireCaptcha(params) &&
!__BUILD_DISABLE_RHC__ &&
!this.clientBypass() &&
!this.shouldBypassCaptchaForAttempt(params)
) {
const captchaChallenge = new CaptchaChallenge(SignIn.clerk);
const captchaParams = await captchaChallenge.managedOrInvisible({ action: 'signin' });
if (!captchaParams) {
throw new ClerkRuntimeError('', { code: 'captcha_unavailable' });
}
body = { ...body, ...captchaParams };
}

return this._basePost({
path: this.pathRoot,
body: locale ? { locale, ...params } : params,
body: body,
});
};

Expand DownExpand Up@@ -576,6 +600,43 @@ export class SignIn extends BaseResource implements SignInResource {
return this;
}

private clientBypass() {
return SignIn.clerk.client?.captchaBypass;
}

/**
* Determines whether captcha is required for sign in based on the provided params.
* Add new conditions here as captcha requirements evolve.
*/
private shouldRequireCaptcha(params: SignInCreateParams): boolean {
if ('signUpIfMissing' in params && params.signUpIfMissing) {
return true;
}

return false;
}

/**
* We delegate bot detection to the following providers, instead of relying on turnstile exclusively
*/
protected shouldBypassCaptchaForAttempt(params: SignInCreateParams) {
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
const captchaOauthBypass = SignIn.clerk.__internal_environment!.displayConfig.captchaOauthBypass;

// Check transfer strategy against bypass list
if (params.transfer && SignIn.clerk.client?.signUp?.verifications?.externalAccount?.status === 'transferable') {
const signUpStrategy = SignIn.clerk.client.signUp.verifications.externalAccount.strategy;
return signUpStrategy ? captchaOauthBypass.some(strategy => strategy === signUpStrategy) : false;
}

// Check direct strategy against bypass list
if ('strategy' in params && params.strategy) {
return captchaOauthBypass.some(strategy => strategy === params.strategy);
}

return false;
}

public __internal_updateFromJSON(data: SignInJSON | SignInJSONSnapshot | null): this {
return this.fromJSON(data);
}
Expand DownExpand Up@@ -814,11 +875,80 @@ class SignInFuture implements SignInFutureResource {
});
}

/**
* Determines whether captcha is required for sign in based on the provided params.
* Add new conditions here as captcha requirements evolve.
*/
private shouldRequireCaptcha(params: { signUpIfMissing?: boolean }): boolean {
if (params.signUpIfMissing) {
return true;
}

return false;
}

private shouldBypassCaptchaForAttempt(params: { strategy?: string; transfer?: boolean }) {
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
const captchaOauthBypass = SignIn.clerk.__internal_environment!.displayConfig.captchaOauthBypass;

// Check transfer strategy against bypass list
if (params.transfer && SignIn.clerk.client?.signUp?.verifications?.externalAccount?.status === 'transferable') {
const signUpStrategy = SignIn.clerk.client.signUp.verifications.externalAccount.strategy;
return signUpStrategy ? captchaOauthBypass.some(strategy => strategy === signUpStrategy) : false;
}

// Check direct strategy against bypass list
if (params.strategy) {
return captchaOauthBypass.some(strategy => strategy === params.strategy);
}

return false;
}

private async getCaptchaToken(
params: { strategy?: string; transfer?: boolean; signUpIfMissing?: boolean } = {},
): Promise<{
captchaToken?: string;
captchaWidgetType?: CaptchaWidgetType;
captchaError?: unknown;
}> {
if (
!this.shouldRequireCaptcha(params) ||
__BUILD_DISABLE_RHC__ ||
SignIn.clerk.client?.captchaBypass ||
this.shouldBypassCaptchaForAttempt(params)
) {
return {
captchaToken: undefined,
captchaWidgetType: undefined,
captchaError: undefined,
};
}

const captchaChallenge = new CaptchaChallenge(SignIn.clerk);
const response = await captchaChallenge.managedOrInvisible({ action: 'signin' });
if (!response) {
throw new Error('Captcha challenge failed');
}

const { captchaError, captchaToken, captchaWidgetType } = response;
return { captchaToken, captchaWidgetType, captchaError };
}

private async _create(params: SignInFutureCreateParams): Promise<void> {
const locale = getBrowserLocale();
const { captchaToken, captchaWidgetType, captchaError } = await this.getCaptchaToken(params);

const body: Record<string, unknown> = {
...params,
captchaToken,
captchaWidgetType,
captchaError,
locale: getBrowserLocale() || undefined,
};

await this.#resource.__internal_basePost({
path: this.#resource.pathRoot,
body: locale ? { locale, ...params } : params,
body,
});
}

Expand Down
51 changes: 24 additions & 27 deletions packages/clerk-js/src/core/resources/SignUp.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -173,13 +173,6 @@ export class SignUp extends BaseResource implements SignUpResource {
finalParams = { ...finalParams, ...captchaParams };
}

if (finalParams.transfer && this.shouldBypassCaptchaForAttempt(finalParams)) {

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

I cleaned up this code path, which is pointless: On a transfer, the backend already pulls the strategy from the transfer and ignores any strategy included in the query params. We don't need the SDK to also pull the strategy from the transfer and include it in the query params.

const strategy = SignUp.clerk.client?.signIn.firstFactorVerification.strategy;
if (strategy) {
finalParams = { ...finalParams, strategy: strategy as SignUpCreateParams['strategy'] };
}
}

return this._basePost({
path: this.pathRoot,
body: normalizeUnsafeMetadata(finalParams),
Expand DownExpand Up@@ -561,22 +554,24 @@ export class SignUp extends BaseResource implements SignUpResource {
* We delegate bot detection to the following providers, instead of relying on turnstile exclusively
*/
protected shouldBypassCaptchaForAttempt(params: SignUpCreateParams) {
if (!params.strategy) {
return false;
}

// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
const captchaOauthBypass = SignUp.clerk.__internal_environment!.displayConfig.captchaOauthBypass;

if (captchaOauthBypass.some(strategy => strategy === params.strategy)) {
// For transfers, inspect the SignIn strategy to determine bypass logic
if (params.transfer && SignUp.clerk.client?.signIn?.firstFactorVerification?.status === 'transferable') {
const signInStrategy = SignUp.clerk.client.signIn.firstFactorVerification.strategy;

// OAuth transfer: Check if strategy is in bypass list
if (signInStrategy?.startsWith('oauth_')) {
return captchaOauthBypass.some(strategy => strategy === signInStrategy);
}

// Non-OAuth transfer (signUpIfMissing): Captcha already validated during SignIn
return true;
}

if (
params.transfer &&
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
captchaOauthBypass.some(strategy => strategy === SignUp.clerk.client!.signIn.firstFactorVerification.strategy)
) {
// For direct SignUp (not transfer), check OAuth bypass
if (params.strategy && captchaOauthBypass.some(strategy => strategy === params.strategy)) {
return true;
}

Expand DownExpand Up@@ -787,22 +782,24 @@ class SignUpFuture implements SignUpFutureResource {
}

private shouldBypassCaptchaForAttempt(params: { strategy?: string; transfer?: boolean }) {
if (!params.strategy) {
return false;
}

// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
const captchaOauthBypass = SignUp.clerk.__internal_environment!.displayConfig.captchaOauthBypass;

if (captchaOauthBypass.some(strategy => strategy === params.strategy)) {
// For transfers, inspect the SignIn strategy to determine bypass logic
if (params.transfer && SignUp.clerk.client?.signIn?.firstFactorVerification?.status === 'transferable') {
const signInStrategy = SignUp.clerk.client.signIn.firstFactorVerification.strategy;

// OAuth transfer: Check if strategy is in bypass list
if (signInStrategy?.startsWith('oauth_')) {
return captchaOauthBypass.some(strategy => strategy === signInStrategy);
}

// Non-OAuth transfer (signUpIfMissing): Captcha already validated during SignIn
return true;
}

if (
params.transfer &&
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
captchaOauthBypass.some(strategy => strategy === SignUp.clerk.client!.signIn.firstFactorVerification.strategy)
) {
// For direct SignUp (not transfer), check OAuth bypass
if (params.strategy && captchaOauthBypass.some(strategy => strategy === params.strategy)) {
return true;
}

Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Strip utm_, fbclid, gclid, etc. from all links on page (function() { var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content', 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid', 'ref', 'ref_src', 'source', 'medium', 'campaign']; function cleanUrl(url) { try { var u = new URL(url, window.location.origin); var changed = false; trackingParams.forEach(function(p) { if (u.searchParams.has(p)) { u.searchParams.delete(p); changed = true; } }); return changed ? u.toString() : url; } catch (e) { return url; } } function cleanLinks() { document.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } cleanLinks(); var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1) { if (node.tagName === 'A') cleanLinks(); node.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + ' feat(clerk-js): Add signUpIfMissing for SignIn by dmoerner · Pull Request #7749 · clerk/javascript · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions .changeset/strict-needles-taste.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
---
'@clerk/clerk-js': minor
'@clerk/shared': minor
---

Support `sign_up_if_missing` on SignIn.create, including captcha
2 changes: 1 addition & 1 deletion packages/clerk-js/bundlewatch.config.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,7 +5,7 @@
{ "path": "./dist/clerk.chips.browser.js", "maxSize": "66KB" },
{ "path": "./dist/clerk.legacy.browser.js", "maxSize": "108KB" },
{ "path": "./dist/clerk.no-rhc.js", "maxSize": "307KB" },
{ "path": "./dist/clerk.native.js", "maxSize": "65KB" },
{ "path": "./dist/clerk.native.js", "maxSize": "66KB" },
{ "path": "./dist/vendors*.js", "maxSize": "7KB" },
{ "path": "./dist/coinbase*.js", "maxSize": "36KB" },
{ "path": "./dist/base-account-sdk*.js", "maxSize": "203KB" },
Expand Down
140 changes: 135 additions & 5 deletions packages/clerk-js/src/core/resources/SignIn.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,6 +16,7 @@ import type {
AuthenticateWithPopupParams,
AuthenticateWithRedirectParams,
AuthenticateWithWeb3Params,
CaptchaWidgetType,
ClientTrustState,
CreateEmailLinkFlowReturn,
EmailCodeConfig,
Expand DownExpand Up@@ -82,6 +83,7 @@ import {
_futureAuthenticateWithPopup,
wrapWithPopupRoutes,
} from '../../utils/authenticateWithPopup';
import { CaptchaChallenge } from '../../utils/captcha/CaptchaChallenge';
import { runAsyncResourceTask } from '../../utils/runAsyncResourceTask';
import { loadZxcvbn } from '../../utils/zxcvbn';
import {
Expand DownExpand Up@@ -164,12 +166,34 @@ export class SignIn extends BaseResource implements SignInResource {
this.fromJSON(data);
}

create = (params: SignInCreateParams): Promise<SignInResource> => {
create = async (params: SignInCreateParams): Promise<SignInResource> => {
debugLogger.debug('SignIn.create', { id: this.id, strategy: 'strategy' in params ? params.strategy : undefined });
const locale = getBrowserLocale();

let body: Record<string, unknown> = { ...params };

// Inject browser locale
const browserLocale = getBrowserLocale();
if (browserLocale) {
body.locale = browserLocale;
}

if (
this.shouldRequireCaptcha(params) &&
!__BUILD_DISABLE_RHC__ &&
!this.clientBypass() &&
!this.shouldBypassCaptchaForAttempt(params)
) {
const captchaChallenge = new CaptchaChallenge(SignIn.clerk);
const captchaParams = await captchaChallenge.managedOrInvisible({ action: 'signin' });
if (!captchaParams) {
throw new ClerkRuntimeError('', { code: 'captcha_unavailable' });
}
body = { ...body, ...captchaParams };
}

return this._basePost({
path: this.pathRoot,
body: locale ? { locale, ...params } : params,
body: body,
});
};

Expand DownExpand Up@@ -576,6 +600,43 @@ export class SignIn extends BaseResource implements SignInResource {
return this;
}

private clientBypass() {
return SignIn.clerk.client?.captchaBypass;
}

/**
* Determines whether captcha is required for sign in based on the provided params.
* Add new conditions here as captcha requirements evolve.
*/
private shouldRequireCaptcha(params: SignInCreateParams): boolean {
if ('signUpIfMissing' in params && params.signUpIfMissing) {
return true;
}

return false;
}

/**
* We delegate bot detection to the following providers, instead of relying on turnstile exclusively
*/
protected shouldBypassCaptchaForAttempt(params: SignInCreateParams) {
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
const captchaOauthBypass = SignIn.clerk.__internal_environment!.displayConfig.captchaOauthBypass;

// Check transfer strategy against bypass list
if (params.transfer && SignIn.clerk.client?.signUp?.verifications?.externalAccount?.status === 'transferable') {
const signUpStrategy = SignIn.clerk.client.signUp.verifications.externalAccount.strategy;
return signUpStrategy ? captchaOauthBypass.some(strategy => strategy === signUpStrategy) : false;
}

// Check direct strategy against bypass list
if ('strategy' in params && params.strategy) {
return captchaOauthBypass.some(strategy => strategy === params.strategy);
}

return false;
}

public __internal_updateFromJSON(data: SignInJSON | SignInJSONSnapshot | null): this {
return this.fromJSON(data);
}
Expand DownExpand Up@@ -814,11 +875,80 @@ class SignInFuture implements SignInFutureResource {
});
}

/**
* Determines whether captcha is required for sign in based on the provided params.
* Add new conditions here as captcha requirements evolve.
*/
private shouldRequireCaptcha(params: { signUpIfMissing?: boolean }): boolean {
if (params.signUpIfMissing) {
return true;
}

return false;
}

private shouldBypassCaptchaForAttempt(params: { strategy?: string; transfer?: boolean }) {
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
const captchaOauthBypass = SignIn.clerk.__internal_environment!.displayConfig.captchaOauthBypass;

// Check transfer strategy against bypass list
if (params.transfer && SignIn.clerk.client?.signUp?.verifications?.externalAccount?.status === 'transferable') {
const signUpStrategy = SignIn.clerk.client.signUp.verifications.externalAccount.strategy;
return signUpStrategy ? captchaOauthBypass.some(strategy => strategy === signUpStrategy) : false;
}

// Check direct strategy against bypass list
if (params.strategy) {
return captchaOauthBypass.some(strategy => strategy === params.strategy);
}

return false;
}

private async getCaptchaToken(
params: { strategy?: string; transfer?: boolean; signUpIfMissing?: boolean } = {},
): Promise<{
captchaToken?: string;
captchaWidgetType?: CaptchaWidgetType;
captchaError?: unknown;
}> {
if (
!this.shouldRequireCaptcha(params) ||
__BUILD_DISABLE_RHC__ ||
SignIn.clerk.client?.captchaBypass ||
this.shouldBypassCaptchaForAttempt(params)
) {
return {
captchaToken: undefined,
captchaWidgetType: undefined,
captchaError: undefined,
};
}

const captchaChallenge = new CaptchaChallenge(SignIn.clerk);
const response = await captchaChallenge.managedOrInvisible({ action: 'signin' });
if (!response) {
throw new Error('Captcha challenge failed');
}

const { captchaError, captchaToken, captchaWidgetType } = response;
return { captchaToken, captchaWidgetType, captchaError };
}

private async _create(params: SignInFutureCreateParams): Promise<void> {
const locale = getBrowserLocale();
const { captchaToken, captchaWidgetType, captchaError } = await this.getCaptchaToken(params);

const body: Record<string, unknown> = {
...params,
captchaToken,
captchaWidgetType,
captchaError,
locale: getBrowserLocale() || undefined,
};

await this.#resource.__internal_basePost({
path: this.#resource.pathRoot,
body: locale ? { locale, ...params } : params,
body,
});
}

Expand Down
51 changes: 24 additions & 27 deletions packages/clerk-js/src/core/resources/SignUp.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -173,13 +173,6 @@ export class SignUp extends BaseResource implements SignUpResource {
finalParams = { ...finalParams, ...captchaParams };
}

if (finalParams.transfer && this.shouldBypassCaptchaForAttempt(finalParams)) {

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

I cleaned up this code path, which is pointless: On a transfer, the backend already pulls the strategy from the transfer and ignores any strategy included in the query params. We don't need the SDK to also pull the strategy from the transfer and include it in the query params.

const strategy = SignUp.clerk.client?.signIn.firstFactorVerification.strategy;
if (strategy) {
finalParams = { ...finalParams, strategy: strategy as SignUpCreateParams['strategy'] };
}
}

return this._basePost({
path: this.pathRoot,
body: normalizeUnsafeMetadata(finalParams),
Expand DownExpand Up@@ -561,22 +554,24 @@ export class SignUp extends BaseResource implements SignUpResource {
* We delegate bot detection to the following providers, instead of relying on turnstile exclusively
*/
protected shouldBypassCaptchaForAttempt(params: SignUpCreateParams) {
if (!params.strategy) {
return false;
}

// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
const captchaOauthBypass = SignUp.clerk.__internal_environment!.displayConfig.captchaOauthBypass;

if (captchaOauthBypass.some(strategy => strategy === params.strategy)) {
// For transfers, inspect the SignIn strategy to determine bypass logic
if (params.transfer && SignUp.clerk.client?.signIn?.firstFactorVerification?.status === 'transferable') {
const signInStrategy = SignUp.clerk.client.signIn.firstFactorVerification.strategy;

// OAuth transfer: Check if strategy is in bypass list
if (signInStrategy?.startsWith('oauth_')) {
return captchaOauthBypass.some(strategy => strategy === signInStrategy);
}

// Non-OAuth transfer (signUpIfMissing): Captcha already validated during SignIn
return true;
}

if (
params.transfer &&
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
captchaOauthBypass.some(strategy => strategy === SignUp.clerk.client!.signIn.firstFactorVerification.strategy)
) {
// For direct SignUp (not transfer), check OAuth bypass
if (params.strategy && captchaOauthBypass.some(strategy => strategy === params.strategy)) {
return true;
}

Expand DownExpand Up@@ -787,22 +782,24 @@ class SignUpFuture implements SignUpFutureResource {
}

private shouldBypassCaptchaForAttempt(params: { strategy?: string; transfer?: boolean }) {
if (!params.strategy) {
return false;
}

// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
const captchaOauthBypass = SignUp.clerk.__internal_environment!.displayConfig.captchaOauthBypass;

if (captchaOauthBypass.some(strategy => strategy === params.strategy)) {
// For transfers, inspect the SignIn strategy to determine bypass logic
if (params.transfer && SignUp.clerk.client?.signIn?.firstFactorVerification?.status === 'transferable') {
const signInStrategy = SignUp.clerk.client.signIn.firstFactorVerification.strategy;

// OAuth transfer: Check if strategy is in bypass list
if (signInStrategy?.startsWith('oauth_')) {
return captchaOauthBypass.some(strategy => strategy === signInStrategy);
}

// Non-OAuth transfer (signUpIfMissing): Captcha already validated during SignIn
return true;
}

if (
params.transfer &&
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
captchaOauthBypass.some(strategy => strategy === SignUp.clerk.client!.signIn.firstFactorVerification.strategy)
) {
// For direct SignUp (not transfer), check OAuth bypass
if (params.strategy && captchaOauthBypass.some(strategy => strategy === params.strategy)) {
return true;
}

Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Auto-enable theater mode on YouTube (function() { function tryTheater() { var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]'); if (btn && !btn.classList.contains('activated')) { btn.click(); } } // Try immediately tryTheater(); // Try after navigation (SPA) var lastUrl = location.href; setInterval(function() { if (location.href !== lastUrl) { lastUrl = location.href; setTimeout(tryTheater, 500); } }, 1000); // Also try on player load var observer = new MutationObserver(tryTheater); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' feat(clerk-js): Add signUpIfMissing for SignIn by dmoerner · Pull Request #7749 · clerk/javascript · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions .changeset/strict-needles-taste.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
---
'@clerk/clerk-js': minor
'@clerk/shared': minor
---

Support `sign_up_if_missing` on SignIn.create, including captcha
2 changes: 1 addition & 1 deletion packages/clerk-js/bundlewatch.config.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,7 +5,7 @@
{ "path": "./dist/clerk.chips.browser.js", "maxSize": "66KB" },
{ "path": "./dist/clerk.legacy.browser.js", "maxSize": "108KB" },
{ "path": "./dist/clerk.no-rhc.js", "maxSize": "307KB" },
{ "path": "./dist/clerk.native.js", "maxSize": "65KB" },
{ "path": "./dist/clerk.native.js", "maxSize": "66KB" },
{ "path": "./dist/vendors*.js", "maxSize": "7KB" },
{ "path": "./dist/coinbase*.js", "maxSize": "36KB" },
{ "path": "./dist/base-account-sdk*.js", "maxSize": "203KB" },
Expand Down
140 changes: 135 additions & 5 deletions packages/clerk-js/src/core/resources/SignIn.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,6 +16,7 @@ import type {
AuthenticateWithPopupParams,
AuthenticateWithRedirectParams,
AuthenticateWithWeb3Params,
CaptchaWidgetType,
ClientTrustState,
CreateEmailLinkFlowReturn,
EmailCodeConfig,
Expand DownExpand Up@@ -82,6 +83,7 @@ import {
_futureAuthenticateWithPopup,
wrapWithPopupRoutes,
} from '../../utils/authenticateWithPopup';
import { CaptchaChallenge } from '../../utils/captcha/CaptchaChallenge';
import { runAsyncResourceTask } from '../../utils/runAsyncResourceTask';
import { loadZxcvbn } from '../../utils/zxcvbn';
import {
Expand DownExpand Up@@ -164,12 +166,34 @@ export class SignIn extends BaseResource implements SignInResource {
this.fromJSON(data);
}

create = (params: SignInCreateParams): Promise<SignInResource> => {
create = async (params: SignInCreateParams): Promise<SignInResource> => {
debugLogger.debug('SignIn.create', { id: this.id, strategy: 'strategy' in params ? params.strategy : undefined });
const locale = getBrowserLocale();

let body: Record<string, unknown> = { ...params };

// Inject browser locale
const browserLocale = getBrowserLocale();
if (browserLocale) {
body.locale = browserLocale;
}

if (
this.shouldRequireCaptcha(params) &&
!__BUILD_DISABLE_RHC__ &&
!this.clientBypass() &&
!this.shouldBypassCaptchaForAttempt(params)
) {
const captchaChallenge = new CaptchaChallenge(SignIn.clerk);
const captchaParams = await captchaChallenge.managedOrInvisible({ action: 'signin' });
if (!captchaParams) {
throw new ClerkRuntimeError('', { code: 'captcha_unavailable' });
}
body = { ...body, ...captchaParams };
}

return this._basePost({
path: this.pathRoot,
body: locale ? { locale, ...params } : params,
body: body,
});
};

Expand DownExpand Up@@ -576,6 +600,43 @@ export class SignIn extends BaseResource implements SignInResource {
return this;
}

private clientBypass() {
return SignIn.clerk.client?.captchaBypass;
}

/**
* Determines whether captcha is required for sign in based on the provided params.
* Add new conditions here as captcha requirements evolve.
*/
private shouldRequireCaptcha(params: SignInCreateParams): boolean {
if ('signUpIfMissing' in params && params.signUpIfMissing) {
return true;
}

return false;
}

/**
* We delegate bot detection to the following providers, instead of relying on turnstile exclusively
*/
protected shouldBypassCaptchaForAttempt(params: SignInCreateParams) {
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
const captchaOauthBypass = SignIn.clerk.__internal_environment!.displayConfig.captchaOauthBypass;

// Check transfer strategy against bypass list
if (params.transfer && SignIn.clerk.client?.signUp?.verifications?.externalAccount?.status === 'transferable') {
const signUpStrategy = SignIn.clerk.client.signUp.verifications.externalAccount.strategy;
return signUpStrategy ? captchaOauthBypass.some(strategy => strategy === signUpStrategy) : false;
}

// Check direct strategy against bypass list
if ('strategy' in params && params.strategy) {
return captchaOauthBypass.some(strategy => strategy === params.strategy);
}

return false;
}

public __internal_updateFromJSON(data: SignInJSON | SignInJSONSnapshot | null): this {
return this.fromJSON(data);
}
Expand DownExpand Up@@ -814,11 +875,80 @@ class SignInFuture implements SignInFutureResource {
});
}

/**
* Determines whether captcha is required for sign in based on the provided params.
* Add new conditions here as captcha requirements evolve.
*/
private shouldRequireCaptcha(params: { signUpIfMissing?: boolean }): boolean {
if (params.signUpIfMissing) {
return true;
}

return false;
}

private shouldBypassCaptchaForAttempt(params: { strategy?: string; transfer?: boolean }) {
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
const captchaOauthBypass = SignIn.clerk.__internal_environment!.displayConfig.captchaOauthBypass;

// Check transfer strategy against bypass list
if (params.transfer && SignIn.clerk.client?.signUp?.verifications?.externalAccount?.status === 'transferable') {
const signUpStrategy = SignIn.clerk.client.signUp.verifications.externalAccount.strategy;
return signUpStrategy ? captchaOauthBypass.some(strategy => strategy === signUpStrategy) : false;
}

// Check direct strategy against bypass list
if (params.strategy) {
return captchaOauthBypass.some(strategy => strategy === params.strategy);
}

return false;
}

private async getCaptchaToken(
params: { strategy?: string; transfer?: boolean; signUpIfMissing?: boolean } = {},
): Promise<{
captchaToken?: string;
captchaWidgetType?: CaptchaWidgetType;
captchaError?: unknown;
}> {
if (
!this.shouldRequireCaptcha(params) ||
__BUILD_DISABLE_RHC__ ||
SignIn.clerk.client?.captchaBypass ||
this.shouldBypassCaptchaForAttempt(params)
) {
return {
captchaToken: undefined,
captchaWidgetType: undefined,
captchaError: undefined,
};
}

const captchaChallenge = new CaptchaChallenge(SignIn.clerk);
const response = await captchaChallenge.managedOrInvisible({ action: 'signin' });
if (!response) {
throw new Error('Captcha challenge failed');
}

const { captchaError, captchaToken, captchaWidgetType } = response;
return { captchaToken, captchaWidgetType, captchaError };
}

private async _create(params: SignInFutureCreateParams): Promise<void> {
const locale = getBrowserLocale();
const { captchaToken, captchaWidgetType, captchaError } = await this.getCaptchaToken(params);

const body: Record<string, unknown> = {
...params,
captchaToken,
captchaWidgetType,
captchaError,
locale: getBrowserLocale() || undefined,
};

await this.#resource.__internal_basePost({
path: this.#resource.pathRoot,
body: locale ? { locale, ...params } : params,
body,
});
}

Expand Down
51 changes: 24 additions & 27 deletions packages/clerk-js/src/core/resources/SignUp.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -173,13 +173,6 @@ export class SignUp extends BaseResource implements SignUpResource {
finalParams = { ...finalParams, ...captchaParams };
}

if (finalParams.transfer && this.shouldBypassCaptchaForAttempt(finalParams)) {

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

I cleaned up this code path, which is pointless: On a transfer, the backend already pulls the strategy from the transfer and ignores any strategy included in the query params. We don't need the SDK to also pull the strategy from the transfer and include it in the query params.

const strategy = SignUp.clerk.client?.signIn.firstFactorVerification.strategy;
if (strategy) {
finalParams = { ...finalParams, strategy: strategy as SignUpCreateParams['strategy'] };
}
}

return this._basePost({
path: this.pathRoot,
body: normalizeUnsafeMetadata(finalParams),
Expand DownExpand Up@@ -561,22 +554,24 @@ export class SignUp extends BaseResource implements SignUpResource {
* We delegate bot detection to the following providers, instead of relying on turnstile exclusively
*/
protected shouldBypassCaptchaForAttempt(params: SignUpCreateParams) {
if (!params.strategy) {
return false;
}

// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
const captchaOauthBypass = SignUp.clerk.__internal_environment!.displayConfig.captchaOauthBypass;

if (captchaOauthBypass.some(strategy => strategy === params.strategy)) {
// For transfers, inspect the SignIn strategy to determine bypass logic
if (params.transfer && SignUp.clerk.client?.signIn?.firstFactorVerification?.status === 'transferable') {
const signInStrategy = SignUp.clerk.client.signIn.firstFactorVerification.strategy;

// OAuth transfer: Check if strategy is in bypass list
if (signInStrategy?.startsWith('oauth_')) {
return captchaOauthBypass.some(strategy => strategy === signInStrategy);
}

// Non-OAuth transfer (signUpIfMissing): Captcha already validated during SignIn
return true;
}

if (
params.transfer &&
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
captchaOauthBypass.some(strategy => strategy === SignUp.clerk.client!.signIn.firstFactorVerification.strategy)
) {
// For direct SignUp (not transfer), check OAuth bypass
if (params.strategy && captchaOauthBypass.some(strategy => strategy === params.strategy)) {
return true;
}

Expand DownExpand Up@@ -787,22 +782,24 @@ class SignUpFuture implements SignUpFutureResource {
}

private shouldBypassCaptchaForAttempt(params: { strategy?: string; transfer?: boolean }) {
if (!params.strategy) {
return false;
}

// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
const captchaOauthBypass = SignUp.clerk.__internal_environment!.displayConfig.captchaOauthBypass;

if (captchaOauthBypass.some(strategy => strategy === params.strategy)) {
// For transfers, inspect the SignIn strategy to determine bypass logic
if (params.transfer && SignUp.clerk.client?.signIn?.firstFactorVerification?.status === 'transferable') {
const signInStrategy = SignUp.clerk.client.signIn.firstFactorVerification.strategy;

// OAuth transfer: Check if strategy is in bypass list
if (signInStrategy?.startsWith('oauth_')) {
return captchaOauthBypass.some(strategy => strategy === signInStrategy);
}

// Non-OAuth transfer (signUpIfMissing): Captcha already validated during SignIn
return true;
}

if (
params.transfer &&
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
captchaOauthBypass.some(strategy => strategy === SignUp.clerk.client!.signIn.firstFactorVerification.strategy)
) {
// For direct SignUp (not transfer), check OAuth bypass
if (params.strategy && captchaOauthBypass.some(strategy => strategy === params.strategy)) {
return true;
}

Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Remove or un-stick sticky/fixed headers that block content (function() { function unstick() { document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) { if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') { el.style.position = 'static'; el.style.top = 'auto'; el.style.zIndex = 'auto'; } }); } unstick(); var observer = new MutationObserver(unstick); observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] }); })(); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' feat(clerk-js): Add signUpIfMissing for SignIn by dmoerner · Pull Request #7749 · clerk/javascript · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions .changeset/strict-needles-taste.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
---
'@clerk/clerk-js': minor
'@clerk/shared': minor
---

Support `sign_up_if_missing` on SignIn.create, including captcha
2 changes: 1 addition & 1 deletion packages/clerk-js/bundlewatch.config.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,7 +5,7 @@
{ "path": "./dist/clerk.chips.browser.js", "maxSize": "66KB" },
{ "path": "./dist/clerk.legacy.browser.js", "maxSize": "108KB" },
{ "path": "./dist/clerk.no-rhc.js", "maxSize": "307KB" },
{ "path": "./dist/clerk.native.js", "maxSize": "65KB" },
{ "path": "./dist/clerk.native.js", "maxSize": "66KB" },
{ "path": "./dist/vendors*.js", "maxSize": "7KB" },
{ "path": "./dist/coinbase*.js", "maxSize": "36KB" },
{ "path": "./dist/base-account-sdk*.js", "maxSize": "203KB" },
Expand Down
140 changes: 135 additions & 5 deletions packages/clerk-js/src/core/resources/SignIn.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,6 +16,7 @@ import type {
AuthenticateWithPopupParams,
AuthenticateWithRedirectParams,
AuthenticateWithWeb3Params,
CaptchaWidgetType,
ClientTrustState,
CreateEmailLinkFlowReturn,
EmailCodeConfig,
Expand DownExpand Up@@ -82,6 +83,7 @@ import {
_futureAuthenticateWithPopup,
wrapWithPopupRoutes,
} from '../../utils/authenticateWithPopup';
import { CaptchaChallenge } from '../../utils/captcha/CaptchaChallenge';
import { runAsyncResourceTask } from '../../utils/runAsyncResourceTask';
import { loadZxcvbn } from '../../utils/zxcvbn';
import {
Expand DownExpand Up@@ -164,12 +166,34 @@ export class SignIn extends BaseResource implements SignInResource {
this.fromJSON(data);
}

create = (params: SignInCreateParams): Promise<SignInResource> => {
create = async (params: SignInCreateParams): Promise<SignInResource> => {
debugLogger.debug('SignIn.create', { id: this.id, strategy: 'strategy' in params ? params.strategy : undefined });
const locale = getBrowserLocale();

let body: Record<string, unknown> = { ...params };

// Inject browser locale
const browserLocale = getBrowserLocale();
if (browserLocale) {
body.locale = browserLocale;
}

if (
this.shouldRequireCaptcha(params) &&
!__BUILD_DISABLE_RHC__ &&
!this.clientBypass() &&
!this.shouldBypassCaptchaForAttempt(params)
) {
const captchaChallenge = new CaptchaChallenge(SignIn.clerk);
const captchaParams = await captchaChallenge.managedOrInvisible({ action: 'signin' });
if (!captchaParams) {
throw new ClerkRuntimeError('', { code: 'captcha_unavailable' });
}
body = { ...body, ...captchaParams };
}

return this._basePost({
path: this.pathRoot,
body: locale ? { locale, ...params } : params,
body: body,
});
};

Expand DownExpand Up@@ -576,6 +600,43 @@ export class SignIn extends BaseResource implements SignInResource {
return this;
}

private clientBypass() {
return SignIn.clerk.client?.captchaBypass;
}

/**
* Determines whether captcha is required for sign in based on the provided params.
* Add new conditions here as captcha requirements evolve.
*/
private shouldRequireCaptcha(params: SignInCreateParams): boolean {
if ('signUpIfMissing' in params && params.signUpIfMissing) {
return true;
}

return false;
}

/**
* We delegate bot detection to the following providers, instead of relying on turnstile exclusively
*/
protected shouldBypassCaptchaForAttempt(params: SignInCreateParams) {
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
const captchaOauthBypass = SignIn.clerk.__internal_environment!.displayConfig.captchaOauthBypass;

// Check transfer strategy against bypass list
if (params.transfer && SignIn.clerk.client?.signUp?.verifications?.externalAccount?.status === 'transferable') {
const signUpStrategy = SignIn.clerk.client.signUp.verifications.externalAccount.strategy;
return signUpStrategy ? captchaOauthBypass.some(strategy => strategy === signUpStrategy) : false;
}

// Check direct strategy against bypass list
if ('strategy' in params && params.strategy) {
return captchaOauthBypass.some(strategy => strategy === params.strategy);
}

return false;
}

public __internal_updateFromJSON(data: SignInJSON | SignInJSONSnapshot | null): this {
return this.fromJSON(data);
}
Expand DownExpand Up@@ -814,11 +875,80 @@ class SignInFuture implements SignInFutureResource {
});
}

/**
* Determines whether captcha is required for sign in based on the provided params.
* Add new conditions here as captcha requirements evolve.
*/
private shouldRequireCaptcha(params: { signUpIfMissing?: boolean }): boolean {
if (params.signUpIfMissing) {
return true;
}

return false;
}

private shouldBypassCaptchaForAttempt(params: { strategy?: string; transfer?: boolean }) {
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
const captchaOauthBypass = SignIn.clerk.__internal_environment!.displayConfig.captchaOauthBypass;

// Check transfer strategy against bypass list
if (params.transfer && SignIn.clerk.client?.signUp?.verifications?.externalAccount?.status === 'transferable') {
const signUpStrategy = SignIn.clerk.client.signUp.verifications.externalAccount.strategy;
return signUpStrategy ? captchaOauthBypass.some(strategy => strategy === signUpStrategy) : false;
}

// Check direct strategy against bypass list
if (params.strategy) {
return captchaOauthBypass.some(strategy => strategy === params.strategy);
}

return false;
}

private async getCaptchaToken(
params: { strategy?: string; transfer?: boolean; signUpIfMissing?: boolean } = {},
): Promise<{
captchaToken?: string;
captchaWidgetType?: CaptchaWidgetType;
captchaError?: unknown;
}> {
if (
!this.shouldRequireCaptcha(params) ||
__BUILD_DISABLE_RHC__ ||
SignIn.clerk.client?.captchaBypass ||
this.shouldBypassCaptchaForAttempt(params)
) {
return {
captchaToken: undefined,
captchaWidgetType: undefined,
captchaError: undefined,
};
}

const captchaChallenge = new CaptchaChallenge(SignIn.clerk);
const response = await captchaChallenge.managedOrInvisible({ action: 'signin' });
if (!response) {
throw new Error('Captcha challenge failed');
}

const { captchaError, captchaToken, captchaWidgetType } = response;
return { captchaToken, captchaWidgetType, captchaError };
}

private async _create(params: SignInFutureCreateParams): Promise<void> {
const locale = getBrowserLocale();
const { captchaToken, captchaWidgetType, captchaError } = await this.getCaptchaToken(params);

const body: Record<string, unknown> = {
...params,
captchaToken,
captchaWidgetType,
captchaError,
locale: getBrowserLocale() || undefined,
};

await this.#resource.__internal_basePost({
path: this.#resource.pathRoot,
body: locale ? { locale, ...params } : params,
body,
});
}

Expand Down
51 changes: 24 additions & 27 deletions packages/clerk-js/src/core/resources/SignUp.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -173,13 +173,6 @@ export class SignUp extends BaseResource implements SignUpResource {
finalParams = { ...finalParams, ...captchaParams };
}

if (finalParams.transfer && this.shouldBypassCaptchaForAttempt(finalParams)) {

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

I cleaned up this code path, which is pointless: On a transfer, the backend already pulls the strategy from the transfer and ignores any strategy included in the query params. We don't need the SDK to also pull the strategy from the transfer and include it in the query params.

const strategy = SignUp.clerk.client?.signIn.firstFactorVerification.strategy;
if (strategy) {
finalParams = { ...finalParams, strategy: strategy as SignUpCreateParams['strategy'] };
}
}

return this._basePost({
path: this.pathRoot,
body: normalizeUnsafeMetadata(finalParams),
Expand DownExpand Up@@ -561,22 +554,24 @@ export class SignUp extends BaseResource implements SignUpResource {
* We delegate bot detection to the following providers, instead of relying on turnstile exclusively
*/
protected shouldBypassCaptchaForAttempt(params: SignUpCreateParams) {
if (!params.strategy) {
return false;
}

// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
const captchaOauthBypass = SignUp.clerk.__internal_environment!.displayConfig.captchaOauthBypass;

if (captchaOauthBypass.some(strategy => strategy === params.strategy)) {
// For transfers, inspect the SignIn strategy to determine bypass logic
if (params.transfer && SignUp.clerk.client?.signIn?.firstFactorVerification?.status === 'transferable') {
const signInStrategy = SignUp.clerk.client.signIn.firstFactorVerification.strategy;

// OAuth transfer: Check if strategy is in bypass list
if (signInStrategy?.startsWith('oauth_')) {
return captchaOauthBypass.some(strategy => strategy === signInStrategy);
}

// Non-OAuth transfer (signUpIfMissing): Captcha already validated during SignIn
return true;
}

if (
params.transfer &&
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
captchaOauthBypass.some(strategy => strategy === SignUp.clerk.client!.signIn.firstFactorVerification.strategy)
) {
// For direct SignUp (not transfer), check OAuth bypass
if (params.strategy && captchaOauthBypass.some(strategy => strategy === params.strategy)) {
return true;
}

Expand DownExpand Up@@ -787,22 +782,24 @@ class SignUpFuture implements SignUpFutureResource {
}

private shouldBypassCaptchaForAttempt(params: { strategy?: string; transfer?: boolean }) {
if (!params.strategy) {
return false;
}

// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
const captchaOauthBypass = SignUp.clerk.__internal_environment!.displayConfig.captchaOauthBypass;

if (captchaOauthBypass.some(strategy => strategy === params.strategy)) {
// For transfers, inspect the SignIn strategy to determine bypass logic
if (params.transfer && SignUp.clerk.client?.signIn?.firstFactorVerification?.status === 'transferable') {
const signInStrategy = SignUp.clerk.client.signIn.firstFactorVerification.strategy;

// OAuth transfer: Check if strategy is in bypass list
if (signInStrategy?.startsWith('oauth_')) {
return captchaOauthBypass.some(strategy => strategy === signInStrategy);
}

// Non-OAuth transfer (signUpIfMissing): Captcha already validated during SignIn
return true;
}

if (
params.transfer &&
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
captchaOauthBypass.some(strategy => strategy === SignUp.clerk.client!.signIn.firstFactorVerification.strategy)
) {
// For direct SignUp (not transfer), check OAuth bypass
if (params.strategy && captchaOauthBypass.some(strategy => strategy === params.strategy)) {
return true;
}

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

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions .changeset/strict-needles-taste.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
---
'@clerk/clerk-js': minor
'@clerk/shared': minor
---

Support `sign_up_if_missing` on SignIn.create, including captcha
2 changes: 1 addition & 1 deletion packages/clerk-js/bundlewatch.config.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,7 +5,7 @@
{ "path": "./dist/clerk.chips.browser.js", "maxSize": "66KB" },
{ "path": "./dist/clerk.legacy.browser.js", "maxSize": "108KB" },
{ "path": "./dist/clerk.no-rhc.js", "maxSize": "307KB" },
{ "path": "./dist/clerk.native.js", "maxSize": "65KB" },
{ "path": "./dist/clerk.native.js", "maxSize": "66KB" },
{ "path": "./dist/vendors*.js", "maxSize": "7KB" },
{ "path": "./dist/coinbase*.js", "maxSize": "36KB" },
{ "path": "./dist/base-account-sdk*.js", "maxSize": "203KB" },
Expand Down
140 changes: 135 additions & 5 deletions packages/clerk-js/src/core/resources/SignIn.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,6 +16,7 @@ import type {
AuthenticateWithPopupParams,
AuthenticateWithRedirectParams,
AuthenticateWithWeb3Params,
CaptchaWidgetType,
ClientTrustState,
CreateEmailLinkFlowReturn,
EmailCodeConfig,
Expand DownExpand Up@@ -82,6 +83,7 @@ import {
_futureAuthenticateWithPopup,
wrapWithPopupRoutes,
} from '../../utils/authenticateWithPopup';
import { CaptchaChallenge } from '../../utils/captcha/CaptchaChallenge';
import { runAsyncResourceTask } from '../../utils/runAsyncResourceTask';
import { loadZxcvbn } from '../../utils/zxcvbn';
import {
Expand DownExpand Up@@ -164,12 +166,34 @@ export class SignIn extends BaseResource implements SignInResource {
this.fromJSON(data);
}

create = (params: SignInCreateParams): Promise<SignInResource> => {
create = async (params: SignInCreateParams): Promise<SignInResource> => {
debugLogger.debug('SignIn.create', { id: this.id, strategy: 'strategy' in params ? params.strategy : undefined });
const locale = getBrowserLocale();

let body: Record<string, unknown> = { ...params };

// Inject browser locale
const browserLocale = getBrowserLocale();
if (browserLocale) {
body.locale = browserLocale;
}

if (
this.shouldRequireCaptcha(params) &&
!__BUILD_DISABLE_RHC__ &&
!this.clientBypass() &&
!this.shouldBypassCaptchaForAttempt(params)
) {
const captchaChallenge = new CaptchaChallenge(SignIn.clerk);
const captchaParams = await captchaChallenge.managedOrInvisible({ action: 'signin' });
if (!captchaParams) {
throw new ClerkRuntimeError('', { code: 'captcha_unavailable' });
}
body = { ...body, ...captchaParams };
}

return this._basePost({
path: this.pathRoot,
body: locale ? { locale, ...params } : params,
body: body,
});
};

Expand DownExpand Up@@ -576,6 +600,43 @@ export class SignIn extends BaseResource implements SignInResource {
return this;
}

private clientBypass() {
return SignIn.clerk.client?.captchaBypass;
}

/**
* Determines whether captcha is required for sign in based on the provided params.
* Add new conditions here as captcha requirements evolve.
*/
private shouldRequireCaptcha(params: SignInCreateParams): boolean {
if ('signUpIfMissing' in params && params.signUpIfMissing) {
return true;
}

return false;
}

/**
* We delegate bot detection to the following providers, instead of relying on turnstile exclusively
*/
protected shouldBypassCaptchaForAttempt(params: SignInCreateParams) {
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
const captchaOauthBypass = SignIn.clerk.__internal_environment!.displayConfig.captchaOauthBypass;

// Check transfer strategy against bypass list
if (params.transfer && SignIn.clerk.client?.signUp?.verifications?.externalAccount?.status === 'transferable') {
const signUpStrategy = SignIn.clerk.client.signUp.verifications.externalAccount.strategy;
return signUpStrategy ? captchaOauthBypass.some(strategy => strategy === signUpStrategy) : false;
}

// Check direct strategy against bypass list
if ('strategy' in params && params.strategy) {
return captchaOauthBypass.some(strategy => strategy === params.strategy);
}

return false;
}

public __internal_updateFromJSON(data: SignInJSON | SignInJSONSnapshot | null): this {
return this.fromJSON(data);
}
Expand DownExpand Up@@ -814,11 +875,80 @@ class SignInFuture implements SignInFutureResource {
});
}

/**
* Determines whether captcha is required for sign in based on the provided params.
* Add new conditions here as captcha requirements evolve.
*/
private shouldRequireCaptcha(params: { signUpIfMissing?: boolean }): boolean {
if (params.signUpIfMissing) {
return true;
}

return false;
}

private shouldBypassCaptchaForAttempt(params: { strategy?: string; transfer?: boolean }) {
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
const captchaOauthBypass = SignIn.clerk.__internal_environment!.displayConfig.captchaOauthBypass;

// Check transfer strategy against bypass list
if (params.transfer && SignIn.clerk.client?.signUp?.verifications?.externalAccount?.status === 'transferable') {
const signUpStrategy = SignIn.clerk.client.signUp.verifications.externalAccount.strategy;
return signUpStrategy ? captchaOauthBypass.some(strategy => strategy === signUpStrategy) : false;
}

// Check direct strategy against bypass list
if (params.strategy) {
return captchaOauthBypass.some(strategy => strategy === params.strategy);
}

return false;
}

private async getCaptchaToken(
params: { strategy?: string; transfer?: boolean; signUpIfMissing?: boolean } = {},
): Promise<{
captchaToken?: string;
captchaWidgetType?: CaptchaWidgetType;
captchaError?: unknown;
}> {
if (
!this.shouldRequireCaptcha(params) ||
__BUILD_DISABLE_RHC__ ||
SignIn.clerk.client?.captchaBypass ||
this.shouldBypassCaptchaForAttempt(params)
) {
return {
captchaToken: undefined,
captchaWidgetType: undefined,
captchaError: undefined,
};
}

const captchaChallenge = new CaptchaChallenge(SignIn.clerk);
const response = await captchaChallenge.managedOrInvisible({ action: 'signin' });
if (!response) {
throw new Error('Captcha challenge failed');
}

const { captchaError, captchaToken, captchaWidgetType } = response;
return { captchaToken, captchaWidgetType, captchaError };
}

private async _create(params: SignInFutureCreateParams): Promise<void> {
const locale = getBrowserLocale();
const { captchaToken, captchaWidgetType, captchaError } = await this.getCaptchaToken(params);

const body: Record<string, unknown> = {
...params,
captchaToken,
captchaWidgetType,
captchaError,
locale: getBrowserLocale() || undefined,
};

await this.#resource.__internal_basePost({
path: this.#resource.pathRoot,
body: locale ? { locale, ...params } : params,
body,
});
}

Expand Down
51 changes: 24 additions & 27 deletions packages/clerk-js/src/core/resources/SignUp.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -173,13 +173,6 @@ export class SignUp extends BaseResource implements SignUpResource {
finalParams = { ...finalParams, ...captchaParams };
}

if (finalParams.transfer && this.shouldBypassCaptchaForAttempt(finalParams)) {

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

I cleaned up this code path, which is pointless: On a transfer, the backend already pulls the strategy from the transfer and ignores any strategy included in the query params. We don't need the SDK to also pull the strategy from the transfer and include it in the query params.

const strategy = SignUp.clerk.client?.signIn.firstFactorVerification.strategy;
if (strategy) {
finalParams = { ...finalParams, strategy: strategy as SignUpCreateParams['strategy'] };
}
}

return this._basePost({
path: this.pathRoot,
body: normalizeUnsafeMetadata(finalParams),
Expand DownExpand Up@@ -561,22 +554,24 @@ export class SignUp extends BaseResource implements SignUpResource {
* We delegate bot detection to the following providers, instead of relying on turnstile exclusively
*/
protected shouldBypassCaptchaForAttempt(params: SignUpCreateParams) {
if (!params.strategy) {
return false;
}

// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
const captchaOauthBypass = SignUp.clerk.__internal_environment!.displayConfig.captchaOauthBypass;

if (captchaOauthBypass.some(strategy => strategy === params.strategy)) {
// For transfers, inspect the SignIn strategy to determine bypass logic
if (params.transfer && SignUp.clerk.client?.signIn?.firstFactorVerification?.status === 'transferable') {
const signInStrategy = SignUp.clerk.client.signIn.firstFactorVerification.strategy;

// OAuth transfer: Check if strategy is in bypass list
if (signInStrategy?.startsWith('oauth_')) {
return captchaOauthBypass.some(strategy => strategy === signInStrategy);
}

// Non-OAuth transfer (signUpIfMissing): Captcha already validated during SignIn
return true;
}

if (
params.transfer &&
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
captchaOauthBypass.some(strategy => strategy === SignUp.clerk.client!.signIn.firstFactorVerification.strategy)
) {
// For direct SignUp (not transfer), check OAuth bypass
if (params.strategy && captchaOauthBypass.some(strategy => strategy === params.strategy)) {
return true;
}

Expand DownExpand Up@@ -787,22 +782,24 @@ class SignUpFuture implements SignUpFutureResource {
}

private shouldBypassCaptchaForAttempt(params: { strategy?: string; transfer?: boolean }) {
if (!params.strategy) {
return false;
}

// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
const captchaOauthBypass = SignUp.clerk.__internal_environment!.displayConfig.captchaOauthBypass;

if (captchaOauthBypass.some(strategy => strategy === params.strategy)) {
// For transfers, inspect the SignIn strategy to determine bypass logic
if (params.transfer && SignUp.clerk.client?.signIn?.firstFactorVerification?.status === 'transferable') {
const signInStrategy = SignUp.clerk.client.signIn.firstFactorVerification.strategy;

// OAuth transfer: Check if strategy is in bypass list
if (signInStrategy?.startsWith('oauth_')) {
return captchaOauthBypass.some(strategy => strategy === signInStrategy);
}

// Non-OAuth transfer (signUpIfMissing): Captcha already validated during SignIn
return true;
}

if (
params.transfer &&
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
captchaOauthBypass.some(strategy => strategy === SignUp.clerk.client!.signIn.firstFactorVerification.strategy)
) {
// For direct SignUp (not transfer), check OAuth bypass
if (params.strategy && captchaOauthBypass.some(strategy => strategy === params.strategy)) {
return true;
}

Expand Down
Loading
Loading