Skip to content

fix(expo): Restore persisted sessions after native singleton reuse - #8928

Merged
wobsoriano merged 6 commits into
mainfrom
rob/expo-session-persist-fix
Jun 29, 2026
Merged

fix(expo): Restore persisted sessions after native singleton reuse#8928
wobsoriano merged 6 commits into
mainfrom
rob/expo-session-persist-fix

Conversation

@wobsoriano

@wobsorianowobsoriano commented Jun 19, 2026•
edited by coderabbitai Bot
Loading

Copy link
Copy Markdown
Member

Description

Fixes Expo session restoration when the native Clerk singleton is reused before ClerkProvider provides the app's real tokenCache.

The singleton now tracks the latest explicit tokenCache, so cold-start /v1/client requests can use the persisted client JWT instead of loading a signed-out client.

Confirmed by a customer that the snapshot for this PR resolved their issue.

Resolves MOBILE-564

Checklist

  • pnpm test runs as expected.
  • pnpm build runs as expected.
  • (If applicable) JSDoc comments have been added or updated for any package exports
  • (If applicable) Documentation has been updated

Type of change

  • 🐛 Bug fix
  • 🌟 New feature
  • 🔨 Breaking change
  • 📖 Refactoring / dependency upgrade / documentation
  • other:

Summary by CodeRabbit

  • Bug Fixes

    • Fixed persisted session restoration in Expo when the native Clerk singleton initializes before the app’s token cache is available.
    • Improved session token handling during request and response cycles so the most recent token cache is used consistently.
    • Ensured refreshed tokens are saved to the correct cache and stale client tokens are cleared when configuration changes.

  • Tests

    • Added coverage for singleton reuse scenarios involving token cache updates and request/response authorization behavior.

@changeset-bot

changeset-botBot commented Jun 19, 2026•
edited
Loading

Copy link
Copy Markdown

🦋 Changeset detected

Latest commit: 41c879a

The changes in this PR will be included in the next version bump.

This PR includes changesets to release 1 package
NameType
@clerk/expoPatch

Not sure what this means? Click here to learn what changesets are.

Click here if you're a maintainer who wants to add another changeset to this PR

@vercel

vercelBot commented Jun 19, 2026•
edited
Loading

Copy link
Copy Markdown

The latest updates on your projects. Learn more about Vercel for GitHub.

ProjectDeploymentActionsUpdated (UTC)
clerk-js-sandboxReadyReadyPreview, CommentJun 29, 2026 4:48pm
swingsetReadyReadyPreview, CommentJun 29, 2026 4:48pm

Request Review

@coderabbitai

coderabbitaiBot commented Jun 19, 2026•
edited
Loading

Copy link
Copy Markdown
Contributor

Review Change Stack

📝 Walkthrough

Walkthrough

Introduces a module-level __internal_tokenCache variable in createClerkInstance.ts initialized to MemoryTokenCache. The tokenCache from options is applied only when explicitly provided, and request/response hooks read from and write to this module-level cache. Three new tests validate singleton reuse with updated token caches.

Token cache late-binding fix

Layer / File(s)Summary
Module-scoped tokenCache and late-binding logic
packages/expo/src/provider/singleton/createClerkInstance.ts		Adds TokenCache import, introduces __internal_tokenCache module variable defaulting to MemoryTokenCache, updates hasOwnOption type guard to BuildClerkOptions, removes tokenCache from early options destructuring, and conditionally sets __internal_tokenCache only when options explicitly contains tokenCache; clearToken/getToken/saveToken closures reference the module-level variable.
Tests for tokenCache reuse behavior
packages/expo/src/provider/singleton/__tests__/createClerkInstance.test.ts		Adds three tests: latest explicit tokenCache is used by __internal_onBeforeRequest, latest cache is preserved when a subsequent call omits tokenCache, and __internal_onAfterResponse saves JWT only into the latest cache.
Patch changeset
.changeset/fresh-expo-token-cache.md		Declares a patch release for @clerk/expo describing the token cache timing fix.

Estimated code review effort

🎯 3 (Moderate) | ⏱️ ~20 minutes

Possibly related PRs

  • clerk/javascript#8860: Refactors MemoryTokenCache internals used as the default value for the new __internal_tokenCache module variable introduced in this PR.

Poem

🐇 Hoppity-hop through the singleton tree,
The token cache now updates, late but free!
No more stale sessions from init gone wrong,
The latest cache sings its authorization song.
Cache cleared, token saved — the bunny hops on! 🎉

🚥 Pre-merge checks | ✅ 4 | ❌ 1

❌ Failed checks (1 warning)

Check nameStatusExplanationResolution
Docstring Coverage⚠️ WarningDocstring coverage is 0.00% which is insufficient. The required threshold is 80.00%.Write docstrings for the functions missing them to satisfy the coverage threshold.
✅ Passed checks (4 passed)
Check nameStatusExplanation
Description Check✅ PassedCheck skipped - CodeRabbit’s high-level summary is enabled.
Title check✅ PassedThe title clearly matches the main Expo session-restoration fix and mentions the native singleton reuse scenario.
Linked Issues check✅ PassedCheck skipped because no linked issues were found for this pull request.
Out of Scope Changes check✅ PassedCheck skipped because no linked issues were found for this pull request.
✨ Finishing Touches
📝 Generate docstrings
  • Create stacked PR
  • Commit on current branch

Comment @coderabbitai help to get the list of available commands.

@pkg-pr-new

pkg-pr-newBot commented Jun 19, 2026•
edited
Loading

Copy link
Copy Markdown

Open in StackBlitz

@clerk/astro

npm i https://pkg.pr.new/@clerk/astro@8928

@clerk/backend

npm i https://pkg.pr.new/@clerk/backend@8928

@clerk/chrome-extension

npm i https://pkg.pr.new/@clerk/chrome-extension@8928

@clerk/clerk-js

npm i https://pkg.pr.new/@clerk/clerk-js@8928

@clerk/electron

npm i https://pkg.pr.new/@clerk/electron@8928

@clerk/electron-passkeys

npm i https://pkg.pr.new/@clerk/electron-passkeys@8928

@clerk/eslint-plugin

npm i https://pkg.pr.new/@clerk/eslint-plugin@8928

@clerk/expo

npm i https://pkg.pr.new/@clerk/expo@8928

@clerk/expo-passkeys

npm i https://pkg.pr.new/@clerk/expo-passkeys@8928

@clerk/express

npm i https://pkg.pr.new/@clerk/express@8928

@clerk/fastify

npm i https://pkg.pr.new/@clerk/fastify@8928

@clerk/hono

npm i https://pkg.pr.new/@clerk/hono@8928

@clerk/localizations

npm i https://pkg.pr.new/@clerk/localizations@8928

@clerk/nextjs

npm i https://pkg.pr.new/@clerk/nextjs@8928

@clerk/nuxt

npm i https://pkg.pr.new/@clerk/nuxt@8928

@clerk/react

npm i https://pkg.pr.new/@clerk/react@8928

@clerk/react-router

npm i https://pkg.pr.new/@clerk/react-router@8928

@clerk/shared

npm i https://pkg.pr.new/@clerk/shared@8928

@clerk/tanstack-react-start

npm i https://pkg.pr.new/@clerk/tanstack-react-start@8928

@clerk/testing

npm i https://pkg.pr.new/@clerk/testing@8928

@clerk/ui

npm i https://pkg.pr.new/@clerk/ui@8928

@clerk/upgrade

npm i https://pkg.pr.new/@clerk/upgrade@8928

@clerk/vue

npm i https://pkg.pr.new/@clerk/vue@8928

commit: 41c879a

@wobsorianowobsoriano changed the title fix(expo): Attempt token revive fixfix(expo): Restore persisted sessions after native singleton reuseJun 29, 2026
@wobsoriano
wobsoriano marked this pull request as ready for review June 29, 2026 16:29
@github-actions

github-actionsBot commented Jun 29, 2026•
edited
Loading

Copy link
Copy Markdown
Contributor

API Changes Report

Generated by Break Check on 2026-06-29T16:49:44.153Z

Summary

MetricCount
Packages analyzed19
Packages with changes0
🔴 Breaking changes0
🟡 Non-breaking changes0
🟢 Additions0

No API Changes Detected

All packages have stable APIs with no detected changes.

Report generated by Break Check

Last ran on 41c879a.

coderabbitai[bot]
coderabbitaiBot reviewed Jun 29, 2026
View reviewed changes

@coderabbitaicoderabbitaiBot left a comment

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.

Actionable comments posted: 1

🤖 Prompt for all review comments with 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.
Inline comments:
In `@packages/expo/src/provider/singleton/__tests__/createClerkInstance.test.ts`:
- Around line 322-347: The test around createClerkInstance should verify the
token cache key used by __internal_onBeforeRequest, not just the resulting
authorization header. Update the latestTokenCache mock in
createClerkInstance.test.ts to be key-sensitive or assert getToken was called
with CLERK_CLIENT_JWT_KEY, so the contract between getClerkInstance and
TokenCache is covered. Keep the existing header assertion, but add a call
expectation on the mocked getToken to ensure the correct persistence key is
read.
🪄 Autofix (Beta)

Fix all unresolved CodeRabbit comments on this PR:

  • Push a commit to this branch (recommended)
  • Create a new PR with the fixes
ℹ️ Review info
⚙️ Run configuration

Configuration used: Repository YAML (base), Repository UI (inherited)

Review profile: CHILL

Plan: Pro Plus

Run ID: 25a1c6ce-c1db-4359-a8da-78ae69017288

📥 Commits

Reviewing files that changed from the base of the PR and between 73c48f1 and 41c879a.

