Skip to content

fix(js): Handle native OAuth transfer callbacks#9037

New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Merged
wobsoriano merged 2 commits into from
Jun 29, 2026
Merged

fix(js): Handle native OAuth transfer callbacks #9037

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
aa61055
fix(js): handle native OAuth transfer callbacks
wobsoriano Jun 29, 2026
f3e3a9b
Merge branch 'main' into rob/user-5648
wobsoriano Jun 29, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions .changeset/native-oauth-transfer-signals.md
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
---
'@clerk/clerk-js': patch
'@clerk/shared': patch
---

Fix native OAuth transport handling for combined sign-in-or-up flows so transfer callbacks can continue instead of surfacing a generic OAuth callback failure.
7 changes: 4 additions & 3 deletions packages/clerk-js/src/core/__tests__/clerk.test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
import { ClerkOfflineError, EmailLinkErrorCodeStatus } from '@clerk/shared/error';
import { ERROR_CODES } from '@clerk/shared/internal/clerk-js/constants';
import type {
ActiveSessionResource,
PendingSessionResource,
Expand DownExpand Up@@ -1487,7 +1488,7 @@ describe('Clerk singleton', () => {
strategy: 'oauth_google',
external_verification_redirect_url: null,
error: {
code: 'external_account_exists',
code: ERROR_CODES.EXTERNAL_ACCOUNT_EXISTS,
long_message: 'This external account already exists.',
message: 'already exists',
},
Expand All@@ -1499,7 +1500,7 @@ describe('Clerk singleton', () => {
strategy: 'oauth_google',
external_verification_redirect_url: null,
error: {
code: 'external_account_exists',
code: ERROR_CODES.EXTERNAL_ACCOUNT_EXISTS,
long_message: 'This external account already exists.',
message: 'already exists',
},
Expand DownExpand Up@@ -2085,7 +2086,7 @@ describe('Clerk singleton', () => {
external_account: {
status: 'transferable',
error: {
code: 'external_account_exists',
code: ERROR_CODES.EXTERNAL_ACCOUNT_EXISTS,
},
},
},
Expand Down
3 changes: 2 additions & 1 deletion packages/clerk-js/src/core/clerk.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2493,7 +2493,8 @@ export class Clerk implements ClerkInterface {
}

const userExistsButNeedsToSignIn =
su.externalAccountStatus === 'transferable' && su.externalAccountErrorCode === 'external_account_exists';
su.externalAccountStatus === 'transferable' &&
su.externalAccountErrorCode === ERROR_CODES.EXTERNAL_ACCOUNT_EXISTS;

if (userExistsButNeedsToSignIn) {
const res = await signIn.create({ transfer: true });
Expand Down
3 changes: 2 additions & 1 deletion packages/clerk-js/src/core/resources/SignUp.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
import { inBrowser } from '@clerk/shared/browser';
import { type ClerkError, ClerkRuntimeError, isCaptchaError, isClerkAPIResponseError } from '@clerk/shared/error';
import { ERROR_CODES } from '@clerk/shared/internal/clerk-js/constants';
import { createValidatePassword } from '@clerk/shared/internal/clerk-js/passwords/password';
import { Poller } from '@clerk/shared/poller';
import type {
Expand DownExpand Up@@ -794,7 +795,7 @@ class SignUpFuture implements SignUpFutureResource {
// TODO: we can likely remove the error code check as the status should be sufficient
return (
this.#resource.verifications.externalAccount.status === 'transferable' &&
this.#resource.verifications.externalAccount.error?.code === 'external_account_exists'
this.#resource.verifications.externalAccount.error?.code === ERROR_CODES.EXTERNAL_ACCOUNT_EXISTS
);
}

Expand Down
33 changes: 33 additions & 0 deletions packages/clerk-js/src/utils/__tests__/authenticateWithTransport.test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
import type { ClerkRuntimeError } from '@clerk/shared/error';
import { ERROR_CODES } from '@clerk/shared/internal/clerk-js/constants';
import { describe, expect, it, vi } from 'vitest';

import { _authenticateWithTransport } from '../authenticateWithTransport';
Expand DownExpand Up@@ -64,6 +65,38 @@ describe('_authenticateWithTransport', () => {
expect(clerk.__internal_handleResourceCallback).toHaveBeenCalledWith(resource, {});
});

it.each([ERROR_CODES.EXTERNAL_ACCOUNT_NOT_FOUND, ERROR_CODES.EXTERNAL_ACCOUNT_EXISTS])(
'continues to callback handling for native OAuth transfer signal %s',
async errorCode => {
const clerk = makeClerk();
const transport = {
getRedirectUrl: vi.fn().mockResolvedValue('myapp://sso-callback'),
open: vi.fn().mockResolvedValue({
callbackUrl: `myapp://sso-callback?__clerk_status=failed&__clerk_error_code=${errorCode}`,
}),
};
const resource = {
reload: vi.fn().mockResolvedValue(undefined),
create: vi.fn().mockResolvedValue(undefined),
} as any;
const authenticateMethod = vi.fn(async (_params, navigate) => navigate('https://provider.example/auth'));
const callbackParams = { signInUrl: '/sign-in' };

await _authenticateWithTransport({
clerk: clerk as any,
transport,
resource,
authenticateMethod,
params: {} as any,
callbackParams,
});

expect(resource.reload).toHaveBeenCalledWith();
expect(resource.create).not.toHaveBeenCalled();
expect(clerk.__internal_handleResourceCallback).toHaveBeenCalledWith(resource, callbackParams);
},
);

it('rejects with a localizable error without reloading when the native callback reports OAuth failure', async () => {
const clerk = makeClerk();
const transport = {
Expand Down
11 changes: 10 additions & 1 deletion packages/clerk-js/src/utils/authenticateWithTransport.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
import { ClerkRuntimeError } from '@clerk/shared/error';
import { ERROR_CODES } from '@clerk/shared/internal/clerk-js/constants';
import type {
AuthenticateWithRedirectParams,
HandleOAuthCallbackParams,
Expand All@@ -21,8 +22,12 @@ type ClerkWithResourceCallback = {

const NATIVE_OAUTH_FAILED_STATUS = 'failed';
const NATIVE_OAUTH_ERROR_FALLBACK_CODE = 'oauth_callback_failed';
const NATIVE_OAUTH_TRANSFER_SIGNAL_CODES = new Set<string>([
ERROR_CODES.EXTERNAL_ACCOUNT_NOT_FOUND,
ERROR_CODES.EXTERNAL_ACCOUNT_EXISTS,
]);
const NATIVE_OAUTH_ERROR_MESSAGES: Record<string, string> = {
oauth_access_denied: 'You did not grant access to your account.',
[ERROR_CODES.OAUTH_ACCESS_DENIED]: 'You did not grant access to your account.',
};

function getNativeOAuthCallbackFailure(callbackUrl: string): { code: string; message: string } | null {
Expand All@@ -34,6 +39,10 @@ function getNativeOAuthCallbackFailure(callbackUrl: string): { code: string; mes
}

const unsafeCode = searchParams.get('__clerk_error_code') || NATIVE_OAUTH_ERROR_FALLBACK_CODE;
if (NATIVE_OAUTH_TRANSFER_SIGNAL_CODES.has(unsafeCode)) {
return null;
}

const code = NATIVE_OAUTH_ERROR_MESSAGES[unsafeCode] ? unsafeCode : NATIVE_OAUTH_ERROR_FALLBACK_CODE;

return {
Expand Down
1 change: 1 addition & 0 deletions packages/shared/src/internal/clerk-js/constants.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -33,6 +33,7 @@ export const ERROR_CODES = {
SAML_USER_ATTRIBUTE_MISSING: 'saml_user_attribute_missing',
USER_LOCKED: 'user_locked',
EXTERNAL_ACCOUNT_NOT_FOUND: 'external_account_not_found',
EXTERNAL_ACCOUNT_EXISTS: 'external_account_exists',
SESSION_EXISTS: 'session_exists',
SIGN_UP_MODE_RESTRICTED: 'sign_up_mode_restricted',
SIGN_UP_MODE_RESTRICTED_WAITLIST: 'sign_up_restricted_waitlist',
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
fix(js): Handle native OAuth transfer callbacks by wobsoriano · Pull Request #9037 · clerk/javascript · GitHub
Skip to content
fix(js): Handle native OAuth transfer callbacks#9037

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Merged

wobsoriano
merged 2 commits into

from

Jun 29, 2026
 Merged


fix(js): Handle native OAuth transfer callbacks
#9037
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
aa61055

fix(js): handle native OAuth transfer callbacks


wobsoriano Jun 29, 2026
f3e3a9b

Merge branch 'main' into rob/user-5648


wobsoriano Jun 29, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


6 changes: 6 additions & 0 deletions
.changeset/native-oauth-transfer-signals.md

View file


Open in desktop

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

Fix native OAuth transport handling for combined sign-in-or-up flows so transfer callbacks can continue instead of surfacing a generic OAuth callback failure.

7 changes: 4 additions & 3 deletions
packages/clerk-js/src/core/__tests__/clerk.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
import { ClerkOfflineError, EmailLinkErrorCodeStatus } from '@clerk/shared/error';
import { ERROR_CODES } from '@clerk/shared/internal/clerk-js/constants';
import type {
 ActiveSessionResource,
 PendingSessionResource,
Expand DownExpand Up@@ -1487,7 +1488,7 @@ describe('Clerk singleton', () => {
 strategy: 'oauth_google',
 external_verification_redirect_url: null,
 error: {
 code: 'external_account_exists',
 code: ERROR_CODES.EXTERNAL_ACCOUNT_EXISTS,
 long_message: 'This external account already exists.',
 message: 'already exists',
 },
Expand All@@ -1499,7 +1500,7 @@ describe('Clerk singleton', () => {
 strategy: 'oauth_google',
 external_verification_redirect_url: null,
 error: {
 code: 'external_account_exists',
 code: ERROR_CODES.EXTERNAL_ACCOUNT_EXISTS,
 long_message: 'This external account already exists.',
 message: 'already exists',
 },
Expand DownExpand Up@@ -2085,7 +2086,7 @@ describe('Clerk singleton', () => {
 external_account: {
 status: 'transferable',
 error: {
 code: 'external_account_exists',
 code: ERROR_CODES.EXTERNAL_ACCOUNT_EXISTS,
 },
 },
 },
Expand Down

3 changes: 2 additions & 1 deletion
packages/clerk-js/src/core/clerk.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2493,7 +2493,8 @@ export class Clerk implements ClerkInterface {
 }

 const userExistsButNeedsToSignIn =
 su.externalAccountStatus === 'transferable' && su.externalAccountErrorCode === 'external_account_exists';
 su.externalAccountStatus === 'transferable' &&
 su.externalAccountErrorCode === ERROR_CODES.EXTERNAL_ACCOUNT_EXISTS;

 if (userExistsButNeedsToSignIn) {
 const res = await signIn.create({ transfer: true });
Expand Down

3 changes: 2 additions & 1 deletion
packages/clerk-js/src/core/resources/SignUp.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
import { inBrowser } from '@clerk/shared/browser';
import { type ClerkError, ClerkRuntimeError, isCaptchaError, isClerkAPIResponseError } from '@clerk/shared/error';
import { ERROR_CODES } from '@clerk/shared/internal/clerk-js/constants';
import { createValidatePassword } from '@clerk/shared/internal/clerk-js/passwords/password';
import { Poller } from '@clerk/shared/poller';
import type {
Expand DownExpand Up@@ -794,7 +795,7 @@ class SignUpFuture implements SignUpFutureResource {
 // TODO: we can likely remove the error code check as the status should be sufficient
 return (
 this.#resource.verifications.externalAccount.status === 'transferable' &&
 this.#resource.verifications.externalAccount.error?.code === 'external_account_exists'
 this.#resource.verifications.externalAccount.error?.code === ERROR_CODES.EXTERNAL_ACCOUNT_EXISTS
 );
 }

Expand Down

33 changes: 33 additions & 0 deletions
packages/clerk-js/src/utils/__tests__/authenticateWithTransport.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
import type { ClerkRuntimeError } from '@clerk/shared/error';
import { ERROR_CODES } from '@clerk/shared/internal/clerk-js/constants';
import { describe, expect, it, vi } from 'vitest';

import { _authenticateWithTransport } from '../authenticateWithTransport';
Expand DownExpand Up@@ -64,6 +65,38 @@ describe('_authenticateWithTransport', () => {
 expect(clerk.__internal_handleResourceCallback).toHaveBeenCalledWith(resource, {});
 });

 it.each([ERROR_CODES.EXTERNAL_ACCOUNT_NOT_FOUND, ERROR_CODES.EXTERNAL_ACCOUNT_EXISTS])(
 'continues to callback handling for native OAuth transfer signal %s',
 async errorCode => {
 const clerk = makeClerk();
 const transport = {
 getRedirectUrl: vi.fn().mockResolvedValue('myapp://sso-callback'),
 open: vi.fn().mockResolvedValue({
 callbackUrl: `myapp://sso-callback?__clerk_status=failed&__clerk_error_code=${errorCode}`,
 }),
 };
 const resource = {
 reload: vi.fn().mockResolvedValue(undefined),
 create: vi.fn().mockResolvedValue(undefined),
 } as any;
 const authenticateMethod = vi.fn(async (_params, navigate) => navigate('https://provider.example/auth'));
 const callbackParams = { signInUrl: '/sign-in' };

 await _authenticateWithTransport({
 clerk: clerk as any,
 transport,
 resource,
 authenticateMethod,
 params: {} as any,
 callbackParams,
 });

 expect(resource.reload).toHaveBeenCalledWith();
 expect(resource.create).not.toHaveBeenCalled();
 expect(clerk.__internal_handleResourceCallback).toHaveBeenCalledWith(resource, callbackParams);
 },
 );

 it('rejects with a localizable error without reloading when the native callback reports OAuth failure', async () => {
 const clerk = makeClerk();
 const transport = {
Expand Down

11 changes: 10 additions & 1 deletion
packages/clerk-js/src/utils/authenticateWithTransport.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
import { ClerkRuntimeError } from '@clerk/shared/error';
import { ERROR_CODES } from '@clerk/shared/internal/clerk-js/constants';
import type {
 AuthenticateWithRedirectParams,
 HandleOAuthCallbackParams,
Expand All@@ -21,8 +22,12 @@ type ClerkWithResourceCallback = {

const NATIVE_OAUTH_FAILED_STATUS = 'failed';
const NATIVE_OAUTH_ERROR_FALLBACK_CODE = 'oauth_callback_failed';
const NATIVE_OAUTH_TRANSFER_SIGNAL_CODES = new Set<string>([
 ERROR_CODES.EXTERNAL_ACCOUNT_NOT_FOUND,
 ERROR_CODES.EXTERNAL_ACCOUNT_EXISTS,
]);
const NATIVE_OAUTH_ERROR_MESSAGES: Record<string, string> = {
oauth_access_denied: 'You did not grant access to your account.',
[ERROR_CODES.OAUTH_ACCESS_DENIED]: 'You did not grant access to your account.',
};

function getNativeOAuthCallbackFailure(callbackUrl: string): { code: string; message: string } | null {
Expand All@@ -34,6 +39,10 @@ function getNativeOAuthCallbackFailure(callbackUrl: string): { code: string; mes
 }

 const unsafeCode = searchParams.get('__clerk_error_code') || NATIVE_OAUTH_ERROR_FALLBACK_CODE;
 if (NATIVE_OAUTH_TRANSFER_SIGNAL_CODES.has(unsafeCode)) {
 return null;
 }

 const code = NATIVE_OAUTH_ERROR_MESSAGES[unsafeCode] ? unsafeCode : NATIVE_OAUTH_ERROR_FALLBACK_CODE;

 return {
Expand Down

1 change: 1 addition & 0 deletions
packages/shared/src/internal/clerk-js/constants.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -33,6 +33,7 @@ export const ERROR_CODES = {
 SAML_USER_ATTRIBUTE_MISSING: 'saml_user_attribute_missing',
 USER_LOCKED: 'user_locked',
 EXTERNAL_ACCOUNT_NOT_FOUND: 'external_account_not_found',
 EXTERNAL_ACCOUNT_EXISTS: 'external_account_exists',
 SESSION_EXISTS: 'session_exists',
 SIGN_UP_MODE_RESTRICTED: 'sign_up_mode_restricted',
 SIGN_UP_MODE_RESTRICTED_WAITLIST: 'sign_up_restricted_waitlist',
Expand Down
Loading

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

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Merged

wobsoriano
merged 2 commits into

from

Jun 29, 2026
 Merged


fix(js): Handle native OAuth transfer callbacks
#9037
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
aa61055

fix(js): handle native OAuth transfer callbacks


wobsoriano Jun 29, 2026
f3e3a9b

Merge branch 'main' into rob/user-5648


wobsoriano Jun 29, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


6 changes: 6 additions & 0 deletions
.changeset/native-oauth-transfer-signals.md

View file


Open in desktop

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

Fix native OAuth transport handling for combined sign-in-or-up flows so transfer callbacks can continue instead of surfacing a generic OAuth callback failure.

7 changes: 4 additions & 3 deletions
packages/clerk-js/src/core/__tests__/clerk.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
import { ClerkOfflineError, EmailLinkErrorCodeStatus } from '@clerk/shared/error';
import { ERROR_CODES } from '@clerk/shared/internal/clerk-js/constants';
import type {
 ActiveSessionResource,
 PendingSessionResource,
Expand DownExpand Up@@ -1487,7 +1488,7 @@ describe('Clerk singleton', () => {
 strategy: 'oauth_google',
 external_verification_redirect_url: null,
 error: {
 code: 'external_account_exists',
 code: ERROR_CODES.EXTERNAL_ACCOUNT_EXISTS,
 long_message: 'This external account already exists.',
 message: 'already exists',
 },
Expand All@@ -1499,7 +1500,7 @@ describe('Clerk singleton', () => {
 strategy: 'oauth_google',
 external_verification_redirect_url: null,
 error: {
 code: 'external_account_exists',
 code: ERROR_CODES.EXTERNAL_ACCOUNT_EXISTS,
 long_message: 'This external account already exists.',
 message: 'already exists',
 },
Expand DownExpand Up@@ -2085,7 +2086,7 @@ describe('Clerk singleton', () => {
 external_account: {
 status: 'transferable',
 error: {
 code: 'external_account_exists',
 code: ERROR_CODES.EXTERNAL_ACCOUNT_EXISTS,
 },
 },
 },
Expand Down

3 changes: 2 additions & 1 deletion
packages/clerk-js/src/core/clerk.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2493,7 +2493,8 @@ export class Clerk implements ClerkInterface {
 }

 const userExistsButNeedsToSignIn =
 su.externalAccountStatus === 'transferable' && su.externalAccountErrorCode === 'external_account_exists';
 su.externalAccountStatus === 'transferable' &&
 su.externalAccountErrorCode === ERROR_CODES.EXTERNAL_ACCOUNT_EXISTS;

 if (userExistsButNeedsToSignIn) {
 const res = await signIn.create({ transfer: true });
Expand Down

3 changes: 2 additions & 1 deletion
packages/clerk-js/src/core/resources/SignUp.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
import { inBrowser } from '@clerk/shared/browser';
import { type ClerkError, ClerkRuntimeError, isCaptchaError, isClerkAPIResponseError } from '@clerk/shared/error';
import { ERROR_CODES } from '@clerk/shared/internal/clerk-js/constants';
import { createValidatePassword } from '@clerk/shared/internal/clerk-js/passwords/password';
import { Poller } from '@clerk/shared/poller';
import type {
Expand DownExpand Up@@ -794,7 +795,7 @@ class SignUpFuture implements SignUpFutureResource {
 // TODO: we can likely remove the error code check as the status should be sufficient
 return (
 this.#resource.verifications.externalAccount.status === 'transferable' &&
 this.#resource.verifications.externalAccount.error?.code === 'external_account_exists'
 this.#resource.verifications.externalAccount.error?.code === ERROR_CODES.EXTERNAL_ACCOUNT_EXISTS
 );
 }

Expand Down

33 changes: 33 additions & 0 deletions
packages/clerk-js/src/utils/__tests__/authenticateWithTransport.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
import type { ClerkRuntimeError } from '@clerk/shared/error';
import { ERROR_CODES } from '@clerk/shared/internal/clerk-js/constants';
import { describe, expect, it, vi } from 'vitest';

import { _authenticateWithTransport } from '../authenticateWithTransport';
Expand DownExpand Up@@ -64,6 +65,38 @@ describe('_authenticateWithTransport', () => {
 expect(clerk.__internal_handleResourceCallback).toHaveBeenCalledWith(resource, {});
 });

 it.each([ERROR_CODES.EXTERNAL_ACCOUNT_NOT_FOUND, ERROR_CODES.EXTERNAL_ACCOUNT_EXISTS])(
 'continues to callback handling for native OAuth transfer signal %s',
 async errorCode => {
 const clerk = makeClerk();
 const transport = {
 getRedirectUrl: vi.fn().mockResolvedValue('myapp://sso-callback'),
 open: vi.fn().mockResolvedValue({
 callbackUrl: `myapp://sso-callback?__clerk_status=failed&__clerk_error_code=${errorCode}`,
 }),
 };
 const resource = {
 reload: vi.fn().mockResolvedValue(undefined),
 create: vi.fn().mockResolvedValue(undefined),
 } as any;
 const authenticateMethod = vi.fn(async (_params, navigate) => navigate('https://provider.example/auth'));
 const callbackParams = { signInUrl: '/sign-in' };

 await _authenticateWithTransport({
 clerk: clerk as any,
 transport,
 resource,
 authenticateMethod,
 params: {} as any,
 callbackParams,
 });

 expect(resource.reload).toHaveBeenCalledWith();
 expect(resource.create).not.toHaveBeenCalled();
 expect(clerk.__internal_handleResourceCallback).toHaveBeenCalledWith(resource, callbackParams);
 },
 );

 it('rejects with a localizable error without reloading when the native callback reports OAuth failure', async () => {
 const clerk = makeClerk();
 const transport = {
Expand Down

11 changes: 10 additions & 1 deletion
packages/clerk-js/src/utils/authenticateWithTransport.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
import { ClerkRuntimeError } from '@clerk/shared/error';
import { ERROR_CODES } from '@clerk/shared/internal/clerk-js/constants';
import type {
 AuthenticateWithRedirectParams,
 HandleOAuthCallbackParams,
Expand All@@ -21,8 +22,12 @@ type ClerkWithResourceCallback = {

const NATIVE_OAUTH_FAILED_STATUS = 'failed';
const NATIVE_OAUTH_ERROR_FALLBACK_CODE = 'oauth_callback_failed';
const NATIVE_OAUTH_TRANSFER_SIGNAL_CODES = new Set<string>([
 ERROR_CODES.EXTERNAL_ACCOUNT_NOT_FOUND,
 ERROR_CODES.EXTERNAL_ACCOUNT_EXISTS,
]);
const NATIVE_OAUTH_ERROR_MESSAGES: Record<string, string> = {
oauth_access_denied: 'You did not grant access to your account.',
[ERROR_CODES.OAUTH_ACCESS_DENIED]: 'You did not grant access to your account.',
};

function getNativeOAuthCallbackFailure(callbackUrl: string): { code: string; message: string } | null {
Expand All@@ -34,6 +39,10 @@ function getNativeOAuthCallbackFailure(callbackUrl: string): { code: string; mes
 }

 const unsafeCode = searchParams.get('__clerk_error_code') || NATIVE_OAUTH_ERROR_FALLBACK_CODE;
 if (NATIVE_OAUTH_TRANSFER_SIGNAL_CODES.has(unsafeCode)) {
 return null;
 }

 const code = NATIVE_OAUTH_ERROR_MESSAGES[unsafeCode] ? unsafeCode : NATIVE_OAUTH_ERROR_FALLBACK_CODE;

 return {
Expand Down

1 change: 1 addition & 0 deletions
packages/shared/src/internal/clerk-js/constants.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -33,6 +33,7 @@ export const ERROR_CODES = {
 SAML_USER_ATTRIBUTE_MISSING: 'saml_user_attribute_missing',
 USER_LOCKED: 'user_locked',
 EXTERNAL_ACCOUNT_NOT_FOUND: 'external_account_not_found',
 EXTERNAL_ACCOUNT_EXISTS: 'external_account_exists',
 SESSION_EXISTS: 'session_exists',
 SIGN_UP_MODE_RESTRICTED: 'sign_up_mode_restricted',
 SIGN_UP_MODE_RESTRICTED_WAITLIST: 'sign_up_restricted_waitlist',
Expand Down
Loading

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

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Merged

wobsoriano
merged 2 commits into

from

Jun 29, 2026
 Merged


fix(js): Handle native OAuth transfer callbacks
#9037
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
aa61055

fix(js): handle native OAuth transfer callbacks


wobsoriano Jun 29, 2026
f3e3a9b

Merge branch 'main' into rob/user-5648


wobsoriano Jun 29, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


6 changes: 6 additions & 0 deletions
.changeset/native-oauth-transfer-signals.md

View file


Open in desktop

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

Fix native OAuth transport handling for combined sign-in-or-up flows so transfer callbacks can continue instead of surfacing a generic OAuth callback failure.

7 changes: 4 additions & 3 deletions
packages/clerk-js/src/core/__tests__/clerk.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
import { ClerkOfflineError, EmailLinkErrorCodeStatus } from '@clerk/shared/error';
import { ERROR_CODES } from '@clerk/shared/internal/clerk-js/constants';
import type {
 ActiveSessionResource,
 PendingSessionResource,
Expand DownExpand Up@@ -1487,7 +1488,7 @@ describe('Clerk singleton', () => {
 strategy: 'oauth_google',
 external_verification_redirect_url: null,
 error: {
 code: 'external_account_exists',
 code: ERROR_CODES.EXTERNAL_ACCOUNT_EXISTS,
 long_message: 'This external account already exists.',
 message: 'already exists',
 },
Expand All@@ -1499,7 +1500,7 @@ describe('Clerk singleton', () => {
 strategy: 'oauth_google',
 external_verification_redirect_url: null,
 error: {
 code: 'external_account_exists',
 code: ERROR_CODES.EXTERNAL_ACCOUNT_EXISTS,
 long_message: 'This external account already exists.',
 message: 'already exists',
 },
Expand DownExpand Up@@ -2085,7 +2086,7 @@ describe('Clerk singleton', () => {
 external_account: {
 status: 'transferable',
 error: {
 code: 'external_account_exists',
 code: ERROR_CODES.EXTERNAL_ACCOUNT_EXISTS,
 },
 },
 },
Expand Down

3 changes: 2 additions & 1 deletion
packages/clerk-js/src/core/clerk.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2493,7 +2493,8 @@ export class Clerk implements ClerkInterface {
 }

 const userExistsButNeedsToSignIn =
 su.externalAccountStatus === 'transferable' && su.externalAccountErrorCode === 'external_account_exists';
 su.externalAccountStatus === 'transferable' &&
 su.externalAccountErrorCode === ERROR_CODES.EXTERNAL_ACCOUNT_EXISTS;

 if (userExistsButNeedsToSignIn) {
 const res = await signIn.create({ transfer: true });
Expand Down

3 changes: 2 additions & 1 deletion
packages/clerk-js/src/core/resources/SignUp.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
import { inBrowser } from '@clerk/shared/browser';
import { type ClerkError, ClerkRuntimeError, isCaptchaError, isClerkAPIResponseError } from '@clerk/shared/error';
import { ERROR_CODES } from '@clerk/shared/internal/clerk-js/constants';
import { createValidatePassword } from '@clerk/shared/internal/clerk-js/passwords/password';
import { Poller } from '@clerk/shared/poller';
import type {
Expand DownExpand Up@@ -794,7 +795,7 @@ class SignUpFuture implements SignUpFutureResource {
 // TODO: we can likely remove the error code check as the status should be sufficient
 return (
 this.#resource.verifications.externalAccount.status === 'transferable' &&
 this.#resource.verifications.externalAccount.error?.code === 'external_account_exists'
 this.#resource.verifications.externalAccount.error?.code === ERROR_CODES.EXTERNAL_ACCOUNT_EXISTS
 );
 }

Expand Down

33 changes: 33 additions & 0 deletions
packages/clerk-js/src/utils/__tests__/authenticateWithTransport.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
import type { ClerkRuntimeError } from '@clerk/shared/error';
import { ERROR_CODES } from '@clerk/shared/internal/clerk-js/constants';
import { describe, expect, it, vi } from 'vitest';

import { _authenticateWithTransport } from '../authenticateWithTransport';
Expand DownExpand Up@@ -64,6 +65,38 @@ describe('_authenticateWithTransport', () => {
 expect(clerk.__internal_handleResourceCallback).toHaveBeenCalledWith(resource, {});
 });

 it.each([ERROR_CODES.EXTERNAL_ACCOUNT_NOT_FOUND, ERROR_CODES.EXTERNAL_ACCOUNT_EXISTS])(
 'continues to callback handling for native OAuth transfer signal %s',
 async errorCode => {
 const clerk = makeClerk();
 const transport = {
 getRedirectUrl: vi.fn().mockResolvedValue('myapp://sso-callback'),
 open: vi.fn().mockResolvedValue({
 callbackUrl: `myapp://sso-callback?__clerk_status=failed&__clerk_error_code=${errorCode}`,
 }),
 };
 const resource = {
 reload: vi.fn().mockResolvedValue(undefined),
 create: vi.fn().mockResolvedValue(undefined),
 } as any;
 const authenticateMethod = vi.fn(async (_params, navigate) => navigate('https://provider.example/auth'));
 const callbackParams = { signInUrl: '/sign-in' };

 await _authenticateWithTransport({
 clerk: clerk as any,
 transport,
 resource,
 authenticateMethod,
 params: {} as any,
 callbackParams,
 });

 expect(resource.reload).toHaveBeenCalledWith();
 expect(resource.create).not.toHaveBeenCalled();
 expect(clerk.__internal_handleResourceCallback).toHaveBeenCalledWith(resource, callbackParams);
 },
 );

 it('rejects with a localizable error without reloading when the native callback reports OAuth failure', async () => {
 const clerk = makeClerk();
 const transport = {
Expand Down

11 changes: 10 additions & 1 deletion
packages/clerk-js/src/utils/authenticateWithTransport.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
import { ClerkRuntimeError } from '@clerk/shared/error';
import { ERROR_CODES } from '@clerk/shared/internal/clerk-js/constants';
import type {
 AuthenticateWithRedirectParams,
 HandleOAuthCallbackParams,
Expand All@@ -21,8 +22,12 @@ type ClerkWithResourceCallback = {

const NATIVE_OAUTH_FAILED_STATUS = 'failed';
const NATIVE_OAUTH_ERROR_FALLBACK_CODE = 'oauth_callback_failed';
const NATIVE_OAUTH_TRANSFER_SIGNAL_CODES = new Set<string>([
 ERROR_CODES.EXTERNAL_ACCOUNT_NOT_FOUND,
 ERROR_CODES.EXTERNAL_ACCOUNT_EXISTS,
]);
const NATIVE_OAUTH_ERROR_MESSAGES: Record<string, string> = {
oauth_access_denied: 'You did not grant access to your account.',
[ERROR_CODES.OAUTH_ACCESS_DENIED]: 'You did not grant access to your account.',
};

function getNativeOAuthCallbackFailure(callbackUrl: string): { code: string; message: string } | null {
Expand All@@ -34,6 +39,10 @@ function getNativeOAuthCallbackFailure(callbackUrl: string): { code: string; mes
 }

 const unsafeCode = searchParams.get('__clerk_error_code') || NATIVE_OAUTH_ERROR_FALLBACK_CODE;
 if (NATIVE_OAUTH_TRANSFER_SIGNAL_CODES.has(unsafeCode)) {
 return null;
 }

 const code = NATIVE_OAUTH_ERROR_MESSAGES[unsafeCode] ? unsafeCode : NATIVE_OAUTH_ERROR_FALLBACK_CODE;

 return {
Expand Down

1 change: 1 addition & 0 deletions
packages/shared/src/internal/clerk-js/constants.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -33,6 +33,7 @@ export const ERROR_CODES = {
 SAML_USER_ATTRIBUTE_MISSING: 'saml_user_attribute_missing',
 USER_LOCKED: 'user_locked',
 EXTERNAL_ACCOUNT_NOT_FOUND: 'external_account_not_found',
 EXTERNAL_ACCOUNT_EXISTS: 'external_account_exists',
 SESSION_EXISTS: 'session_exists',
 SIGN_UP_MODE_RESTRICTED: 'sign_up_mode_restricted',
 SIGN_UP_MODE_RESTRICTED_WAITLIST: 'sign_up_restricted_waitlist',
Expand Down
Loading

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

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Merged

wobsoriano
merged 2 commits into

from

Jun 29, 2026
 Merged


fix(js): Handle native OAuth transfer callbacks
#9037
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
aa61055

fix(js): handle native OAuth transfer callbacks


wobsoriano Jun 29, 2026
f3e3a9b

Merge branch 'main' into rob/user-5648


wobsoriano Jun 29, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


6 changes: 6 additions & 0 deletions
.changeset/native-oauth-transfer-signals.md

View file


Open in desktop

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

Fix native OAuth transport handling for combined sign-in-or-up flows so transfer callbacks can continue instead of surfacing a generic OAuth callback failure.

7 changes: 4 additions & 3 deletions
packages/clerk-js/src/core/__tests__/clerk.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
import { ClerkOfflineError, EmailLinkErrorCodeStatus } from '@clerk/shared/error';
import { ERROR_CODES } from '@clerk/shared/internal/clerk-js/constants';
import type {
 ActiveSessionResource,
 PendingSessionResource,
Expand DownExpand Up@@ -1487,7 +1488,7 @@ describe('Clerk singleton', () => {
 strategy: 'oauth_google',
 external_verification_redirect_url: null,
 error: {
 code: 'external_account_exists',
 code: ERROR_CODES.EXTERNAL_ACCOUNT_EXISTS,
 long_message: 'This external account already exists.',
 message: 'already exists',
 },
Expand All@@ -1499,7 +1500,7 @@ describe('Clerk singleton', () => {
 strategy: 'oauth_google',
 external_verification_redirect_url: null,
 error: {
 code: 'external_account_exists',
 code: ERROR_CODES.EXTERNAL_ACCOUNT_EXISTS,
 long_message: 'This external account already exists.',
 message: 'already exists',
 },
Expand DownExpand Up@@ -2085,7 +2086,7 @@ describe('Clerk singleton', () => {
 external_account: {
 status: 'transferable',
 error: {
 code: 'external_account_exists',
 code: ERROR_CODES.EXTERNAL_ACCOUNT_EXISTS,
 },
 },
 },
Expand Down

3 changes: 2 additions & 1 deletion
packages/clerk-js/src/core/clerk.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2493,7 +2493,8 @@ export class Clerk implements ClerkInterface {
 }

 const userExistsButNeedsToSignIn =
 su.externalAccountStatus === 'transferable' && su.externalAccountErrorCode === 'external_account_exists';
 su.externalAccountStatus === 'transferable' &&
 su.externalAccountErrorCode === ERROR_CODES.EXTERNAL_ACCOUNT_EXISTS;

 if (userExistsButNeedsToSignIn) {
 const res = await signIn.create({ transfer: true });
Expand Down

3 changes: 2 additions & 1 deletion
packages/clerk-js/src/core/resources/SignUp.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
import { inBrowser } from '@clerk/shared/browser';
import { type ClerkError, ClerkRuntimeError, isCaptchaError, isClerkAPIResponseError } from '@clerk/shared/error';
import { ERROR_CODES } from '@clerk/shared/internal/clerk-js/constants';
import { createValidatePassword } from '@clerk/shared/internal/clerk-js/passwords/password';
import { Poller } from '@clerk/shared/poller';
import type {
Expand DownExpand Up@@ -794,7 +795,7 @@ class SignUpFuture implements SignUpFutureResource {
 // TODO: we can likely remove the error code check as the status should be sufficient
 return (
 this.#resource.verifications.externalAccount.status === 'transferable' &&
 this.#resource.verifications.externalAccount.error?.code === 'external_account_exists'
 this.#resource.verifications.externalAccount.error?.code === ERROR_CODES.EXTERNAL_ACCOUNT_EXISTS
 );
 }

Expand Down

33 changes: 33 additions & 0 deletions
packages/clerk-js/src/utils/__tests__/authenticateWithTransport.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
import type { ClerkRuntimeError } from '@clerk/shared/error';
import { ERROR_CODES } from '@clerk/shared/internal/clerk-js/constants';
import { describe, expect, it, vi } from 'vitest';

import { _authenticateWithTransport } from '../authenticateWithTransport';
Expand DownExpand Up@@ -64,6 +65,38 @@ describe('_authenticateWithTransport', () => {
 expect(clerk.__internal_handleResourceCallback).toHaveBeenCalledWith(resource, {});
 });

 it.each([ERROR_CODES.EXTERNAL_ACCOUNT_NOT_FOUND, ERROR_CODES.EXTERNAL_ACCOUNT_EXISTS])(
 'continues to callback handling for native OAuth transfer signal %s',
 async errorCode => {
 const clerk = makeClerk();
 const transport = {
 getRedirectUrl: vi.fn().mockResolvedValue('myapp://sso-callback'),
 open: vi.fn().mockResolvedValue({
 callbackUrl: `myapp://sso-callback?__clerk_status=failed&__clerk_error_code=${errorCode}`,
 }),
 };
 const resource = {
 reload: vi.fn().mockResolvedValue(undefined),
 create: vi.fn().mockResolvedValue(undefined),
 } as any;
 const authenticateMethod = vi.fn(async (_params, navigate) => navigate('https://provider.example/auth'));
 const callbackParams = { signInUrl: '/sign-in' };

 await _authenticateWithTransport({
 clerk: clerk as any,
 transport,
 resource,
 authenticateMethod,
 params: {} as any,
 callbackParams,
 });

 expect(resource.reload).toHaveBeenCalledWith();
 expect(resource.create).not.toHaveBeenCalled();
 expect(clerk.__internal_handleResourceCallback).toHaveBeenCalledWith(resource, callbackParams);
 },
 );

 it('rejects with a localizable error without reloading when the native callback reports OAuth failure', async () => {
 const clerk = makeClerk();
 const transport = {
Expand Down

11 changes: 10 additions & 1 deletion
packages/clerk-js/src/utils/authenticateWithTransport.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
import { ClerkRuntimeError } from '@clerk/shared/error';
import { ERROR_CODES } from '@clerk/shared/internal/clerk-js/constants';
import type {
 AuthenticateWithRedirectParams,
 HandleOAuthCallbackParams,
Expand All@@ -21,8 +22,12 @@ type ClerkWithResourceCallback = {

const NATIVE_OAUTH_FAILED_STATUS = 'failed';
const NATIVE_OAUTH_ERROR_FALLBACK_CODE = 'oauth_callback_failed';
const NATIVE_OAUTH_TRANSFER_SIGNAL_CODES = new Set<string>([
 ERROR_CODES.EXTERNAL_ACCOUNT_NOT_FOUND,
 ERROR_CODES.EXTERNAL_ACCOUNT_EXISTS,
]);
const NATIVE_OAUTH_ERROR_MESSAGES: Record<string, string> = {
oauth_access_denied: 'You did not grant access to your account.',
[ERROR_CODES.OAUTH_ACCESS_DENIED]: 'You did not grant access to your account.',
};

function getNativeOAuthCallbackFailure(callbackUrl: string): { code: string; message: string } | null {
Expand All@@ -34,6 +39,10 @@ function getNativeOAuthCallbackFailure(callbackUrl: string): { code: string; mes
 }

 const unsafeCode = searchParams.get('__clerk_error_code') || NATIVE_OAUTH_ERROR_FALLBACK_CODE;
 if (NATIVE_OAUTH_TRANSFER_SIGNAL_CODES.has(unsafeCode)) {
 return null;
 }

 const code = NATIVE_OAUTH_ERROR_MESSAGES[unsafeCode] ? unsafeCode : NATIVE_OAUTH_ERROR_FALLBACK_CODE;

 return {
Expand Down

1 change: 1 addition & 0 deletions
packages/shared/src/internal/clerk-js/constants.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -33,6 +33,7 @@ export const ERROR_CODES = {
 SAML_USER_ATTRIBUTE_MISSING: 'saml_user_attribute_missing',
 USER_LOCKED: 'user_locked',
 EXTERNAL_ACCOUNT_NOT_FOUND: 'external_account_not_found',
 EXTERNAL_ACCOUNT_EXISTS: 'external_account_exists',
 SESSION_EXISTS: 'session_exists',
 SIGN_UP_MODE_RESTRICTED: 'sign_up_mode_restricted',
 SIGN_UP_MODE_RESTRICTED_WAITLIST: 'sign_up_restricted_waitlist',
Expand Down
Loading

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

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Merged

wobsoriano
merged 2 commits into

from

Jun 29, 2026
 Merged


fix(js): Handle native OAuth transfer callbacks
#9037
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
aa61055

fix(js): handle native OAuth transfer callbacks


wobsoriano Jun 29, 2026
f3e3a9b

Merge branch 'main' into rob/user-5648


wobsoriano Jun 29, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


6 changes: 6 additions & 0 deletions
.changeset/native-oauth-transfer-signals.md

View file


Open in desktop

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

Fix native OAuth transport handling for combined sign-in-or-up flows so transfer callbacks can continue instead of surfacing a generic OAuth callback failure.

7 changes: 4 additions & 3 deletions
packages/clerk-js/src/core/__tests__/clerk.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
import { ClerkOfflineError, EmailLinkErrorCodeStatus } from '@clerk/shared/error';
import { ERROR_CODES } from '@clerk/shared/internal/clerk-js/constants';
import type {
 ActiveSessionResource,
 PendingSessionResource,
Expand DownExpand Up@@ -1487,7 +1488,7 @@ describe('Clerk singleton', () => {
 strategy: 'oauth_google',
 external_verification_redirect_url: null,
 error: {
 code: 'external_account_exists',
 code: ERROR_CODES.EXTERNAL_ACCOUNT_EXISTS,
 long_message: 'This external account already exists.',
 message: 'already exists',
 },
Expand All@@ -1499,7 +1500,7 @@ describe('Clerk singleton', () => {
 strategy: 'oauth_google',
 external_verification_redirect_url: null,
 error: {
 code: 'external_account_exists',
 code: ERROR_CODES.EXTERNAL_ACCOUNT_EXISTS,
 long_message: 'This external account already exists.',
 message: 'already exists',
 },
Expand DownExpand Up@@ -2085,7 +2086,7 @@ describe('Clerk singleton', () => {
 external_account: {
 status: 'transferable',
 error: {
 code: 'external_account_exists',
 code: ERROR_CODES.EXTERNAL_ACCOUNT_EXISTS,
 },
 },
 },
Expand Down

3 changes: 2 additions & 1 deletion
packages/clerk-js/src/core/clerk.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2493,7 +2493,8 @@ export class Clerk implements ClerkInterface {
 }

 const userExistsButNeedsToSignIn =
 su.externalAccountStatus === 'transferable' && su.externalAccountErrorCode === 'external_account_exists';
 su.externalAccountStatus === 'transferable' &&
 su.externalAccountErrorCode === ERROR_CODES.EXTERNAL_ACCOUNT_EXISTS;

 if (userExistsButNeedsToSignIn) {
 const res = await signIn.create({ transfer: true });
Expand Down

3 changes: 2 additions & 1 deletion
packages/clerk-js/src/core/resources/SignUp.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
import { inBrowser } from '@clerk/shared/browser';
import { type ClerkError, ClerkRuntimeError, isCaptchaError, isClerkAPIResponseError } from '@clerk/shared/error';
import { ERROR_CODES } from '@clerk/shared/internal/clerk-js/constants';
import { createValidatePassword } from '@clerk/shared/internal/clerk-js/passwords/password';
import { Poller } from '@clerk/shared/poller';
import type {
Expand DownExpand Up@@ -794,7 +795,7 @@ class SignUpFuture implements SignUpFutureResource {
 // TODO: we can likely remove the error code check as the status should be sufficient
 return (
 this.#resource.verifications.externalAccount.status === 'transferable' &&
 this.#resource.verifications.externalAccount.error?.code === 'external_account_exists'
 this.#resource.verifications.externalAccount.error?.code === ERROR_CODES.EXTERNAL_ACCOUNT_EXISTS
 );
 }

Expand Down

33 changes: 33 additions & 0 deletions
packages/clerk-js/src/utils/__tests__/authenticateWithTransport.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
import type { ClerkRuntimeError } from '@clerk/shared/error';
import { ERROR_CODES } from '@clerk/shared/internal/clerk-js/constants';
import { describe, expect, it, vi } from 'vitest';

import { _authenticateWithTransport } from '../authenticateWithTransport';
Expand DownExpand Up@@ -64,6 +65,38 @@ describe('_authenticateWithTransport', () => {
 expect(clerk.__internal_handleResourceCallback).toHaveBeenCalledWith(resource, {});
 });

 it.each([ERROR_CODES.EXTERNAL_ACCOUNT_NOT_FOUND, ERROR_CODES.EXTERNAL_ACCOUNT_EXISTS])(
 'continues to callback handling for native OAuth transfer signal %s',
 async errorCode => {
 const clerk = makeClerk();
 const transport = {
 getRedirectUrl: vi.fn().mockResolvedValue('myapp://sso-callback'),
 open: vi.fn().mockResolvedValue({
 callbackUrl: `myapp://sso-callback?__clerk_status=failed&__clerk_error_code=${errorCode}`,
 }),
 };
 const resource = {
 reload: vi.fn().mockResolvedValue(undefined),
 create: vi.fn().mockResolvedValue(undefined),
 } as any;
 const authenticateMethod = vi.fn(async (_params, navigate) => navigate('https://provider.example/auth'));
 const callbackParams = { signInUrl: '/sign-in' };

 await _authenticateWithTransport({
 clerk: clerk as any,
 transport,
 resource,
 authenticateMethod,
 params: {} as any,
 callbackParams,
 });

 expect(resource.reload).toHaveBeenCalledWith();
 expect(resource.create).not.toHaveBeenCalled();
 expect(clerk.__internal_handleResourceCallback).toHaveBeenCalledWith(resource, callbackParams);
 },
 );

 it('rejects with a localizable error without reloading when the native callback reports OAuth failure', async () => {
 const clerk = makeClerk();
 const transport = {
Expand Down

11 changes: 10 additions & 1 deletion
packages/clerk-js/src/utils/authenticateWithTransport.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
import { ClerkRuntimeError } from '@clerk/shared/error';
import { ERROR_CODES } from '@clerk/shared/internal/clerk-js/constants';
import type {
 AuthenticateWithRedirectParams,
 HandleOAuthCallbackParams,
Expand All@@ -21,8 +22,12 @@ type ClerkWithResourceCallback = {

const NATIVE_OAUTH_FAILED_STATUS = 'failed';
const NATIVE_OAUTH_ERROR_FALLBACK_CODE = 'oauth_callback_failed';
const NATIVE_OAUTH_TRANSFER_SIGNAL_CODES = new Set<string>([
 ERROR_CODES.EXTERNAL_ACCOUNT_NOT_FOUND,
 ERROR_CODES.EXTERNAL_ACCOUNT_EXISTS,
]);
const NATIVE_OAUTH_ERROR_MESSAGES: Record<string, string> = {
oauth_access_denied: 'You did not grant access to your account.',
[ERROR_CODES.OAUTH_ACCESS_DENIED]: 'You did not grant access to your account.',
};

function getNativeOAuthCallbackFailure(callbackUrl: string): { code: string; message: string } | null {
Expand All@@ -34,6 +39,10 @@ function getNativeOAuthCallbackFailure(callbackUrl: string): { code: string; mes
 }

 const unsafeCode = searchParams.get('__clerk_error_code') || NATIVE_OAUTH_ERROR_FALLBACK_CODE;
 if (NATIVE_OAUTH_TRANSFER_SIGNAL_CODES.has(unsafeCode)) {
 return null;
 }

 const code = NATIVE_OAUTH_ERROR_MESSAGES[unsafeCode] ? unsafeCode : NATIVE_OAUTH_ERROR_FALLBACK_CODE;

 return {
Expand Down

1 change: 1 addition & 0 deletions
packages/shared/src/internal/clerk-js/constants.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -33,6 +33,7 @@ export const ERROR_CODES = {
 SAML_USER_ATTRIBUTE_MISSING: 'saml_user_attribute_missing',
 USER_LOCKED: 'user_locked',
 EXTERNAL_ACCOUNT_NOT_FOUND: 'external_account_not_found',
 EXTERNAL_ACCOUNT_EXISTS: 'external_account_exists',
 SESSION_EXISTS: 'session_exists',
 SIGN_UP_MODE_RESTRICTED: 'sign_up_mode_restricted',
 SIGN_UP_MODE_RESTRICTED_WAITLIST: 'sign_up_restricted_waitlist',
Expand Down
Loading

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

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Merged

wobsoriano
merged 2 commits into

from

Jun 29, 2026
 Merged


fix(js): Handle native OAuth transfer callbacks
#9037
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
aa61055

fix(js): handle native OAuth transfer callbacks


wobsoriano Jun 29, 2026
f3e3a9b

Merge branch 'main' into rob/user-5648


wobsoriano Jun 29, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


6 changes: 6 additions & 0 deletions
.changeset/native-oauth-transfer-signals.md

View file


Open in desktop

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

Fix native OAuth transport handling for combined sign-in-or-up flows so transfer callbacks can continue instead of surfacing a generic OAuth callback failure.

7 changes: 4 additions & 3 deletions
packages/clerk-js/src/core/__tests__/clerk.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
import { ClerkOfflineError, EmailLinkErrorCodeStatus } from '@clerk/shared/error';
import { ERROR_CODES } from '@clerk/shared/internal/clerk-js/constants';
import type {
 ActiveSessionResource,
 PendingSessionResource,
Expand DownExpand Up@@ -1487,7 +1488,7 @@ describe('Clerk singleton', () => {
 strategy: 'oauth_google',
 external_verification_redirect_url: null,
 error: {
 code: 'external_account_exists',
 code: ERROR_CODES.EXTERNAL_ACCOUNT_EXISTS,
 long_message: 'This external account already exists.',
 message: 'already exists',
 },
Expand All@@ -1499,7 +1500,7 @@ describe('Clerk singleton', () => {
 strategy: 'oauth_google',
 external_verification_redirect_url: null,
 error: {
 code: 'external_account_exists',
 code: ERROR_CODES.EXTERNAL_ACCOUNT_EXISTS,
 long_message: 'This external account already exists.',
 message: 'already exists',
 },
Expand DownExpand Up@@ -2085,7 +2086,7 @@ describe('Clerk singleton', () => {
 external_account: {
 status: 'transferable',
 error: {
 code: 'external_account_exists',
 code: ERROR_CODES.EXTERNAL_ACCOUNT_EXISTS,
 },
 },
 },
Expand Down

3 changes: 2 additions & 1 deletion
packages/clerk-js/src/core/clerk.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2493,7 +2493,8 @@ export class Clerk implements ClerkInterface {
 }

 const userExistsButNeedsToSignIn =
 su.externalAccountStatus === 'transferable' && su.externalAccountErrorCode === 'external_account_exists';
 su.externalAccountStatus === 'transferable' &&
 su.externalAccountErrorCode === ERROR_CODES.EXTERNAL_ACCOUNT_EXISTS;

 if (userExistsButNeedsToSignIn) {
 const res = await signIn.create({ transfer: true });
Expand Down

3 changes: 2 additions & 1 deletion
packages/clerk-js/src/core/resources/SignUp.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
import { inBrowser } from '@clerk/shared/browser';
import { type ClerkError, ClerkRuntimeError, isCaptchaError, isClerkAPIResponseError } from '@clerk/shared/error';
import { ERROR_CODES } from '@clerk/shared/internal/clerk-js/constants';
import { createValidatePassword } from '@clerk/shared/internal/clerk-js/passwords/password';
import { Poller } from '@clerk/shared/poller';
import type {
Expand DownExpand Up@@ -794,7 +795,7 @@ class SignUpFuture implements SignUpFutureResource {
 // TODO: we can likely remove the error code check as the status should be sufficient
 return (
 this.#resource.verifications.externalAccount.status === 'transferable' &&
 this.#resource.verifications.externalAccount.error?.code === 'external_account_exists'
 this.#resource.verifications.externalAccount.error?.code === ERROR_CODES.EXTERNAL_ACCOUNT_EXISTS
 );
 }

Expand Down

33 changes: 33 additions & 0 deletions
packages/clerk-js/src/utils/__tests__/authenticateWithTransport.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
import type { ClerkRuntimeError } from '@clerk/shared/error';
import { ERROR_CODES } from '@clerk/shared/internal/clerk-js/constants';
import { describe, expect, it, vi } from 'vitest';

import { _authenticateWithTransport } from '../authenticateWithTransport';
Expand DownExpand Up@@ -64,6 +65,38 @@ describe('_authenticateWithTransport', () => {
 expect(clerk.__internal_handleResourceCallback).toHaveBeenCalledWith(resource, {});
 });

 it.each([ERROR_CODES.EXTERNAL_ACCOUNT_NOT_FOUND, ERROR_CODES.EXTERNAL_ACCOUNT_EXISTS])(
 'continues to callback handling for native OAuth transfer signal %s',
 async errorCode => {
 const clerk = makeClerk();
 const transport = {
 getRedirectUrl: vi.fn().mockResolvedValue('myapp://sso-callback'),
 open: vi.fn().mockResolvedValue({
 callbackUrl: `myapp://sso-callback?__clerk_status=failed&__clerk_error_code=${errorCode}`,
 }),
 };
 const resource = {
 reload: vi.fn().mockResolvedValue(undefined),
 create: vi.fn().mockResolvedValue(undefined),
 } as any;
 const authenticateMethod = vi.fn(async (_params, navigate) => navigate('https://provider.example/auth'));
 const callbackParams = { signInUrl: '/sign-in' };

 await _authenticateWithTransport({
 clerk: clerk as any,
 transport,
 resource,
 authenticateMethod,
 params: {} as any,
 callbackParams,
 });

 expect(resource.reload).toHaveBeenCalledWith();
 expect(resource.create).not.toHaveBeenCalled();
 expect(clerk.__internal_handleResourceCallback).toHaveBeenCalledWith(resource, callbackParams);
 },
 );

 it('rejects with a localizable error without reloading when the native callback reports OAuth failure', async () => {
 const clerk = makeClerk();
 const transport = {
Expand Down

11 changes: 10 additions & 1 deletion
packages/clerk-js/src/utils/authenticateWithTransport.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
import { ClerkRuntimeError } from '@clerk/shared/error';
import { ERROR_CODES } from '@clerk/shared/internal/clerk-js/constants';
import type {
 AuthenticateWithRedirectParams,
 HandleOAuthCallbackParams,
Expand All@@ -21,8 +22,12 @@ type ClerkWithResourceCallback = {

const NATIVE_OAUTH_FAILED_STATUS = 'failed';
const NATIVE_OAUTH_ERROR_FALLBACK_CODE = 'oauth_callback_failed';
const NATIVE_OAUTH_TRANSFER_SIGNAL_CODES = new Set<string>([
 ERROR_CODES.EXTERNAL_ACCOUNT_NOT_FOUND,
 ERROR_CODES.EXTERNAL_ACCOUNT_EXISTS,
]);
const NATIVE_OAUTH_ERROR_MESSAGES: Record<string, string> = {
oauth_access_denied: 'You did not grant access to your account.',
[ERROR_CODES.OAUTH_ACCESS_DENIED]: 'You did not grant access to your account.',
};

function getNativeOAuthCallbackFailure(callbackUrl: string): { code: string; message: string } | null {
Expand All@@ -34,6 +39,10 @@ function getNativeOAuthCallbackFailure(callbackUrl: string): { code: string; mes
 }

 const unsafeCode = searchParams.get('__clerk_error_code') || NATIVE_OAUTH_ERROR_FALLBACK_CODE;
 if (NATIVE_OAUTH_TRANSFER_SIGNAL_CODES.has(unsafeCode)) {
 return null;
 }

 const code = NATIVE_OAUTH_ERROR_MESSAGES[unsafeCode] ? unsafeCode : NATIVE_OAUTH_ERROR_FALLBACK_CODE;

 return {
Expand Down

1 change: 1 addition & 0 deletions
packages/shared/src/internal/clerk-js/constants.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -33,6 +33,7 @@ export const ERROR_CODES = {
 SAML_USER_ATTRIBUTE_MISSING: 'saml_user_attribute_missing',
 USER_LOCKED: 'user_locked',
 EXTERNAL_ACCOUNT_NOT_FOUND: 'external_account_not_found',
 EXTERNAL_ACCOUNT_EXISTS: 'external_account_exists',
 SESSION_EXISTS: 'session_exists',
 SIGN_UP_MODE_RESTRICTED: 'sign_up_mode_restricted',
 SIGN_UP_MODE_RESTRICTED_WAITLIST: 'sign_up_restricted_waitlist',
Expand Down
Loading

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

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Merged

wobsoriano
merged 2 commits into

from

Jun 29, 2026
 Merged


fix(js): Handle native OAuth transfer callbacks
#9037
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
aa61055

fix(js): handle native OAuth transfer callbacks


wobsoriano Jun 29, 2026
f3e3a9b

Merge branch 'main' into rob/user-5648


wobsoriano Jun 29, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


6 changes: 6 additions & 0 deletions
.changeset/native-oauth-transfer-signals.md

View file


Open in desktop

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

Fix native OAuth transport handling for combined sign-in-or-up flows so transfer callbacks can continue instead of surfacing a generic OAuth callback failure.

7 changes: 4 additions & 3 deletions
packages/clerk-js/src/core/__tests__/clerk.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
import { ClerkOfflineError, EmailLinkErrorCodeStatus } from '@clerk/shared/error';
import { ERROR_CODES } from '@clerk/shared/internal/clerk-js/constants';
import type {
 ActiveSessionResource,
 PendingSessionResource,
Expand DownExpand Up@@ -1487,7 +1488,7 @@ describe('Clerk singleton', () => {
 strategy: 'oauth_google',
 external_verification_redirect_url: null,
 error: {
 code: 'external_account_exists',
 code: ERROR_CODES.EXTERNAL_ACCOUNT_EXISTS,
 long_message: 'This external account already exists.',
 message: 'already exists',
 },
Expand All@@ -1499,7 +1500,7 @@ describe('Clerk singleton', () => {
 strategy: 'oauth_google',
 external_verification_redirect_url: null,
 error: {
 code: 'external_account_exists',
 code: ERROR_CODES.EXTERNAL_ACCOUNT_EXISTS,
 long_message: 'This external account already exists.',
 message: 'already exists',
 },
Expand DownExpand Up@@ -2085,7 +2086,7 @@ describe('Clerk singleton', () => {
 external_account: {
 status: 'transferable',
 error: {
 code: 'external_account_exists',
 code: ERROR_CODES.EXTERNAL_ACCOUNT_EXISTS,
 },
 },
 },
Expand Down

3 changes: 2 additions & 1 deletion
packages/clerk-js/src/core/clerk.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2493,7 +2493,8 @@ export class Clerk implements ClerkInterface {
 }

 const userExistsButNeedsToSignIn =
 su.externalAccountStatus === 'transferable' && su.externalAccountErrorCode === 'external_account_exists';
 su.externalAccountStatus === 'transferable' &&
 su.externalAccountErrorCode === ERROR_CODES.EXTERNAL_ACCOUNT_EXISTS;

 if (userExistsButNeedsToSignIn) {
 const res = await signIn.create({ transfer: true });
Expand Down

3 changes: 2 additions & 1 deletion
packages/clerk-js/src/core/resources/SignUp.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
import { inBrowser } from '@clerk/shared/browser';
import { type ClerkError, ClerkRuntimeError, isCaptchaError, isClerkAPIResponseError } from '@clerk/shared/error';
import { ERROR_CODES } from '@clerk/shared/internal/clerk-js/constants';
import { createValidatePassword } from '@clerk/shared/internal/clerk-js/passwords/password';
import { Poller } from '@clerk/shared/poller';
import type {
Expand DownExpand Up@@ -794,7 +795,7 @@ class SignUpFuture implements SignUpFutureResource {
 // TODO: we can likely remove the error code check as the status should be sufficient
 return (
 this.#resource.verifications.externalAccount.status === 'transferable' &&
 this.#resource.verifications.externalAccount.error?.code === 'external_account_exists'
 this.#resource.verifications.externalAccount.error?.code === ERROR_CODES.EXTERNAL_ACCOUNT_EXISTS
 );
 }

Expand Down

33 changes: 33 additions & 0 deletions
packages/clerk-js/src/utils/__tests__/authenticateWithTransport.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
import type { ClerkRuntimeError } from '@clerk/shared/error';
import { ERROR_CODES } from '@clerk/shared/internal/clerk-js/constants';
import { describe, expect, it, vi } from 'vitest';

import { _authenticateWithTransport } from '../authenticateWithTransport';
Expand DownExpand Up@@ -64,6 +65,38 @@ describe('_authenticateWithTransport', () => {
 expect(clerk.__internal_handleResourceCallback).toHaveBeenCalledWith(resource, {});
 });

 it.each([ERROR_CODES.EXTERNAL_ACCOUNT_NOT_FOUND, ERROR_CODES.EXTERNAL_ACCOUNT_EXISTS])(
 'continues to callback handling for native OAuth transfer signal %s',
 async errorCode => {
 const clerk = makeClerk();
 const transport = {
 getRedirectUrl: vi.fn().mockResolvedValue('myapp://sso-callback'),
 open: vi.fn().mockResolvedValue({
 callbackUrl: `myapp://sso-callback?__clerk_status=failed&__clerk_error_code=${errorCode}`,
 }),
 };
 const resource = {
 reload: vi.fn().mockResolvedValue(undefined),
 create: vi.fn().mockResolvedValue(undefined),
 } as any;
 const authenticateMethod = vi.fn(async (_params, navigate) => navigate('https://provider.example/auth'));
 const callbackParams = { signInUrl: '/sign-in' };

 await _authenticateWithTransport({
 clerk: clerk as any,
 transport,
 resource,
 authenticateMethod,
 params: {} as any,
 callbackParams,
 });

 expect(resource.reload).toHaveBeenCalledWith();
 expect(resource.create).not.toHaveBeenCalled();
 expect(clerk.__internal_handleResourceCallback).toHaveBeenCalledWith(resource, callbackParams);
 },
 );

 it('rejects with a localizable error without reloading when the native callback reports OAuth failure', async () => {
 const clerk = makeClerk();
 const transport = {
Expand Down

11 changes: 10 additions & 1 deletion
packages/clerk-js/src/utils/authenticateWithTransport.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
import { ClerkRuntimeError } from '@clerk/shared/error';
import { ERROR_CODES } from '@clerk/shared/internal/clerk-js/constants';
import type {
 AuthenticateWithRedirectParams,
 HandleOAuthCallbackParams,
Expand All@@ -21,8 +22,12 @@ type ClerkWithResourceCallback = {

const NATIVE_OAUTH_FAILED_STATUS = 'failed';
const NATIVE_OAUTH_ERROR_FALLBACK_CODE = 'oauth_callback_failed';
const NATIVE_OAUTH_TRANSFER_SIGNAL_CODES = new Set<string>([
 ERROR_CODES.EXTERNAL_ACCOUNT_NOT_FOUND,
 ERROR_CODES.EXTERNAL_ACCOUNT_EXISTS,
]);
const NATIVE_OAUTH_ERROR_MESSAGES: Record<string, string> = {
oauth_access_denied: 'You did not grant access to your account.',
[ERROR_CODES.OAUTH_ACCESS_DENIED]: 'You did not grant access to your account.',
};

function getNativeOAuthCallbackFailure(callbackUrl: string): { code: string; message: string } | null {
Expand All@@ -34,6 +39,10 @@ function getNativeOAuthCallbackFailure(callbackUrl: string): { code: string; mes
 }

 const unsafeCode = searchParams.get('__clerk_error_code') || NATIVE_OAUTH_ERROR_FALLBACK_CODE;
 if (NATIVE_OAUTH_TRANSFER_SIGNAL_CODES.has(unsafeCode)) {
 return null;
 }

 const code = NATIVE_OAUTH_ERROR_MESSAGES[unsafeCode] ? unsafeCode : NATIVE_OAUTH_ERROR_FALLBACK_CODE;

 return {
Expand Down

1 change: 1 addition & 0 deletions
packages/shared/src/internal/clerk-js/constants.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -33,6 +33,7 @@ export const ERROR_CODES = {
 SAML_USER_ATTRIBUTE_MISSING: 'saml_user_attribute_missing',
 USER_LOCKED: 'user_locked',
 EXTERNAL_ACCOUNT_NOT_FOUND: 'external_account_not_found',
 EXTERNAL_ACCOUNT_EXISTS: 'external_account_exists',
 SESSION_EXISTS: 'session_exists',
 SIGN_UP_MODE_RESTRICTED: 'sign_up_mode_restricted',
 SIGN_UP_MODE_RESTRICTED_WAITLIST: 'sign_up_restricted_waitlist',
Expand Down
Loading