Skip to content

fix(expo): sync native and JS client changes#8879

New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Merged
wobsoriano merged 15 commits into from
Jun 17, 2026
Merged

fix(expo): sync native and JS client changes #8879

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
8456881
fix(expo): sync iOS native client via ClerkKit
mikepitre Jun 12, 2026
49bb0a8
Make Expo client token bridge async
mikepitre Jun 12, 2026
dd9f1be
fix(expo): sync JS sessions to native iOS
mikepitre Jun 12, 2026
cea88df
fix(expo): notify native views when iOS bridge is ready
mikepitre Jun 12, 2026
766f2ac
chore(expo): sort ClerkProvider imports
mikepitre Jun 13, 2026
f83e93e
fix(expo): sync native sign-out to JS
mikepitre Jun 15, 2026
5a1351e
fix(expo): sync native auth state reactively
mikepitre Jun 15, 2026
78d941c
fix(expo): prevent native sync feedback loops
mikepitre Jun 15, 2026
03e4107
fix(expo): emit native sign-out immediately
mikepitre Jun 15, 2026
9618b49
fix(expo): sync JS auth changes from Clerk events
mikepitre Jun 15, 2026
4365bcf
fix(expo): sync native and JS client changes
mikepitre Jun 16, 2026
5681de2
fix(expo): harden native client sync
mikepitre Jun 16, 2026
960f377
refactor(expo): simplify native client sync
mikepitre Jun 16, 2026
ef0d544
docs(expo): update native sync changeset
mikepitre Jun 16, 2026
326f194
fix(expo): address native client sync review feedback
mikepitre Jun 16, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/quiet-ravens-remember.md
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
'@clerk/expo': patch
Comment thread
mikepitre marked this conversation as resolved.
---

Fix Expo native Clerk components and JavaScript auth hooks staying stale when authentication changes between the JavaScript and native SDKs. JS-owned sign-in now hydrates native components on cold start, sign-out from either runtime updates the other side, and native multi-session changes keep the remaining JavaScript session active.
138 changes: 77 additions & 61 deletions packages/expo/android/src/main/java/expo/modules/clerk/ClerkExpoModule.kt
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -24,6 +24,7 @@ import kotlinx.coroutines.withTimeout
import org.json.JSONObject

private const val TAG = "ClerkExpoModule"
private const val NATIVE_CLIENT_CHANGED_EVENT = "clerkNativeClientChanged"