📒 Files selected for processing (2)
  • packages/expo/src/provider/singleton/__tests__/createClerkInstance.test.ts
  • packages/expo/src/provider/singleton/createClerkInstance.ts
🚧 Files skipped from review as they are similar to previous changes (1)
  • packages/expo/src/provider/singleton/createClerkInstance.ts

Comment threadpackages/expo/src/provider/singleton/__tests__/createClerkInstance.test.ts
mikepitre
mikepitre approved these changes Jun 29, 2026
View reviewed changes

@mikepitremikepitre left a comment

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.

LGTM! Thanks for fixing!

@wobsoriano
wobsoriano merged commit 2305459 into mainJun 29, 2026
58 checks passed
@wobsoriano
wobsoriano deleted the rob/expo-session-persist-fix branch June 29, 2026 17:02
@clerk-cookieclerk-cookie mentioned this pull request Jun 29, 2026
Merged
@coderabbitaicoderabbitaiBot mentioned this pull request Jun 29, 2026
Merged
9 tasks
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@coderabbitaicoderabbitai[bot]coderabbitai[bot] left review comments
@mikepitremikepitremikepitre approved these changes

Assignees

No one assigned

Labels

expo

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@wobsoriano@mikepitre
, '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(expo): Restore persisted sessions after native singleton reuse by wobsoriano · Pull Request #8928 · clerk/javascript · GitHub
Skip to content
fix(expo): Restore persisted sessions after native singleton reuse - #8928
Merged
wobsoriano merged 6 commits into
mainfrom 
rob/expo-session-persist-fix
Jun 29, 2026
Merged
fix(expo): Restore persisted sessions after native singleton reuse#8928
wobsoriano merged 6 commits into
mainfrom 
rob/expo-session-persist-fix
Conversation
@wobsoriano
@wobsorianowobsoriano
commented
Jun 19, 2026•

edited by coderabbitai
Bot
Loading

Copy link


Copy Markdown

Member
Description
Fixes Expo session restoration when the native Clerk singleton is reused before ClerkProvider provides the app's real tokenCache.
The singleton now tracks the latest explicit tokenCache, so cold-start /v1/client requests can use the persisted client JWT instead of loading a signed-out client.
Confirmed by a customer that the snapshot for this PR resolved their issue.
Resolves MOBILE-564
Checklist
  • pnpm test runs as expected.
  • pnpm build runs as expected.
  •  (If applicable) JSDoc comments have been added or updated for any package exports
  •  (If applicable) Documentation has been updated
Type of change
  •  🐛 Bug fix
  •  🌟 New feature
  •  🔨 Breaking change
  •  📖 Refactoring / dependency upgrade / documentation
  •  other:
Summary by CodeRabbit
  • Bug Fixes
    • Fixed persisted session restoration in Expo when the native Clerk singleton initializes before the app’s token cache is available.
    • Improved session token handling during request and response cycles so the most recent token cache is used consistently.
    • Ensured refreshed tokens are saved to the correct cache and stale client tokens are cleared when configuration changes.
  • Tests
    • Added coverage for singleton reuse scenarios involving token cache updates and request/response authorization behavior.
@changeset-bot
changeset-botBot
commented
Jun 19, 2026•

edited

Loading

Copy link


Copy Markdown

🦋 Changeset detected
Latest commit: 41c879a
The changes in this PR will be included in the next version bump.
This PR includes changesets to release 1 package
NameType
@clerk/expoPatch
Not sure what this means? Click here to learn what changesets are.
Click here if you're a maintainer who wants to add another changeset to this PR
@vercel
vercelBot
commented
Jun 19, 2026•

edited

Loading

Copy link


Copy Markdown

The latest updates on your projects. Learn more about Vercel for GitHub.
ProjectDeploymentActionsUpdated (UTC)
clerk-js-sandboxReadyReadyPreview, CommentJun 29, 2026 4:48pm
swingsetReadyReadyPreview, CommentJun 29, 2026 4:48pm
Request Review
@coderabbitai
coderabbitaiBot
commented
Jun 19, 2026•

edited

Loading

Copy link


Copy Markdown

Contributor
Review Change Stack
📝 Walkthrough
Walkthrough
Introduces a module-level __internal_tokenCache variable in createClerkInstance.ts initialized to MemoryTokenCache. The tokenCache from options is applied only when explicitly provided, and request/response hooks read from and write to this module-level cache. Three new tests validate singleton reuse with updated token caches.
Token cache late-binding fix
Layer / File(s)Summary
Module-scoped tokenCache and late-binding logic
packages/expo/src/provider/singleton/createClerkInstance.ts		Adds TokenCache import, introduces __internal_tokenCache module variable defaulting to MemoryTokenCache, updates hasOwnOption type guard to BuildClerkOptions, removes tokenCache from early options destructuring, and conditionally sets __internal_tokenCache only when options explicitly contains tokenCache; clearToken/getToken/saveToken closures reference the module-level variable.
Tests for tokenCache reuse behavior
packages/expo/src/provider/singleton/__tests__/createClerkInstance.test.ts		Adds three tests: latest explicit tokenCache is used by __internal_onBeforeRequest, latest cache is preserved when a subsequent call omits tokenCache, and __internal_onAfterResponse saves JWT only into the latest cache.
Patch changeset
.changeset/fresh-expo-token-cache.md		Declares a patch release for @clerk/expo describing the token cache timing fix.
Estimated code review effort
🎯 3 (Moderate) | ⏱️ ~20 minutes
Possibly related PRs
  • clerk/javascript#8860: Refactors MemoryTokenCache internals used as the default value for the new __internal_tokenCache module variable introduced in this PR.
Poem
🐇 Hoppity-hop through the singleton tree,

The token cache now updates, late but free!

No more stale sessions from init gone wrong,

The latest cache sings its authorization song.

Cache cleared, token saved — the bunny hops on! 🎉
🚥 Pre-merge checks | ✅ 4 | ❌ 1
❌ Failed checks (1 warning)
Check nameStatusExplanationResolution
Docstring Coverage⚠️ WarningDocstring coverage is 0.00% which is insufficient. The required threshold is 80.00%.Write docstrings for the functions missing them to satisfy the coverage threshold.
✅ Passed checks (4 passed)
Check nameStatusExplanation
Description Check✅ PassedCheck skipped - CodeRabbit’s high-level summary is enabled.
Title check✅ PassedThe title clearly matches the main Expo session-restoration fix and mentions the native singleton reuse scenario.
Linked Issues check✅ PassedCheck skipped because no linked issues were found for this pull request.
Out of Scope Changes check✅ PassedCheck skipped because no linked issues were found for this pull request.
✨ Finishing Touches
📝 Generate docstrings
  •  Create stacked PR
  •  Commit on current branch
Comment @coderabbitai help to get the list of available commands.
@pkg-pr-new
pkg-pr-newBot
commented
Jun 19, 2026•

edited

Loading

Copy link


Copy Markdown

Open in StackBlitz
@clerk/astro
npm i https://pkg.pr.new/@clerk/astro@8928

@clerk/backend
npm i https://pkg.pr.new/@clerk/backend@8928

@clerk/chrome-extension
npm i https://pkg.pr.new/@clerk/chrome-extension@8928

@clerk/clerk-js
npm i https://pkg.pr.new/@clerk/clerk-js@8928

@clerk/electron
npm i https://pkg.pr.new/@clerk/electron@8928

@clerk/electron-passkeys
npm i https://pkg.pr.new/@clerk/electron-passkeys@8928

@clerk/eslint-plugin
npm i https://pkg.pr.new/@clerk/eslint-plugin@8928

@clerk/expo
npm i https://pkg.pr.new/@clerk/expo@8928

@clerk/expo-passkeys
npm i https://pkg.pr.new/@clerk/expo-passkeys@8928

@clerk/express
npm i https://pkg.pr.new/@clerk/express@8928

@clerk/fastify
npm i https://pkg.pr.new/@clerk/fastify@8928

@clerk/hono
npm i https://pkg.pr.new/@clerk/hono@8928

@clerk/localizations
npm i https://pkg.pr.new/@clerk/localizations@8928

@clerk/nextjs
npm i https://pkg.pr.new/@clerk/nextjs@8928

@clerk/nuxt
npm i https://pkg.pr.new/@clerk/nuxt@8928

@clerk/react
npm i https://pkg.pr.new/@clerk/react@8928

@clerk/react-router
npm i https://pkg.pr.new/@clerk/react-router@8928

@clerk/shared
npm i https://pkg.pr.new/@clerk/shared@8928

@clerk/tanstack-react-start
npm i https://pkg.pr.new/@clerk/tanstack-react-start@8928

@clerk/testing
npm i https://pkg.pr.new/@clerk/testing@8928

@clerk/ui
npm i https://pkg.pr.new/@clerk/ui@8928

@clerk/upgrade
npm i https://pkg.pr.new/@clerk/upgrade@8928

@clerk/vue
npm i https://pkg.pr.new/@clerk/vue@8928

commit: 41c879a
@wobsorianowobsoriano
changed the title
fix(expo): Attempt token revive fixfix(expo): Restore persisted sessions after native singleton reuseJun 29, 2026
@wobsoriano
wobsoriano
marked this pull request as ready for review
June 29, 2026 16:29
@github-actions
github-actionsBot
commented
Jun 29, 2026•

edited

Loading

Copy link


Copy Markdown

Contributor
API Changes Report
Generated by Break Check on 2026-06-29T16:49:44.153Z
Summary
MetricCount
Packages analyzed19
Packages with changes0
🔴 Breaking changes0
🟡 Non-breaking changes0
🟢 Additions0
No API Changes Detected
All packages have stable APIs with no detected changes.
Report generated by Break Check
Last ran on 41c879a.
coderabbitai[bot]
coderabbitaiBot
reviewed
Jun 29, 2026
View reviewed changes
@coderabbitaicoderabbitaiBot
left a comment


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.

