Closed
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
5 changes: 5 additions & 0 deletions .changeset/expo-callback-nonce-hash.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
'@clerk/expo': patch
---

Fixed SSO sign-ins failing with a 401 `signed_out` error when the OAuth callback URL carries a stray `#` on the `rotating_token_nonce` parameter, as seen on iOS.
8 changes: 4 additions & 4 deletions packages/expo/src/hooks/useHostedAuth.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,7 @@ import type * as WebBrowser from 'expo-web-browser';
import { Platform } from 'react-native';

import { getClerkInstance } from '../provider/singleton';
import { getAuthSessionCallbackParam } from '../utils/authSessionCallback';
import { errorThrower } from '../utils/errors';
import type { HostedAuthClerkInstance, HostedAuthMode } from '../utils/hostedAuth';
import { applyHostedAuthClientJSON, createHostedAuth, redeemHostedAuth } from '../utils/hostedAuth';
Expand DownExpand Up@@ -159,17 +160,16 @@ export function useHostedAuth(): {
return errorThrower.throw('Hosted auth callback URL did not match the initiated redirect URL.');
}

const callbackParams = callbackUrl.searchParams;
if (callbackParams.get('state') !== state) {
if (getAuthSessionCallbackParam(authSessionResult.url, 'state') !== state) {
return errorThrower.throw('Hosted auth callback state did not match the initiated state.');
}

const rotatingTokenNonce = callbackParams.get('rotating_token_nonce') ?? '';
const rotatingTokenNonce = getAuthSessionCallbackParam(authSessionResult.url, 'rotating_token_nonce') ?? '';
if (!rotatingTokenNonce) {
return errorThrower.throw('Hosted auth callback did not include a rotating token nonce.');
}

const createdSessionId = callbackParams.get('created_session_id');
const createdSessionId = getAuthSessionCallbackParam(authSessionResult.url, 'created_session_id');
if (!createdSessionId) {
return errorThrower.throw('Hosted auth callback did not include the created session.');
}
Expand Down
5 changes: 2 additions & 3 deletions packages/expo/src/hooks/useOAuth.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,7 @@ import { useSignIn, useSignUp } from '@clerk/react/legacy';
import type { OAuthStrategy, SetActive, SignInResource, SignUpResource } from '@clerk/shared/types';
import type * as WebBrowser from 'expo-web-browser';

import { getAuthSessionCallbackParam } from '../utils/authSessionCallback';
import { errorThrower } from '../utils/errors';

export type UseOAuthFlowParams = {
Expand DownExpand Up@@ -98,9 +99,7 @@ export function useOAuth(useOAuthParams: UseOAuthFlowParams) {
};
}

const params = new URL(url).searchParams;

const rotatingTokenNonce = params.get('rotating_token_nonce') || '';
const rotatingTokenNonce = getAuthSessionCallbackParam(url, 'rotating_token_nonce') || '';
await signIn.reload({ rotatingTokenNonce });
Comment on lines +102 to 103

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

🗄️ Data Integrity & Integration | 🟠 Major | ⚡ Quick win

Reject missing or invalid nonces before reloading sign-in.

getAuthSessionCallbackParam returns null for malformed URLs or absent parameters, but || '' causes Line 103 to call signIn.reload({ rotatingTokenNonce: '' }). Fail locally, as hosted auth does, instead of forwarding an invalid nonce to FAPI.

Proposed fix
- const rotatingTokenNonce = getAuthSessionCallbackParam(url, 'rotating_token_nonce') || '';+ const rotatingTokenNonce = getAuthSessionCallbackParam(url, 'rotating_token_nonce');+ if (!rotatingTokenNonce) {+ return errorThrower.throw(+ 'OAuth callback did not include a rotating token nonce. Please restart the OAuth flow.',+ );+ }
await signIn.reload({ rotatingTokenNonce });
📝 Committable suggestion

‼️IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
constrotatingTokenNonce=getAuthSessionCallbackParam(url,'rotating_token_nonce')||'';
awaitsignIn.reload({ rotatingTokenNonce });
constrotatingTokenNonce=getAuthSessionCallbackParam(url,'rotating_token_nonce');
if(!rotatingTokenNonce){
returnerrorThrower.throw(
'OAuth callback did not include a rotating token nonce. Please restart the OAuth flow.',
);
}
awaitsignIn.reload({ rotatingTokenNonce });
🤖 Prompt for AI Agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.
In `@packages/expo/src/hooks/useOAuth.ts` around lines 102 - 103, Update the OAuth
callback flow around getAuthSessionCallbackParam and signIn.reload to reject a
null or otherwise missing rotating token nonce before invoking reload. Remove
the empty-string fallback, fail locally using the existing error-handling
behavior used for invalid auth callback data, and only pass a validated nonce to
signIn.reload.


const { status, firstFactorVerification } = signIn;
Expand Down
4 changes: 2 additions & 2 deletions packages/expo/src/hooks/useSSO.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,7 @@ import type {
} from '@clerk/shared/types';
import type * as WebBrowser from 'expo-web-browser';

import { getAuthSessionCallbackParam } from '../utils/authSessionCallback';
import { errorThrower } from '../utils/errors';

export type StartSSOFlowParams = {
Expand DownExpand Up@@ -106,8 +107,7 @@ export function useSSO() {
};
}

const params = new URL(authSessionResult.url).searchParams;
const rotatingTokenNonce = params.get('rotating_token_nonce') ?? '';
const rotatingTokenNonce = getAuthSessionCallbackParam(authSessionResult.url, 'rotating_token_nonce') ?? '';
await signIn.reload({ rotatingTokenNonce });

const userNeedsToBeCreated = signIn.firstFactorVerification.status === 'transferable';
Expand Down
31 changes: 31 additions & 0 deletions packages/expo/src/utils/__tests__/authSessionCallback.test.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
import { describe, expect, test } from 'vitest';

import { getAuthSessionCallbackParam } from '../authSessionCallback';

describe('getAuthSessionCallbackParam', () => {
test.each([
['a clean URL', 'myapp://sso-callback?rotating_token_nonce=abc123'],
['a literal trailing fragment', 'myapp://sso-callback?rotating_token_nonce=abc123#'],
['a Facebook-style fragment', 'myapp://sso-callback?rotating_token_nonce=abc123#_=_'],
['a percent-encoded trailing hash', 'myapp://sso-callback?rotating_token_nonce=abc123%23'],
['a percent-encoded hash with a suffix', 'myapp://sso-callback?rotating_token_nonce=abc123%23_=_'],
])('returns a clean value given %s', (_, url) => {
expect(getAuthSessionCallbackParam(url, 'rotating_token_nonce')).toBe('abc123');
});

test('leaves params before a corrupted last param intact', () => {
const url = 'myapp:?created_session_id=sess_1&rotating_token_nonce=abc123%23';
expect(getAuthSessionCallbackParam(url, 'created_session_id')).toBe('sess_1');
expect(getAuthSessionCallbackParam(url, 'rotating_token_nonce')).toBe('abc123');
});

test('returns null when the param is missing', () => {
expect(
getAuthSessionCallbackParam('myapp://sso-callback?created_session_id=sess_1', 'rotating_token_nonce'),
).toBeNull();
});

test('returns null for an unparsable URL', () => {
expect(getAuthSessionCallbackParam('not a url', 'rotating_token_nonce')).toBeNull();
});
});
11 changes: 11 additions & 0 deletions packages/expo/src/utils/authSessionCallback.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
// OAuth redirect chains can leave a stray `#` on the callback URL, literal or percent-encoded
// into the last query value, so strip it from both the URL and the extracted value.
export function getAuthSessionCallbackParam(url: string, name: string): string | null {
let value: string | null;
try {
value = new URL(url.split('#')[0]).searchParams.get(name);
} catch {
return null;
}
return value?.split('#')[0] ?? null;
}
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Skip to content
Closed
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
5 changes: 5 additions & 0 deletions .changeset/expo-callback-nonce-hash.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
'@clerk/expo': patch
---

Fixed SSO sign-ins failing with a 401 `signed_out` error when the OAuth callback URL carries a stray `#` on the `rotating_token_nonce` parameter, as seen on iOS.
8 changes: 4 additions & 4 deletions packages/expo/src/hooks/useHostedAuth.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,7 @@ import type * as WebBrowser from 'expo-web-browser';
import { Platform } from 'react-native';

import { getClerkInstance } from '../provider/singleton';
import { getAuthSessionCallbackParam } from '../utils/authSessionCallback';
import { errorThrower } from '../utils/errors';
import type { HostedAuthClerkInstance, HostedAuthMode } from '../utils/hostedAuth';
import { applyHostedAuthClientJSON, createHostedAuth, redeemHostedAuth } from '../utils/hostedAuth';
Expand DownExpand Up@@ -159,17 +160,16 @@ export function useHostedAuth(): {
return errorThrower.throw('Hosted auth callback URL did not match the initiated redirect URL.');
}

const callbackParams = callbackUrl.searchParams;
if (callbackParams.get('state') !== state) {
if (getAuthSessionCallbackParam(authSessionResult.url, 'state') !== state) {
return errorThrower.throw('Hosted auth callback state did not match the initiated state.');
}

const rotatingTokenNonce = callbackParams.get('rotating_token_nonce') ?? '';
const rotatingTokenNonce = getAuthSessionCallbackParam(authSessionResult.url, 'rotating_token_nonce') ?? '';
if (!rotatingTokenNonce) {
return errorThrower.throw('Hosted auth callback did not include a rotating token nonce.');
}

const createdSessionId = callbackParams.get('created_session_id');
const createdSessionId = getAuthSessionCallbackParam(authSessionResult.url, 'created_session_id');
if (!createdSessionId) {
return errorThrower.throw('Hosted auth callback did not include the created session.');
}
Expand Down
5 changes: 2 additions & 3 deletions packages/expo/src/hooks/useOAuth.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,7 @@ import { useSignIn, useSignUp } from '@clerk/react/legacy';
import type { OAuthStrategy, SetActive, SignInResource, SignUpResource } from '@clerk/shared/types';
import type * as WebBrowser from 'expo-web-browser';

import { getAuthSessionCallbackParam } from '../utils/authSessionCallback';
import { errorThrower } from '../utils/errors';

export type UseOAuthFlowParams = {
Expand DownExpand Up@@ -98,9 +99,7 @@ export function useOAuth(useOAuthParams: UseOAuthFlowParams) {
};
}

const params = new URL(url).searchParams;

const rotatingTokenNonce = params.get('rotating_token_nonce') || '';
const rotatingTokenNonce = getAuthSessionCallbackParam(url, 'rotating_token_nonce') || '';
await signIn.reload({ rotatingTokenNonce });
Comment on lines +102 to 103

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

🗄️ Data Integrity & Integration | 🟠 Major | ⚡ Quick win

Reject missing or invalid nonces before reloading sign-in.

getAuthSessionCallbackParam returns null for malformed URLs or absent parameters, but || '' causes Line 103 to call signIn.reload({ rotatingTokenNonce: '' }). Fail locally, as hosted auth does, instead of forwarding an invalid nonce to FAPI.

Proposed fix
- const rotatingTokenNonce = getAuthSessionCallbackParam(url, 'rotating_token_nonce') || '';+ const rotatingTokenNonce = getAuthSessionCallbackParam(url, 'rotating_token_nonce');+ if (!rotatingTokenNonce) {+ return errorThrower.throw(+ 'OAuth callback did not include a rotating token nonce. Please restart the OAuth flow.',+ );+ }
await signIn.reload({ rotatingTokenNonce });
📝 Committable suggestion

‼️IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
constrotatingTokenNonce=getAuthSessionCallbackParam(url,'rotating_token_nonce')||'';
awaitsignIn.reload({ rotatingTokenNonce });
constrotatingTokenNonce=getAuthSessionCallbackParam(url,'rotating_token_nonce');
if(!rotatingTokenNonce){
returnerrorThrower.throw(
'OAuth callback did not include a rotating token nonce. Please restart the OAuth flow.',
);
}
awaitsignIn.reload({ rotatingTokenNonce });
🤖 Prompt for AI Agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.
In `@packages/expo/src/hooks/useOAuth.ts` around lines 102 - 103, Update the OAuth
callback flow around getAuthSessionCallbackParam and signIn.reload to reject a
null or otherwise missing rotating token nonce before invoking reload. Remove
the empty-string fallback, fail locally using the existing error-handling
behavior used for invalid auth callback data, and only pass a validated nonce to
signIn.reload.


const { status, firstFactorVerification } = signIn;
Expand Down
4 changes: 2 additions & 2 deletions packages/expo/src/hooks/useSSO.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,7 @@ import type {
} from '@clerk/shared/types';
import type * as WebBrowser from 'expo-web-browser';

import { getAuthSessionCallbackParam } from '../utils/authSessionCallback';
import { errorThrower } from '../utils/errors';

export type StartSSOFlowParams = {
Expand DownExpand Up@@ -106,8 +107,7 @@ export function useSSO() {
};
}

const params = new URL(authSessionResult.url).searchParams;
const rotatingTokenNonce = params.get('rotating_token_nonce') ?? '';
const rotatingTokenNonce = getAuthSessionCallbackParam(authSessionResult.url, 'rotating_token_nonce') ?? '';
await signIn.reload({ rotatingTokenNonce });

const userNeedsToBeCreated = signIn.firstFactorVerification.status === 'transferable';
Expand Down
31 changes: 31 additions & 0 deletions packages/expo/src/utils/__tests__/authSessionCallback.test.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
import { describe, expect, test } from 'vitest';

import { getAuthSessionCallbackParam } from '../authSessionCallback';

describe('getAuthSessionCallbackParam', () => {
test.each([
['a clean URL', 'myapp://sso-callback?rotating_token_nonce=abc123'],
['a literal trailing fragment', 'myapp://sso-callback?rotating_token_nonce=abc123#'],
['a Facebook-style fragment', 'myapp://sso-callback?rotating_token_nonce=abc123#_=_'],
['a percent-encoded trailing hash', 'myapp://sso-callback?rotating_token_nonce=abc123%23'],
['a percent-encoded hash with a suffix', 'myapp://sso-callback?rotating_token_nonce=abc123%23_=_'],
])('returns a clean value given %s', (_, url) => {
expect(getAuthSessionCallbackParam(url, 'rotating_token_nonce')).toBe('abc123');
});

test('leaves params before a corrupted last param intact', () => {
const url = 'myapp:?created_session_id=sess_1&rotating_token_nonce=abc123%23';
expect(getAuthSessionCallbackParam(url, 'created_session_id')).toBe('sess_1');
expect(getAuthSessionCallbackParam(url, 'rotating_token_nonce')).toBe('abc123');
});

test('returns null when the param is missing', () => {
expect(
getAuthSessionCallbackParam('myapp://sso-callback?created_session_id=sess_1', 'rotating_token_nonce'),
).toBeNull();
});

test('returns null for an unparsable URL', () => {
expect(getAuthSessionCallbackParam('not a url', 'rotating_token_nonce')).toBeNull();
});
});
11 changes: 11 additions & 0 deletions packages/expo/src/utils/authSessionCallback.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
// OAuth redirect chains can leave a stray `#` on the callback URL, literal or percent-encoded
// into the last query value, so strip it from both the URL and the extracted value.
export function getAuthSessionCallbackParam(url: string, name: string): string | null {
let value: string | null;
try {
value = new URL(url.split('#')[0]).searchParams.get(name);
} catch {
return null;
}
return value?.split('#')[0] ?? null;
}
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Closed
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
5 changes: 5 additions & 0 deletions .changeset/expo-callback-nonce-hash.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
'@clerk/expo': patch
---

Fixed SSO sign-ins failing with a 401 `signed_out` error when the OAuth callback URL carries a stray `#` on the `rotating_token_nonce` parameter, as seen on iOS.
8 changes: 4 additions & 4 deletions packages/expo/src/hooks/useHostedAuth.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,7 @@ import type * as WebBrowser from 'expo-web-browser';
import { Platform } from 'react-native';

import { getClerkInstance } from '../provider/singleton';
import { getAuthSessionCallbackParam } from '../utils/authSessionCallback';
import { errorThrower } from '../utils/errors';
import type { HostedAuthClerkInstance, HostedAuthMode } from '../utils/hostedAuth';
import { applyHostedAuthClientJSON, createHostedAuth, redeemHostedAuth } from '../utils/hostedAuth';
Expand DownExpand Up@@ -159,17 +160,16 @@ export function useHostedAuth(): {
return errorThrower.throw('Hosted auth callback URL did not match the initiated redirect URL.');
}

const callbackParams = callbackUrl.searchParams;
if (callbackParams.get('state') !== state) {
if (getAuthSessionCallbackParam(authSessionResult.url, 'state') !== state) {
return errorThrower.throw('Hosted auth callback state did not match the initiated state.');
}

const rotatingTokenNonce = callbackParams.get('rotating_token_nonce') ?? '';
const rotatingTokenNonce = getAuthSessionCallbackParam(authSessionResult.url, 'rotating_token_nonce') ?? '';
if (!rotatingTokenNonce) {
return errorThrower.throw('Hosted auth callback did not include a rotating token nonce.');
}

const createdSessionId = callbackParams.get('created_session_id');
const createdSessionId = getAuthSessionCallbackParam(authSessionResult.url, 'created_session_id');
if (!createdSessionId) {
return errorThrower.throw('Hosted auth callback did not include the created session.');
}
Expand Down
5 changes: 2 additions & 3 deletions packages/expo/src/hooks/useOAuth.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,7 @@ import { useSignIn, useSignUp } from '@clerk/react/legacy';
import type { OAuthStrategy, SetActive, SignInResource, SignUpResource } from '@clerk/shared/types';
import type * as WebBrowser from 'expo-web-browser';

import { getAuthSessionCallbackParam } from '../utils/authSessionCallback';
import { errorThrower } from '../utils/errors';

export type UseOAuthFlowParams = {
Expand DownExpand Up@@ -98,9 +99,7 @@ export function useOAuth(useOAuthParams: UseOAuthFlowParams) {
};
}

const params = new URL(url).searchParams;

const rotatingTokenNonce = params.get('rotating_token_nonce') || '';
const rotatingTokenNonce = getAuthSessionCallbackParam(url, 'rotating_token_nonce') || '';
await signIn.reload({ rotatingTokenNonce });
Comment on lines +102 to 103

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

🗄️ Data Integrity & Integration | 🟠 Major | ⚡ Quick win

Reject missing or invalid nonces before reloading sign-in.

getAuthSessionCallbackParam returns null for malformed URLs or absent parameters, but || '' causes Line 103 to call signIn.reload({ rotatingTokenNonce: '' }). Fail locally, as hosted auth does, instead of forwarding an invalid nonce to FAPI.

Proposed fix
- const rotatingTokenNonce = getAuthSessionCallbackParam(url, 'rotating_token_nonce') || '';+ const rotatingTokenNonce = getAuthSessionCallbackParam(url, 'rotating_token_nonce');+ if (!rotatingTokenNonce) {+ return errorThrower.throw(+ 'OAuth callback did not include a rotating token nonce. Please restart the OAuth flow.',+ );+ }
await signIn.reload({ rotatingTokenNonce });
📝 Committable suggestion

‼️IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
constrotatingTokenNonce=getAuthSessionCallbackParam(url,'rotating_token_nonce')||'';
awaitsignIn.reload({ rotatingTokenNonce });
constrotatingTokenNonce=getAuthSessionCallbackParam(url,'rotating_token_nonce');
if(!rotatingTokenNonce){
returnerrorThrower.throw(
'OAuth callback did not include a rotating token nonce. Please restart the OAuth flow.',
);
}
awaitsignIn.reload({ rotatingTokenNonce });
🤖 Prompt for AI Agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.
In `@packages/expo/src/hooks/useOAuth.ts` around lines 102 - 103, Update the OAuth
callback flow around getAuthSessionCallbackParam and signIn.reload to reject a
null or otherwise missing rotating token nonce before invoking reload. Remove
the empty-string fallback, fail locally using the existing error-handling
behavior used for invalid auth callback data, and only pass a validated nonce to
signIn.reload.


const { status, firstFactorVerification } = signIn;
Expand Down
4 changes: 2 additions & 2 deletions packages/expo/src/hooks/useSSO.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,7 @@ import type {
} from '@clerk/shared/types';
import type * as WebBrowser from 'expo-web-browser';

import { getAuthSessionCallbackParam } from '../utils/authSessionCallback';
import { errorThrower } from '../utils/errors';

export type StartSSOFlowParams = {
Expand DownExpand Up@@ -106,8 +107,7 @@ export function useSSO() {
};
}

const params = new URL(authSessionResult.url).searchParams;
const rotatingTokenNonce = params.get('rotating_token_nonce') ?? '';
const rotatingTokenNonce = getAuthSessionCallbackParam(authSessionResult.url, 'rotating_token_nonce') ?? '';
await signIn.reload({ rotatingTokenNonce });

const userNeedsToBeCreated = signIn.firstFactorVerification.status === 'transferable';
Expand Down
31 changes: 31 additions & 0 deletions packages/expo/src/utils/__tests__/authSessionCallback.test.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
import { describe, expect, test } from 'vitest';

import { getAuthSessionCallbackParam } from '../authSessionCallback';

describe('getAuthSessionCallbackParam', () => {
test.each([
['a clean URL', 'myapp://sso-callback?rotating_token_nonce=abc123'],
['a literal trailing fragment', 'myapp://sso-callback?rotating_token_nonce=abc123#'],
['a Facebook-style fragment', 'myapp://sso-callback?rotating_token_nonce=abc123#_=_'],
['a percent-encoded trailing hash', 'myapp://sso-callback?rotating_token_nonce=abc123%23'],
['a percent-encoded hash with a suffix', 'myapp://sso-callback?rotating_token_nonce=abc123%23_=_'],
])('returns a clean value given %s', (_, url) => {
expect(getAuthSessionCallbackParam(url, 'rotating_token_nonce')).toBe('abc123');
});

test('leaves params before a corrupted last param intact', () => {
const url = 'myapp:?created_session_id=sess_1&rotating_token_nonce=abc123%23';
expect(getAuthSessionCallbackParam(url, 'created_session_id')).toBe('sess_1');
expect(getAuthSessionCallbackParam(url, 'rotating_token_nonce')).toBe('abc123');
});

test('returns null when the param is missing', () => {
expect(
getAuthSessionCallbackParam('myapp://sso-callback?created_session_id=sess_1', 'rotating_token_nonce'),
).toBeNull();
});

test('returns null for an unparsable URL', () => {
expect(getAuthSessionCallbackParam('not a url', 'rotating_token_nonce')).toBeNull();
});
});
11 changes: 11 additions & 0 deletions packages/expo/src/utils/authSessionCallback.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
// OAuth redirect chains can leave a stray `#` on the callback URL, literal or percent-encoded
// into the last query value, so strip it from both the URL and the extracted value.
export function getAuthSessionCallbackParam(url: string, name: string): string | null {
let value: string | null;
try {
value = new URL(url.split('#')[0]).searchParams.get(name);
} catch {
return null;
}
return value?.split('#')[0] ?? null;
}
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Closed
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
5 changes: 5 additions & 0 deletions .changeset/expo-callback-nonce-hash.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
'@clerk/expo': patch
---

Fixed SSO sign-ins failing with a 401 `signed_out` error when the OAuth callback URL carries a stray `#` on the `rotating_token_nonce` parameter, as seen on iOS.
8 changes: 4 additions & 4 deletions packages/expo/src/hooks/useHostedAuth.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,7 @@ import type * as WebBrowser from 'expo-web-browser';
import { Platform } from 'react-native';

import { getClerkInstance } from '../provider/singleton';
import { getAuthSessionCallbackParam } from '../utils/authSessionCallback';
import { errorThrower } from '../utils/errors';
import type { HostedAuthClerkInstance, HostedAuthMode } from '../utils/hostedAuth';
import { applyHostedAuthClientJSON, createHostedAuth, redeemHostedAuth } from '../utils/hostedAuth';
Expand DownExpand Up@@ -159,17 +160,16 @@ export function useHostedAuth(): {
return errorThrower.throw('Hosted auth callback URL did not match the initiated redirect URL.');
}

const callbackParams = callbackUrl.searchParams;
if (callbackParams.get('state') !== state) {
if (getAuthSessionCallbackParam(authSessionResult.url, 'state') !== state) {
return errorThrower.throw('Hosted auth callback state did not match the initiated state.');
}

const rotatingTokenNonce = callbackParams.get('rotating_token_nonce') ?? '';
const rotatingTokenNonce = getAuthSessionCallbackParam(authSessionResult.url, 'rotating_token_nonce') ?? '';
if (!rotatingTokenNonce) {
return errorThrower.throw('Hosted auth callback did not include a rotating token nonce.');
}

const createdSessionId = callbackParams.get('created_session_id');
const createdSessionId = getAuthSessionCallbackParam(authSessionResult.url, 'created_session_id');
if (!createdSessionId) {
return errorThrower.throw('Hosted auth callback did not include the created session.');
}
Expand Down
5 changes: 2 additions & 3 deletions packages/expo/src/hooks/useOAuth.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,7 @@ import { useSignIn, useSignUp } from '@clerk/react/legacy';
import type { OAuthStrategy, SetActive, SignInResource, SignUpResource } from '@clerk/shared/types';
import type * as WebBrowser from 'expo-web-browser';

import { getAuthSessionCallbackParam } from '../utils/authSessionCallback';
import { errorThrower } from '../utils/errors';

export type UseOAuthFlowParams = {
Expand DownExpand Up@@ -98,9 +99,7 @@ export function useOAuth(useOAuthParams: UseOAuthFlowParams) {
};
}

const params = new URL(url).searchParams;

const rotatingTokenNonce = params.get('rotating_token_nonce') || '';
const rotatingTokenNonce = getAuthSessionCallbackParam(url, 'rotating_token_nonce') || '';
await signIn.reload({ rotatingTokenNonce });
Comment on lines +102 to 103

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

🗄️ Data Integrity & Integration | 🟠 Major | ⚡ Quick win

Reject missing or invalid nonces before reloading sign-in.

getAuthSessionCallbackParam returns null for malformed URLs or absent parameters, but || '' causes Line 103 to call signIn.reload({ rotatingTokenNonce: '' }). Fail locally, as hosted auth does, instead of forwarding an invalid nonce to FAPI.

Proposed fix
- const rotatingTokenNonce = getAuthSessionCallbackParam(url, 'rotating_token_nonce') || '';+ const rotatingTokenNonce = getAuthSessionCallbackParam(url, 'rotating_token_nonce');+ if (!rotatingTokenNonce) {+ return errorThrower.throw(+ 'OAuth callback did not include a rotating token nonce. Please restart the OAuth flow.',+ );+ }
await signIn.reload({ rotatingTokenNonce });
📝 Committable suggestion

‼️IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
constrotatingTokenNonce=getAuthSessionCallbackParam(url,'rotating_token_nonce')||'';
awaitsignIn.reload({ rotatingTokenNonce });
constrotatingTokenNonce=getAuthSessionCallbackParam(url,'rotating_token_nonce');
if(!rotatingTokenNonce){
returnerrorThrower.throw(
'OAuth callback did not include a rotating token nonce. Please restart the OAuth flow.',
);
}
awaitsignIn.reload({ rotatingTokenNonce });
🤖 Prompt for AI Agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.
In `@packages/expo/src/hooks/useOAuth.ts` around lines 102 - 103, Update the OAuth
callback flow around getAuthSessionCallbackParam and signIn.reload to reject a
null or otherwise missing rotating token nonce before invoking reload. Remove
the empty-string fallback, fail locally using the existing error-handling
behavior used for invalid auth callback data, and only pass a validated nonce to
signIn.reload.


const { status, firstFactorVerification } = signIn;
Expand Down
4 changes: 2 additions & 2 deletions packages/expo/src/hooks/useSSO.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,7 @@ import type {
} from '@clerk/shared/types';
import type * as WebBrowser from 'expo-web-browser';

import { getAuthSessionCallbackParam } from '../utils/authSessionCallback';
import { errorThrower } from '../utils/errors';

export type StartSSOFlowParams = {
Expand DownExpand Up@@ -106,8 +107,7 @@ export function useSSO() {
};
}

const params = new URL(authSessionResult.url).searchParams;
const rotatingTokenNonce = params.get('rotating_token_nonce') ?? '';
const rotatingTokenNonce = getAuthSessionCallbackParam(authSessionResult.url, 'rotating_token_nonce') ?? '';
await signIn.reload({ rotatingTokenNonce });

const userNeedsToBeCreated = signIn.firstFactorVerification.status === 'transferable';
Expand Down
31 changes: 31 additions & 0 deletions packages/expo/src/utils/__tests__/authSessionCallback.test.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
import { describe, expect, test } from 'vitest';

import { getAuthSessionCallbackParam } from '../authSessionCallback';

describe('getAuthSessionCallbackParam', () => {
test.each([
['a clean URL', 'myapp://sso-callback?rotating_token_nonce=abc123'],
['a literal trailing fragment', 'myapp://sso-callback?rotating_token_nonce=abc123#'],
['a Facebook-style fragment', 'myapp://sso-callback?rotating_token_nonce=abc123#_=_'],
['a percent-encoded trailing hash', 'myapp://sso-callback?rotating_token_nonce=abc123%23'],
['a percent-encoded hash with a suffix', 'myapp://sso-callback?rotating_token_nonce=abc123%23_=_'],
])('returns a clean value given %s', (_, url) => {
expect(getAuthSessionCallbackParam(url, 'rotating_token_nonce')).toBe('abc123');
});

test('leaves params before a corrupted last param intact', () => {
const url = 'myapp:?created_session_id=sess_1&rotating_token_nonce=abc123%23';
expect(getAuthSessionCallbackParam(url, 'created_session_id')).toBe('sess_1');
expect(getAuthSessionCallbackParam(url, 'rotating_token_nonce')).toBe('abc123');
});

test('returns null when the param is missing', () => {
expect(
getAuthSessionCallbackParam('myapp://sso-callback?created_session_id=sess_1', 'rotating_token_nonce'),
).toBeNull();
});

test('returns null for an unparsable URL', () => {
expect(getAuthSessionCallbackParam('not a url', 'rotating_token_nonce')).toBeNull();
});
});
11 changes: 11 additions & 0 deletions packages/expo/src/utils/authSessionCallback.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
// OAuth redirect chains can leave a stray `#` on the callback URL, literal or percent-encoded
// into the last query value, so strip it from both the URL and the extracted value.
export function getAuthSessionCallbackParam(url: string, name: string): string | null {
let value: string | null;
try {
value = new URL(url.split('#')[0]).searchParams.get(name);
} catch {
return null;
}
return value?.split('#')[0] ?? null;
}
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content
Closed
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
5 changes: 5 additions & 0 deletions .changeset/expo-callback-nonce-hash.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
'@clerk/expo': patch
---

Fixed SSO sign-ins failing with a 401 `signed_out` error when the OAuth callback URL carries a stray `#` on the `rotating_token_nonce` parameter, as seen on iOS.
8 changes: 4 additions & 4 deletions packages/expo/src/hooks/useHostedAuth.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,7 @@ import type * as WebBrowser from 'expo-web-browser';
import { Platform } from 'react-native';

import { getClerkInstance } from '../provider/singleton';
import { getAuthSessionCallbackParam } from '../utils/authSessionCallback';
import { errorThrower } from '../utils/errors';
import type { HostedAuthClerkInstance, HostedAuthMode } from '../utils/hostedAuth';
import { applyHostedAuthClientJSON, createHostedAuth, redeemHostedAuth } from '../utils/hostedAuth';
Expand DownExpand Up@@ -159,17 +160,16 @@ export function useHostedAuth(): {
return errorThrower.throw('Hosted auth callback URL did not match the initiated redirect URL.');
}

const callbackParams = callbackUrl.searchParams;
if (callbackParams.get('state') !== state) {
if (getAuthSessionCallbackParam(authSessionResult.url, 'state') !== state) {
return errorThrower.throw('Hosted auth callback state did not match the initiated state.');
}

const rotatingTokenNonce = callbackParams.get('rotating_token_nonce') ?? '';
const rotatingTokenNonce = getAuthSessionCallbackParam(authSessionResult.url, 'rotating_token_nonce') ?? '';
if (!rotatingTokenNonce) {
return errorThrower.throw('Hosted auth callback did not include a rotating token nonce.');
}

const createdSessionId = callbackParams.get('created_session_id');
const createdSessionId = getAuthSessionCallbackParam(authSessionResult.url, 'created_session_id');
if (!createdSessionId) {
return errorThrower.throw('Hosted auth callback did not include the created session.');
}
Expand Down
5 changes: 2 additions & 3 deletions packages/expo/src/hooks/useOAuth.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,7 @@ import { useSignIn, useSignUp } from '@clerk/react/legacy';
import type { OAuthStrategy, SetActive, SignInResource, SignUpResource } from '@clerk/shared/types';
import type * as WebBrowser from 'expo-web-browser';

import { getAuthSessionCallbackParam } from '../utils/authSessionCallback';
import { errorThrower } from '../utils/errors';

export type UseOAuthFlowParams = {
Expand DownExpand Up@@ -98,9 +99,7 @@ export function useOAuth(useOAuthParams: UseOAuthFlowParams) {
};
}

const params = new URL(url).searchParams;

const rotatingTokenNonce = params.get('rotating_token_nonce') || '';
const rotatingTokenNonce = getAuthSessionCallbackParam(url, 'rotating_token_nonce') || '';
await signIn.reload({ rotatingTokenNonce });
Comment on lines +102 to 103

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

🗄️ Data Integrity & Integration | 🟠 Major | ⚡ Quick win

Reject missing or invalid nonces before reloading sign-in.

getAuthSessionCallbackParam returns null for malformed URLs or absent parameters, but || '' causes Line 103 to call signIn.reload({ rotatingTokenNonce: '' }). Fail locally, as hosted auth does, instead of forwarding an invalid nonce to FAPI.

Proposed fix
- const rotatingTokenNonce = getAuthSessionCallbackParam(url, 'rotating_token_nonce') || '';+ const rotatingTokenNonce = getAuthSessionCallbackParam(url, 'rotating_token_nonce');+ if (!rotatingTokenNonce) {+ return errorThrower.throw(+ 'OAuth callback did not include a rotating token nonce. Please restart the OAuth flow.',+ );+ }
await signIn.reload({ rotatingTokenNonce });
📝 Committable suggestion

‼️IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
constrotatingTokenNonce=getAuthSessionCallbackParam(url,'rotating_token_nonce')||'';
awaitsignIn.reload({ rotatingTokenNonce });
constrotatingTokenNonce=getAuthSessionCallbackParam(url,'rotating_token_nonce');
if(!rotatingTokenNonce){
returnerrorThrower.throw(
'OAuth callback did not include a rotating token nonce. Please restart the OAuth flow.',
);
}
awaitsignIn.reload({ rotatingTokenNonce });
🤖 Prompt for AI Agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.
In `@packages/expo/src/hooks/useOAuth.ts` around lines 102 - 103, Update the OAuth
callback flow around getAuthSessionCallbackParam and signIn.reload to reject a
null or otherwise missing rotating token nonce before invoking reload. Remove
the empty-string fallback, fail locally using the existing error-handling
behavior used for invalid auth callback data, and only pass a validated nonce to
signIn.reload.


const { status, firstFactorVerification } = signIn;
Expand Down
4 changes: 2 additions & 2 deletions packages/expo/src/hooks/useSSO.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,7 @@ import type {
} from '@clerk/shared/types';
import type * as WebBrowser from 'expo-web-browser';

import { getAuthSessionCallbackParam } from '../utils/authSessionCallback';
import { errorThrower } from '../utils/errors';

export type StartSSOFlowParams = {
Expand DownExpand Up@@ -106,8 +107,7 @@ export function useSSO() {
};
}

const params = new URL(authSessionResult.url).searchParams;
const rotatingTokenNonce = params.get('rotating_token_nonce') ?? '';
const rotatingTokenNonce = getAuthSessionCallbackParam(authSessionResult.url, 'rotating_token_nonce') ?? '';
await signIn.reload({ rotatingTokenNonce });

const userNeedsToBeCreated = signIn.firstFactorVerification.status === 'transferable';
Expand Down
31 changes: 31 additions & 0 deletions packages/expo/src/utils/__tests__/authSessionCallback.test.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
import { describe, expect, test } from 'vitest';

import { getAuthSessionCallbackParam } from '../authSessionCallback';

describe('getAuthSessionCallbackParam', () => {
test.each([
['a clean URL', 'myapp://sso-callback?rotating_token_nonce=abc123'],
['a literal trailing fragment', 'myapp://sso-callback?rotating_token_nonce=abc123#'],
['a Facebook-style fragment', 'myapp://sso-callback?rotating_token_nonce=abc123#_=_'],
['a percent-encoded trailing hash', 'myapp://sso-callback?rotating_token_nonce=abc123%23'],
['a percent-encoded hash with a suffix', 'myapp://sso-callback?rotating_token_nonce=abc123%23_=_'],
])('returns a clean value given %s', (_, url) => {
expect(getAuthSessionCallbackParam(url, 'rotating_token_nonce')).toBe('abc123');
});

test('leaves params before a corrupted last param intact', () => {
const url = 'myapp:?created_session_id=sess_1&rotating_token_nonce=abc123%23';
expect(getAuthSessionCallbackParam(url, 'created_session_id')).toBe('sess_1');
expect(getAuthSessionCallbackParam(url, 'rotating_token_nonce')).toBe('abc123');
});

test('returns null when the param is missing', () => {
expect(
getAuthSessionCallbackParam('myapp://sso-callback?created_session_id=sess_1', 'rotating_token_nonce'),
).toBeNull();
});

test('returns null for an unparsable URL', () => {
expect(getAuthSessionCallbackParam('not a url', 'rotating_token_nonce')).toBeNull();
});
});
11 changes: 11 additions & 0 deletions packages/expo/src/utils/authSessionCallback.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
// OAuth redirect chains can leave a stray `#` on the callback URL, literal or percent-encoded
// into the last query value, so strip it from both the URL and the extracted value.
export function getAuthSessionCallbackParam(url: string, name: string): string | null {
let value: string | null;
try {
value = new URL(url.split('#')[0]).searchParams.get(name);
} catch {
return null;
}
return value?.split('#')[0] ?? null;
}
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Closed
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
5 changes: 5 additions & 0 deletions .changeset/expo-callback-nonce-hash.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
'@clerk/expo': patch
---

Fixed SSO sign-ins failing with a 401 `signed_out` error when the OAuth callback URL carries a stray `#` on the `rotating_token_nonce` parameter, as seen on iOS.
8 changes: 4 additions & 4 deletions packages/expo/src/hooks/useHostedAuth.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,7 @@ import type * as WebBrowser from 'expo-web-browser';
import { Platform } from 'react-native';

import { getClerkInstance } from '../provider/singleton';
import { getAuthSessionCallbackParam } from '../utils/authSessionCallback';
import { errorThrower } from '../utils/errors';
import type { HostedAuthClerkInstance, HostedAuthMode } from '../utils/hostedAuth';
import { applyHostedAuthClientJSON, createHostedAuth, redeemHostedAuth } from '../utils/hostedAuth';
Expand DownExpand Up@@ -159,17 +160,16 @@ export function useHostedAuth(): {
return errorThrower.throw('Hosted auth callback URL did not match the initiated redirect URL.');
}

const callbackParams = callbackUrl.searchParams;
if (callbackParams.get('state') !== state) {
if (getAuthSessionCallbackParam(authSessionResult.url, 'state') !== state) {
return errorThrower.throw('Hosted auth callback state did not match the initiated state.');
}

const rotatingTokenNonce = callbackParams.get('rotating_token_nonce') ?? '';
const rotatingTokenNonce = getAuthSessionCallbackParam(authSessionResult.url, 'rotating_token_nonce') ?? '';
if (!rotatingTokenNonce) {
return errorThrower.throw('Hosted auth callback did not include a rotating token nonce.');
}

const createdSessionId = callbackParams.get('created_session_id');
const createdSessionId = getAuthSessionCallbackParam(authSessionResult.url, 'created_session_id');
if (!createdSessionId) {
return errorThrower.throw('Hosted auth callback did not include the created session.');
}
Expand Down
5 changes: 2 additions & 3 deletions packages/expo/src/hooks/useOAuth.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,7 @@ import { useSignIn, useSignUp } from '@clerk/react/legacy';
import type { OAuthStrategy, SetActive, SignInResource, SignUpResource } from '@clerk/shared/types';
import type * as WebBrowser from 'expo-web-browser';

import { getAuthSessionCallbackParam } from '../utils/authSessionCallback';
import { errorThrower } from '../utils/errors';

export type UseOAuthFlowParams = {
Expand DownExpand Up@@ -98,9 +99,7 @@ export function useOAuth(useOAuthParams: UseOAuthFlowParams) {
};
}

const params = new URL(url).searchParams;

const rotatingTokenNonce = params.get('rotating_token_nonce') || '';
const rotatingTokenNonce = getAuthSessionCallbackParam(url, 'rotating_token_nonce') || '';
await signIn.reload({ rotatingTokenNonce });
Comment on lines +102 to 103

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

🗄️ Data Integrity & Integration | 🟠 Major | ⚡ Quick win

Reject missing or invalid nonces before reloading sign-in.

getAuthSessionCallbackParam returns null for malformed URLs or absent parameters, but || '' causes Line 103 to call signIn.reload({ rotatingTokenNonce: '' }). Fail locally, as hosted auth does, instead of forwarding an invalid nonce to FAPI.

Proposed fix
- const rotatingTokenNonce = getAuthSessionCallbackParam(url, 'rotating_token_nonce') || '';+ const rotatingTokenNonce = getAuthSessionCallbackParam(url, 'rotating_token_nonce');+ if (!rotatingTokenNonce) {+ return errorThrower.throw(+ 'OAuth callback did not include a rotating token nonce. Please restart the OAuth flow.',+ );+ }
await signIn.reload({ rotatingTokenNonce });
📝 Committable suggestion

‼️IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
constrotatingTokenNonce=getAuthSessionCallbackParam(url,'rotating_token_nonce')||'';
awaitsignIn.reload({ rotatingTokenNonce });
constrotatingTokenNonce=getAuthSessionCallbackParam(url,'rotating_token_nonce');
if(!rotatingTokenNonce){
returnerrorThrower.throw(
'OAuth callback did not include a rotating token nonce. Please restart the OAuth flow.',
);
}
awaitsignIn.reload({ rotatingTokenNonce });
🤖 Prompt for AI Agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.
In `@packages/expo/src/hooks/useOAuth.ts` around lines 102 - 103, Update the OAuth
callback flow around getAuthSessionCallbackParam and signIn.reload to reject a
null or otherwise missing rotating token nonce before invoking reload. Remove
the empty-string fallback, fail locally using the existing error-handling
behavior used for invalid auth callback data, and only pass a validated nonce to
signIn.reload.


const { status, firstFactorVerification } = signIn;
Expand Down
4 changes: 2 additions & 2 deletions packages/expo/src/hooks/useSSO.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,7 @@ import type {
} from '@clerk/shared/types';
import type * as WebBrowser from 'expo-web-browser';

import { getAuthSessionCallbackParam } from '../utils/authSessionCallback';
import { errorThrower } from '../utils/errors';

export type StartSSOFlowParams = {
Expand DownExpand Up@@ -106,8 +107,7 @@ export function useSSO() {
};
}

const params = new URL(authSessionResult.url).searchParams;
const rotatingTokenNonce = params.get('rotating_token_nonce') ?? '';
const rotatingTokenNonce = getAuthSessionCallbackParam(authSessionResult.url, 'rotating_token_nonce') ?? '';
await signIn.reload({ rotatingTokenNonce });

const userNeedsToBeCreated = signIn.firstFactorVerification.status === 'transferable';
Expand Down
31 changes: 31 additions & 0 deletions packages/expo/src/utils/__tests__/authSessionCallback.test.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
import { describe, expect, test } from 'vitest';

import { getAuthSessionCallbackParam } from '../authSessionCallback';

describe('getAuthSessionCallbackParam', () => {
test.each([
['a clean URL', 'myapp://sso-callback?rotating_token_nonce=abc123'],
['a literal trailing fragment', 'myapp://sso-callback?rotating_token_nonce=abc123#'],
['a Facebook-style fragment', 'myapp://sso-callback?rotating_token_nonce=abc123#_=_'],
['a percent-encoded trailing hash', 'myapp://sso-callback?rotating_token_nonce=abc123%23'],
['a percent-encoded hash with a suffix', 'myapp://sso-callback?rotating_token_nonce=abc123%23_=_'],
])('returns a clean value given %s', (_, url) => {
expect(getAuthSessionCallbackParam(url, 'rotating_token_nonce')).toBe('abc123');
});

test('leaves params before a corrupted last param intact', () => {
const url = 'myapp:?created_session_id=sess_1&rotating_token_nonce=abc123%23';
expect(getAuthSessionCallbackParam(url, 'created_session_id')).toBe('sess_1');
expect(getAuthSessionCallbackParam(url, 'rotating_token_nonce')).toBe('abc123');
});

test('returns null when the param is missing', () => {
expect(
getAuthSessionCallbackParam('myapp://sso-callback?created_session_id=sess_1', 'rotating_token_nonce'),
).toBeNull();
});

test('returns null for an unparsable URL', () => {
expect(getAuthSessionCallbackParam('not a url', 'rotating_token_nonce')).toBeNull();
});
});
11 changes: 11 additions & 0 deletions packages/expo/src/utils/authSessionCallback.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
// OAuth redirect chains can leave a stray `#` on the callback URL, literal or percent-encoded
// into the last query value, so strip it from both the URL and the extracted value.
export function getAuthSessionCallbackParam(url: string, name: string): string | null {
let value: string | null;
try {
value = new URL(url.split('#')[0]).searchParams.get(name);
} catch {
return null;
}
return value?.split('#')[0] ?? null;
}
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Closed
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
5 changes: 5 additions & 0 deletions .changeset/expo-callback-nonce-hash.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
'@clerk/expo': patch
---

Fixed SSO sign-ins failing with a 401 `signed_out` error when the OAuth callback URL carries a stray `#` on the `rotating_token_nonce` parameter, as seen on iOS.
8 changes: 4 additions & 4 deletions packages/expo/src/hooks/useHostedAuth.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,7 @@ import type * as WebBrowser from 'expo-web-browser';
import { Platform } from 'react-native';

import { getClerkInstance } from '../provider/singleton';
import { getAuthSessionCallbackParam } from '../utils/authSessionCallback';
import { errorThrower } from '../utils/errors';
import type { HostedAuthClerkInstance, HostedAuthMode } from '../utils/hostedAuth';
import { applyHostedAuthClientJSON, createHostedAuth, redeemHostedAuth } from '../utils/hostedAuth';
Expand DownExpand Up@@ -159,17 +160,16 @@ export function useHostedAuth(): {
return errorThrower.throw('Hosted auth callback URL did not match the initiated redirect URL.');
}

const callbackParams = callbackUrl.searchParams;
if (callbackParams.get('state') !== state) {
if (getAuthSessionCallbackParam(authSessionResult.url, 'state') !== state) {
return errorThrower.throw('Hosted auth callback state did not match the initiated state.');
}

const rotatingTokenNonce = callbackParams.get('rotating_token_nonce') ?? '';
const rotatingTokenNonce = getAuthSessionCallbackParam(authSessionResult.url, 'rotating_token_nonce') ?? '';
if (!rotatingTokenNonce) {
return errorThrower.throw('Hosted auth callback did not include a rotating token nonce.');
}

const createdSessionId = callbackParams.get('created_session_id');
const createdSessionId = getAuthSessionCallbackParam(authSessionResult.url, 'created_session_id');
if (!createdSessionId) {
return errorThrower.throw('Hosted auth callback did not include the created session.');
}
Expand Down
5 changes: 2 additions & 3 deletions packages/expo/src/hooks/useOAuth.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,7 @@ import { useSignIn, useSignUp } from '@clerk/react/legacy';
import type { OAuthStrategy, SetActive, SignInResource, SignUpResource } from '@clerk/shared/types';
import type * as WebBrowser from 'expo-web-browser';

import { getAuthSessionCallbackParam } from '../utils/authSessionCallback';
import { errorThrower } from '../utils/errors';

export type UseOAuthFlowParams = {
Expand DownExpand Up@@ -98,9 +99,7 @@ export function useOAuth(useOAuthParams: UseOAuthFlowParams) {
};
}

const params = new URL(url).searchParams;

const rotatingTokenNonce = params.get('rotating_token_nonce') || '';
const rotatingTokenNonce = getAuthSessionCallbackParam(url, 'rotating_token_nonce') || '';
await signIn.reload({ rotatingTokenNonce });
Comment on lines +102 to 103

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

🗄️ Data Integrity & Integration | 🟠 Major | ⚡ Quick win

Reject missing or invalid nonces before reloading sign-in.

getAuthSessionCallbackParam returns null for malformed URLs or absent parameters, but || '' causes Line 103 to call signIn.reload({ rotatingTokenNonce: '' }). Fail locally, as hosted auth does, instead of forwarding an invalid nonce to FAPI.

Proposed fix
- const rotatingTokenNonce = getAuthSessionCallbackParam(url, 'rotating_token_nonce') || '';+ const rotatingTokenNonce = getAuthSessionCallbackParam(url, 'rotating_token_nonce');+ if (!rotatingTokenNonce) {+ return errorThrower.throw(+ 'OAuth callback did not include a rotating token nonce. Please restart the OAuth flow.',+ );+ }
await signIn.reload({ rotatingTokenNonce });
📝 Committable suggestion

‼️IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
constrotatingTokenNonce=getAuthSessionCallbackParam(url,'rotating_token_nonce')||'';
awaitsignIn.reload({ rotatingTokenNonce });
constrotatingTokenNonce=getAuthSessionCallbackParam(url,'rotating_token_nonce');
if(!rotatingTokenNonce){
returnerrorThrower.throw(
'OAuth callback did not include a rotating token nonce. Please restart the OAuth flow.',
);
}
awaitsignIn.reload({ rotatingTokenNonce });
🤖 Prompt for AI Agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.
In `@packages/expo/src/hooks/useOAuth.ts` around lines 102 - 103, Update the OAuth
callback flow around getAuthSessionCallbackParam and signIn.reload to reject a
null or otherwise missing rotating token nonce before invoking reload. Remove
the empty-string fallback, fail locally using the existing error-handling
behavior used for invalid auth callback data, and only pass a validated nonce to
signIn.reload.


const { status, firstFactorVerification } = signIn;
Expand Down
4 changes: 2 additions & 2 deletions packages/expo/src/hooks/useSSO.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,7 @@ import type {
} from '@clerk/shared/types';
import type * as WebBrowser from 'expo-web-browser';

import { getAuthSessionCallbackParam } from '../utils/authSessionCallback';
import { errorThrower } from '../utils/errors';

export type StartSSOFlowParams = {
Expand DownExpand Up@@ -106,8 +107,7 @@ export function useSSO() {
};
}

const params = new URL(authSessionResult.url).searchParams;
const rotatingTokenNonce = params.get('rotating_token_nonce') ?? '';
const rotatingTokenNonce = getAuthSessionCallbackParam(authSessionResult.url, 'rotating_token_nonce') ?? '';
await signIn.reload({ rotatingTokenNonce });

const userNeedsToBeCreated = signIn.firstFactorVerification.status === 'transferable';
Expand Down
31 changes: 31 additions & 0 deletions packages/expo/src/utils/__tests__/authSessionCallback.test.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
import { describe, expect, test } from 'vitest';

import { getAuthSessionCallbackParam } from '../authSessionCallback';

describe('getAuthSessionCallbackParam', () => {
test.each([
['a clean URL', 'myapp://sso-callback?rotating_token_nonce=abc123'],
['a literal trailing fragment', 'myapp://sso-callback?rotating_token_nonce=abc123#'],
['a Facebook-style fragment', 'myapp://sso-callback?rotating_token_nonce=abc123#_=_'],
['a percent-encoded trailing hash', 'myapp://sso-callback?rotating_token_nonce=abc123%23'],
['a percent-encoded hash with a suffix', 'myapp://sso-callback?rotating_token_nonce=abc123%23_=_'],
])('returns a clean value given %s', (_, url) => {
expect(getAuthSessionCallbackParam(url, 'rotating_token_nonce')).toBe('abc123');
});

test('leaves params before a corrupted last param intact', () => {
const url = 'myapp:?created_session_id=sess_1&rotating_token_nonce=abc123%23';
expect(getAuthSessionCallbackParam(url, 'created_session_id')).toBe('sess_1');
expect(getAuthSessionCallbackParam(url, 'rotating_token_nonce')).toBe('abc123');
});

test('returns null when the param is missing', () => {
expect(
getAuthSessionCallbackParam('myapp://sso-callback?created_session_id=sess_1', 'rotating_token_nonce'),
).toBeNull();
});

test('returns null for an unparsable URL', () => {
expect(getAuthSessionCallbackParam('not a url', 'rotating_token_nonce')).toBeNull();
});
});
11 changes: 11 additions & 0 deletions packages/expo/src/utils/authSessionCallback.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
// OAuth redirect chains can leave a stray `#` on the callback URL, literal or percent-encoded
// into the last query value, so strip it from both the URL and the extracted value.
export function getAuthSessionCallbackParam(url: string, name: string): string | null {
let value: string | null;
try {
value = new URL(url.split('#')[0]).searchParams.get(name);
} catch {
return null;
}
return value?.split('#')[0] ?? null;
}
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content
Closed
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
5 changes: 5 additions & 0 deletions .changeset/expo-callback-nonce-hash.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
'@clerk/expo': patch
---

Fixed SSO sign-ins failing with a 401 `signed_out` error when the OAuth callback URL carries a stray `#` on the `rotating_token_nonce` parameter, as seen on iOS.
8 changes: 4 additions & 4 deletions packages/expo/src/hooks/useHostedAuth.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,7 @@ import type * as WebBrowser from 'expo-web-browser';
import { Platform } from 'react-native';

import { getClerkInstance } from '../provider/singleton';
import { getAuthSessionCallbackParam } from '../utils/authSessionCallback';
import { errorThrower } from '../utils/errors';
import type { HostedAuthClerkInstance, HostedAuthMode } from '../utils/hostedAuth';
import { applyHostedAuthClientJSON, createHostedAuth, redeemHostedAuth } from '../utils/hostedAuth';
Expand DownExpand Up@@ -159,17 +160,16 @@ export function useHostedAuth(): {
return errorThrower.throw('Hosted auth callback URL did not match the initiated redirect URL.');
}

const callbackParams = callbackUrl.searchParams;
if (callbackParams.get('state') !== state) {
if (getAuthSessionCallbackParam(authSessionResult.url, 'state') !== state) {
return errorThrower.throw('Hosted auth callback state did not match the initiated state.');
}

const rotatingTokenNonce = callbackParams.get('rotating_token_nonce') ?? '';
const rotatingTokenNonce = getAuthSessionCallbackParam(authSessionResult.url, 'rotating_token_nonce') ?? '';
if (!rotatingTokenNonce) {
return errorThrower.throw('Hosted auth callback did not include a rotating token nonce.');
}

const createdSessionId = callbackParams.get('created_session_id');
const createdSessionId = getAuthSessionCallbackParam(authSessionResult.url, 'created_session_id');
if (!createdSessionId) {
return errorThrower.throw('Hosted auth callback did not include the created session.');
}
Expand Down
5 changes: 2 additions & 3 deletions packages/expo/src/hooks/useOAuth.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,7 @@ import { useSignIn, useSignUp } from '@clerk/react/legacy';
import type { OAuthStrategy, SetActive, SignInResource, SignUpResource } from '@clerk/shared/types';
import type * as WebBrowser from 'expo-web-browser';

import { getAuthSessionCallbackParam } from '../utils/authSessionCallback';
import { errorThrower } from '../utils/errors';

export type UseOAuthFlowParams = {
Expand DownExpand Up@@ -98,9 +99,7 @@ export function useOAuth(useOAuthParams: UseOAuthFlowParams) {
};
}

const params = new URL(url).searchParams;

const rotatingTokenNonce = params.get('rotating_token_nonce') || '';
const rotatingTokenNonce = getAuthSessionCallbackParam(url, 'rotating_token_nonce') || '';
await signIn.reload({ rotatingTokenNonce });
Comment on lines +102 to 103

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

🗄️ Data Integrity & Integration | 🟠 Major | ⚡ Quick win

Reject missing or invalid nonces before reloading sign-in.

getAuthSessionCallbackParam returns null for malformed URLs or absent parameters, but || '' causes Line 103 to call signIn.reload({ rotatingTokenNonce: '' }). Fail locally, as hosted auth does, instead of forwarding an invalid nonce to FAPI.

Proposed fix
- const rotatingTokenNonce = getAuthSessionCallbackParam(url, 'rotating_token_nonce') || '';+ const rotatingTokenNonce = getAuthSessionCallbackParam(url, 'rotating_token_nonce');+ if (!rotatingTokenNonce) {+ return errorThrower.throw(+ 'OAuth callback did not include a rotating token nonce. Please restart the OAuth flow.',+ );+ }
await signIn.reload({ rotatingTokenNonce });
📝 Committable suggestion

‼️IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
constrotatingTokenNonce=getAuthSessionCallbackParam(url,'rotating_token_nonce')||'';
awaitsignIn.reload({ rotatingTokenNonce });
constrotatingTokenNonce=getAuthSessionCallbackParam(url,'rotating_token_nonce');
if(!rotatingTokenNonce){
returnerrorThrower.throw(
'OAuth callback did not include a rotating token nonce. Please restart the OAuth flow.',
);
}
awaitsignIn.reload({ rotatingTokenNonce });
🤖 Prompt for AI Agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.
In `@packages/expo/src/hooks/useOAuth.ts` around lines 102 - 103, Update the OAuth
callback flow around getAuthSessionCallbackParam and signIn.reload to reject a
null or otherwise missing rotating token nonce before invoking reload. Remove
the empty-string fallback, fail locally using the existing error-handling
behavior used for invalid auth callback data, and only pass a validated nonce to
signIn.reload.


const { status, firstFactorVerification } = signIn;
Expand Down
4 changes: 2 additions & 2 deletions packages/expo/src/hooks/useSSO.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,7 @@ import type {
} from '@clerk/shared/types';
import type * as WebBrowser from 'expo-web-browser';

import { getAuthSessionCallbackParam } from '../utils/authSessionCallback';
import { errorThrower } from '../utils/errors';

export type StartSSOFlowParams = {
Expand DownExpand Up@@ -106,8 +107,7 @@ export function useSSO() {
};
}

const params = new URL(authSessionResult.url).searchParams;
const rotatingTokenNonce = params.get('rotating_token_nonce') ?? '';
const rotatingTokenNonce = getAuthSessionCallbackParam(authSessionResult.url, 'rotating_token_nonce') ?? '';
await signIn.reload({ rotatingTokenNonce });

const userNeedsToBeCreated = signIn.firstFactorVerification.status === 'transferable';
Expand Down
31 changes: 31 additions & 0 deletions packages/expo/src/utils/__tests__/authSessionCallback.test.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
import { describe, expect, test } from 'vitest';

import { getAuthSessionCallbackParam } from '../authSessionCallback';

describe('getAuthSessionCallbackParam', () => {
test.each([
['a clean URL', 'myapp://sso-callback?rotating_token_nonce=abc123'],
['a literal trailing fragment', 'myapp://sso-callback?rotating_token_nonce=abc123#'],
['a Facebook-style fragment', 'myapp://sso-callback?rotating_token_nonce=abc123#_=_'],
['a percent-encoded trailing hash', 'myapp://sso-callback?rotating_token_nonce=abc123%23'],
['a percent-encoded hash with a suffix', 'myapp://sso-callback?rotating_token_nonce=abc123%23_=_'],
])('returns a clean value given %s', (_, url) => {
expect(getAuthSessionCallbackParam(url, 'rotating_token_nonce')).toBe('abc123');
});

test('leaves params before a corrupted last param intact', () => {
const url = 'myapp:?created_session_id=sess_1&rotating_token_nonce=abc123%23';
expect(getAuthSessionCallbackParam(url, 'created_session_id')).toBe('sess_1');
expect(getAuthSessionCallbackParam(url, 'rotating_token_nonce')).toBe('abc123');
});

test('returns null when the param is missing', () => {
expect(
getAuthSessionCallbackParam('myapp://sso-callback?created_session_id=sess_1', 'rotating_token_nonce'),
).toBeNull();
});

test('returns null for an unparsable URL', () => {
expect(getAuthSessionCallbackParam('not a url', 'rotating_token_nonce')).toBeNull();
});
});
11 changes: 11 additions & 0 deletions packages/expo/src/utils/authSessionCallback.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
// OAuth redirect chains can leave a stray `#` on the callback URL, literal or percent-encoded
// into the last query value, so strip it from both the URL and the extracted value.
export function getAuthSessionCallbackParam(url: string, name: string): string | null {
let value: string | null;
try {
value = new URL(url.split('#')[0]).searchParams.get(name);
} catch {
return null;
}
return value?.split('#')[0] ?? null;
}
Loading