private fun debugLog(tag: String, message: String) {
if (BuildConfig.DEBUG) {
Expand All@@ -35,20 +36,22 @@ class ClerkExpoModule : Module() {
private val coroutineScope = CoroutineScope(Dispatchers.Main)
private var clientStateObserverJob: Job? = null
private var lastObservedClient: Client? = null
private var jsOriginatedClientSyncDepth = 0
private var configuredPublishableKey: String? = null

companion object {
private var sharedInstance: ClerkExpoModule? = null

fun emitRefreshClient() {
sharedInstance?.sendEvent("refreshClient", emptyMap<String, Any?>())
fun emitClientChanged(sourceId: String? = null) {
val instance = sharedInstance ?: return
instance.sendEvent(NATIVE_CLIENT_CHANGED_EVENT, instance.clientChangedPayload(sourceId))
}
}

override fun definition() = ModuleDefinition {
Name("ClerkExpo")

Events("refreshClient")
Events(NATIVE_CLIENT_CHANGED_EVENT)

OnCreate {
sharedInstance = this@ClerkExpoModule
Expand All@@ -66,16 +69,12 @@ class ClerkExpoModule : Module() {
configure(pubKey, bearerToken, promise)
}

AsyncFunction("getSession") { promise: Promise ->
getSession(promise)
}

AsyncFunction("getClientToken") { promise: Promise ->
getClientToken(promise)
}

AsyncFunction("refreshClient") { promise: Promise ->
refreshClient(promise)
AsyncFunction("syncFromJsClientToken") { clientToken: String?, sourceId: String?, promise: Promise ->
syncFromJsClientToken(clientToken, sourceId, promise)
}
}

Expand All@@ -96,11 +95,35 @@ class ClerkExpoModule : Module() {
}

lastObservedClient = client
emitRefreshClient()
if (jsOriginatedClientSyncDepth > 0) {
return@collect
}

emitClientChanged()
}
}
}

private fun clientChangedPayload(sourceId: String? = null): Map<String, Any?> {
val result = mutableMapOf<String, Any?>(
"clientToken" to try {
Clerk.getDeviceToken()
} catch (e: Exception) {
debugLog(TAG, "clientChangedPayload - getDeviceToken failed: ${e.message}")
null
}
)
if (!sourceId.isNullOrEmpty()) {
result["sourceId"] = sourceId
}
return result
}

private fun emitSyncedClientChanged(sourceId: String?) {
lastObservedClient = Clerk.clientFlow.value
emitClientChanged(sourceId)
}

// MARK: - configure

private fun configure(pubKey: String, bearerToken: String?, promise: Promise) {
Expand DownExpand Up@@ -142,8 +165,8 @@ class ClerkExpoModule : Module() {
withTimeout(10_000L) {
Clerk.isInitialized.first { it }
}
// If a bearer token was provided, wait for the session to hydrate
// so callers that immediately call getSession() see the session.
// If a bearer token was provided, wait for native client state to hydrate
// before resolving the configure call.
if (!bearerToken.isNullOrEmpty()) {
withTimeout(5_000L) {
Clerk.sessionFlow.first { it != null }
Expand DownExpand Up@@ -245,46 +268,6 @@ class ClerkExpoModule : Module() {
}
}

// MARK: - getSession

private fun getSession(promise: Promise) {
if (!Clerk.isInitialized.value) {
// Return null when not initialized (matches iOS behavior)
// so callers can proceed to call configure() with a bearer token.
promise.resolve(null)
return
}

val session = Clerk.session
val user = Clerk.user

val result = mutableMapOf<String, Any?>()

session?.let {
result["session"] = mapOf(
"id" to it.id,
"status" to it.status.name,
"userId" to it.user?.id
)
}

user?.let {
val primaryEmail = it.emailAddresses?.find { e -> e.id == it.primaryEmailAddressId }
val primaryPhone = it.phoneNumbers.find { p -> p.id == it.primaryPhoneNumberId }

result["user"] = mapOf(
"id" to it.id,
"firstName" to it.firstName,
"lastName" to it.lastName,
"imageUrl" to it.imageUrl,
"primaryEmailAddress" to primaryEmail?.emailAddress,
"primaryPhoneNumber" to primaryPhone?.phoneNumber
)
}

promise.resolve(result)
}

// MARK: - getClientToken

private fun getClientToken(promise: Promise) {
Expand All@@ -300,26 +283,59 @@ class ClerkExpoModule : Module() {
}
}

// MARK: - refreshClient
// MARK: - syncFromJsClientToken

private fun refreshClient(promise: Promise) {
private fun syncFromJsClientToken(clientToken: String?, sourceId: String?, promise: Promise) {
if (!Clerk.isInitialized.value) {
promise.resolve(null)
return
}

coroutineScope.launch {
try {
jsOriginatedClientSyncDepth += 1
if (!clientToken.isNullOrBlank()) {
when (val result = Clerk.updateDeviceToken(clientToken)) {
is ClerkResult.Failure -> {
promise.reject(
"E_SYNC_FROM_JS_FAILED",
result.error?.firstMessage() ?: result.throwable?.message ?: "Client token sync failed",
null
)
return@launch
}
is ClerkResult.Success -> {
try {
withTimeout(5_000L) {
Clerk.sessionFlow.first { it != null }
}
} catch (_: TimeoutCancellationException) {
debugLog(TAG, "syncFromJsClientToken - session did not appear after token update")
}
emitSyncedClientChanged(sourceId)
promise.resolve(null)
return@launch
}
}
}

when (val result = Clerk.refreshClient()) {
is ClerkResult.Failure -> promise.reject(
"E_REFRESH_CLIENT_FAILED",
result.error?.firstMessage() ?: result.throwable?.message ?: "Client refresh failed",
null
)
is ClerkResult.Success -> promise.resolve(null)
is ClerkResult.Failure -> {
promise.reject(
"E_SYNC_FROM_JS_FAILED",
result.error?.firstMessage() ?: result.throwable?.message ?: "Client refresh failed",
null
)
}
is ClerkResult.Success -> {
emitSyncedClientChanged(sourceId)
promise.resolve(null)
}
}
} catch (e: Exception) {
promise.reject("E_REFRESH_CLIENT_FAILED", e.message ?: "Client refresh failed", e)
promise.reject("E_SYNC_FROM_JS_FAILED", e.message ?: "Client token sync failed", e)
} finally {
jsOriginatedClientSyncDepth = maxOf(0, jsOriginatedClientSyncDepth - 1)
}
}
}
Expand Down
7 changes: 3 additions & 4 deletions packages/expo/ios/ClerkExpoModule.m
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,13 +8,12 @@ @interface RCT_EXTERN_MODULE(ClerkExpo, RCTEventEmitter)
resolve:(RCTPromiseResolveBlock)resolve
reject:(RCTPromiseRejectBlock)reject)

RCT_EXTERN_METHOD(getSession:(RCTPromiseResolveBlock)resolve
reject:(RCTPromiseRejectBlock)reject)

RCT_EXTERN_METHOD(getClientToken:(RCTPromiseResolveBlock)resolve
reject:(RCTPromiseRejectBlock)reject)

RCT_EXTERN_METHOD(refreshClient:(RCTPromiseResolveBlock)resolve
RCT_EXTERN_METHOD(syncFromJsClientToken:(id)clientToken
sourceId:(id)sourceId
resolve:(RCTPromiseResolveBlock)resolve
reject:(RCTPromiseRejectBlock)reject)

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

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Merged

wobsoriano
merged 15 commits into

from

Jun 17, 2026
 Merged


fix(expo): sync native and JS client changes
#8879
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


15 commits


Select commit
Hold shift + click to select a range
8456881

fix(expo): sync iOS native client via ClerkKit


mikepitre Jun 12, 2026
49bb0a8

Make Expo client token bridge async


mikepitre Jun 12, 2026
dd9f1be

fix(expo): sync JS sessions to native iOS


mikepitre Jun 12, 2026
cea88df

fix(expo): notify native views when iOS bridge is ready


mikepitre Jun 12, 2026
766f2ac

chore(expo): sort ClerkProvider imports


mikepitre Jun 13, 2026
f83e93e

fix(expo): sync native sign-out to JS


mikepitre Jun 15, 2026
5a1351e

fix(expo): sync native auth state reactively


mikepitre Jun 15, 2026
78d941c

fix(expo): prevent native sync feedback loops


mikepitre Jun 15, 2026
03e4107

fix(expo): emit native sign-out immediately


mikepitre Jun 15, 2026
9618b49

fix(expo): sync JS auth changes from Clerk events


mikepitre Jun 15, 2026
4365bcf

fix(expo): sync native and JS client changes


mikepitre Jun 16, 2026
5681de2

fix(expo): harden native client sync


mikepitre Jun 16, 2026
960f377

refactor(expo): simplify native client sync


mikepitre Jun 16, 2026
ef0d544

docs(expo): update native sync changeset


mikepitre Jun 16, 2026
326f194

fix(expo): address native client sync review feedback


mikepitre Jun 16, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


5 changes: 5 additions & 0 deletions
.changeset/quiet-ravens-remember.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
'@clerk/expo': patch
Comment thread
mikepitre marked this conversation as resolved.

---

Fix Expo native Clerk components and JavaScript auth hooks staying stale when authentication changes between the JavaScript and native SDKs. JS-owned sign-in now hydrates native components on cold start, sign-out from either runtime updates the other side, and native multi-session changes keep the remaining JavaScript session active.

138 changes: 77 additions & 61 deletions
packages/expo/android/src/main/java/expo/modules/clerk/ClerkExpoModule.kt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,6 +24,7 @@ import kotlinx.coroutines.withTimeout
import org.json.JSONObject

private const val TAG = "ClerkExpoModule"
private const val NATIVE_CLIENT_CHANGED_EVENT = "clerkNativeClientChanged"

private fun debugLog(tag: String, message: String) {
 if (BuildConfig.DEBUG) {
Expand All@@ -35,20 +36,22 @@ class ClerkExpoModule : Module() {
 private val coroutineScope = CoroutineScope(Dispatchers.Main)
 private var clientStateObserverJob: Job? = null
 private var lastObservedClient: Client? = null
 private var jsOriginatedClientSyncDepth = 0
 private var configuredPublishableKey: String? = null

 companion object {
 private var sharedInstance: ClerkExpoModule? = null

 fun emitRefreshClient() {
 sharedInstance?.sendEvent("refreshClient", emptyMap<String, Any?>())
 fun emitClientChanged(sourceId: String? = null) {
 val instance = sharedInstance ?: return
 instance.sendEvent(NATIVE_CLIENT_CHANGED_EVENT, instance.clientChangedPayload(sourceId))
 }
 }

 override fun definition() = ModuleDefinition {
 Name("ClerkExpo")

 Events("refreshClient")
 Events(NATIVE_CLIENT_CHANGED_EVENT)

 OnCreate {
 sharedInstance = this@ClerkExpoModule
Expand All@@ -66,16 +69,12 @@ class ClerkExpoModule : Module() {
 configure(pubKey, bearerToken, promise)
 }

 AsyncFunction("getSession") { promise: Promise ->
 getSession(promise)
 }

 AsyncFunction("getClientToken") { promise: Promise ->
 getClientToken(promise)
 }

 AsyncFunction("refreshClient") { promise: Promise ->
refreshClient(promise)
 AsyncFunction("syncFromJsClientToken") { clientToken: String?, sourceId: String?, promise: Promise ->
syncFromJsClientToken(clientToken, sourceId, promise)
 }
 }

Expand All@@ -96,11 +95,35 @@ class ClerkExpoModule : Module() {
 }

 lastObservedClient = client
 emitRefreshClient()
 if (jsOriginatedClientSyncDepth > 0) {
 return@collect
 }

 emitClientChanged()
 }
 }
 }

 private fun clientChangedPayload(sourceId: String? = null): Map<String, Any?> {
 val result = mutableMapOf<String, Any?>(
 "clientToken" to try {
 Clerk.getDeviceToken()
 } catch (e: Exception) {
 debugLog(TAG, "clientChangedPayload - getDeviceToken failed: ${e.message}")
 null
 }
 )
 if (!sourceId.isNullOrEmpty()) {
 result["sourceId"] = sourceId
 }
 return result
 }

 private fun emitSyncedClientChanged(sourceId: String?) {
 lastObservedClient = Clerk.clientFlow.value
 emitClientChanged(sourceId)
 }

 // MARK: - configure

 private fun configure(pubKey: String, bearerToken: String?, promise: Promise) {
Expand DownExpand Up@@ -142,8 +165,8 @@ class ClerkExpoModule : Module() {
 withTimeout(10_000L) {
 Clerk.isInitialized.first { it }
 }
 // If a bearer token was provided, wait for the session to hydrate
 // so callers that immediately call getSession() see the session.
 // If a bearer token was provided, wait for native client state to hydrate
 // before resolving the configure call.
 if (!bearerToken.isNullOrEmpty()) {
 withTimeout(5_000L) {
 Clerk.sessionFlow.first { it != null }
Expand DownExpand Up@@ -245,46 +268,6 @@ class ClerkExpoModule : Module() {
 }
 }

 // MARK: - getSession

 private fun getSession(promise: Promise) {
 if (!Clerk.isInitialized.value) {
 // Return null when not initialized (matches iOS behavior)
 // so callers can proceed to call configure() with a bearer token.
 promise.resolve(null)
 return
 }

 val session = Clerk.session
 val user = Clerk.user

 val result = mutableMapOf<String, Any?>()

 session?.let {
 result["session"] = mapOf(
 "id" to it.id,
 "status" to it.status.name,
 "userId" to it.user?.id
 )
 }

 user?.let {
 val primaryEmail = it.emailAddresses?.find { e -> e.id == it.primaryEmailAddressId }
 val primaryPhone = it.phoneNumbers.find { p -> p.id == it.primaryPhoneNumberId }

 result["user"] = mapOf(
 "id" to it.id,
 "firstName" to it.firstName,
 "lastName" to it.lastName,
 "imageUrl" to it.imageUrl,
 "primaryEmailAddress" to primaryEmail?.emailAddress,
 "primaryPhoneNumber" to primaryPhone?.phoneNumber
 )
 }

 promise.resolve(result)
 }

 // MARK: - getClientToken

 private fun getClientToken(promise: Promise) {
Expand All@@ -300,26 +283,59 @@ class ClerkExpoModule : Module() {
 }
 }

 // MARK: - refreshClient
 // MARK: - syncFromJsClientToken

 private fun refreshClient(promise: Promise) {
 private fun syncFromJsClientToken(clientToken: String?, sourceId: String?, promise: Promise) {
 if (!Clerk.isInitialized.value) {
 promise.resolve(null)
 return
 }

 coroutineScope.launch {
 try {
 jsOriginatedClientSyncDepth += 1
 if (!clientToken.isNullOrBlank()) {
 when (val result = Clerk.updateDeviceToken(clientToken)) {
 is ClerkResult.Failure -> {
 promise.reject(
 "E_SYNC_FROM_JS_FAILED",
 result.error?.firstMessage() ?: result.throwable?.message ?: "Client token sync failed",
 null
 )
 return@launch
 }
 is ClerkResult.Success -> {
 try {
 withTimeout(5_000L) {
 Clerk.sessionFlow.first { it != null }
 }
 } catch (_: TimeoutCancellationException) {
 debugLog(TAG, "syncFromJsClientToken - session did not appear after token update")
 }
 emitSyncedClientChanged(sourceId)
 promise.resolve(null)
 return@launch
 }
 }
 }

 when (val result = Clerk.refreshClient()) {
 is ClerkResult.Failure -> promise.reject(
 "E_REFRESH_CLIENT_FAILED",
 result.error?.firstMessage() ?: result.throwable?.message ?: "Client refresh failed",
 null
 )
 is ClerkResult.Success -> promise.resolve(null)
 is ClerkResult.Failure -> {
 promise.reject(
 "E_SYNC_FROM_JS_FAILED",
 result.error?.firstMessage() ?: result.throwable?.message ?: "Client refresh failed",
 null
 )
 }
 is ClerkResult.Success -> {
 emitSyncedClientChanged(sourceId)
 promise.resolve(null)
 }
 }
 } catch (e: Exception) {
 promise.reject("E_REFRESH_CLIENT_FAILED", e.message ?: "Client refresh failed", e)
 promise.reject("E_SYNC_FROM_JS_FAILED", e.message ?: "Client token sync failed", e)
 } finally {
 jsOriginatedClientSyncDepth = maxOf(0, jsOriginatedClientSyncDepth - 1)
 }
 }
 }
Expand Down

7 changes: 3 additions & 4 deletions
packages/expo/ios/ClerkExpoModule.m

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,13 +8,12 @@ @interface RCT_EXTERN_MODULE(ClerkExpo, RCTEventEmitter)
 resolve:(RCTPromiseResolveBlock)resolve
 reject:(RCTPromiseRejectBlock)reject)

RCT_EXTERN_METHOD(getSession:(RCTPromiseResolveBlock)resolve
 reject:(RCTPromiseRejectBlock)reject)

RCT_EXTERN_METHOD(getClientToken:(RCTPromiseResolveBlock)resolve
 reject:(RCTPromiseRejectBlock)reject)

RCT_EXTERN_METHOD(refreshClient:(RCTPromiseResolveBlock)resolve
RCT_EXTERN_METHOD(syncFromJsClientToken:(id)clientToken
 sourceId:(id)sourceId
 resolve:(RCTPromiseResolveBlock)resolve
 reject:(RCTPromiseRejectBlock)reject)

@end
Loading
Loading

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

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Merged

wobsoriano
merged 15 commits into

from

Jun 17, 2026
 Merged


fix(expo): sync native and JS client changes
#8879
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


15 commits


Select commit
Hold shift + click to select a range
8456881

fix(expo): sync iOS native client via ClerkKit


mikepitre Jun 12, 2026
49bb0a8

Make Expo client token bridge async


mikepitre Jun 12, 2026
dd9f1be

fix(expo): sync JS sessions to native iOS


mikepitre Jun 12, 2026
cea88df

fix(expo): notify native views when iOS bridge is ready


mikepitre Jun 12, 2026
766f2ac

chore(expo): sort ClerkProvider imports


mikepitre Jun 13, 2026
f83e93e

fix(expo): sync native sign-out to JS


mikepitre Jun 15, 2026
5a1351e

fix(expo): sync native auth state reactively


mikepitre Jun 15, 2026
78d941c

fix(expo): prevent native sync feedback loops


mikepitre Jun 15, 2026
03e4107

fix(expo): emit native sign-out immediately


mikepitre Jun 15, 2026
9618b49

fix(expo): sync JS auth changes from Clerk events


mikepitre Jun 15, 2026
4365bcf

fix(expo): sync native and JS client changes


mikepitre Jun 16, 2026
5681de2

fix(expo): harden native client sync


mikepitre Jun 16, 2026
960f377

refactor(expo): simplify native client sync


mikepitre Jun 16, 2026
ef0d544

docs(expo): update native sync changeset


mikepitre Jun 16, 2026
326f194

fix(expo): address native client sync review feedback


mikepitre Jun 16, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


5 changes: 5 additions & 0 deletions
.changeset/quiet-ravens-remember.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
'@clerk/expo': patch
Comment thread
mikepitre marked this conversation as resolved.

---

Fix Expo native Clerk components and JavaScript auth hooks staying stale when authentication changes between the JavaScript and native SDKs. JS-owned sign-in now hydrates native components on cold start, sign-out from either runtime updates the other side, and native multi-session changes keep the remaining JavaScript session active.

138 changes: 77 additions & 61 deletions
packages/expo/android/src/main/java/expo/modules/clerk/ClerkExpoModule.kt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,6 +24,7 @@ import kotlinx.coroutines.withTimeout
import org.json.JSONObject

private const val TAG = "ClerkExpoModule"
private const val NATIVE_CLIENT_CHANGED_EVENT = "clerkNativeClientChanged"

private fun debugLog(tag: String, message: String) {
 if (BuildConfig.DEBUG) {
Expand All@@ -35,20 +36,22 @@ class ClerkExpoModule : Module() {
 private val coroutineScope = CoroutineScope(Dispatchers.Main)
 private var clientStateObserverJob: Job? = null
 private var lastObservedClient: Client? = null
 private var jsOriginatedClientSyncDepth = 0
 private var configuredPublishableKey: String? = null

 companion object {
 private var sharedInstance: ClerkExpoModule? = null

 fun emitRefreshClient() {
 sharedInstance?.sendEvent("refreshClient", emptyMap<String, Any?>())
 fun emitClientChanged(sourceId: String? = null) {
 val instance = sharedInstance ?: return
 instance.sendEvent(NATIVE_CLIENT_CHANGED_EVENT, instance.clientChangedPayload(sourceId))
 }
 }

 override fun definition() = ModuleDefinition {
 Name("ClerkExpo")

 Events("refreshClient")
 Events(NATIVE_CLIENT_CHANGED_EVENT)

 OnCreate {
 sharedInstance = this@ClerkExpoModule
Expand All@@ -66,16 +69,12 @@ class ClerkExpoModule : Module() {
 configure(pubKey, bearerToken, promise)
 }

 AsyncFunction("getSession") { promise: Promise ->
 getSession(promise)
 }

 AsyncFunction("getClientToken") { promise: Promise ->
 getClientToken(promise)
 }

 AsyncFunction("refreshClient") { promise: Promise ->
refreshClient(promise)
 AsyncFunction("syncFromJsClientToken") { clientToken: String?, sourceId: String?, promise: Promise ->
syncFromJsClientToken(clientToken, sourceId, promise)
 }
 }

Expand All@@ -96,11 +95,35 @@ class ClerkExpoModule : Module() {
 }

 lastObservedClient = client
 emitRefreshClient()
 if (jsOriginatedClientSyncDepth > 0) {
 return@collect
 }

 emitClientChanged()
 }
 }
 }

 private fun clientChangedPayload(sourceId: String? = null): Map<String, Any?> {
 val result = mutableMapOf<String, Any?>(
 "clientToken" to try {
 Clerk.getDeviceToken()
 } catch (e: Exception) {
 debugLog(TAG, "clientChangedPayload - getDeviceToken failed: ${e.message}")
 null
 }
 )
 if (!sourceId.isNullOrEmpty()) {
 result["sourceId"] = sourceId
 }
 return result
 }

 private fun emitSyncedClientChanged(sourceId: String?) {
 lastObservedClient = Clerk.clientFlow.value
 emitClientChanged(sourceId)
 }

 // MARK: - configure

 private fun configure(pubKey: String, bearerToken: String?, promise: Promise) {
Expand DownExpand Up@@ -142,8 +165,8 @@ class ClerkExpoModule : Module() {
 withTimeout(10_000L) {
 Clerk.isInitialized.first { it }
 }
 // If a bearer token was provided, wait for the session to hydrate
 // so callers that immediately call getSession() see the session.
 // If a bearer token was provided, wait for native client state to hydrate
 // before resolving the configure call.
 if (!bearerToken.isNullOrEmpty()) {
 withTimeout(5_000L) {
 Clerk.sessionFlow.first { it != null }
Expand DownExpand Up@@ -245,46 +268,6 @@ class ClerkExpoModule : Module() {
 }
 }

 // MARK: - getSession

 private fun getSession(promise: Promise) {
 if (!Clerk.isInitialized.value) {
 // Return null when not initialized (matches iOS behavior)
 // so callers can proceed to call configure() with a bearer token.
 promise.resolve(null)
 return
 }

 val session = Clerk.session
 val user = Clerk.user

 val result = mutableMapOf<String, Any?>()

 session?.let {
 result["session"] = mapOf(
 "id" to it.id,
 "status" to it.status.name,
 "userId" to it.user?.id
 )
 }

 user?.let {
 val primaryEmail = it.emailAddresses?.find { e -> e.id == it.primaryEmailAddressId }
 val primaryPhone = it.phoneNumbers.find { p -> p.id == it.primaryPhoneNumberId }

 result["user"] = mapOf(
 "id" to it.id,
 "firstName" to it.firstName,
 "lastName" to it.lastName,
 "imageUrl" to it.imageUrl,
 "primaryEmailAddress" to primaryEmail?.emailAddress,
 "primaryPhoneNumber" to primaryPhone?.phoneNumber
 )
 }

 promise.resolve(result)
 }

 // MARK: - getClientToken

 private fun getClientToken(promise: Promise) {
Expand All@@ -300,26 +283,59 @@ class ClerkExpoModule : Module() {
 }
 }

 // MARK: - refreshClient
 // MARK: - syncFromJsClientToken

 private fun refreshClient(promise: Promise) {
 private fun syncFromJsClientToken(clientToken: String?, sourceId: String?, promise: Promise) {
 if (!Clerk.isInitialized.value) {
 promise.resolve(null)
 return
 }

 coroutineScope.launch {
 try {
 jsOriginatedClientSyncDepth += 1
 if (!clientToken.isNullOrBlank()) {
 when (val result = Clerk.updateDeviceToken(clientToken)) {
 is ClerkResult.Failure -> {
 promise.reject(
 "E_SYNC_FROM_JS_FAILED",
 result.error?.firstMessage() ?: result.throwable?.message ?: "Client token sync failed",
 null
 )
 return@launch
 }
 is ClerkResult.Success -> {
 try {
 withTimeout(5_000L) {
 Clerk.sessionFlow.first { it != null }
 }
 } catch (_: TimeoutCancellationException) {
 debugLog(TAG, "syncFromJsClientToken - session did not appear after token update")
 }
 emitSyncedClientChanged(sourceId)
 promise.resolve(null)
 return@launch
 }
 }
 }

 when (val result = Clerk.refreshClient()) {
 is ClerkResult.Failure -> promise.reject(
 "E_REFRESH_CLIENT_FAILED",
 result.error?.firstMessage() ?: result.throwable?.message ?: "Client refresh failed",
 null
 )
 is ClerkResult.Success -> promise.resolve(null)
 is ClerkResult.Failure -> {
 promise.reject(
 "E_SYNC_FROM_JS_FAILED",
 result.error?.firstMessage() ?: result.throwable?.message ?: "Client refresh failed",
 null
 )
 }
 is ClerkResult.Success -> {
 emitSyncedClientChanged(sourceId)
 promise.resolve(null)
 }
 }
 } catch (e: Exception) {
 promise.reject("E_REFRESH_CLIENT_FAILED", e.message ?: "Client refresh failed", e)
 promise.reject("E_SYNC_FROM_JS_FAILED", e.message ?: "Client token sync failed", e)
 } finally {
 jsOriginatedClientSyncDepth = maxOf(0, jsOriginatedClientSyncDepth - 1)
 }
 }
 }
Expand Down

7 changes: 3 additions & 4 deletions
packages/expo/ios/ClerkExpoModule.m

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,13 +8,12 @@ @interface RCT_EXTERN_MODULE(ClerkExpo, RCTEventEmitter)
 resolve:(RCTPromiseResolveBlock)resolve
 reject:(RCTPromiseRejectBlock)reject)

RCT_EXTERN_METHOD(getSession:(RCTPromiseResolveBlock)resolve
 reject:(RCTPromiseRejectBlock)reject)

RCT_EXTERN_METHOD(getClientToken:(RCTPromiseResolveBlock)resolve
 reject:(RCTPromiseRejectBlock)reject)

RCT_EXTERN_METHOD(refreshClient:(RCTPromiseResolveBlock)resolve
RCT_EXTERN_METHOD(syncFromJsClientToken:(id)clientToken
 sourceId:(id)sourceId
 resolve:(RCTPromiseResolveBlock)resolve
 reject:(RCTPromiseRejectBlock)reject)

@end
Loading
Loading

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

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Merged

wobsoriano
merged 15 commits into

from

Jun 17, 2026
 Merged


fix(expo): sync native and JS client changes
#8879
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


15 commits


Select commit
Hold shift + click to select a range
8456881

fix(expo): sync iOS native client via ClerkKit


mikepitre Jun 12, 2026
49bb0a8

Make Expo client token bridge async


mikepitre Jun 12, 2026
dd9f1be

fix(expo): sync JS sessions to native iOS


mikepitre Jun 12, 2026
cea88df

fix(expo): notify native views when iOS bridge is ready


mikepitre Jun 12, 2026
766f2ac

chore(expo): sort ClerkProvider imports


mikepitre Jun 13, 2026
f83e93e

fix(expo): sync native sign-out to JS


mikepitre Jun 15, 2026
5a1351e

fix(expo): sync native auth state reactively


mikepitre Jun 15, 2026
78d941c

fix(expo): prevent native sync feedback loops


mikepitre Jun 15, 2026
03e4107

fix(expo): emit native sign-out immediately


mikepitre Jun 15, 2026
9618b49

fix(expo): sync JS auth changes from Clerk events


mikepitre Jun 15, 2026
4365bcf

fix(expo): sync native and JS client changes


mikepitre Jun 16, 2026
5681de2

fix(expo): harden native client sync


mikepitre Jun 16, 2026
960f377

refactor(expo): simplify native client sync


mikepitre Jun 16, 2026
ef0d544

docs(expo): update native sync changeset


mikepitre Jun 16, 2026
326f194

fix(expo): address native client sync review feedback


mikepitre Jun 16, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


5 changes: 5 additions & 0 deletions
.changeset/quiet-ravens-remember.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
'@clerk/expo': patch
Comment thread
mikepitre marked this conversation as resolved.

---

Fix Expo native Clerk components and JavaScript auth hooks staying stale when authentication changes between the JavaScript and native SDKs. JS-owned sign-in now hydrates native components on cold start, sign-out from either runtime updates the other side, and native multi-session changes keep the remaining JavaScript session active.

138 changes: 77 additions & 61 deletions
packages/expo/android/src/main/java/expo/modules/clerk/ClerkExpoModule.kt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,6 +24,7 @@ import kotlinx.coroutines.withTimeout
import org.json.JSONObject

private const val TAG = "ClerkExpoModule"
private const val NATIVE_CLIENT_CHANGED_EVENT = "clerkNativeClientChanged"

private fun debugLog(tag: String, message: String) {
 if (BuildConfig.DEBUG) {
Expand All@@ -35,20 +36,22 @@ class ClerkExpoModule : Module() {
 private val coroutineScope = CoroutineScope(Dispatchers.Main)
 private var clientStateObserverJob: Job? = null
 private var lastObservedClient: Client? = null
 private var jsOriginatedClientSyncDepth = 0
 private var configuredPublishableKey: String? = null

 companion object {
 private var sharedInstance: ClerkExpoModule? = null

 fun emitRefreshClient() {
 sharedInstance?.sendEvent("refreshClient", emptyMap<String, Any?>())
 fun emitClientChanged(sourceId: String? = null) {
 val instance = sharedInstance ?: return
 instance.sendEvent(NATIVE_CLIENT_CHANGED_EVENT, instance.clientChangedPayload(sourceId))
 }
 }

 override fun definition() = ModuleDefinition {
 Name("ClerkExpo")

 Events("refreshClient")
 Events(NATIVE_CLIENT_CHANGED_EVENT)

 OnCreate {
 sharedInstance = this@ClerkExpoModule
Expand All@@ -66,16 +69,12 @@ class ClerkExpoModule : Module() {
 configure(pubKey, bearerToken, promise)
 }

 AsyncFunction("getSession") { promise: Promise ->
 getSession(promise)
 }

 AsyncFunction("getClientToken") { promise: Promise ->
 getClientToken(promise)
 }

 AsyncFunction("refreshClient") { promise: Promise ->
refreshClient(promise)
 AsyncFunction("syncFromJsClientToken") { clientToken: String?, sourceId: String?, promise: Promise ->
syncFromJsClientToken(clientToken, sourceId, promise)
 }
 }

Expand All@@ -96,11 +95,35 @@ class ClerkExpoModule : Module() {
 }

 lastObservedClient = client
 emitRefreshClient()
 if (jsOriginatedClientSyncDepth > 0) {
 return@collect
 }

 emitClientChanged()
 }
 }
 }

 private fun clientChangedPayload(sourceId: String? = null): Map<String, Any?> {
 val result = mutableMapOf<String, Any?>(
 "clientToken" to try {
 Clerk.getDeviceToken()
 } catch (e: Exception) {
 debugLog(TAG, "clientChangedPayload - getDeviceToken failed: ${e.message}")
 null
 }
 )
 if (!sourceId.isNullOrEmpty()) {
 result["sourceId"] = sourceId
 }
 return result
 }

 private fun emitSyncedClientChanged(sourceId: String?) {
 lastObservedClient = Clerk.clientFlow.value
 emitClientChanged(sourceId)
 }

 // MARK: - configure

 private fun configure(pubKey: String, bearerToken: String?, promise: Promise) {
Expand DownExpand Up@@ -142,8 +165,8 @@ class ClerkExpoModule : Module() {
 withTimeout(10_000L) {
 Clerk.isInitialized.first { it }
 }
 // If a bearer token was provided, wait for the session to hydrate
 // so callers that immediately call getSession() see the session.
 // If a bearer token was provided, wait for native client state to hydrate
 // before resolving the configure call.
 if (!bearerToken.isNullOrEmpty()) {
 withTimeout(5_000L) {
 Clerk.sessionFlow.first { it != null }
Expand DownExpand Up@@ -245,46 +268,6 @@ class ClerkExpoModule : Module() {
 }
 }

 // MARK: - getSession

 private fun getSession(promise: Promise) {
 if (!Clerk.isInitialized.value) {
 // Return null when not initialized (matches iOS behavior)
 // so callers can proceed to call configure() with a bearer token.
 promise.resolve(null)
 return
 }

 val session = Clerk.session
 val user = Clerk.user

 val result = mutableMapOf<String, Any?>()

 session?.let {
 result["session"] = mapOf(
 "id" to it.id,
 "status" to it.status.name,
 "userId" to it.user?.id
 )
 }

 user?.let {
 val primaryEmail = it.emailAddresses?.find { e -> e.id == it.primaryEmailAddressId }
 val primaryPhone = it.phoneNumbers.find { p -> p.id == it.primaryPhoneNumberId }

 result["user"] = mapOf(
 "id" to it.id,
 "firstName" to it.firstName,
 "lastName" to it.lastName,
 "imageUrl" to it.imageUrl,
 "primaryEmailAddress" to primaryEmail?.emailAddress,
 "primaryPhoneNumber" to primaryPhone?.phoneNumber
 )
 }

 promise.resolve(result)
 }

 // MARK: - getClientToken

 private fun getClientToken(promise: Promise) {
Expand All@@ -300,26 +283,59 @@ class ClerkExpoModule : Module() {
 }
 }

 // MARK: - refreshClient
 // MARK: - syncFromJsClientToken

 private fun refreshClient(promise: Promise) {
 private fun syncFromJsClientToken(clientToken: String?, sourceId: String?, promise: Promise) {
 if (!Clerk.isInitialized.value) {
 promise.resolve(null)
 return
 }

 coroutineScope.launch {
 try {
 jsOriginatedClientSyncDepth += 1
 if (!clientToken.isNullOrBlank()) {
 when (val result = Clerk.updateDeviceToken(clientToken)) {
 is ClerkResult.Failure -> {
 promise.reject(
 "E_SYNC_FROM_JS_FAILED",
 result.error?.firstMessage() ?: result.throwable?.message ?: "Client token sync failed",
 null
 )
 return@launch
 }
 is ClerkResult.Success -> {
 try {
 withTimeout(5_000L) {
 Clerk.sessionFlow.first { it != null }
 }
 } catch (_: TimeoutCancellationException) {
 debugLog(TAG, "syncFromJsClientToken - session did not appear after token update")
 }
 emitSyncedClientChanged(sourceId)
 promise.resolve(null)
 return@launch
 }
 }
 }

 when (val result = Clerk.refreshClient()) {
 is ClerkResult.Failure -> promise.reject(
 "E_REFRESH_CLIENT_FAILED",
 result.error?.firstMessage() ?: result.throwable?.message ?: "Client refresh failed",
 null
 )
 is ClerkResult.Success -> promise.resolve(null)
 is ClerkResult.Failure -> {
 promise.reject(
 "E_SYNC_FROM_JS_FAILED",
 result.error?.firstMessage() ?: result.throwable?.message ?: "Client refresh failed",
 null
 )
 }
 is ClerkResult.Success -> {
 emitSyncedClientChanged(sourceId)
 promise.resolve(null)
 }
 }
 } catch (e: Exception) {
 promise.reject("E_REFRESH_CLIENT_FAILED", e.message ?: "Client refresh failed", e)
 promise.reject("E_SYNC_FROM_JS_FAILED", e.message ?: "Client token sync failed", e)
 } finally {
 jsOriginatedClientSyncDepth = maxOf(0, jsOriginatedClientSyncDepth - 1)
 }
 }
 }
Expand Down

7 changes: 3 additions & 4 deletions
packages/expo/ios/ClerkExpoModule.m

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,13 +8,12 @@ @interface RCT_EXTERN_MODULE(ClerkExpo, RCTEventEmitter)
 resolve:(RCTPromiseResolveBlock)resolve
 reject:(RCTPromiseRejectBlock)reject)

RCT_EXTERN_METHOD(getSession:(RCTPromiseResolveBlock)resolve
 reject:(RCTPromiseRejectBlock)reject)

RCT_EXTERN_METHOD(getClientToken:(RCTPromiseResolveBlock)resolve
 reject:(RCTPromiseRejectBlock)reject)

RCT_EXTERN_METHOD(refreshClient:(RCTPromiseResolveBlock)resolve
RCT_EXTERN_METHOD(syncFromJsClientToken:(id)clientToken
 sourceId:(id)sourceId
 resolve:(RCTPromiseResolveBlock)resolve
 reject:(RCTPromiseRejectBlock)reject)

@end
Loading
Loading

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

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Merged

wobsoriano
merged 15 commits into

from

Jun 17, 2026
 Merged


fix(expo): sync native and JS client changes
#8879
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


15 commits


Select commit
Hold shift + click to select a range
8456881

fix(expo): sync iOS native client via ClerkKit


mikepitre Jun 12, 2026
49bb0a8

Make Expo client token bridge async


mikepitre Jun 12, 2026
dd9f1be

fix(expo): sync JS sessions to native iOS


mikepitre Jun 12, 2026
cea88df

fix(expo): notify native views when iOS bridge is ready


mikepitre Jun 12, 2026
766f2ac

chore(expo): sort ClerkProvider imports


mikepitre Jun 13, 2026
f83e93e

fix(expo): sync native sign-out to JS


mikepitre Jun 15, 2026
5a1351e

fix(expo): sync native auth state reactively


mikepitre Jun 15, 2026
78d941c

fix(expo): prevent native sync feedback loops


mikepitre Jun 15, 2026
03e4107

fix(expo): emit native sign-out immediately


mikepitre Jun 15, 2026
9618b49

fix(expo): sync JS auth changes from Clerk events


mikepitre Jun 15, 2026
4365bcf

fix(expo): sync native and JS client changes


mikepitre Jun 16, 2026
5681de2

fix(expo): harden native client sync


mikepitre Jun 16, 2026
960f377

refactor(expo): simplify native client sync


mikepitre Jun 16, 2026
ef0d544

docs(expo): update native sync changeset


mikepitre Jun 16, 2026
326f194

fix(expo): address native client sync review feedback


mikepitre Jun 16, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


5 changes: 5 additions & 0 deletions
.changeset/quiet-ravens-remember.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
'@clerk/expo': patch
Comment thread
mikepitre marked this conversation as resolved.

---

Fix Expo native Clerk components and JavaScript auth hooks staying stale when authentication changes between the JavaScript and native SDKs. JS-owned sign-in now hydrates native components on cold start, sign-out from either runtime updates the other side, and native multi-session changes keep the remaining JavaScript session active.

138 changes: 77 additions & 61 deletions
packages/expo/android/src/main/java/expo/modules/clerk/ClerkExpoModule.kt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,6 +24,7 @@ import kotlinx.coroutines.withTimeout
import org.json.JSONObject

private const val TAG = "ClerkExpoModule"
private const val NATIVE_CLIENT_CHANGED_EVENT = "clerkNativeClientChanged"

private fun debugLog(tag: String, message: String) {
 if (BuildConfig.DEBUG) {
Expand All@@ -35,20 +36,22 @@ class ClerkExpoModule : Module() {
 private val coroutineScope = CoroutineScope(Dispatchers.Main)
 private var clientStateObserverJob: Job? = null
 private var lastObservedClient: Client? = null
 private var jsOriginatedClientSyncDepth = 0
 private var configuredPublishableKey: String? = null

 companion object {
 private var sharedInstance: ClerkExpoModule? = null

 fun emitRefreshClient() {
 sharedInstance?.sendEvent("refreshClient", emptyMap<String, Any?>())
 fun emitClientChanged(sourceId: String? = null) {
 val instance = sharedInstance ?: return
 instance.sendEvent(NATIVE_CLIENT_CHANGED_EVENT, instance.clientChangedPayload(sourceId))
 }
 }

 override fun definition() = ModuleDefinition {
 Name("ClerkExpo")

 Events("refreshClient")
 Events(NATIVE_CLIENT_CHANGED_EVENT)

 OnCreate {
 sharedInstance = this@ClerkExpoModule
Expand All@@ -66,16 +69,12 @@ class ClerkExpoModule : Module() {
 configure(pubKey, bearerToken, promise)
 }

 AsyncFunction("getSession") { promise: Promise ->
 getSession(promise)
 }

 AsyncFunction("getClientToken") { promise: Promise ->
 getClientToken(promise)
 }

 AsyncFunction("refreshClient") { promise: Promise ->
refreshClient(promise)
 AsyncFunction("syncFromJsClientToken") { clientToken: String?, sourceId: String?, promise: Promise ->
syncFromJsClientToken(clientToken, sourceId, promise)
 }
 }

Expand All@@ -96,11 +95,35 @@ class ClerkExpoModule : Module() {
 }

 lastObservedClient = client
 emitRefreshClient()
 if (jsOriginatedClientSyncDepth > 0) {
 return@collect
 }

 emitClientChanged()
 }
 }
 }

 private fun clientChangedPayload(sourceId: String? = null): Map<String, Any?> {
 val result = mutableMapOf<String, Any?>(
 "clientToken" to try {
 Clerk.getDeviceToken()
 } catch (e: Exception) {
 debugLog(TAG, "clientChangedPayload - getDeviceToken failed: ${e.message}")
 null
 }
 )
 if (!sourceId.isNullOrEmpty()) {
 result["sourceId"] = sourceId
 }
 return result
 }

 private fun emitSyncedClientChanged(sourceId: String?) {
 lastObservedClient = Clerk.clientFlow.value
 emitClientChanged(sourceId)
 }

 // MARK: - configure

 private fun configure(pubKey: String, bearerToken: String?, promise: Promise) {
Expand DownExpand Up@@ -142,8 +165,8 @@ class ClerkExpoModule : Module() {
 withTimeout(10_000L) {
 Clerk.isInitialized.first { it }
 }
 // If a bearer token was provided, wait for the session to hydrate
 // so callers that immediately call getSession() see the session.
 // If a bearer token was provided, wait for native client state to hydrate
 // before resolving the configure call.
 if (!bearerToken.isNullOrEmpty()) {
 withTimeout(5_000L) {
 Clerk.sessionFlow.first { it != null }
Expand DownExpand Up@@ -245,46 +268,6 @@ class ClerkExpoModule : Module() {
 }
 }

 // MARK: - getSession

 private fun getSession(promise: Promise) {
 if (!Clerk.isInitialized.value) {
 // Return null when not initialized (matches iOS behavior)
 // so callers can proceed to call configure() with a bearer token.
 promise.resolve(null)
 return
 }

 val session = Clerk.session
 val user = Clerk.user

 val result = mutableMapOf<String, Any?>()

 session?.let {
 result["session"] = mapOf(
 "id" to it.id,
 "status" to it.status.name,
 "userId" to it.user?.id
 )
 }

 user?.let {
 val primaryEmail = it.emailAddresses?.find { e -> e.id == it.primaryEmailAddressId }
 val primaryPhone = it.phoneNumbers.find { p -> p.id == it.primaryPhoneNumberId }

 result["user"] = mapOf(
 "id" to it.id,
 "firstName" to it.firstName,
 "lastName" to it.lastName,
 "imageUrl" to it.imageUrl,
 "primaryEmailAddress" to primaryEmail?.emailAddress,
 "primaryPhoneNumber" to primaryPhone?.phoneNumber
 )
 }

 promise.resolve(result)
 }

 // MARK: - getClientToken

 private fun getClientToken(promise: Promise) {
Expand All@@ -300,26 +283,59 @@ class ClerkExpoModule : Module() {
 }
 }

 // MARK: - refreshClient
 // MARK: - syncFromJsClientToken

 private fun refreshClient(promise: Promise) {
 private fun syncFromJsClientToken(clientToken: String?, sourceId: String?, promise: Promise) {
 if (!Clerk.isInitialized.value) {
 promise.resolve(null)
 return
 }

 coroutineScope.launch {
 try {
 jsOriginatedClientSyncDepth += 1
 if (!clientToken.isNullOrBlank()) {
 when (val result = Clerk.updateDeviceToken(clientToken)) {
 is ClerkResult.Failure -> {
 promise.reject(
 "E_SYNC_FROM_JS_FAILED",
 result.error?.firstMessage() ?: result.throwable?.message ?: "Client token sync failed",
 null
 )
 return@launch
 }
 is ClerkResult.Success -> {
 try {
 withTimeout(5_000L) {
 Clerk.sessionFlow.first { it != null }
 }
 } catch (_: TimeoutCancellationException) {
 debugLog(TAG, "syncFromJsClientToken - session did not appear after token update")
 }
 emitSyncedClientChanged(sourceId)
 promise.resolve(null)
 return@launch
 }
 }
 }

 when (val result = Clerk.refreshClient()) {
 is ClerkResult.Failure -> promise.reject(
 "E_REFRESH_CLIENT_FAILED",
 result.error?.firstMessage() ?: result.throwable?.message ?: "Client refresh failed",
 null
 )
 is ClerkResult.Success -> promise.resolve(null)
 is ClerkResult.Failure -> {
 promise.reject(
 "E_SYNC_FROM_JS_FAILED",
 result.error?.firstMessage() ?: result.throwable?.message ?: "Client refresh failed",
 null
 )
 }
 is ClerkResult.Success -> {
 emitSyncedClientChanged(sourceId)
 promise.resolve(null)
 }
 }
 } catch (e: Exception) {
 promise.reject("E_REFRESH_CLIENT_FAILED", e.message ?: "Client refresh failed", e)
 promise.reject("E_SYNC_FROM_JS_FAILED", e.message ?: "Client token sync failed", e)
 } finally {
 jsOriginatedClientSyncDepth = maxOf(0, jsOriginatedClientSyncDepth - 1)
 }
 }
 }
Expand Down

7 changes: 3 additions & 4 deletions
packages/expo/ios/ClerkExpoModule.m

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,13 +8,12 @@ @interface RCT_EXTERN_MODULE(ClerkExpo, RCTEventEmitter)
 resolve:(RCTPromiseResolveBlock)resolve
 reject:(RCTPromiseRejectBlock)reject)

RCT_EXTERN_METHOD(getSession:(RCTPromiseResolveBlock)resolve
 reject:(RCTPromiseRejectBlock)reject)

RCT_EXTERN_METHOD(getClientToken:(RCTPromiseResolveBlock)resolve
 reject:(RCTPromiseRejectBlock)reject)

RCT_EXTERN_METHOD(refreshClient:(RCTPromiseResolveBlock)resolve
RCT_EXTERN_METHOD(syncFromJsClientToken:(id)clientToken
 sourceId:(id)sourceId
 resolve:(RCTPromiseResolveBlock)resolve
 reject:(RCTPromiseRejectBlock)reject)

@end
Loading
Loading

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

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Merged

wobsoriano
merged 15 commits into

from

Jun 17, 2026
 Merged


fix(expo): sync native and JS client changes
#8879
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


15 commits


Select commit
Hold shift + click to select a range
8456881

fix(expo): sync iOS native client via ClerkKit


mikepitre Jun 12, 2026
49bb0a8

Make Expo client token bridge async


mikepitre Jun 12, 2026
dd9f1be

fix(expo): sync JS sessions to native iOS


mikepitre Jun 12, 2026
cea88df

fix(expo): notify native views when iOS bridge is ready


mikepitre Jun 12, 2026
766f2ac

chore(expo): sort ClerkProvider imports


mikepitre Jun 13, 2026
f83e93e

fix(expo): sync native sign-out to JS


mikepitre Jun 15, 2026
5a1351e

fix(expo): sync native auth state reactively


mikepitre Jun 15, 2026
78d941c

fix(expo): prevent native sync feedback loops


mikepitre Jun 15, 2026
03e4107

fix(expo): emit native sign-out immediately


mikepitre Jun 15, 2026
9618b49

fix(expo): sync JS auth changes from Clerk events


mikepitre Jun 15, 2026
4365bcf

fix(expo): sync native and JS client changes


mikepitre Jun 16, 2026
5681de2

fix(expo): harden native client sync


mikepitre Jun 16, 2026
960f377

refactor(expo): simplify native client sync


mikepitre Jun 16, 2026
ef0d544

docs(expo): update native sync changeset


mikepitre Jun 16, 2026
326f194

fix(expo): address native client sync review feedback


mikepitre Jun 16, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


5 changes: 5 additions & 0 deletions
.changeset/quiet-ravens-remember.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
'@clerk/expo': patch
Comment thread
mikepitre marked this conversation as resolved.

---

Fix Expo native Clerk components and JavaScript auth hooks staying stale when authentication changes between the JavaScript and native SDKs. JS-owned sign-in now hydrates native components on cold start, sign-out from either runtime updates the other side, and native multi-session changes keep the remaining JavaScript session active.

138 changes: 77 additions & 61 deletions
packages/expo/android/src/main/java/expo/modules/clerk/ClerkExpoModule.kt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,6 +24,7 @@ import kotlinx.coroutines.withTimeout
import org.json.JSONObject

private const val TAG = "ClerkExpoModule"
private const val NATIVE_CLIENT_CHANGED_EVENT = "clerkNativeClientChanged"

private fun debugLog(tag: String, message: String) {
 if (BuildConfig.DEBUG) {
Expand All@@ -35,20 +36,22 @@ class ClerkExpoModule : Module() {
 private val coroutineScope = CoroutineScope(Dispatchers.Main)
 private var clientStateObserverJob: Job? = null
 private var lastObservedClient: Client? = null
 private var jsOriginatedClientSyncDepth = 0
 private var configuredPublishableKey: String? = null

 companion object {
 private var sharedInstance: ClerkExpoModule? = null

 fun emitRefreshClient() {
 sharedInstance?.sendEvent("refreshClient", emptyMap<String, Any?>())
 fun emitClientChanged(sourceId: String? = null) {
 val instance = sharedInstance ?: return
 instance.sendEvent(NATIVE_CLIENT_CHANGED_EVENT, instance.clientChangedPayload(sourceId))
 }
 }

 override fun definition() = ModuleDefinition {
 Name("ClerkExpo")

 Events("refreshClient")
 Events(NATIVE_CLIENT_CHANGED_EVENT)

 OnCreate {
 sharedInstance = this@ClerkExpoModule
Expand All@@ -66,16 +69,12 @@ class ClerkExpoModule : Module() {
 configure(pubKey, bearerToken, promise)
 }

 AsyncFunction("getSession") { promise: Promise ->
 getSession(promise)
 }

 AsyncFunction("getClientToken") { promise: Promise ->
 getClientToken(promise)
 }

 AsyncFunction("refreshClient") { promise: Promise ->
refreshClient(promise)
 AsyncFunction("syncFromJsClientToken") { clientToken: String?, sourceId: String?, promise: Promise ->
syncFromJsClientToken(clientToken, sourceId, promise)
 }
 }

Expand All@@ -96,11 +95,35 @@ class ClerkExpoModule : Module() {
 }

 lastObservedClient = client
 emitRefreshClient()
 if (jsOriginatedClientSyncDepth > 0) {
 return@collect
 }

 emitClientChanged()
 }
 }
 }

 private fun clientChangedPayload(sourceId: String? = null): Map<String, Any?> {
 val result = mutableMapOf<String, Any?>(
 "clientToken" to try {
 Clerk.getDeviceToken()
 } catch (e: Exception) {
 debugLog(TAG, "clientChangedPayload - getDeviceToken failed: ${e.message}")
 null
 }
 )
 if (!sourceId.isNullOrEmpty()) {
 result["sourceId"] = sourceId
 }
 return result
 }

 private fun emitSyncedClientChanged(sourceId: String?) {
 lastObservedClient = Clerk.clientFlow.value
 emitClientChanged(sourceId)
 }

 // MARK: - configure

 private fun configure(pubKey: String, bearerToken: String?, promise: Promise) {
Expand DownExpand Up@@ -142,8 +165,8 @@ class ClerkExpoModule : Module() {
 withTimeout(10_000L) {
 Clerk.isInitialized.first { it }
 }
 // If a bearer token was provided, wait for the session to hydrate
 // so callers that immediately call getSession() see the session.
 // If a bearer token was provided, wait for native client state to hydrate
 // before resolving the configure call.
 if (!bearerToken.isNullOrEmpty()) {
 withTimeout(5_000L) {
 Clerk.sessionFlow.first { it != null }
Expand DownExpand Up@@ -245,46 +268,6 @@ class ClerkExpoModule : Module() {
 }
 }

 // MARK: - getSession

 private fun getSession(promise: Promise) {
 if (!Clerk.isInitialized.value) {
 // Return null when not initialized (matches iOS behavior)
 // so callers can proceed to call configure() with a bearer token.
 promise.resolve(null)
 return
 }

 val session = Clerk.session
 val user = Clerk.user

 val result = mutableMapOf<String, Any?>()

 session?.let {
 result["session"] = mapOf(
 "id" to it.id,
 "status" to it.status.name,
 "userId" to it.user?.id
 )
 }

 user?.let {
 val primaryEmail = it.emailAddresses?.find { e -> e.id == it.primaryEmailAddressId }
 val primaryPhone = it.phoneNumbers.find { p -> p.id == it.primaryPhoneNumberId }

 result["user"] = mapOf(
 "id" to it.id,
 "firstName" to it.firstName,
 "lastName" to it.lastName,
 "imageUrl" to it.imageUrl,
 "primaryEmailAddress" to primaryEmail?.emailAddress,
 "primaryPhoneNumber" to primaryPhone?.phoneNumber
 )
 }

 promise.resolve(result)
 }

 // MARK: - getClientToken

 private fun getClientToken(promise: Promise) {
Expand All@@ -300,26 +283,59 @@ class ClerkExpoModule : Module() {
 }
 }

 // MARK: - refreshClient
 // MARK: - syncFromJsClientToken

 private fun refreshClient(promise: Promise) {
 private fun syncFromJsClientToken(clientToken: String?, sourceId: String?, promise: Promise) {
 if (!Clerk.isInitialized.value) {
 promise.resolve(null)
 return
 }

 coroutineScope.launch {
 try {
 jsOriginatedClientSyncDepth += 1
 if (!clientToken.isNullOrBlank()) {
 when (val result = Clerk.updateDeviceToken(clientToken)) {
 is ClerkResult.Failure -> {
 promise.reject(
 "E_SYNC_FROM_JS_FAILED",
 result.error?.firstMessage() ?: result.throwable?.message ?: "Client token sync failed",
 null
 )
 return@launch
 }
 is ClerkResult.Success -> {
 try {
 withTimeout(5_000L) {
 Clerk.sessionFlow.first { it != null }
 }
 } catch (_: TimeoutCancellationException) {
 debugLog(TAG, "syncFromJsClientToken - session did not appear after token update")
 }
 emitSyncedClientChanged(sourceId)
 promise.resolve(null)
 return@launch
 }
 }
 }

 when (val result = Clerk.refreshClient()) {
 is ClerkResult.Failure -> promise.reject(
 "E_REFRESH_CLIENT_FAILED",
 result.error?.firstMessage() ?: result.throwable?.message ?: "Client refresh failed",
 null
 )
 is ClerkResult.Success -> promise.resolve(null)
 is ClerkResult.Failure -> {
 promise.reject(
 "E_SYNC_FROM_JS_FAILED",
 result.error?.firstMessage() ?: result.throwable?.message ?: "Client refresh failed",
 null
 )
 }
 is ClerkResult.Success -> {
 emitSyncedClientChanged(sourceId)
 promise.resolve(null)
 }
 }
 } catch (e: Exception) {
 promise.reject("E_REFRESH_CLIENT_FAILED", e.message ?: "Client refresh failed", e)
 promise.reject("E_SYNC_FROM_JS_FAILED", e.message ?: "Client token sync failed", e)
 } finally {
 jsOriginatedClientSyncDepth = maxOf(0, jsOriginatedClientSyncDepth - 1)
 }
 }
 }
Expand Down

7 changes: 3 additions & 4 deletions
packages/expo/ios/ClerkExpoModule.m

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,13 +8,12 @@ @interface RCT_EXTERN_MODULE(ClerkExpo, RCTEventEmitter)
 resolve:(RCTPromiseResolveBlock)resolve
 reject:(RCTPromiseRejectBlock)reject)

RCT_EXTERN_METHOD(getSession:(RCTPromiseResolveBlock)resolve
 reject:(RCTPromiseRejectBlock)reject)

RCT_EXTERN_METHOD(getClientToken:(RCTPromiseResolveBlock)resolve
 reject:(RCTPromiseRejectBlock)reject)

RCT_EXTERN_METHOD(refreshClient:(RCTPromiseResolveBlock)resolve
RCT_EXTERN_METHOD(syncFromJsClientToken:(id)clientToken
 sourceId:(id)sourceId
 resolve:(RCTPromiseResolveBlock)resolve
 reject:(RCTPromiseRejectBlock)reject)

@end
Loading
Loading

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

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Merged

wobsoriano
merged 15 commits into

from

Jun 17, 2026
 Merged


fix(expo): sync native and JS client changes
#8879
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


15 commits


Select commit
Hold shift + click to select a range
8456881

fix(expo): sync iOS native client via ClerkKit


mikepitre Jun 12, 2026
49bb0a8

Make Expo client token bridge async


mikepitre Jun 12, 2026
dd9f1be

fix(expo): sync JS sessions to native iOS


mikepitre Jun 12, 2026
cea88df

fix(expo): notify native views when iOS bridge is ready


mikepitre Jun 12, 2026
766f2ac

chore(expo): sort ClerkProvider imports


mikepitre Jun 13, 2026
f83e93e

fix(expo): sync native sign-out to JS


mikepitre Jun 15, 2026
5a1351e

fix(expo): sync native auth state reactively


mikepitre Jun 15, 2026
78d941c

fix(expo): prevent native sync feedback loops


mikepitre Jun 15, 2026
03e4107

fix(expo): emit native sign-out immediately


mikepitre Jun 15, 2026
9618b49

fix(expo): sync JS auth changes from Clerk events


mikepitre Jun 15, 2026
4365bcf

fix(expo): sync native and JS client changes


mikepitre Jun 16, 2026
5681de2

fix(expo): harden native client sync


mikepitre Jun 16, 2026
960f377

refactor(expo): simplify native client sync


mikepitre Jun 16, 2026
ef0d544

docs(expo): update native sync changeset


mikepitre Jun 16, 2026
326f194

fix(expo): address native client sync review feedback


mikepitre Jun 16, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


5 changes: 5 additions & 0 deletions
.changeset/quiet-ravens-remember.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
'@clerk/expo': patch
Comment thread
mikepitre marked this conversation as resolved.

---

Fix Expo native Clerk components and JavaScript auth hooks staying stale when authentication changes between the JavaScript and native SDKs. JS-owned sign-in now hydrates native components on cold start, sign-out from either runtime updates the other side, and native multi-session changes keep the remaining JavaScript session active.

138 changes: 77 additions & 61 deletions
packages/expo/android/src/main/java/expo/modules/clerk/ClerkExpoModule.kt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,6 +24,7 @@ import kotlinx.coroutines.withTimeout
import org.json.JSONObject

private const val TAG = "ClerkExpoModule"
private const val NATIVE_CLIENT_CHANGED_EVENT = "clerkNativeClientChanged"

private fun debugLog(tag: String, message: String) {
 if (BuildConfig.DEBUG) {
Expand All@@ -35,20 +36,22 @@ class ClerkExpoModule : Module() {
 private val coroutineScope = CoroutineScope(Dispatchers.Main)
 private var clientStateObserverJob: Job? = null
 private var lastObservedClient: Client? = null
 private var jsOriginatedClientSyncDepth = 0
 private var configuredPublishableKey: String? = null

 companion object {
 private var sharedInstance: ClerkExpoModule? = null

 fun emitRefreshClient() {
 sharedInstance?.sendEvent("refreshClient", emptyMap<String, Any?>())
 fun emitClientChanged(sourceId: String? = null) {
 val instance = sharedInstance ?: return
 instance.sendEvent(NATIVE_CLIENT_CHANGED_EVENT, instance.clientChangedPayload(sourceId))
 }
 }

 override fun definition() = ModuleDefinition {
 Name("ClerkExpo")

 Events("refreshClient")
 Events(NATIVE_CLIENT_CHANGED_EVENT)

 OnCreate {
 sharedInstance = this@ClerkExpoModule
Expand All@@ -66,16 +69,12 @@ class ClerkExpoModule : Module() {
 configure(pubKey, bearerToken, promise)
 }

 AsyncFunction("getSession") { promise: Promise ->
 getSession(promise)
 }

 AsyncFunction("getClientToken") { promise: Promise ->
 getClientToken(promise)
 }

 AsyncFunction("refreshClient") { promise: Promise ->
refreshClient(promise)
 AsyncFunction("syncFromJsClientToken") { clientToken: String?, sourceId: String?, promise: Promise ->
syncFromJsClientToken(clientToken, sourceId, promise)
 }
 }

Expand All@@ -96,11 +95,35 @@ class ClerkExpoModule : Module() {
 }

 lastObservedClient = client
 emitRefreshClient()
 if (jsOriginatedClientSyncDepth > 0) {
 return@collect
 }

 emitClientChanged()
 }
 }
 }

 private fun clientChangedPayload(sourceId: String? = null): Map<String, Any?> {
 val result = mutableMapOf<String, Any?>(
 "clientToken" to try {
 Clerk.getDeviceToken()
 } catch (e: Exception) {
 debugLog(TAG, "clientChangedPayload - getDeviceToken failed: ${e.message}")
 null
 }
 )
 if (!sourceId.isNullOrEmpty()) {
 result["sourceId"] = sourceId
 }
 return result
 }

 private fun emitSyncedClientChanged(sourceId: String?) {
 lastObservedClient = Clerk.clientFlow.value
 emitClientChanged(sourceId)
 }

 // MARK: - configure

 private fun configure(pubKey: String, bearerToken: String?, promise: Promise) {
Expand DownExpand Up@@ -142,8 +165,8 @@ class ClerkExpoModule : Module() {
 withTimeout(10_000L) {
 Clerk.isInitialized.first { it }
 }
 // If a bearer token was provided, wait for the session to hydrate
 // so callers that immediately call getSession() see the session.
 // If a bearer token was provided, wait for native client state to hydrate
 // before resolving the configure call.
 if (!bearerToken.isNullOrEmpty()) {
 withTimeout(5_000L) {
 Clerk.sessionFlow.first { it != null }
Expand DownExpand Up@@ -245,46 +268,6 @@ class ClerkExpoModule : Module() {
 }
 }

 // MARK: - getSession

 private fun getSession(promise: Promise) {
 if (!Clerk.isInitialized.value) {
 // Return null when not initialized (matches iOS behavior)
 // so callers can proceed to call configure() with a bearer token.
 promise.resolve(null)
 return
 }

 val session = Clerk.session
 val user = Clerk.user

 val result = mutableMapOf<String, Any?>()

 session?.let {
 result["session"] = mapOf(
 "id" to it.id,
 "status" to it.status.name,
 "userId" to it.user?.id
 )
 }

 user?.let {
 val primaryEmail = it.emailAddresses?.find { e -> e.id == it.primaryEmailAddressId }
 val primaryPhone = it.phoneNumbers.find { p -> p.id == it.primaryPhoneNumberId }

 result["user"] = mapOf(
 "id" to it.id,
 "firstName" to it.firstName,
 "lastName" to it.lastName,
 "imageUrl" to it.imageUrl,
 "primaryEmailAddress" to primaryEmail?.emailAddress,
 "primaryPhoneNumber" to primaryPhone?.phoneNumber
 )
 }

 promise.resolve(result)
 }

 // MARK: - getClientToken

 private fun getClientToken(promise: Promise) {
Expand All@@ -300,26 +283,59 @@ class ClerkExpoModule : Module() {
 }
 }

 // MARK: - refreshClient
 // MARK: - syncFromJsClientToken

 private fun refreshClient(promise: Promise) {
 private fun syncFromJsClientToken(clientToken: String?, sourceId: String?, promise: Promise) {
 if (!Clerk.isInitialized.value) {
 promise.resolve(null)
 return
 }

 coroutineScope.launch {
 try {
 jsOriginatedClientSyncDepth += 1
 if (!clientToken.isNullOrBlank()) {
 when (val result = Clerk.updateDeviceToken(clientToken)) {
 is ClerkResult.Failure -> {
 promise.reject(
 "E_SYNC_FROM_JS_FAILED",
 result.error?.firstMessage() ?: result.throwable?.message ?: "Client token sync failed",
 null
 )
 return@launch
 }
 is ClerkResult.Success -> {
 try {
 withTimeout(5_000L) {
 Clerk.sessionFlow.first { it != null }
 }
 } catch (_: TimeoutCancellationException) {
 debugLog(TAG, "syncFromJsClientToken - session did not appear after token update")
 }
 emitSyncedClientChanged(sourceId)
 promise.resolve(null)
 return@launch
 }
 }
 }

 when (val result = Clerk.refreshClient()) {
 is ClerkResult.Failure -> promise.reject(
 "E_REFRESH_CLIENT_FAILED",
 result.error?.firstMessage() ?: result.throwable?.message ?: "Client refresh failed",
 null
 )
 is ClerkResult.Success -> promise.resolve(null)
 is ClerkResult.Failure -> {
 promise.reject(
 "E_SYNC_FROM_JS_FAILED",
 result.error?.firstMessage() ?: result.throwable?.message ?: "Client refresh failed",
 null
 )
 }
 is ClerkResult.Success -> {
 emitSyncedClientChanged(sourceId)
 promise.resolve(null)
 }
 }
 } catch (e: Exception) {
 promise.reject("E_REFRESH_CLIENT_FAILED", e.message ?: "Client refresh failed", e)
 promise.reject("E_SYNC_FROM_JS_FAILED", e.message ?: "Client token sync failed", e)
 } finally {
 jsOriginatedClientSyncDepth = maxOf(0, jsOriginatedClientSyncDepth - 1)
 }
 }
 }
Expand Down

7 changes: 3 additions & 4 deletions
packages/expo/ios/ClerkExpoModule.m

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,13 +8,12 @@ @interface RCT_EXTERN_MODULE(ClerkExpo, RCTEventEmitter)
 resolve:(RCTPromiseResolveBlock)resolve
 reject:(RCTPromiseRejectBlock)reject)

RCT_EXTERN_METHOD(getSession:(RCTPromiseResolveBlock)resolve
 reject:(RCTPromiseRejectBlock)reject)

RCT_EXTERN_METHOD(getClientToken:(RCTPromiseResolveBlock)resolve
 reject:(RCTPromiseRejectBlock)reject)

RCT_EXTERN_METHOD(refreshClient:(RCTPromiseResolveBlock)resolve
RCT_EXTERN_METHOD(syncFromJsClientToken:(id)clientToken
 sourceId:(id)sourceId
 resolve:(RCTPromiseResolveBlock)resolve
 reject:(RCTPromiseRejectBlock)reject)

@end
Loading
Loading