Actionable comments posted: 1
🤖 Prompt for all review comments with 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.
Inline comments:
In `@packages/expo/src/provider/singleton/__tests__/createClerkInstance.test.ts`:
- Around line 322-347: The test around createClerkInstance should verify the
token cache key used by __internal_onBeforeRequest, not just the resulting
authorization header. Update the latestTokenCache mock in
createClerkInstance.test.ts to be key-sensitive or assert getToken was called
with CLERK_CLIENT_JWT_KEY, so the contract between getClerkInstance and
TokenCache is covered. Keep the existing header assertion, but add a call
expectation on the mocked getToken to ensure the correct persistence key is
read.

🪄 Autofix (Beta)
Fix all unresolved CodeRabbit comments on this PR:
  •  Push a commit to this branch (recommended)
  •  Create a new PR with the fixes
ℹ️ Review info
⚙️ Run configuration
Configuration used: Repository YAML (base), Repository UI (inherited)
Review profile: CHILL
Plan: Pro Plus
Run ID: 25a1c6ce-c1db-4359-a8da-78ae69017288
📥 Commits
Reviewing files that changed from the base of the PR and between 73c48f1 and 41c879a.
📒 Files selected for processing (2)
  • packages/expo/src/provider/singleton/__tests__/createClerkInstance.test.ts
  • packages/expo/src/provider/singleton/createClerkInstance.ts
🚧 Files skipped from review as they are similar to previous changes (1)
  • packages/expo/src/provider/singleton/createClerkInstance.ts
Comment threadpackages/expo/src/provider/singleton/__tests__/createClerkInstance.test.ts
mikepitre
mikepitre
approved these changes
Jun 29, 2026
View reviewed changes
@mikepitremikepitre
left a comment


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.

LGTM! Thanks for fixing!
@wobsoriano
wobsoriano
merged commit 2305459
into
mainJun 29, 2026

58 checks passed

@wobsoriano
wobsoriano
deleted the

rob/expo-session-persist-fix

branch
June 29, 2026 17:02
@clerk-cookieclerk-cookie
mentioned this pull request
Jun 29, 2026
 Merged

@coderabbitaicoderabbitaiBot
mentioned this pull request
Jun 29, 2026
 Merged

9 tasks
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@coderabbitaicoderabbitai[bot]coderabbitai[bot] left review comments
@mikepitremikepitremikepitre approved these changes

Assignees


No one assigned


Labels

expo

Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

2 participants

@wobsoriano@mikepitre

, '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(expo): Restore persisted sessions after native singleton reuse by wobsoriano · Pull Request #8928 · clerk/javascript · GitHub
Skip to content
fix(expo): Restore persisted sessions after native singleton reuse - #8928
Merged
wobsoriano merged 6 commits into
mainfrom 
rob/expo-session-persist-fix
Jun 29, 2026
Merged
fix(expo): Restore persisted sessions after native singleton reuse#8928
wobsoriano merged 6 commits into
mainfrom 
rob/expo-session-persist-fix
Conversation
@wobsoriano
@wobsorianowobsoriano
commented
Jun 19, 2026•

edited by coderabbitai
Bot
Loading

Copy link


Copy Markdown

Member
Description
Fixes Expo session restoration when the native Clerk singleton is reused before ClerkProvider provides the app's real tokenCache.
The singleton now tracks the latest explicit tokenCache, so cold-start /v1/client requests can use the persisted client JWT instead of loading a signed-out client.
Confirmed by a customer that the snapshot for this PR resolved their issue.
Resolves MOBILE-564
Checklist
  • pnpm test runs as expected.
  • pnpm build runs as expected.
  •  (If applicable) JSDoc comments have been added or updated for any package exports
  •  (If applicable) Documentation has been updated
Type of change
  •  🐛 Bug fix
  •  🌟 New feature
  •  🔨 Breaking change
  •  📖 Refactoring / dependency upgrade / documentation
  •  other:
Summary by CodeRabbit
  • Bug Fixes
    • Fixed persisted session restoration in Expo when the native Clerk singleton initializes before the app’s token cache is available.
    • Improved session token handling during request and response cycles so the most recent token cache is used consistently.
    • Ensured refreshed tokens are saved to the correct cache and stale client tokens are cleared when configuration changes.
  • Tests
    • Added coverage for singleton reuse scenarios involving token cache updates and request/response authorization behavior.
@changeset-bot
changeset-botBot
commented
Jun 19, 2026•

edited

Loading

Copy link


Copy Markdown

🦋 Changeset detected
Latest commit: 41c879a
The changes in this PR will be included in the next version bump.
This PR includes changesets to release 1 package
NameType
@clerk/expoPatch
Not sure what this means? Click here to learn what changesets are.
Click here if you're a maintainer who wants to add another changeset to this PR
@vercel
vercelBot
commented
Jun 19, 2026•

edited

Loading

Copy link


Copy Markdown

The latest updates on your projects. Learn more about Vercel for GitHub.
ProjectDeploymentActionsUpdated (UTC)
clerk-js-sandboxReadyReadyPreview, CommentJun 29, 2026 4:48pm
swingsetReadyReadyPreview, CommentJun 29, 2026 4:48pm
Request Review
@coderabbitai
coderabbitaiBot
commented
Jun 19, 2026•

edited

Loading

Copy link


Copy Markdown

Contributor
Review Change Stack
📝 Walkthrough
Walkthrough
Introduces a module-level __internal_tokenCache variable in createClerkInstance.ts initialized to MemoryTokenCache. The tokenCache from options is applied only when explicitly provided, and request/response hooks read from and write to this module-level cache. Three new tests validate singleton reuse with updated token caches.
Token cache late-binding fix
Layer / File(s)Summary
Module-scoped tokenCache and late-binding logic
packages/expo/src/provider/singleton/createClerkInstance.ts		Adds TokenCache import, introduces __internal_tokenCache module variable defaulting to MemoryTokenCache, updates hasOwnOption type guard to BuildClerkOptions, removes tokenCache from early options destructuring, and conditionally sets __internal_tokenCache only when options explicitly contains tokenCache; clearToken/getToken/saveToken closures reference the module-level variable.
Tests for tokenCache reuse behavior
packages/expo/src/provider/singleton/__tests__/createClerkInstance.test.ts		Adds three tests: latest explicit tokenCache is used by __internal_onBeforeRequest, latest cache is preserved when a subsequent call omits tokenCache, and __internal_onAfterResponse saves JWT only into the latest cache.
Patch changeset
.changeset/fresh-expo-token-cache.md		Declares a patch release for @clerk/expo describing the token cache timing fix.
Estimated code review effort
🎯 3 (Moderate) | ⏱️ ~20 minutes
Possibly related PRs
  • clerk/javascript#8860: Refactors MemoryTokenCache internals used as the default value for the new __internal_tokenCache module variable introduced in this PR.
Poem
🐇 Hoppity-hop through the singleton tree,

The token cache now updates, late but free!

No more stale sessions from init gone wrong,

The latest cache sings its authorization song.

Cache cleared, token saved — the bunny hops on! 🎉
🚥 Pre-merge checks | ✅ 4 | ❌ 1
❌ Failed checks (1 warning)
Check nameStatusExplanationResolution
Docstring Coverage⚠️ WarningDocstring coverage is 0.00% which is insufficient. The required threshold is 80.00%.Write docstrings for the functions missing them to satisfy the coverage threshold.
✅ Passed checks (4 passed)
Check nameStatusExplanation
Description Check✅ PassedCheck skipped - CodeRabbit’s high-level summary is enabled.
Title check✅ PassedThe title clearly matches the main Expo session-restoration fix and mentions the native singleton reuse scenario.
Linked Issues check✅ PassedCheck skipped because no linked issues were found for this pull request.
Out of Scope Changes check✅ PassedCheck skipped because no linked issues were found for this pull request.
✨ Finishing Touches
📝 Generate docstrings
  •  Create stacked PR
  •  Commit on current branch
Comment @coderabbitai help to get the list of available commands.
@pkg-pr-new
pkg-pr-newBot
commented
Jun 19, 2026•

edited

Loading

Copy link


Copy Markdown

Open in StackBlitz
@clerk/astro
npm i https://pkg.pr.new/@clerk/astro@8928

@clerk/backend
npm i https://pkg.pr.new/@clerk/backend@8928

@clerk/chrome-extension
npm i https://pkg.pr.new/@clerk/chrome-extension@8928

@clerk/clerk-js
npm i https://pkg.pr.new/@clerk/clerk-js@8928

@clerk/electron
npm i https://pkg.pr.new/@clerk/electron@8928

@clerk/electron-passkeys
npm i https://pkg.pr.new/@clerk/electron-passkeys@8928

@clerk/eslint-plugin
npm i https://pkg.pr.new/@clerk/eslint-plugin@8928

@clerk/expo
npm i https://pkg.pr.new/@clerk/expo@8928

@clerk/expo-passkeys
npm i https://pkg.pr.new/@clerk/expo-passkeys@8928

@clerk/express
npm i https://pkg.pr.new/@clerk/express@8928

@clerk/fastify
npm i https://pkg.pr.new/@clerk/fastify@8928

@clerk/hono
npm i https://pkg.pr.new/@clerk/hono@8928

@clerk/localizations
npm i https://pkg.pr.new/@clerk/localizations@8928

@clerk/nextjs
npm i https://pkg.pr.new/@clerk/nextjs@8928

@clerk/nuxt
npm i https://pkg.pr.new/@clerk/nuxt@8928

@clerk/react
npm i https://pkg.pr.new/@clerk/react@8928

@clerk/react-router
npm i https://pkg.pr.new/@clerk/react-router@8928

@clerk/shared
npm i https://pkg.pr.new/@clerk/shared@8928

@clerk/tanstack-react-start
npm i https://pkg.pr.new/@clerk/tanstack-react-start@8928

@clerk/testing
npm i https://pkg.pr.new/@clerk/testing@8928

@clerk/ui
npm i https://pkg.pr.new/@clerk/ui@8928

@clerk/upgrade
npm i https://pkg.pr.new/@clerk/upgrade@8928

@clerk/vue
npm i https://pkg.pr.new/@clerk/vue@8928

commit: 41c879a
@wobsorianowobsoriano
changed the title
fix(expo): Attempt token revive fixfix(expo): Restore persisted sessions after native singleton reuseJun 29, 2026
@wobsoriano
wobsoriano
marked this pull request as ready for review
June 29, 2026 16:29
@github-actions
github-actionsBot
commented
Jun 29, 2026•

edited

Loading

Copy link


Copy Markdown

Contributor
API Changes Report
Generated by Break Check on 2026-06-29T16:49:44.153Z
Summary
MetricCount
Packages analyzed19
Packages with changes0
🔴 Breaking changes0
🟡 Non-breaking changes0
🟢 Additions0
No API Changes Detected
All packages have stable APIs with no detected changes.
Report generated by Break Check
Last ran on 41c879a.
coderabbitai[bot]
coderabbitaiBot
reviewed
Jun 29, 2026
View reviewed changes
@coderabbitaicoderabbitaiBot
left a comment


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.

Actionable comments posted: 1
🤖 Prompt for all review comments with 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.
Inline comments:
In `@packages/expo/src/provider/singleton/__tests__/createClerkInstance.test.ts`:
- Around line 322-347: The test around createClerkInstance should verify the
token cache key used by __internal_onBeforeRequest, not just the resulting
authorization header. Update the latestTokenCache mock in
createClerkInstance.test.ts to be key-sensitive or assert getToken was called
with CLERK_CLIENT_JWT_KEY, so the contract between getClerkInstance and
TokenCache is covered. Keep the existing header assertion, but add a call
expectation on the mocked getToken to ensure the correct persistence key is
read.

🪄 Autofix (Beta)
Fix all unresolved CodeRabbit comments on this PR:
  •  Push a commit to this branch (recommended)
  •  Create a new PR with the fixes
ℹ️ Review info
⚙️ Run configuration
Configuration used: Repository YAML (base), Repository UI (inherited)
Review profile: CHILL
Plan: Pro Plus
Run ID: 25a1c6ce-c1db-4359-a8da-78ae69017288
📥 Commits
Reviewing files that changed from the base of the PR and between 73c48f1 and 41c879a.
📒 Files selected for processing (2)
  • packages/expo/src/provider/singleton/__tests__/createClerkInstance.test.ts
  • packages/expo/src/provider/singleton/createClerkInstance.ts
🚧 Files skipped from review as they are similar to previous changes (1)
  • packages/expo/src/provider/singleton/createClerkInstance.ts
Comment threadpackages/expo/src/provider/singleton/__tests__/createClerkInstance.test.ts
mikepitre
mikepitre
approved these changes
Jun 29, 2026
View reviewed changes
@mikepitremikepitre
left a comment


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.

LGTM! Thanks for fixing!
@wobsoriano
wobsoriano
merged commit 2305459
into
mainJun 29, 2026

58 checks passed

@wobsoriano
wobsoriano
deleted the

rob/expo-session-persist-fix

branch
June 29, 2026 17:02
@clerk-cookieclerk-cookie
mentioned this pull request
Jun 29, 2026
 Merged

@coderabbitaicoderabbitaiBot
mentioned this pull request
Jun 29, 2026
 Merged

9 tasks
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@coderabbitaicoderabbitai[bot]coderabbitai[bot] left review comments
@mikepitremikepitremikepitre approved these changes

Assignees


No one assigned


Labels

expo

Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

2 participants

@wobsoriano@mikepitre

, '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(expo): Restore persisted sessions after native singleton reuse by wobsoriano · Pull Request #8928 · clerk/javascript · GitHub
Skip to content
fix(expo): Restore persisted sessions after native singleton reuse - #8928
Merged
wobsoriano merged 6 commits into
mainfrom 
rob/expo-session-persist-fix
Jun 29, 2026
Merged
fix(expo): Restore persisted sessions after native singleton reuse#8928
wobsoriano merged 6 commits into
mainfrom 
rob/expo-session-persist-fix
Conversation
@wobsoriano
@wobsorianowobsoriano
commented
Jun 19, 2026•

edited by coderabbitai
Bot
Loading

Copy link


Copy Markdown

Member
Description
Fixes Expo session restoration when the native Clerk singleton is reused before ClerkProvider provides the app's real tokenCache.
The singleton now tracks the latest explicit tokenCache, so cold-start /v1/client requests can use the persisted client JWT instead of loading a signed-out client.
Confirmed by a customer that the snapshot for this PR resolved their issue.
Resolves MOBILE-564
Checklist
  • pnpm test runs as expected.
  • pnpm build runs as expected.
  •  (If applicable) JSDoc comments have been added or updated for any package exports
  •  (If applicable) Documentation has been updated
Type of change
  •  🐛 Bug fix
  •  🌟 New feature
  •  🔨 Breaking change
  •  📖 Refactoring / dependency upgrade / documentation
  •  other:
Summary by CodeRabbit
  • Bug Fixes
    • Fixed persisted session restoration in Expo when the native Clerk singleton initializes before the app’s token cache is available.
    • Improved session token handling during request and response cycles so the most recent token cache is used consistently.
    • Ensured refreshed tokens are saved to the correct cache and stale client tokens are cleared when configuration changes.
  • Tests
    • Added coverage for singleton reuse scenarios involving token cache updates and request/response authorization behavior.
@changeset-bot
changeset-botBot
commented
Jun 19, 2026•

edited

Loading

Copy link


Copy Markdown

🦋 Changeset detected
Latest commit: 41c879a
The changes in this PR will be included in the next version bump.
This PR includes changesets to release 1 package
NameType
@clerk/expoPatch
Not sure what this means? Click here to learn what changesets are.
Click here if you're a maintainer who wants to add another changeset to this PR
@vercel
vercelBot
commented
Jun 19, 2026•

edited

Loading

Copy link


Copy Markdown

The latest updates on your projects. Learn more about Vercel for GitHub.
ProjectDeploymentActionsUpdated (UTC)
clerk-js-sandboxReadyReadyPreview, CommentJun 29, 2026 4:48pm
swingsetReadyReadyPreview, CommentJun 29, 2026 4:48pm
Request Review
@coderabbitai
coderabbitaiBot
commented
Jun 19, 2026•

edited

Loading

Copy link


Copy Markdown

Contributor
Review Change Stack
📝 Walkthrough
Walkthrough
Introduces a module-level __internal_tokenCache variable in createClerkInstance.ts initialized to MemoryTokenCache. The tokenCache from options is applied only when explicitly provided, and request/response hooks read from and write to this module-level cache. Three new tests validate singleton reuse with updated token caches.
Token cache late-binding fix
Layer / File(s)Summary
Module-scoped tokenCache and late-binding logic
packages/expo/src/provider/singleton/createClerkInstance.ts		Adds TokenCache import, introduces __internal_tokenCache module variable defaulting to MemoryTokenCache, updates hasOwnOption type guard to BuildClerkOptions, removes tokenCache from early options destructuring, and conditionally sets __internal_tokenCache only when options explicitly contains tokenCache; clearToken/getToken/saveToken closures reference the module-level variable.
Tests for tokenCache reuse behavior
packages/expo/src/provider/singleton/__tests__/createClerkInstance.test.ts		Adds three tests: latest explicit tokenCache is used by __internal_onBeforeRequest, latest cache is preserved when a subsequent call omits tokenCache, and __internal_onAfterResponse saves JWT only into the latest cache.
Patch changeset
.changeset/fresh-expo-token-cache.md		Declares a patch release for @clerk/expo describing the token cache timing fix.
Estimated code review effort
🎯 3 (Moderate) | ⏱️ ~20 minutes
Possibly related PRs
  • clerk/javascript#8860: Refactors MemoryTokenCache internals used as the default value for the new __internal_tokenCache module variable introduced in this PR.
Poem
🐇 Hoppity-hop through the singleton tree,

The token cache now updates, late but free!

No more stale sessions from init gone wrong,

The latest cache sings its authorization song.

Cache cleared, token saved — the bunny hops on! 🎉
🚥 Pre-merge checks | ✅ 4 | ❌ 1
❌ Failed checks (1 warning)
Check nameStatusExplanationResolution
Docstring Coverage⚠️ WarningDocstring coverage is 0.00% which is insufficient. The required threshold is 80.00%.Write docstrings for the functions missing them to satisfy the coverage threshold.
✅ Passed checks (4 passed)
Check nameStatusExplanation
Description Check✅ PassedCheck skipped - CodeRabbit’s high-level summary is enabled.
Title check✅ PassedThe title clearly matches the main Expo session-restoration fix and mentions the native singleton reuse scenario.
Linked Issues check✅ PassedCheck skipped because no linked issues were found for this pull request.
Out of Scope Changes check✅ PassedCheck skipped because no linked issues were found for this pull request.
✨ Finishing Touches
📝 Generate docstrings
  •  Create stacked PR
  •  Commit on current branch
Comment @coderabbitai help to get the list of available commands.
@pkg-pr-new
pkg-pr-newBot
commented
Jun 19, 2026•

edited

Loading

Copy link


Copy Markdown

Open in StackBlitz
@clerk/astro
npm i https://pkg.pr.new/@clerk/astro@8928

@clerk/backend
npm i https://pkg.pr.new/@clerk/backend@8928

@clerk/chrome-extension
npm i https://pkg.pr.new/@clerk/chrome-extension@8928

@clerk/clerk-js
npm i https://pkg.pr.new/@clerk/clerk-js@8928

@clerk/electron
npm i https://pkg.pr.new/@clerk/electron@8928

@clerk/electron-passkeys
npm i https://pkg.pr.new/@clerk/electron-passkeys@8928

@clerk/eslint-plugin
npm i https://pkg.pr.new/@clerk/eslint-plugin@8928

@clerk/expo
npm i https://pkg.pr.new/@clerk/expo@8928

@clerk/expo-passkeys
npm i https://pkg.pr.new/@clerk/expo-passkeys@8928

@clerk/express
npm i https://pkg.pr.new/@clerk/express@8928

@clerk/fastify
npm i https://pkg.pr.new/@clerk/fastify@8928

@clerk/hono
npm i https://pkg.pr.new/@clerk/hono@8928

@clerk/localizations
npm i https://pkg.pr.new/@clerk/localizations@8928

@clerk/nextjs
npm i https://pkg.pr.new/@clerk/nextjs@8928

@clerk/nuxt
npm i https://pkg.pr.new/@clerk/nuxt@8928

@clerk/react
npm i https://pkg.pr.new/@clerk/react@8928

@clerk/react-router
npm i https://pkg.pr.new/@clerk/react-router@8928

@clerk/shared
npm i https://pkg.pr.new/@clerk/shared@8928

@clerk/tanstack-react-start
npm i https://pkg.pr.new/@clerk/tanstack-react-start@8928

@clerk/testing
npm i https://pkg.pr.new/@clerk/testing@8928

@clerk/ui
npm i https://pkg.pr.new/@clerk/ui@8928

@clerk/upgrade
npm i https://pkg.pr.new/@clerk/upgrade@8928

@clerk/vue
npm i https://pkg.pr.new/@clerk/vue@8928

commit: 41c879a
@wobsorianowobsoriano
changed the title
fix(expo): Attempt token revive fixfix(expo): Restore persisted sessions after native singleton reuseJun 29, 2026
@wobsoriano
wobsoriano
marked this pull request as ready for review
June 29, 2026 16:29
@github-actions
github-actionsBot
commented
Jun 29, 2026•

edited

Loading

Copy link


Copy Markdown

Contributor
API Changes Report
Generated by Break Check on 2026-06-29T16:49:44.153Z
Summary
MetricCount
Packages analyzed19
Packages with changes0
🔴 Breaking changes0
🟡 Non-breaking changes0
🟢 Additions0
No API Changes Detected
All packages have stable APIs with no detected changes.
Report generated by Break Check
Last ran on 41c879a.
coderabbitai[bot]
coderabbitaiBot
reviewed
Jun 29, 2026
View reviewed changes
@coderabbitaicoderabbitaiBot
left a comment


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.

Actionable comments posted: 1
🤖 Prompt for all review comments with 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.
Inline comments:
In `@packages/expo/src/provider/singleton/__tests__/createClerkInstance.test.ts`:
- Around line 322-347: The test around createClerkInstance should verify the
token cache key used by __internal_onBeforeRequest, not just the resulting
authorization header. Update the latestTokenCache mock in
createClerkInstance.test.ts to be key-sensitive or assert getToken was called
with CLERK_CLIENT_JWT_KEY, so the contract between getClerkInstance and
TokenCache is covered. Keep the existing header assertion, but add a call
expectation on the mocked getToken to ensure the correct persistence key is
read.

🪄 Autofix (Beta)
Fix all unresolved CodeRabbit comments on this PR:
  •  Push a commit to this branch (recommended)
  •  Create a new PR with the fixes
ℹ️ Review info
⚙️ Run configuration
Configuration used: Repository YAML (base), Repository UI (inherited)
Review profile: CHILL
Plan: Pro Plus
Run ID: 25a1c6ce-c1db-4359-a8da-78ae69017288
📥 Commits
Reviewing files that changed from the base of the PR and between 73c48f1 and 41c879a.
📒 Files selected for processing (2)
  • packages/expo/src/provider/singleton/__tests__/createClerkInstance.test.ts
  • packages/expo/src/provider/singleton/createClerkInstance.ts
🚧 Files skipped from review as they are similar to previous changes (1)
  • packages/expo/src/provider/singleton/createClerkInstance.ts
Comment threadpackages/expo/src/provider/singleton/__tests__/createClerkInstance.test.ts
mikepitre
mikepitre
approved these changes
Jun 29, 2026
View reviewed changes
@mikepitremikepitre
left a comment


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.

LGTM! Thanks for fixing!
@wobsoriano
wobsoriano
merged commit 2305459
into
mainJun 29, 2026

58 checks passed

@wobsoriano
wobsoriano
deleted the

rob/expo-session-persist-fix

branch
June 29, 2026 17:02
@clerk-cookieclerk-cookie
mentioned this pull request
Jun 29, 2026
 Merged

@coderabbitaicoderabbitaiBot
mentioned this pull request
Jun 29, 2026
 Merged

9 tasks
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@coderabbitaicoderabbitai[bot]coderabbitai[bot] left review comments
@mikepitremikepitremikepitre approved these changes

Assignees


No one assigned


Labels

expo

Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

2 participants

@wobsoriano@mikepitre

, '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(expo): Restore persisted sessions after native singleton reuse by wobsoriano · Pull Request #8928 · clerk/javascript · GitHub
Skip to content
fix(expo): Restore persisted sessions after native singleton reuse - #8928
Merged
wobsoriano merged 6 commits into
mainfrom 
rob/expo-session-persist-fix
Jun 29, 2026
Merged
fix(expo): Restore persisted sessions after native singleton reuse#8928
wobsoriano merged 6 commits into
mainfrom 
rob/expo-session-persist-fix
Conversation
@wobsoriano
@wobsorianowobsoriano
commented
Jun 19, 2026•

edited by coderabbitai
Bot
Loading

Copy link


Copy Markdown

Member
Description
Fixes Expo session restoration when the native Clerk singleton is reused before ClerkProvider provides the app's real tokenCache.
The singleton now tracks the latest explicit tokenCache, so cold-start /v1/client requests can use the persisted client JWT instead of loading a signed-out client.
Confirmed by a customer that the snapshot for this PR resolved their issue.
Resolves MOBILE-564
Checklist
  • pnpm test runs as expected.
  • pnpm build runs as expected.
  •  (If applicable) JSDoc comments have been added or updated for any package exports
  •  (If applicable) Documentation has been updated
Type of change
  •  🐛 Bug fix
  •  🌟 New feature
  •  🔨 Breaking change
  •  📖 Refactoring / dependency upgrade / documentation
  •  other:
Summary by CodeRabbit
  • Bug Fixes
    • Fixed persisted session restoration in Expo when the native Clerk singleton initializes before the app’s token cache is available.
    • Improved session token handling during request and response cycles so the most recent token cache is used consistently.
    • Ensured refreshed tokens are saved to the correct cache and stale client tokens are cleared when configuration changes.
  • Tests
    • Added coverage for singleton reuse scenarios involving token cache updates and request/response authorization behavior.
@changeset-bot
changeset-botBot
commented
Jun 19, 2026•

edited

Loading

Copy link


Copy Markdown

🦋 Changeset detected
Latest commit: 41c879a
The changes in this PR will be included in the next version bump.
This PR includes changesets to release 1 package
NameType
@clerk/expoPatch
Not sure what this means? Click here to learn what changesets are.
Click here if you're a maintainer who wants to add another changeset to this PR
@vercel
vercelBot
commented
Jun 19, 2026•

edited

Loading

Copy link


Copy Markdown

The latest updates on your projects. Learn more about Vercel for GitHub.
ProjectDeploymentActionsUpdated (UTC)
clerk-js-sandboxReadyReadyPreview, CommentJun 29, 2026 4:48pm
swingsetReadyReadyPreview, CommentJun 29, 2026 4:48pm
Request Review
@coderabbitai
coderabbitaiBot
commented
Jun 19, 2026•

edited

Loading

Copy link


Copy Markdown

Contributor
Review Change Stack
📝 Walkthrough
Walkthrough
Introduces a module-level __internal_tokenCache variable in createClerkInstance.ts initialized to MemoryTokenCache. The tokenCache from options is applied only when explicitly provided, and request/response hooks read from and write to this module-level cache. Three new tests validate singleton reuse with updated token caches.
Token cache late-binding fix
Layer / File(s)Summary
Module-scoped tokenCache and late-binding logic
packages/expo/src/provider/singleton/createClerkInstance.ts		Adds TokenCache import, introduces __internal_tokenCache module variable defaulting to MemoryTokenCache, updates hasOwnOption type guard to BuildClerkOptions, removes tokenCache from early options destructuring, and conditionally sets __internal_tokenCache only when options explicitly contains tokenCache; clearToken/getToken/saveToken closures reference the module-level variable.
Tests for tokenCache reuse behavior
packages/expo/src/provider/singleton/__tests__/createClerkInstance.test.ts		Adds three tests: latest explicit tokenCache is used by __internal_onBeforeRequest, latest cache is preserved when a subsequent call omits tokenCache, and __internal_onAfterResponse saves JWT only into the latest cache.
Patch changeset
.changeset/fresh-expo-token-cache.md		Declares a patch release for @clerk/expo describing the token cache timing fix.
Estimated code review effort
🎯 3 (Moderate) | ⏱️ ~20 minutes
Possibly related PRs
  • clerk/javascript#8860: Refactors MemoryTokenCache internals used as the default value for the new __internal_tokenCache module variable introduced in this PR.
Poem
🐇 Hoppity-hop through the singleton tree,

The token cache now updates, late but free!

No more stale sessions from init gone wrong,

The latest cache sings its authorization song.

Cache cleared, token saved — the bunny hops on! 🎉
🚥 Pre-merge checks | ✅ 4 | ❌ 1
❌ Failed checks (1 warning)
Check nameStatusExplanationResolution
Docstring Coverage⚠️ WarningDocstring coverage is 0.00% which is insufficient. The required threshold is 80.00%.Write docstrings for the functions missing them to satisfy the coverage threshold.
✅ Passed checks (4 passed)
Check nameStatusExplanation
Description Check✅ PassedCheck skipped - CodeRabbit’s high-level summary is enabled.
Title check✅ PassedThe title clearly matches the main Expo session-restoration fix and mentions the native singleton reuse scenario.
Linked Issues check✅ PassedCheck skipped because no linked issues were found for this pull request.
Out of Scope Changes check✅ PassedCheck skipped because no linked issues were found for this pull request.
✨ Finishing Touches
📝 Generate docstrings
  •  Create stacked PR
  •  Commit on current branch
Comment @coderabbitai help to get the list of available commands.
@pkg-pr-new
pkg-pr-newBot
commented
Jun 19, 2026•

edited

Loading

Copy link


Copy Markdown

Open in StackBlitz
@clerk/astro
npm i https://pkg.pr.new/@clerk/astro@8928

@clerk/backend
npm i https://pkg.pr.new/@clerk/backend@8928

@clerk/chrome-extension
npm i https://pkg.pr.new/@clerk/chrome-extension@8928

@clerk/clerk-js
npm i https://pkg.pr.new/@clerk/clerk-js@8928

@clerk/electron
npm i https://pkg.pr.new/@clerk/electron@8928

@clerk/electron-passkeys
npm i https://pkg.pr.new/@clerk/electron-passkeys@8928

@clerk/eslint-plugin
npm i https://pkg.pr.new/@clerk/eslint-plugin@8928

@clerk/expo
npm i https://pkg.pr.new/@clerk/expo@8928

@clerk/expo-passkeys
npm i https://pkg.pr.new/@clerk/expo-passkeys@8928

@clerk/express
npm i https://pkg.pr.new/@clerk/express@8928

@clerk/fastify
npm i https://pkg.pr.new/@clerk/fastify@8928

@clerk/hono
npm i https://pkg.pr.new/@clerk/hono@8928

@clerk/localizations
npm i https://pkg.pr.new/@clerk/localizations@8928

@clerk/nextjs
npm i https://pkg.pr.new/@clerk/nextjs@8928

@clerk/nuxt
npm i https://pkg.pr.new/@clerk/nuxt@8928

@clerk/react
npm i https://pkg.pr.new/@clerk/react@8928

@clerk/react-router
npm i https://pkg.pr.new/@clerk/react-router@8928

@clerk/shared
npm i https://pkg.pr.new/@clerk/shared@8928

@clerk/tanstack-react-start
npm i https://pkg.pr.new/@clerk/tanstack-react-start@8928

@clerk/testing
npm i https://pkg.pr.new/@clerk/testing@8928

@clerk/ui
npm i https://pkg.pr.new/@clerk/ui@8928

@clerk/upgrade
npm i https://pkg.pr.new/@clerk/upgrade@8928

@clerk/vue
npm i https://pkg.pr.new/@clerk/vue@8928

commit: 41c879a
@wobsorianowobsoriano
changed the title
fix(expo): Attempt token revive fixfix(expo): Restore persisted sessions after native singleton reuseJun 29, 2026
@wobsoriano
wobsoriano
marked this pull request as ready for review
June 29, 2026 16:29
@github-actions
github-actionsBot
commented
Jun 29, 2026•

edited

Loading

Copy link


Copy Markdown

Contributor
API Changes Report
Generated by Break Check on 2026-06-29T16:49:44.153Z
Summary
MetricCount
Packages analyzed19
Packages with changes0
🔴 Breaking changes0
🟡 Non-breaking changes0
🟢 Additions0
No API Changes Detected
All packages have stable APIs with no detected changes.
Report generated by Break Check
Last ran on 41c879a.
coderabbitai[bot]
coderabbitaiBot
reviewed
Jun 29, 2026
View reviewed changes
@coderabbitaicoderabbitaiBot
left a comment


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.

Actionable comments posted: 1
🤖 Prompt for all review comments with 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.
Inline comments:
In `@packages/expo/src/provider/singleton/__tests__/createClerkInstance.test.ts`:
- Around line 322-347: The test around createClerkInstance should verify the
token cache key used by __internal_onBeforeRequest, not just the resulting
authorization header. Update the latestTokenCache mock in
createClerkInstance.test.ts to be key-sensitive or assert getToken was called
with CLERK_CLIENT_JWT_KEY, so the contract between getClerkInstance and
TokenCache is covered. Keep the existing header assertion, but add a call
expectation on the mocked getToken to ensure the correct persistence key is
read.

🪄 Autofix (Beta)
Fix all unresolved CodeRabbit comments on this PR:
  •  Push a commit to this branch (recommended)
  •  Create a new PR with the fixes
ℹ️ Review info
⚙️ Run configuration
Configuration used: Repository YAML (base), Repository UI (inherited)
Review profile: CHILL
Plan: Pro Plus
Run ID: 25a1c6ce-c1db-4359-a8da-78ae69017288
📥 Commits
Reviewing files that changed from the base of the PR and between 73c48f1 and 41c879a.
📒 Files selected for processing (2)
  • packages/expo/src/provider/singleton/__tests__/createClerkInstance.test.ts
  • packages/expo/src/provider/singleton/createClerkInstance.ts
🚧 Files skipped from review as they are similar to previous changes (1)
  • packages/expo/src/provider/singleton/createClerkInstance.ts
Comment threadpackages/expo/src/provider/singleton/__tests__/createClerkInstance.test.ts
mikepitre
mikepitre
approved these changes
Jun 29, 2026
View reviewed changes
@mikepitremikepitre
left a comment


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.

LGTM! Thanks for fixing!
@wobsoriano
wobsoriano
merged commit 2305459
into
mainJun 29, 2026

58 checks passed

@wobsoriano
wobsoriano
deleted the

rob/expo-session-persist-fix

branch
June 29, 2026 17:02
@clerk-cookieclerk-cookie
mentioned this pull request
Jun 29, 2026
 Merged

@coderabbitaicoderabbitaiBot
mentioned this pull request
Jun 29, 2026
 Merged

9 tasks
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@coderabbitaicoderabbitai[bot]coderabbitai[bot] left review comments
@mikepitremikepitremikepitre approved these changes

Assignees


No one assigned


Labels

expo

Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

2 participants

@wobsoriano@mikepitre

, '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(expo): Restore persisted sessions after native singleton reuse by wobsoriano · Pull Request #8928 · clerk/javascript · GitHub
Skip to content
fix(expo): Restore persisted sessions after native singleton reuse - #8928
Merged
wobsoriano merged 6 commits into
mainfrom 
rob/expo-session-persist-fix
Jun 29, 2026
Merged
fix(expo): Restore persisted sessions after native singleton reuse#8928
wobsoriano merged 6 commits into
mainfrom 
rob/expo-session-persist-fix
Conversation
@wobsoriano
@wobsorianowobsoriano
commented
Jun 19, 2026•

edited by coderabbitai
Bot
Loading

Copy link


Copy Markdown

Member
Description
Fixes Expo session restoration when the native Clerk singleton is reused before ClerkProvider provides the app's real tokenCache.
The singleton now tracks the latest explicit tokenCache, so cold-start /v1/client requests can use the persisted client JWT instead of loading a signed-out client.
Confirmed by a customer that the snapshot for this PR resolved their issue.
Resolves MOBILE-564
Checklist
  • pnpm test runs as expected.
  • pnpm build runs as expected.
  •  (If applicable) JSDoc comments have been added or updated for any package exports
  •  (If applicable) Documentation has been updated
Type of change
  •  🐛 Bug fix
  •  🌟 New feature
  •  🔨 Breaking change
  •  📖 Refactoring / dependency upgrade / documentation
  •  other:
Summary by CodeRabbit
  • Bug Fixes
    • Fixed persisted session restoration in Expo when the native Clerk singleton initializes before the app’s token cache is available.
    • Improved session token handling during request and response cycles so the most recent token cache is used consistently.
    • Ensured refreshed tokens are saved to the correct cache and stale client tokens are cleared when configuration changes.
  • Tests
    • Added coverage for singleton reuse scenarios involving token cache updates and request/response authorization behavior.
@changeset-bot
changeset-botBot
commented
Jun 19, 2026•

edited

Loading

Copy link


Copy Markdown

🦋 Changeset detected
Latest commit: 41c879a
The changes in this PR will be included in the next version bump.
This PR includes changesets to release 1 package
NameType
@clerk/expoPatch
Not sure what this means? Click here to learn what changesets are.
Click here if you're a maintainer who wants to add another changeset to this PR
@vercel
vercelBot
commented
Jun 19, 2026•

edited

Loading

Copy link


Copy Markdown

The latest updates on your projects. Learn more about Vercel for GitHub.
ProjectDeploymentActionsUpdated (UTC)
clerk-js-sandboxReadyReadyPreview, CommentJun 29, 2026 4:48pm
swingsetReadyReadyPreview, CommentJun 29, 2026 4:48pm
Request Review
@coderabbitai
coderabbitaiBot
commented
Jun 19, 2026•

edited

Loading

Copy link


Copy Markdown

Contributor
Review Change Stack
📝 Walkthrough
Walkthrough
Introduces a module-level __internal_tokenCache variable in createClerkInstance.ts initialized to MemoryTokenCache. The tokenCache from options is applied only when explicitly provided, and request/response hooks read from and write to this module-level cache. Three new tests validate singleton reuse with updated token caches.
Token cache late-binding fix
Layer / File(s)Summary
Module-scoped tokenCache and late-binding logic
packages/expo/src/provider/singleton/createClerkInstance.ts		Adds TokenCache import, introduces __internal_tokenCache module variable defaulting to MemoryTokenCache, updates hasOwnOption type guard to BuildClerkOptions, removes tokenCache from early options destructuring, and conditionally sets __internal_tokenCache only when options explicitly contains tokenCache; clearToken/getToken/saveToken closures reference the module-level variable.
Tests for tokenCache reuse behavior
packages/expo/src/provider/singleton/__tests__/createClerkInstance.test.ts		Adds three tests: latest explicit tokenCache is used by __internal_onBeforeRequest, latest cache is preserved when a subsequent call omits tokenCache, and __internal_onAfterResponse saves JWT only into the latest cache.
Patch changeset
.changeset/fresh-expo-token-cache.md		Declares a patch release for @clerk/expo describing the token cache timing fix.
Estimated code review effort
🎯 3 (Moderate) | ⏱️ ~20 minutes
Possibly related PRs
  • clerk/javascript#8860: Refactors MemoryTokenCache internals used as the default value for the new __internal_tokenCache module variable introduced in this PR.
Poem
🐇 Hoppity-hop through the singleton tree,

The token cache now updates, late but free!

No more stale sessions from init gone wrong,

The latest cache sings its authorization song.

Cache cleared, token saved — the bunny hops on! 🎉
🚥 Pre-merge checks | ✅ 4 | ❌ 1
❌ Failed checks (1 warning)
Check nameStatusExplanationResolution
Docstring Coverage⚠️ WarningDocstring coverage is 0.00% which is insufficient. The required threshold is 80.00%.Write docstrings for the functions missing them to satisfy the coverage threshold.
✅ Passed checks (4 passed)
Check nameStatusExplanation
Description Check✅ PassedCheck skipped - CodeRabbit’s high-level summary is enabled.
Title check✅ PassedThe title clearly matches the main Expo session-restoration fix and mentions the native singleton reuse scenario.
Linked Issues check✅ PassedCheck skipped because no linked issues were found for this pull request.
Out of Scope Changes check✅ PassedCheck skipped because no linked issues were found for this pull request.
✨ Finishing Touches
📝 Generate docstrings
  •  Create stacked PR
  •  Commit on current branch
Comment @coderabbitai help to get the list of available commands.
@pkg-pr-new
pkg-pr-newBot
commented
Jun 19, 2026•

edited

Loading

Copy link


Copy Markdown

Open in StackBlitz
@clerk/astro
npm i https://pkg.pr.new/@clerk/astro@8928

@clerk/backend
npm i https://pkg.pr.new/@clerk/backend@8928

@clerk/chrome-extension
npm i https://pkg.pr.new/@clerk/chrome-extension@8928

@clerk/clerk-js
npm i https://pkg.pr.new/@clerk/clerk-js@8928

@clerk/electron
npm i https://pkg.pr.new/@clerk/electron@8928

@clerk/electron-passkeys
npm i https://pkg.pr.new/@clerk/electron-passkeys@8928

@clerk/eslint-plugin
npm i https://pkg.pr.new/@clerk/eslint-plugin@8928

@clerk/expo
npm i https://pkg.pr.new/@clerk/expo@8928

@clerk/expo-passkeys
npm i https://pkg.pr.new/@clerk/expo-passkeys@8928

@clerk/express
npm i https://pkg.pr.new/@clerk/express@8928

@clerk/fastify
npm i https://pkg.pr.new/@clerk/fastify@8928

@clerk/hono
npm i https://pkg.pr.new/@clerk/hono@8928

@clerk/localizations
npm i https://pkg.pr.new/@clerk/localizations@8928

@clerk/nextjs
npm i https://pkg.pr.new/@clerk/nextjs@8928

@clerk/nuxt
npm i https://pkg.pr.new/@clerk/nuxt@8928

@clerk/react
npm i https://pkg.pr.new/@clerk/react@8928

@clerk/react-router
npm i https://pkg.pr.new/@clerk/react-router@8928

@clerk/shared
npm i https://pkg.pr.new/@clerk/shared@8928

@clerk/tanstack-react-start
npm i https://pkg.pr.new/@clerk/tanstack-react-start@8928

@clerk/testing
npm i https://pkg.pr.new/@clerk/testing@8928

@clerk/ui
npm i https://pkg.pr.new/@clerk/ui@8928

@clerk/upgrade
npm i https://pkg.pr.new/@clerk/upgrade@8928

@clerk/vue
npm i https://pkg.pr.new/@clerk/vue@8928

commit: 41c879a
@wobsorianowobsoriano
changed the title
fix(expo): Attempt token revive fixfix(expo): Restore persisted sessions after native singleton reuseJun 29, 2026
@wobsoriano
wobsoriano
marked this pull request as ready for review
June 29, 2026 16:29
@github-actions
github-actionsBot
commented
Jun 29, 2026•

edited

Loading

Copy link


Copy Markdown

Contributor
API Changes Report
Generated by Break Check on 2026-06-29T16:49:44.153Z
Summary
MetricCount
Packages analyzed19
Packages with changes0
🔴 Breaking changes0
🟡 Non-breaking changes0
🟢 Additions0
No API Changes Detected
All packages have stable APIs with no detected changes.
Report generated by Break Check
Last ran on 41c879a.
coderabbitai[bot]
coderabbitaiBot
reviewed
Jun 29, 2026
View reviewed changes
@coderabbitaicoderabbitaiBot
left a comment


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.

Actionable comments posted: 1
🤖 Prompt for all review comments with 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.
Inline comments:
In `@packages/expo/src/provider/singleton/__tests__/createClerkInstance.test.ts`:
- Around line 322-347: The test around createClerkInstance should verify the
token cache key used by __internal_onBeforeRequest, not just the resulting
authorization header. Update the latestTokenCache mock in
createClerkInstance.test.ts to be key-sensitive or assert getToken was called
with CLERK_CLIENT_JWT_KEY, so the contract between getClerkInstance and
TokenCache is covered. Keep the existing header assertion, but add a call
expectation on the mocked getToken to ensure the correct persistence key is
read.

🪄 Autofix (Beta)
Fix all unresolved CodeRabbit comments on this PR:
  •  Push a commit to this branch (recommended)
  •  Create a new PR with the fixes
ℹ️ Review info
⚙️ Run configuration
Configuration used: Repository YAML (base), Repository UI (inherited)
Review profile: CHILL
Plan: Pro Plus
Run ID: 25a1c6ce-c1db-4359-a8da-78ae69017288
📥 Commits
Reviewing files that changed from the base of the PR and between 73c48f1 and 41c879a.
📒 Files selected for processing (2)
  • packages/expo/src/provider/singleton/__tests__/createClerkInstance.test.ts
  • packages/expo/src/provider/singleton/createClerkInstance.ts
🚧 Files skipped from review as they are similar to previous changes (1)
  • packages/expo/src/provider/singleton/createClerkInstance.ts
Comment threadpackages/expo/src/provider/singleton/__tests__/createClerkInstance.test.ts
mikepitre
mikepitre
approved these changes
Jun 29, 2026
View reviewed changes
@mikepitremikepitre
left a comment


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.

LGTM! Thanks for fixing!
@wobsoriano
wobsoriano
merged commit 2305459
into
mainJun 29, 2026

58 checks passed

@wobsoriano
wobsoriano
deleted the

rob/expo-session-persist-fix

branch
June 29, 2026 17:02
@clerk-cookieclerk-cookie
mentioned this pull request
Jun 29, 2026
 Merged

@coderabbitaicoderabbitaiBot
mentioned this pull request
Jun 29, 2026
 Merged

9 tasks
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@coderabbitaicoderabbitai[bot]coderabbitai[bot] left review comments
@mikepitremikepitremikepitre approved these changes

Assignees


No one assigned


Labels

expo

Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

2 participants

@wobsoriano@mikepitre

, '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); }
})();
})();
fix(expo): Restore persisted sessions after native singleton reuse by wobsoriano · Pull Request #8928 · clerk/javascript · GitHub
Skip to content
fix(expo): Restore persisted sessions after native singleton reuse - #8928
Merged
wobsoriano merged 6 commits into
mainfrom 
rob/expo-session-persist-fix
Jun 29, 2026
Merged
fix(expo): Restore persisted sessions after native singleton reuse#8928
wobsoriano merged 6 commits into
mainfrom 
rob/expo-session-persist-fix
Conversation
@wobsoriano
@wobsorianowobsoriano
commented
Jun 19, 2026•

edited by coderabbitai
Bot
Loading

Copy link


Copy Markdown

Member
Description
Fixes Expo session restoration when the native Clerk singleton is reused before ClerkProvider provides the app's real tokenCache.
The singleton now tracks the latest explicit tokenCache, so cold-start /v1/client requests can use the persisted client JWT instead of loading a signed-out client.
Confirmed by a customer that the snapshot for this PR resolved their issue.
Resolves MOBILE-564
Checklist
  • pnpm test runs as expected.
  • pnpm build runs as expected.
  •  (If applicable) JSDoc comments have been added or updated for any package exports
  •  (If applicable) Documentation has been updated
Type of change
  •  🐛 Bug fix
  •  🌟 New feature
  •  🔨 Breaking change
  •  📖 Refactoring / dependency upgrade / documentation
  •  other:
Summary by CodeRabbit
  • Bug Fixes
    • Fixed persisted session restoration in Expo when the native Clerk singleton initializes before the app’s token cache is available.
    • Improved session token handling during request and response cycles so the most recent token cache is used consistently.
    • Ensured refreshed tokens are saved to the correct cache and stale client tokens are cleared when configuration changes.
  • Tests
    • Added coverage for singleton reuse scenarios involving token cache updates and request/response authorization behavior.
@changeset-bot
changeset-botBot
commented
Jun 19, 2026•

edited

Loading

Copy link


Copy Markdown

🦋 Changeset detected
Latest commit: 41c879a
The changes in this PR will be included in the next version bump.
This PR includes changesets to release 1 package
NameType
@clerk/expoPatch
Not sure what this means? Click here to learn what changesets are.
Click here if you're a maintainer who wants to add another changeset to this PR
@vercel
vercelBot
commented
Jun 19, 2026•

edited

Loading

Copy link


Copy Markdown

The latest updates on your projects. Learn more about Vercel for GitHub.
ProjectDeploymentActionsUpdated (UTC)
clerk-js-sandboxReadyReadyPreview, CommentJun 29, 2026 4:48pm
swingsetReadyReadyPreview, CommentJun 29, 2026 4:48pm
Request Review
@coderabbitai
coderabbitaiBot
commented
Jun 19, 2026•

edited

Loading

Copy link


Copy Markdown

Contributor
Review Change Stack
📝 Walkthrough
Walkthrough
Introduces a module-level __internal_tokenCache variable in createClerkInstance.ts initialized to MemoryTokenCache. The tokenCache from options is applied only when explicitly provided, and request/response hooks read from and write to this module-level cache. Three new tests validate singleton reuse with updated token caches.
Token cache late-binding fix
Layer / File(s)Summary
Module-scoped tokenCache and late-binding logic
packages/expo/src/provider/singleton/createClerkInstance.ts		Adds TokenCache import, introduces __internal_tokenCache module variable defaulting to MemoryTokenCache, updates hasOwnOption type guard to BuildClerkOptions, removes tokenCache from early options destructuring, and conditionally sets __internal_tokenCache only when options explicitly contains tokenCache; clearToken/getToken/saveToken closures reference the module-level variable.
Tests for tokenCache reuse behavior
packages/expo/src/provider/singleton/__tests__/createClerkInstance.test.ts		Adds three tests: latest explicit tokenCache is used by __internal_onBeforeRequest, latest cache is preserved when a subsequent call omits tokenCache, and __internal_onAfterResponse saves JWT only into the latest cache.
Patch changeset
.changeset/fresh-expo-token-cache.md		Declares a patch release for @clerk/expo describing the token cache timing fix.
Estimated code review effort
🎯 3 (Moderate) | ⏱️ ~20 minutes
Possibly related PRs
  • clerk/javascript#8860: Refactors MemoryTokenCache internals used as the default value for the new __internal_tokenCache module variable introduced in this PR.
Poem
🐇 Hoppity-hop through the singleton tree,

The token cache now updates, late but free!

No more stale sessions from init gone wrong,

The latest cache sings its authorization song.

Cache cleared, token saved — the bunny hops on! 🎉
🚥 Pre-merge checks | ✅ 4 | ❌ 1
❌ Failed checks (1 warning)
Check nameStatusExplanationResolution
Docstring Coverage⚠️ WarningDocstring coverage is 0.00% which is insufficient. The required threshold is 80.00%.Write docstrings for the functions missing them to satisfy the coverage threshold.
✅ Passed checks (4 passed)
Check nameStatusExplanation
Description Check✅ PassedCheck skipped - CodeRabbit’s high-level summary is enabled.
Title check✅ PassedThe title clearly matches the main Expo session-restoration fix and mentions the native singleton reuse scenario.
Linked Issues check✅ PassedCheck skipped because no linked issues were found for this pull request.
Out of Scope Changes check✅ PassedCheck skipped because no linked issues were found for this pull request.
✨ Finishing Touches
📝 Generate docstrings
  •  Create stacked PR
  •  Commit on current branch
Comment @coderabbitai help to get the list of available commands.
@pkg-pr-new
pkg-pr-newBot
commented
Jun 19, 2026•

edited

Loading

Copy link


Copy Markdown

Open in StackBlitz
@clerk/astro
npm i https://pkg.pr.new/@clerk/astro@8928

@clerk/backend
npm i https://pkg.pr.new/@clerk/backend@8928

@clerk/chrome-extension
npm i https://pkg.pr.new/@clerk/chrome-extension@8928

@clerk/clerk-js
npm i https://pkg.pr.new/@clerk/clerk-js@8928

@clerk/electron
npm i https://pkg.pr.new/@clerk/electron@8928

@clerk/electron-passkeys
npm i https://pkg.pr.new/@clerk/electron-passkeys@8928

@clerk/eslint-plugin
npm i https://pkg.pr.new/@clerk/eslint-plugin@8928

@clerk/expo
npm i https://pkg.pr.new/@clerk/expo@8928

@clerk/expo-passkeys
npm i https://pkg.pr.new/@clerk/expo-passkeys@8928

@clerk/express
npm i https://pkg.pr.new/@clerk/express@8928

@clerk/fastify
npm i https://pkg.pr.new/@clerk/fastify@8928

@clerk/hono
npm i https://pkg.pr.new/@clerk/hono@8928

@clerk/localizations
npm i https://pkg.pr.new/@clerk/localizations@8928

@clerk/nextjs
npm i https://pkg.pr.new/@clerk/nextjs@8928

@clerk/nuxt
npm i https://pkg.pr.new/@clerk/nuxt@8928

@clerk/react
npm i https://pkg.pr.new/@clerk/react@8928

@clerk/react-router
npm i https://pkg.pr.new/@clerk/react-router@8928

@clerk/shared
npm i https://pkg.pr.new/@clerk/shared@8928

@clerk/tanstack-react-start
npm i https://pkg.pr.new/@clerk/tanstack-react-start@8928

@clerk/testing
npm i https://pkg.pr.new/@clerk/testing@8928

@clerk/ui
npm i https://pkg.pr.new/@clerk/ui@8928

@clerk/upgrade
npm i https://pkg.pr.new/@clerk/upgrade@8928

@clerk/vue
npm i https://pkg.pr.new/@clerk/vue@8928

commit: 41c879a
@wobsorianowobsoriano
changed the title
fix(expo): Attempt token revive fixfix(expo): Restore persisted sessions after native singleton reuseJun 29, 2026
@wobsoriano
wobsoriano
marked this pull request as ready for review
June 29, 2026 16:29
@github-actions
github-actionsBot
commented
Jun 29, 2026•

edited

Loading

Copy link


Copy Markdown

Contributor
API Changes Report
Generated by Break Check on 2026-06-29T16:49:44.153Z
Summary
MetricCount
Packages analyzed19
Packages with changes0
🔴 Breaking changes0
🟡 Non-breaking changes0
🟢 Additions0
No API Changes Detected
All packages have stable APIs with no detected changes.
Report generated by Break Check
Last ran on 41c879a.
coderabbitai[bot]
coderabbitaiBot
reviewed
Jun 29, 2026
View reviewed changes
@coderabbitaicoderabbitaiBot
left a comment


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.

Actionable comments posted: 1
🤖 Prompt for all review comments with 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.
Inline comments:
In `@packages/expo/src/provider/singleton/__tests__/createClerkInstance.test.ts`:
- Around line 322-347: The test around createClerkInstance should verify the
token cache key used by __internal_onBeforeRequest, not just the resulting
authorization header. Update the latestTokenCache mock in
createClerkInstance.test.ts to be key-sensitive or assert getToken was called
with CLERK_CLIENT_JWT_KEY, so the contract between getClerkInstance and
TokenCache is covered. Keep the existing header assertion, but add a call
expectation on the mocked getToken to ensure the correct persistence key is
read.

🪄 Autofix (Beta)
Fix all unresolved CodeRabbit comments on this PR:
  •  Push a commit to this branch (recommended)
  •  Create a new PR with the fixes
ℹ️ Review info
⚙️ Run configuration
Configuration used: Repository YAML (base), Repository UI (inherited)
Review profile: CHILL
Plan: Pro Plus
Run ID: 25a1c6ce-c1db-4359-a8da-78ae69017288
📥 Commits
Reviewing files that changed from the base of the PR and between 73c48f1 and 41c879a.
📒 Files selected for processing (2)
  • packages/expo/src/provider/singleton/__tests__/createClerkInstance.test.ts
  • packages/expo/src/provider/singleton/createClerkInstance.ts
🚧 Files skipped from review as they are similar to previous changes (1)
  • packages/expo/src/provider/singleton/createClerkInstance.ts
Comment threadpackages/expo/src/provider/singleton/__tests__/createClerkInstance.test.ts
mikepitre
mikepitre
approved these changes
Jun 29, 2026
View reviewed changes
@mikepitremikepitre
left a comment


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.

LGTM! Thanks for fixing!
@wobsoriano
wobsoriano
merged commit 2305459
into
mainJun 29, 2026

58 checks passed

@wobsoriano
wobsoriano
deleted the

rob/expo-session-persist-fix

branch
June 29, 2026 17:02
@clerk-cookieclerk-cookie
mentioned this pull request
Jun 29, 2026
 Merged

@coderabbitaicoderabbitaiBot
mentioned this pull request
Jun 29, 2026
 Merged

9 tasks
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@coderabbitaicoderabbitai[bot]coderabbitai[bot] left review comments
@mikepitremikepitremikepitre approved these changes

Assignees


No one assigned


Labels

expo

Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

2 participants

@wobsoriano@mikepitre