Skip to content

fix(expo): make native client sync client-driven#8929

New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

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

fix(expo): make native client sync client-driven #8929

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3d49aa7
fix(expo): make native client sync client-driven
mikepitre Jun 19, 2026
5bfdca0
fix(expo): suppress overlapping native token cache echoes
mikepitre Jun 19, 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/client-driven-native-sync.md
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
"@clerk/expo": patch
---

Fix JS/native client syncing so native and JavaScript client or device-token changes refresh each other consistently.
150 changes: 109 additions & 41 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@@ -35,16 +35,32 @@ private fun debugLog(tag: String, message: String) {
class ClerkExpoModule : Module() {
private val coroutineScope = CoroutineScope(Dispatchers.Main)
private var clientStateObserverJob: Job? = null
private var lastObservedClient: Client? = null
private var lastObservedClientState: ClientStateSnapshot? = null
private var jsOriginatedClientSyncDepth = 0
private var configuredPublishableKey: String? = null

private data class ClientStateSnapshot(
val client: Client?,
val deviceToken: String?
)

private data class ClientStateChanges(
val client: Boolean,
val deviceToken: Boolean
)

companion object {
private var sharedInstance: ClerkExpoModule? = null

fun emitClientChanged(sourceId: String? = null) {
val instance = sharedInstance ?: return
instance.sendEvent(NATIVE_CLIENT_CHANGED_EVENT, instance.clientChangedPayload(sourceId))
instance.sendEvent(
NATIVE_CLIENT_CHANGED_EVENT,
instance.clientChangedPayload(
sourceId = sourceId,
changes = ClientStateChanges(client = true, deviceToken = true)
)
)
}
}

Expand DownExpand Up@@ -73,11 +89,17 @@ class ClerkExpoModule : Module() {
getClientToken(promise)
}

AsyncFunction("syncFromJsClientToken") { clientToken: String?, sourceId: String?, shouldRefreshClient: Boolean?, promise: Promise ->
syncFromJsClientToken(
clientToken,
AsyncFunction("syncClientStateFromJs") {
deviceToken: String?,
sourceId: String?,
didChangeClient: Boolean,
didChangeDeviceToken: Boolean,
promise: Promise ->
syncClientStateFromJs(
deviceToken,
sourceId,
shouldRefreshClient ?: clientToken.isNullOrBlank(),
didChangeClient,
didChangeDeviceToken,
promise
)
}
Expand All@@ -91,42 +113,80 @@ class ClerkExpoModule : Module() {
return
}

lastObservedClient = Clerk.clientFlow.value
lastObservedClientState = clientStateSnapshot()

clientStateObserverJob = coroutineScope.launch {
Clerk.clientFlow.collect { client ->
if (client == lastObservedClient) {
val previousClientState = lastObservedClientState
val newClientState = clientStateSnapshot(client)

if (newClientState == previousClientState) {
return@collect
}

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

emitClientChanged()
sendEvent(
NATIVE_CLIENT_CHANGED_EVENT,
clientChangedPayload(
deviceToken = newClientState.deviceToken,
changes = ClientStateChanges(
client = newClientState.client != previousClientState?.client,
deviceToken = newClientState.deviceToken != previousClientState?.deviceToken
)
)
)
}
}
}

private fun clientChangedPayload(sourceId: String? = null): Map<String, Any?> {
val result = mutableMapOf<String, Any?>(
"clientToken" to try {
private fun clientStateSnapshot(client: Client? = Clerk.clientFlow.value): ClientStateSnapshot {
return ClientStateSnapshot(
client = client,
deviceToken = try {
Clerk.getDeviceToken()
} catch (e: Exception) {
debugLog(TAG, "clientChangedPayload - getDeviceToken failed: ${e.message}")
debugLog(TAG, "clientStateSnapshot - getDeviceToken failed: ${e.message}")
null
}
)
}

private fun clientChangedPayload(
sourceId: String? = null,
changes: ClientStateChanges,
deviceToken: String? = clientStateSnapshot().deviceToken
): Map<String, Any?> {
val result = mutableMapOf<String, Any?>(
"changed" to mapOf(
"client" to changes.client,
"deviceToken" to changes.deviceToken
),
"deviceToken" to deviceToken
)
if (!sourceId.isNullOrEmpty()) {
result["sourceId"] = sourceId
}
return result
}

private fun emitSyncedClientChanged(sourceId: String?) {
lastObservedClient = Clerk.clientFlow.value
emitClientChanged(sourceId)
private fun emitSyncedClientChanged(
sourceId: String?,
changes: ClientStateChanges,
snapshot: ClientStateSnapshot = clientStateSnapshot()
) {
lastObservedClientState = snapshot
sendEvent(
NATIVE_CLIENT_CHANGED_EVENT,
clientChangedPayload(
sourceId = sourceId,
changes = changes,
deviceToken = snapshot.deviceToken
)
)
}

// MARK: - configure
Expand DownExpand Up@@ -288,12 +348,13 @@ class ClerkExpoModule : Module() {
}
}

// MARK: - syncFromJsClientToken
// MARK: - syncClientStateFromJs

private fun syncFromJsClientToken(
clientToken: String?,
private fun syncClientStateFromJs(
deviceToken: String?,
sourceId: String?,
shouldRefreshClient: Boolean,
didChangeClient: Boolean,
didChangeDeviceToken: Boolean,
promise: Promise
) {
if (!Clerk.isInitialized.value) {
Expand All@@ -304,25 +365,21 @@ class ClerkExpoModule : Module() {
coroutineScope.launch {
try {
jsOriginatedClientSyncDepth += 1
if (!clientToken.isNullOrBlank()) {
val previousClientState = clientStateSnapshot()

if (didChangeDeviceToken && !deviceToken.isNullOrBlank()) {
val currentDeviceToken = try {
Clerk.getDeviceToken()
} catch (_: Exception) {
null
}

if (currentDeviceToken == clientToken) {
if (!shouldRefreshClient) {
emitSyncedClientChanged(sourceId)
promise.resolve(null)
return@launch
}
} else {
when (val result = Clerk.updateDeviceToken(clientToken)) {
if (currentDeviceToken != deviceToken) {
when (val result = Clerk.updateDeviceToken(deviceToken)) {
is ClerkResult.Failure -> {
promise.reject(
"E_SYNC_FROM_JS_FAILED",
result.error?.firstMessage() ?: result.throwable?.message ?: "Client token sync failed",
result.error?.firstMessage() ?: result.throwable?.message ?: "Device token sync failed",
null
)
return@launch
Expand All@@ -333,19 +390,14 @@ class ClerkExpoModule : Module() {
Clerk.clientFlow.first { it != null }
}
} catch (_: TimeoutCancellationException) {
debugLog(TAG, "syncFromJsClientToken - client did not appear after token update")
}
if (!shouldRefreshClient) {
emitSyncedClientChanged(sourceId)
promise.resolve(null)
return@launch
debugLog(TAG, "syncClientStateFromJs - client did not appear after token update")
}
}
}
}
}

if (shouldRefreshClient) {
if (didChangeClient || didChangeDeviceToken) {
when (val result = Clerk.refreshClient()) {
is ClerkResult.Failure -> {
promise.reject(
Expand All@@ -355,17 +407,33 @@ class ClerkExpoModule : Module() {
)
}
is ClerkResult.Success -> {
emitSyncedClientChanged(sourceId)
val newClientState = clientStateSnapshot()
emitSyncedClientChanged(
sourceId,
ClientStateChanges(
client = newClientState.client != previousClientState.client,
deviceToken = newClientState.deviceToken != previousClientState.deviceToken
),
newClientState
)
promise.resolve(null)
}
}
return@launch
}

emitSyncedClientChanged(sourceId)
val newClientState = clientStateSnapshot()
emitSyncedClientChanged(
sourceId,
ClientStateChanges(
client = newClientState.client != previousClientState.client,
deviceToken = newClientState.deviceToken != previousClientState.deviceToken
),
newClientState
)
promise.resolve(null)
} catch (e: Exception) {
promise.reject("E_SYNC_FROM_JS_FAILED", e.message ?: "Client token sync failed", e)
promise.reject("E_SYNC_FROM_JS_FAILED", e.message ?: "Client state sync failed", e)
} finally {
jsOriginatedClientSyncDepth = maxOf(0, jsOriginatedClientSyncDepth - 1)
}
Expand Down
5 changes: 3 additions & 2 deletions packages/expo/ios/ClerkExpoModule.m
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,9 +11,10 @@ @interface RCT_EXTERN_MODULE(ClerkExpo, RCTEventEmitter)
RCT_EXTERN_METHOD(getClientToken:(RCTPromiseResolveBlock)resolve
reject:(RCTPromiseRejectBlock)reject)

RCT_EXTERN_METHOD(syncFromJsClientToken:(id)clientToken
RCT_EXTERN_METHOD(syncClientStateFromJs:(id)deviceToken
sourceId:(id)sourceId
shouldRefreshClient:(id)shouldRefreshClient
didChangeClient:(BOOL)didChangeClient
didChangeDeviceToken:(BOOL)didChangeDeviceToken
resolve:(RCTPromiseResolveBlock)resolve
reject:(RCTPromiseRejectBlock)reject)

Expand Down
18 changes: 9 additions & 9 deletions packages/expo/ios/ClerkExpoModule.swift
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -86,23 +86,23 @@ class ClerkExpoModule: RCTEventEmitter {
}
}

// MARK: - syncFromJsClientToken
// MARK: - syncClientStateFromJs

@objc func syncFromJsClientToken(_ clientToken: Any?,
@objc func syncClientStateFromJs(_ deviceToken: Any?,
sourceId: Any?,
shouldRefreshClient: Any?,
didChangeClient: Bool,
didChangeDeviceToken: Bool,
resolve: @escaping RCTPromiseResolveBlock,
reject: @escaping RCTPromiseRejectBlock) {
let normalizedClientToken = clientToken as? String
let normalizedDeviceToken = deviceToken as? String
let normalizedSourceId = sourceId as? String
let defaultShouldRefreshClient = normalizedClientToken?.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty ?? true
let normalizedShouldRefreshClient = (shouldRefreshClient as? Bool) ?? defaultShouldRefreshClient
Task {
do {
try await ClerkNativeBridge.shared.syncFromJsClientToken(
normalizedClientToken,
try await ClerkNativeBridge.shared.syncClientStateFromJs(
deviceToken: normalizedDeviceToken,
sourceId: normalizedSourceId,
shouldRefreshClient: normalizedShouldRefreshClient
didChangeClient: didChangeClient,
didChangeDeviceToken: didChangeDeviceToken
)
resolve(nil)
} catch {
Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
fix(expo): make native client sync client-driven by mikepitre · Pull Request #8929 · clerk/javascript · GitHub
Skip to content
fix(expo): make native client sync client-driven#8929

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Merged

wobsoriano
merged 2 commits into

from

Jun 19, 2026
 Merged


fix(expo): make native client sync client-driven
#8929
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
3d49aa7

fix(expo): make native client sync client-driven


mikepitre Jun 19, 2026
5bfdca0

fix(expo): suppress overlapping native token cache echoes


mikepitre Jun 19, 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/client-driven-native-sync.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
"@clerk/expo": patch
---

Fix JS/native client syncing so native and JavaScript client or device-token changes refresh each other consistently.

150 changes: 109 additions & 41 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@@ -35,16 +35,32 @@ private fun debugLog(tag: String, message: String) {
class ClerkExpoModule : Module() {
 private val coroutineScope = CoroutineScope(Dispatchers.Main)
 private var clientStateObserverJob: Job? = null
 private var lastObservedClient: Client? = null
 private var lastObservedClientState: ClientStateSnapshot? = null
 private var jsOriginatedClientSyncDepth = 0
 private var configuredPublishableKey: String? = null

 private data class ClientStateSnapshot(
 val client: Client?,
 val deviceToken: String?
 )

 private data class ClientStateChanges(
 val client: Boolean,
 val deviceToken: Boolean
 )

 companion object {
 private var sharedInstance: ClerkExpoModule? = null

 fun emitClientChanged(sourceId: String? = null) {
 val instance = sharedInstance ?: return
 instance.sendEvent(NATIVE_CLIENT_CHANGED_EVENT, instance.clientChangedPayload(sourceId))
 instance.sendEvent(
 NATIVE_CLIENT_CHANGED_EVENT,
 instance.clientChangedPayload(
 sourceId = sourceId,
 changes = ClientStateChanges(client = true, deviceToken = true)
 )
 )
 }
 }

Expand DownExpand Up@@ -73,11 +89,17 @@ class ClerkExpoModule : Module() {
 getClientToken(promise)
 }

 AsyncFunction("syncFromJsClientToken") { clientToken: String?, sourceId: String?, shouldRefreshClient: Boolean?, promise: Promise ->
 syncFromJsClientToken(
 clientToken,
 AsyncFunction("syncClientStateFromJs") {
 deviceToken: String?,
 sourceId: String?,
 didChangeClient: Boolean,
 didChangeDeviceToken: Boolean,
 promise: Promise ->
 syncClientStateFromJs(
 deviceToken,
 sourceId,
 shouldRefreshClient ?: clientToken.isNullOrBlank(),
 didChangeClient,
 didChangeDeviceToken,
 promise
 )
 }
Expand All@@ -91,42 +113,80 @@ class ClerkExpoModule : Module() {
 return
 }

lastObservedClient = Clerk.clientFlow.value
lastObservedClientState = clientStateSnapshot()

 clientStateObserverJob = coroutineScope.launch {
 Clerk.clientFlow.collect { client ->
 if (client == lastObservedClient) {
 val previousClientState = lastObservedClientState
 val newClientState = clientStateSnapshot(client)

 if (newClientState == previousClientState) {
 return@collect
 }

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

 emitClientChanged()
 sendEvent(
 NATIVE_CLIENT_CHANGED_EVENT,
 clientChangedPayload(
 deviceToken = newClientState.deviceToken,
 changes = ClientStateChanges(
 client = newClientState.client != previousClientState?.client,
 deviceToken = newClientState.deviceToken != previousClientState?.deviceToken
 )
 )
 )
 }
 }
 }

 private fun clientChangedPayload(sourceId: String? = null): Map<String, Any?> {
 val result = mutableMapOf<String, Any?>(
 "clientToken" to try {
 private fun clientStateSnapshot(client: Client? = Clerk.clientFlow.value): ClientStateSnapshot {
 return ClientStateSnapshot(
 client = client,
 deviceToken = try {
 Clerk.getDeviceToken()
 } catch (e: Exception) {
 debugLog(TAG, "clientChangedPayload - getDeviceToken failed: ${e.message}")
 debugLog(TAG, "clientStateSnapshot - getDeviceToken failed: ${e.message}")
 null
 }
 )
 }

 private fun clientChangedPayload(
 sourceId: String? = null,
 changes: ClientStateChanges,
 deviceToken: String? = clientStateSnapshot().deviceToken
 ): Map<String, Any?> {
 val result = mutableMapOf<String, Any?>(
 "changed" to mapOf(
 "client" to changes.client,
 "deviceToken" to changes.deviceToken
 ),
 "deviceToken" to deviceToken
 )
 if (!sourceId.isNullOrEmpty()) {
 result["sourceId"] = sourceId
 }
 return result
 }

 private fun emitSyncedClientChanged(sourceId: String?) {
 lastObservedClient = Clerk.clientFlow.value
 emitClientChanged(sourceId)
 private fun emitSyncedClientChanged(
 sourceId: String?,
 changes: ClientStateChanges,
 snapshot: ClientStateSnapshot = clientStateSnapshot()
 ) {
 lastObservedClientState = snapshot
 sendEvent(
 NATIVE_CLIENT_CHANGED_EVENT,
 clientChangedPayload(
 sourceId = sourceId,
 changes = changes,
 deviceToken = snapshot.deviceToken
 )
 )
 }

 // MARK: - configure
Expand DownExpand Up@@ -288,12 +348,13 @@ class ClerkExpoModule : Module() {
 }
 }

 // MARK: - syncFromJsClientToken
 // MARK: - syncClientStateFromJs

 private fun syncFromJsClientToken(
clientToken: String?,
 private fun syncClientStateFromJs(
deviceToken: String?,
 sourceId: String?,
 shouldRefreshClient: Boolean,
 didChangeClient: Boolean,
 didChangeDeviceToken: Boolean,
 promise: Promise
 ) {
 if (!Clerk.isInitialized.value) {
Expand All@@ -304,25 +365,21 @@ class ClerkExpoModule : Module() {
 coroutineScope.launch {
 try {
 jsOriginatedClientSyncDepth += 1
 if (!clientToken.isNullOrBlank()) {
 val previousClientState = clientStateSnapshot()

 if (didChangeDeviceToken && !deviceToken.isNullOrBlank()) {
 val currentDeviceToken = try {
 Clerk.getDeviceToken()
 } catch (_: Exception) {
 null
 }

 if (currentDeviceToken == clientToken) {
 if (!shouldRefreshClient) {
 emitSyncedClientChanged(sourceId)
 promise.resolve(null)
 return@launch
 }
 } else {
 when (val result = Clerk.updateDeviceToken(clientToken)) {
 if (currentDeviceToken != deviceToken) {
 when (val result = Clerk.updateDeviceToken(deviceToken)) {
 is ClerkResult.Failure -> {
 promise.reject(
 "E_SYNC_FROM_JS_FAILED",
 result.error?.firstMessage() ?: result.throwable?.message ?: "Client token sync failed",
 result.error?.firstMessage() ?: result.throwable?.message ?: "Device token sync failed",
 null
 )
 return@launch
Expand All@@ -333,19 +390,14 @@ class ClerkExpoModule : Module() {
 Clerk.clientFlow.first { it != null }
 }
 } catch (_: TimeoutCancellationException) {
 debugLog(TAG, "syncFromJsClientToken - client did not appear after token update")
 }
 if (!shouldRefreshClient) {
 emitSyncedClientChanged(sourceId)
 promise.resolve(null)
 return@launch
 debugLog(TAG, "syncClientStateFromJs - client did not appear after token update")
 }
 }
 }
 }
 }

 if (shouldRefreshClient) {
 if (didChangeClient || didChangeDeviceToken) {
 when (val result = Clerk.refreshClient()) {
 is ClerkResult.Failure -> {
 promise.reject(
Expand All@@ -355,17 +407,33 @@ class ClerkExpoModule : Module() {
 )
 }
 is ClerkResult.Success -> {
 emitSyncedClientChanged(sourceId)
 val newClientState = clientStateSnapshot()
 emitSyncedClientChanged(
 sourceId,
 ClientStateChanges(
 client = newClientState.client != previousClientState.client,
 deviceToken = newClientState.deviceToken != previousClientState.deviceToken
 ),
 newClientState
 )
 promise.resolve(null)
 }
 }
 return@launch
 }

 emitSyncedClientChanged(sourceId)
 val newClientState = clientStateSnapshot()
 emitSyncedClientChanged(
 sourceId,
 ClientStateChanges(
 client = newClientState.client != previousClientState.client,
 deviceToken = newClientState.deviceToken != previousClientState.deviceToken
 ),
 newClientState
 )
 promise.resolve(null)
 } catch (e: Exception) {
 promise.reject("E_SYNC_FROM_JS_FAILED", e.message ?: "Client token sync failed", e)
 promise.reject("E_SYNC_FROM_JS_FAILED", e.message ?: "Client state sync failed", e)
 } finally {
 jsOriginatedClientSyncDepth = maxOf(0, jsOriginatedClientSyncDepth - 1)
 }
Expand Down

5 changes: 3 additions & 2 deletions
packages/expo/ios/ClerkExpoModule.m

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,9 +11,10 @@ @interface RCT_EXTERN_MODULE(ClerkExpo, RCTEventEmitter)
RCT_EXTERN_METHOD(getClientToken:(RCTPromiseResolveBlock)resolve
 reject:(RCTPromiseRejectBlock)reject)

RCT_EXTERN_METHOD(syncFromJsClientToken:(id)clientToken
RCT_EXTERN_METHOD(syncClientStateFromJs:(id)deviceToken
 sourceId:(id)sourceId
 shouldRefreshClient:(id)shouldRefreshClient
 didChangeClient:(BOOL)didChangeClient
 didChangeDeviceToken:(BOOL)didChangeDeviceToken
 resolve:(RCTPromiseResolveBlock)resolve
 reject:(RCTPromiseRejectBlock)reject)

Expand Down

18 changes: 9 additions & 9 deletions
packages/expo/ios/ClerkExpoModule.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -86,23 +86,23 @@ class ClerkExpoModule: RCTEventEmitter {
 }
 }

 // MARK: - syncFromJsClientToken
 // MARK: - syncClientStateFromJs

 @objc func syncFromJsClientToken(_ clientToken: Any?,
 @objc func syncClientStateFromJs(_ deviceToken: Any?,
 sourceId: Any?,
 shouldRefreshClient: Any?,
 didChangeClient: Bool,
 didChangeDeviceToken: Bool,
 resolve: @escaping RCTPromiseResolveBlock,
 reject: @escaping RCTPromiseRejectBlock) {
 let normalizedClientToken = clientToken as? String
 let normalizedDeviceToken = deviceToken as? String
 let normalizedSourceId = sourceId as? String
 let defaultShouldRefreshClient = normalizedClientToken?.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty ?? true
 let normalizedShouldRefreshClient = (shouldRefreshClient as? Bool) ?? defaultShouldRefreshClient
 Task {
 do {
 try await ClerkNativeBridge.shared.syncFromJsClientToken(
normalizedClientToken,
 try await ClerkNativeBridge.shared.syncClientStateFromJs(
deviceToken: normalizedDeviceToken,
 sourceId: normalizedSourceId,
 shouldRefreshClient: normalizedShouldRefreshClient
 didChangeClient: didChangeClient,
 didChangeDeviceToken: didChangeDeviceToken
 )
 resolve(nil)
 } catch {
Expand Down
Loading
Loading

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

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Merged

wobsoriano
merged 2 commits into

from

Jun 19, 2026
 Merged


fix(expo): make native client sync client-driven
#8929
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
3d49aa7

fix(expo): make native client sync client-driven


mikepitre Jun 19, 2026
5bfdca0

fix(expo): suppress overlapping native token cache echoes


mikepitre Jun 19, 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/client-driven-native-sync.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
"@clerk/expo": patch
---

Fix JS/native client syncing so native and JavaScript client or device-token changes refresh each other consistently.

150 changes: 109 additions & 41 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@@ -35,16 +35,32 @@ private fun debugLog(tag: String, message: String) {
class ClerkExpoModule : Module() {
 private val coroutineScope = CoroutineScope(Dispatchers.Main)
 private var clientStateObserverJob: Job? = null
 private var lastObservedClient: Client? = null
 private var lastObservedClientState: ClientStateSnapshot? = null
 private var jsOriginatedClientSyncDepth = 0
 private var configuredPublishableKey: String? = null

 private data class ClientStateSnapshot(
 val client: Client?,
 val deviceToken: String?
 )

 private data class ClientStateChanges(
 val client: Boolean,
 val deviceToken: Boolean
 )

 companion object {
 private var sharedInstance: ClerkExpoModule? = null

 fun emitClientChanged(sourceId: String? = null) {
 val instance = sharedInstance ?: return
 instance.sendEvent(NATIVE_CLIENT_CHANGED_EVENT, instance.clientChangedPayload(sourceId))
 instance.sendEvent(
 NATIVE_CLIENT_CHANGED_EVENT,
 instance.clientChangedPayload(
 sourceId = sourceId,
 changes = ClientStateChanges(client = true, deviceToken = true)
 )
 )
 }
 }

Expand DownExpand Up@@ -73,11 +89,17 @@ class ClerkExpoModule : Module() {
 getClientToken(promise)
 }

 AsyncFunction("syncFromJsClientToken") { clientToken: String?, sourceId: String?, shouldRefreshClient: Boolean?, promise: Promise ->
 syncFromJsClientToken(
 clientToken,
 AsyncFunction("syncClientStateFromJs") {
 deviceToken: String?,
 sourceId: String?,
 didChangeClient: Boolean,
 didChangeDeviceToken: Boolean,
 promise: Promise ->
 syncClientStateFromJs(
 deviceToken,
 sourceId,
 shouldRefreshClient ?: clientToken.isNullOrBlank(),
 didChangeClient,
 didChangeDeviceToken,
 promise
 )
 }
Expand All@@ -91,42 +113,80 @@ class ClerkExpoModule : Module() {
 return
 }

lastObservedClient = Clerk.clientFlow.value
lastObservedClientState = clientStateSnapshot()

 clientStateObserverJob = coroutineScope.launch {
 Clerk.clientFlow.collect { client ->
 if (client == lastObservedClient) {
 val previousClientState = lastObservedClientState
 val newClientState = clientStateSnapshot(client)

 if (newClientState == previousClientState) {
 return@collect
 }

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

 emitClientChanged()
 sendEvent(
 NATIVE_CLIENT_CHANGED_EVENT,
 clientChangedPayload(
 deviceToken = newClientState.deviceToken,
 changes = ClientStateChanges(
 client = newClientState.client != previousClientState?.client,
 deviceToken = newClientState.deviceToken != previousClientState?.deviceToken
 )
 )
 )
 }
 }
 }

 private fun clientChangedPayload(sourceId: String? = null): Map<String, Any?> {
 val result = mutableMapOf<String, Any?>(
 "clientToken" to try {
 private fun clientStateSnapshot(client: Client? = Clerk.clientFlow.value): ClientStateSnapshot {
 return ClientStateSnapshot(
 client = client,
 deviceToken = try {
 Clerk.getDeviceToken()
 } catch (e: Exception) {
 debugLog(TAG, "clientChangedPayload - getDeviceToken failed: ${e.message}")
 debugLog(TAG, "clientStateSnapshot - getDeviceToken failed: ${e.message}")
 null
 }
 )
 }

 private fun clientChangedPayload(
 sourceId: String? = null,
 changes: ClientStateChanges,
 deviceToken: String? = clientStateSnapshot().deviceToken
 ): Map<String, Any?> {
 val result = mutableMapOf<String, Any?>(
 "changed" to mapOf(
 "client" to changes.client,
 "deviceToken" to changes.deviceToken
 ),
 "deviceToken" to deviceToken
 )
 if (!sourceId.isNullOrEmpty()) {
 result["sourceId"] = sourceId
 }
 return result
 }

 private fun emitSyncedClientChanged(sourceId: String?) {
 lastObservedClient = Clerk.clientFlow.value
 emitClientChanged(sourceId)
 private fun emitSyncedClientChanged(
 sourceId: String?,
 changes: ClientStateChanges,
 snapshot: ClientStateSnapshot = clientStateSnapshot()
 ) {
 lastObservedClientState = snapshot
 sendEvent(
 NATIVE_CLIENT_CHANGED_EVENT,
 clientChangedPayload(
 sourceId = sourceId,
 changes = changes,
 deviceToken = snapshot.deviceToken
 )
 )
 }

 // MARK: - configure
Expand DownExpand Up@@ -288,12 +348,13 @@ class ClerkExpoModule : Module() {
 }
 }

 // MARK: - syncFromJsClientToken
 // MARK: - syncClientStateFromJs

 private fun syncFromJsClientToken(
clientToken: String?,
 private fun syncClientStateFromJs(
deviceToken: String?,
 sourceId: String?,
 shouldRefreshClient: Boolean,
 didChangeClient: Boolean,
 didChangeDeviceToken: Boolean,
 promise: Promise
 ) {
 if (!Clerk.isInitialized.value) {
Expand All@@ -304,25 +365,21 @@ class ClerkExpoModule : Module() {
 coroutineScope.launch {
 try {
 jsOriginatedClientSyncDepth += 1
 if (!clientToken.isNullOrBlank()) {
 val previousClientState = clientStateSnapshot()

 if (didChangeDeviceToken && !deviceToken.isNullOrBlank()) {
 val currentDeviceToken = try {
 Clerk.getDeviceToken()
 } catch (_: Exception) {
 null
 }

 if (currentDeviceToken == clientToken) {
 if (!shouldRefreshClient) {
 emitSyncedClientChanged(sourceId)
 promise.resolve(null)
 return@launch
 }
 } else {
 when (val result = Clerk.updateDeviceToken(clientToken)) {
 if (currentDeviceToken != deviceToken) {
 when (val result = Clerk.updateDeviceToken(deviceToken)) {
 is ClerkResult.Failure -> {
 promise.reject(
 "E_SYNC_FROM_JS_FAILED",
 result.error?.firstMessage() ?: result.throwable?.message ?: "Client token sync failed",
 result.error?.firstMessage() ?: result.throwable?.message ?: "Device token sync failed",
 null
 )
 return@launch
Expand All@@ -333,19 +390,14 @@ class ClerkExpoModule : Module() {
 Clerk.clientFlow.first { it != null }
 }
 } catch (_: TimeoutCancellationException) {
 debugLog(TAG, "syncFromJsClientToken - client did not appear after token update")
 }
 if (!shouldRefreshClient) {
 emitSyncedClientChanged(sourceId)
 promise.resolve(null)
 return@launch
 debugLog(TAG, "syncClientStateFromJs - client did not appear after token update")
 }
 }
 }
 }
 }

 if (shouldRefreshClient) {
 if (didChangeClient || didChangeDeviceToken) {
 when (val result = Clerk.refreshClient()) {
 is ClerkResult.Failure -> {
 promise.reject(
Expand All@@ -355,17 +407,33 @@ class ClerkExpoModule : Module() {
 )
 }
 is ClerkResult.Success -> {
 emitSyncedClientChanged(sourceId)
 val newClientState = clientStateSnapshot()
 emitSyncedClientChanged(
 sourceId,
 ClientStateChanges(
 client = newClientState.client != previousClientState.client,
 deviceToken = newClientState.deviceToken != previousClientState.deviceToken
 ),
 newClientState
 )
 promise.resolve(null)
 }
 }
 return@launch
 }

 emitSyncedClientChanged(sourceId)
 val newClientState = clientStateSnapshot()
 emitSyncedClientChanged(
 sourceId,
 ClientStateChanges(
 client = newClientState.client != previousClientState.client,
 deviceToken = newClientState.deviceToken != previousClientState.deviceToken
 ),
 newClientState
 )
 promise.resolve(null)
 } catch (e: Exception) {
 promise.reject("E_SYNC_FROM_JS_FAILED", e.message ?: "Client token sync failed", e)
 promise.reject("E_SYNC_FROM_JS_FAILED", e.message ?: "Client state sync failed", e)
 } finally {
 jsOriginatedClientSyncDepth = maxOf(0, jsOriginatedClientSyncDepth - 1)
 }
Expand Down

5 changes: 3 additions & 2 deletions
packages/expo/ios/ClerkExpoModule.m

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,9 +11,10 @@ @interface RCT_EXTERN_MODULE(ClerkExpo, RCTEventEmitter)
RCT_EXTERN_METHOD(getClientToken:(RCTPromiseResolveBlock)resolve
 reject:(RCTPromiseRejectBlock)reject)

RCT_EXTERN_METHOD(syncFromJsClientToken:(id)clientToken
RCT_EXTERN_METHOD(syncClientStateFromJs:(id)deviceToken
 sourceId:(id)sourceId
 shouldRefreshClient:(id)shouldRefreshClient
 didChangeClient:(BOOL)didChangeClient
 didChangeDeviceToken:(BOOL)didChangeDeviceToken
 resolve:(RCTPromiseResolveBlock)resolve
 reject:(RCTPromiseRejectBlock)reject)

Expand Down

18 changes: 9 additions & 9 deletions
packages/expo/ios/ClerkExpoModule.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -86,23 +86,23 @@ class ClerkExpoModule: RCTEventEmitter {
 }
 }

 // MARK: - syncFromJsClientToken
 // MARK: - syncClientStateFromJs

 @objc func syncFromJsClientToken(_ clientToken: Any?,
 @objc func syncClientStateFromJs(_ deviceToken: Any?,
 sourceId: Any?,
 shouldRefreshClient: Any?,
 didChangeClient: Bool,
 didChangeDeviceToken: Bool,
 resolve: @escaping RCTPromiseResolveBlock,
 reject: @escaping RCTPromiseRejectBlock) {
 let normalizedClientToken = clientToken as? String
 let normalizedDeviceToken = deviceToken as? String
 let normalizedSourceId = sourceId as? String
 let defaultShouldRefreshClient = normalizedClientToken?.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty ?? true
 let normalizedShouldRefreshClient = (shouldRefreshClient as? Bool) ?? defaultShouldRefreshClient
 Task {
 do {
 try await ClerkNativeBridge.shared.syncFromJsClientToken(
normalizedClientToken,
 try await ClerkNativeBridge.shared.syncClientStateFromJs(
deviceToken: normalizedDeviceToken,
 sourceId: normalizedSourceId,
 shouldRefreshClient: normalizedShouldRefreshClient
 didChangeClient: didChangeClient,
 didChangeDeviceToken: didChangeDeviceToken
 )
 resolve(nil)
 } catch {
Expand Down
Loading
Loading

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

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Merged

wobsoriano
merged 2 commits into

from

Jun 19, 2026
 Merged


fix(expo): make native client sync client-driven
#8929
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
3d49aa7

fix(expo): make native client sync client-driven


mikepitre Jun 19, 2026
5bfdca0

fix(expo): suppress overlapping native token cache echoes


mikepitre Jun 19, 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/client-driven-native-sync.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
"@clerk/expo": patch
---

Fix JS/native client syncing so native and JavaScript client or device-token changes refresh each other consistently.

150 changes: 109 additions & 41 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@@ -35,16 +35,32 @@ private fun debugLog(tag: String, message: String) {
class ClerkExpoModule : Module() {
 private val coroutineScope = CoroutineScope(Dispatchers.Main)
 private var clientStateObserverJob: Job? = null
 private var lastObservedClient: Client? = null
 private var lastObservedClientState: ClientStateSnapshot? = null
 private var jsOriginatedClientSyncDepth = 0
 private var configuredPublishableKey: String? = null

 private data class ClientStateSnapshot(
 val client: Client?,
 val deviceToken: String?
 )

 private data class ClientStateChanges(
 val client: Boolean,
 val deviceToken: Boolean
 )

 companion object {
 private var sharedInstance: ClerkExpoModule? = null

 fun emitClientChanged(sourceId: String? = null) {
 val instance = sharedInstance ?: return
 instance.sendEvent(NATIVE_CLIENT_CHANGED_EVENT, instance.clientChangedPayload(sourceId))
 instance.sendEvent(
 NATIVE_CLIENT_CHANGED_EVENT,
 instance.clientChangedPayload(
 sourceId = sourceId,
 changes = ClientStateChanges(client = true, deviceToken = true)
 )
 )
 }
 }

Expand DownExpand Up@@ -73,11 +89,17 @@ class ClerkExpoModule : Module() {
 getClientToken(promise)
 }

 AsyncFunction("syncFromJsClientToken") { clientToken: String?, sourceId: String?, shouldRefreshClient: Boolean?, promise: Promise ->
 syncFromJsClientToken(
 clientToken,
 AsyncFunction("syncClientStateFromJs") {
 deviceToken: String?,
 sourceId: String?,
 didChangeClient: Boolean,
 didChangeDeviceToken: Boolean,
 promise: Promise ->
 syncClientStateFromJs(
 deviceToken,
 sourceId,
 shouldRefreshClient ?: clientToken.isNullOrBlank(),
 didChangeClient,
 didChangeDeviceToken,
 promise
 )
 }
Expand All@@ -91,42 +113,80 @@ class ClerkExpoModule : Module() {
 return
 }

lastObservedClient = Clerk.clientFlow.value
lastObservedClientState = clientStateSnapshot()

 clientStateObserverJob = coroutineScope.launch {
 Clerk.clientFlow.collect { client ->
 if (client == lastObservedClient) {
 val previousClientState = lastObservedClientState
 val newClientState = clientStateSnapshot(client)

 if (newClientState == previousClientState) {
 return@collect
 }

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

 emitClientChanged()
 sendEvent(
 NATIVE_CLIENT_CHANGED_EVENT,
 clientChangedPayload(
 deviceToken = newClientState.deviceToken,
 changes = ClientStateChanges(
 client = newClientState.client != previousClientState?.client,
 deviceToken = newClientState.deviceToken != previousClientState?.deviceToken
 )
 )
 )
 }
 }
 }

 private fun clientChangedPayload(sourceId: String? = null): Map<String, Any?> {
 val result = mutableMapOf<String, Any?>(
 "clientToken" to try {
 private fun clientStateSnapshot(client: Client? = Clerk.clientFlow.value): ClientStateSnapshot {
 return ClientStateSnapshot(
 client = client,
 deviceToken = try {
 Clerk.getDeviceToken()
 } catch (e: Exception) {
 debugLog(TAG, "clientChangedPayload - getDeviceToken failed: ${e.message}")
 debugLog(TAG, "clientStateSnapshot - getDeviceToken failed: ${e.message}")
 null
 }
 )
 }

 private fun clientChangedPayload(
 sourceId: String? = null,
 changes: ClientStateChanges,
 deviceToken: String? = clientStateSnapshot().deviceToken
 ): Map<String, Any?> {
 val result = mutableMapOf<String, Any?>(
 "changed" to mapOf(
 "client" to changes.client,
 "deviceToken" to changes.deviceToken
 ),
 "deviceToken" to deviceToken
 )
 if (!sourceId.isNullOrEmpty()) {
 result["sourceId"] = sourceId
 }
 return result
 }

 private fun emitSyncedClientChanged(sourceId: String?) {
 lastObservedClient = Clerk.clientFlow.value
 emitClientChanged(sourceId)
 private fun emitSyncedClientChanged(
 sourceId: String?,
 changes: ClientStateChanges,
 snapshot: ClientStateSnapshot = clientStateSnapshot()
 ) {
 lastObservedClientState = snapshot
 sendEvent(
 NATIVE_CLIENT_CHANGED_EVENT,
 clientChangedPayload(
 sourceId = sourceId,
 changes = changes,
 deviceToken = snapshot.deviceToken
 )
 )
 }

 // MARK: - configure
Expand DownExpand Up@@ -288,12 +348,13 @@ class ClerkExpoModule : Module() {
 }
 }

 // MARK: - syncFromJsClientToken
 // MARK: - syncClientStateFromJs

 private fun syncFromJsClientToken(
clientToken: String?,
 private fun syncClientStateFromJs(
deviceToken: String?,
 sourceId: String?,
 shouldRefreshClient: Boolean,
 didChangeClient: Boolean,
 didChangeDeviceToken: Boolean,
 promise: Promise
 ) {
 if (!Clerk.isInitialized.value) {
Expand All@@ -304,25 +365,21 @@ class ClerkExpoModule : Module() {
 coroutineScope.launch {
 try {
 jsOriginatedClientSyncDepth += 1
 if (!clientToken.isNullOrBlank()) {
 val previousClientState = clientStateSnapshot()

 if (didChangeDeviceToken && !deviceToken.isNullOrBlank()) {
 val currentDeviceToken = try {
 Clerk.getDeviceToken()
 } catch (_: Exception) {
 null
 }

 if (currentDeviceToken == clientToken) {
 if (!shouldRefreshClient) {
 emitSyncedClientChanged(sourceId)
 promise.resolve(null)
 return@launch
 }
 } else {
 when (val result = Clerk.updateDeviceToken(clientToken)) {
 if (currentDeviceToken != deviceToken) {
 when (val result = Clerk.updateDeviceToken(deviceToken)) {
 is ClerkResult.Failure -> {
 promise.reject(
 "E_SYNC_FROM_JS_FAILED",
 result.error?.firstMessage() ?: result.throwable?.message ?: "Client token sync failed",
 result.error?.firstMessage() ?: result.throwable?.message ?: "Device token sync failed",
 null
 )
 return@launch
Expand All@@ -333,19 +390,14 @@ class ClerkExpoModule : Module() {
 Clerk.clientFlow.first { it != null }
 }
 } catch (_: TimeoutCancellationException) {
 debugLog(TAG, "syncFromJsClientToken - client did not appear after token update")
 }
 if (!shouldRefreshClient) {
 emitSyncedClientChanged(sourceId)
 promise.resolve(null)
 return@launch
 debugLog(TAG, "syncClientStateFromJs - client did not appear after token update")
 }
 }
 }
 }
 }

 if (shouldRefreshClient) {
 if (didChangeClient || didChangeDeviceToken) {
 when (val result = Clerk.refreshClient()) {
 is ClerkResult.Failure -> {
 promise.reject(
Expand All@@ -355,17 +407,33 @@ class ClerkExpoModule : Module() {
 )
 }
 is ClerkResult.Success -> {
 emitSyncedClientChanged(sourceId)
 val newClientState = clientStateSnapshot()
 emitSyncedClientChanged(
 sourceId,
 ClientStateChanges(
 client = newClientState.client != previousClientState.client,
 deviceToken = newClientState.deviceToken != previousClientState.deviceToken
 ),
 newClientState
 )
 promise.resolve(null)
 }
 }
 return@launch
 }

 emitSyncedClientChanged(sourceId)
 val newClientState = clientStateSnapshot()
 emitSyncedClientChanged(
 sourceId,
 ClientStateChanges(
 client = newClientState.client != previousClientState.client,
 deviceToken = newClientState.deviceToken != previousClientState.deviceToken
 ),
 newClientState
 )
 promise.resolve(null)
 } catch (e: Exception) {
 promise.reject("E_SYNC_FROM_JS_FAILED", e.message ?: "Client token sync failed", e)
 promise.reject("E_SYNC_FROM_JS_FAILED", e.message ?: "Client state sync failed", e)
 } finally {
 jsOriginatedClientSyncDepth = maxOf(0, jsOriginatedClientSyncDepth - 1)
 }
Expand Down

5 changes: 3 additions & 2 deletions
packages/expo/ios/ClerkExpoModule.m

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,9 +11,10 @@ @interface RCT_EXTERN_MODULE(ClerkExpo, RCTEventEmitter)
RCT_EXTERN_METHOD(getClientToken:(RCTPromiseResolveBlock)resolve
 reject:(RCTPromiseRejectBlock)reject)

RCT_EXTERN_METHOD(syncFromJsClientToken:(id)clientToken
RCT_EXTERN_METHOD(syncClientStateFromJs:(id)deviceToken
 sourceId:(id)sourceId
 shouldRefreshClient:(id)shouldRefreshClient
 didChangeClient:(BOOL)didChangeClient
 didChangeDeviceToken:(BOOL)didChangeDeviceToken
 resolve:(RCTPromiseResolveBlock)resolve
 reject:(RCTPromiseRejectBlock)reject)

Expand Down

18 changes: 9 additions & 9 deletions
packages/expo/ios/ClerkExpoModule.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -86,23 +86,23 @@ class ClerkExpoModule: RCTEventEmitter {
 }
 }

 // MARK: - syncFromJsClientToken
 // MARK: - syncClientStateFromJs

 @objc func syncFromJsClientToken(_ clientToken: Any?,
 @objc func syncClientStateFromJs(_ deviceToken: Any?,
 sourceId: Any?,
 shouldRefreshClient: Any?,
 didChangeClient: Bool,
 didChangeDeviceToken: Bool,
 resolve: @escaping RCTPromiseResolveBlock,
 reject: @escaping RCTPromiseRejectBlock) {
 let normalizedClientToken = clientToken as? String
 let normalizedDeviceToken = deviceToken as? String
 let normalizedSourceId = sourceId as? String
 let defaultShouldRefreshClient = normalizedClientToken?.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty ?? true
 let normalizedShouldRefreshClient = (shouldRefreshClient as? Bool) ?? defaultShouldRefreshClient
 Task {
 do {
 try await ClerkNativeBridge.shared.syncFromJsClientToken(
normalizedClientToken,
 try await ClerkNativeBridge.shared.syncClientStateFromJs(
deviceToken: normalizedDeviceToken,
 sourceId: normalizedSourceId,
 shouldRefreshClient: normalizedShouldRefreshClient
 didChangeClient: didChangeClient,
 didChangeDeviceToken: didChangeDeviceToken
 )
 resolve(nil)
 } catch {
Expand Down
Loading
Loading

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

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Merged

wobsoriano
merged 2 commits into

from

Jun 19, 2026
 Merged


fix(expo): make native client sync client-driven
#8929
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
3d49aa7

fix(expo): make native client sync client-driven


mikepitre Jun 19, 2026
5bfdca0

fix(expo): suppress overlapping native token cache echoes


mikepitre Jun 19, 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/client-driven-native-sync.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
"@clerk/expo": patch
---

Fix JS/native client syncing so native and JavaScript client or device-token changes refresh each other consistently.

150 changes: 109 additions & 41 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@@ -35,16 +35,32 @@ private fun debugLog(tag: String, message: String) {
class ClerkExpoModule : Module() {
 private val coroutineScope = CoroutineScope(Dispatchers.Main)
 private var clientStateObserverJob: Job? = null
 private var lastObservedClient: Client? = null
 private var lastObservedClientState: ClientStateSnapshot? = null
 private var jsOriginatedClientSyncDepth = 0
 private var configuredPublishableKey: String? = null

 private data class ClientStateSnapshot(
 val client: Client?,
 val deviceToken: String?
 )

 private data class ClientStateChanges(
 val client: Boolean,
 val deviceToken: Boolean
 )

 companion object {
 private var sharedInstance: ClerkExpoModule? = null

 fun emitClientChanged(sourceId: String? = null) {
 val instance = sharedInstance ?: return
 instance.sendEvent(NATIVE_CLIENT_CHANGED_EVENT, instance.clientChangedPayload(sourceId))
 instance.sendEvent(
 NATIVE_CLIENT_CHANGED_EVENT,
 instance.clientChangedPayload(
 sourceId = sourceId,
 changes = ClientStateChanges(client = true, deviceToken = true)
 )
 )
 }
 }

Expand DownExpand Up@@ -73,11 +89,17 @@ class ClerkExpoModule : Module() {
 getClientToken(promise)
 }

 AsyncFunction("syncFromJsClientToken") { clientToken: String?, sourceId: String?, shouldRefreshClient: Boolean?, promise: Promise ->
 syncFromJsClientToken(
 clientToken,
 AsyncFunction("syncClientStateFromJs") {
 deviceToken: String?,
 sourceId: String?,
 didChangeClient: Boolean,
 didChangeDeviceToken: Boolean,
 promise: Promise ->
 syncClientStateFromJs(
 deviceToken,
 sourceId,
 shouldRefreshClient ?: clientToken.isNullOrBlank(),
 didChangeClient,
 didChangeDeviceToken,
 promise
 )
 }
Expand All@@ -91,42 +113,80 @@ class ClerkExpoModule : Module() {
 return
 }

lastObservedClient = Clerk.clientFlow.value
lastObservedClientState = clientStateSnapshot()

 clientStateObserverJob = coroutineScope.launch {
 Clerk.clientFlow.collect { client ->
 if (client == lastObservedClient) {
 val previousClientState = lastObservedClientState
 val newClientState = clientStateSnapshot(client)

 if (newClientState == previousClientState) {
 return@collect
 }

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

 emitClientChanged()
 sendEvent(
 NATIVE_CLIENT_CHANGED_EVENT,
 clientChangedPayload(
 deviceToken = newClientState.deviceToken,
 changes = ClientStateChanges(
 client = newClientState.client != previousClientState?.client,
 deviceToken = newClientState.deviceToken != previousClientState?.deviceToken
 )
 )
 )
 }
 }
 }

 private fun clientChangedPayload(sourceId: String? = null): Map<String, Any?> {
 val result = mutableMapOf<String, Any?>(
 "clientToken" to try {
 private fun clientStateSnapshot(client: Client? = Clerk.clientFlow.value): ClientStateSnapshot {
 return ClientStateSnapshot(
 client = client,
 deviceToken = try {
 Clerk.getDeviceToken()
 } catch (e: Exception) {
 debugLog(TAG, "clientChangedPayload - getDeviceToken failed: ${e.message}")
 debugLog(TAG, "clientStateSnapshot - getDeviceToken failed: ${e.message}")
 null
 }
 )
 }

 private fun clientChangedPayload(
 sourceId: String? = null,
 changes: ClientStateChanges,
 deviceToken: String? = clientStateSnapshot().deviceToken
 ): Map<String, Any?> {
 val result = mutableMapOf<String, Any?>(
 "changed" to mapOf(
 "client" to changes.client,
 "deviceToken" to changes.deviceToken
 ),
 "deviceToken" to deviceToken
 )
 if (!sourceId.isNullOrEmpty()) {
 result["sourceId"] = sourceId
 }
 return result
 }

 private fun emitSyncedClientChanged(sourceId: String?) {
 lastObservedClient = Clerk.clientFlow.value
 emitClientChanged(sourceId)
 private fun emitSyncedClientChanged(
 sourceId: String?,
 changes: ClientStateChanges,
 snapshot: ClientStateSnapshot = clientStateSnapshot()
 ) {
 lastObservedClientState = snapshot
 sendEvent(
 NATIVE_CLIENT_CHANGED_EVENT,
 clientChangedPayload(
 sourceId = sourceId,
 changes = changes,
 deviceToken = snapshot.deviceToken
 )
 )
 }

 // MARK: - configure
Expand DownExpand Up@@ -288,12 +348,13 @@ class ClerkExpoModule : Module() {
 }
 }

 // MARK: - syncFromJsClientToken
 // MARK: - syncClientStateFromJs

 private fun syncFromJsClientToken(
clientToken: String?,
 private fun syncClientStateFromJs(
deviceToken: String?,
 sourceId: String?,
 shouldRefreshClient: Boolean,
 didChangeClient: Boolean,
 didChangeDeviceToken: Boolean,
 promise: Promise
 ) {
 if (!Clerk.isInitialized.value) {
Expand All@@ -304,25 +365,21 @@ class ClerkExpoModule : Module() {
 coroutineScope.launch {
 try {
 jsOriginatedClientSyncDepth += 1
 if (!clientToken.isNullOrBlank()) {
 val previousClientState = clientStateSnapshot()

 if (didChangeDeviceToken && !deviceToken.isNullOrBlank()) {
 val currentDeviceToken = try {
 Clerk.getDeviceToken()
 } catch (_: Exception) {
 null
 }

 if (currentDeviceToken == clientToken) {
 if (!shouldRefreshClient) {
 emitSyncedClientChanged(sourceId)
 promise.resolve(null)
 return@launch
 }
 } else {
 when (val result = Clerk.updateDeviceToken(clientToken)) {
 if (currentDeviceToken != deviceToken) {
 when (val result = Clerk.updateDeviceToken(deviceToken)) {
 is ClerkResult.Failure -> {
 promise.reject(
 "E_SYNC_FROM_JS_FAILED",
 result.error?.firstMessage() ?: result.throwable?.message ?: "Client token sync failed",
 result.error?.firstMessage() ?: result.throwable?.message ?: "Device token sync failed",
 null
 )
 return@launch
Expand All@@ -333,19 +390,14 @@ class ClerkExpoModule : Module() {
 Clerk.clientFlow.first { it != null }
 }
 } catch (_: TimeoutCancellationException) {
 debugLog(TAG, "syncFromJsClientToken - client did not appear after token update")
 }
 if (!shouldRefreshClient) {
 emitSyncedClientChanged(sourceId)
 promise.resolve(null)
 return@launch
 debugLog(TAG, "syncClientStateFromJs - client did not appear after token update")
 }
 }
 }
 }
 }

 if (shouldRefreshClient) {
 if (didChangeClient || didChangeDeviceToken) {
 when (val result = Clerk.refreshClient()) {
 is ClerkResult.Failure -> {
 promise.reject(
Expand All@@ -355,17 +407,33 @@ class ClerkExpoModule : Module() {
 )
 }
 is ClerkResult.Success -> {
 emitSyncedClientChanged(sourceId)
 val newClientState = clientStateSnapshot()
 emitSyncedClientChanged(
 sourceId,
 ClientStateChanges(
 client = newClientState.client != previousClientState.client,
 deviceToken = newClientState.deviceToken != previousClientState.deviceToken
 ),
 newClientState
 )
 promise.resolve(null)
 }
 }
 return@launch
 }

 emitSyncedClientChanged(sourceId)
 val newClientState = clientStateSnapshot()
 emitSyncedClientChanged(
 sourceId,
 ClientStateChanges(
 client = newClientState.client != previousClientState.client,
 deviceToken = newClientState.deviceToken != previousClientState.deviceToken
 ),
 newClientState
 )
 promise.resolve(null)
 } catch (e: Exception) {
 promise.reject("E_SYNC_FROM_JS_FAILED", e.message ?: "Client token sync failed", e)
 promise.reject("E_SYNC_FROM_JS_FAILED", e.message ?: "Client state sync failed", e)
 } finally {
 jsOriginatedClientSyncDepth = maxOf(0, jsOriginatedClientSyncDepth - 1)
 }
Expand Down

5 changes: 3 additions & 2 deletions
packages/expo/ios/ClerkExpoModule.m

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,9 +11,10 @@ @interface RCT_EXTERN_MODULE(ClerkExpo, RCTEventEmitter)
RCT_EXTERN_METHOD(getClientToken:(RCTPromiseResolveBlock)resolve
 reject:(RCTPromiseRejectBlock)reject)

RCT_EXTERN_METHOD(syncFromJsClientToken:(id)clientToken
RCT_EXTERN_METHOD(syncClientStateFromJs:(id)deviceToken
 sourceId:(id)sourceId
 shouldRefreshClient:(id)shouldRefreshClient
 didChangeClient:(BOOL)didChangeClient
 didChangeDeviceToken:(BOOL)didChangeDeviceToken
 resolve:(RCTPromiseResolveBlock)resolve
 reject:(RCTPromiseRejectBlock)reject)

Expand Down

18 changes: 9 additions & 9 deletions
packages/expo/ios/ClerkExpoModule.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -86,23 +86,23 @@ class ClerkExpoModule: RCTEventEmitter {
 }
 }

 // MARK: - syncFromJsClientToken
 // MARK: - syncClientStateFromJs

 @objc func syncFromJsClientToken(_ clientToken: Any?,
 @objc func syncClientStateFromJs(_ deviceToken: Any?,
 sourceId: Any?,
 shouldRefreshClient: Any?,
 didChangeClient: Bool,
 didChangeDeviceToken: Bool,
 resolve: @escaping RCTPromiseResolveBlock,
 reject: @escaping RCTPromiseRejectBlock) {
 let normalizedClientToken = clientToken as? String
 let normalizedDeviceToken = deviceToken as? String
 let normalizedSourceId = sourceId as? String
 let defaultShouldRefreshClient = normalizedClientToken?.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty ?? true
 let normalizedShouldRefreshClient = (shouldRefreshClient as? Bool) ?? defaultShouldRefreshClient
 Task {
 do {
 try await ClerkNativeBridge.shared.syncFromJsClientToken(
normalizedClientToken,
 try await ClerkNativeBridge.shared.syncClientStateFromJs(
deviceToken: normalizedDeviceToken,
 sourceId: normalizedSourceId,
 shouldRefreshClient: normalizedShouldRefreshClient
 didChangeClient: didChangeClient,
 didChangeDeviceToken: didChangeDeviceToken
 )
 resolve(nil)
 } catch {
Expand Down
Loading
Loading

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

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Merged

wobsoriano
merged 2 commits into

from

Jun 19, 2026
 Merged


fix(expo): make native client sync client-driven
#8929
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
3d49aa7

fix(expo): make native client sync client-driven


mikepitre Jun 19, 2026
5bfdca0

fix(expo): suppress overlapping native token cache echoes


mikepitre Jun 19, 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/client-driven-native-sync.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
"@clerk/expo": patch
---

Fix JS/native client syncing so native and JavaScript client or device-token changes refresh each other consistently.

150 changes: 109 additions & 41 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@@ -35,16 +35,32 @@ private fun debugLog(tag: String, message: String) {
class ClerkExpoModule : Module() {
 private val coroutineScope = CoroutineScope(Dispatchers.Main)
 private var clientStateObserverJob: Job? = null
 private var lastObservedClient: Client? = null
 private var lastObservedClientState: ClientStateSnapshot? = null
 private var jsOriginatedClientSyncDepth = 0
 private var configuredPublishableKey: String? = null

 private data class ClientStateSnapshot(
 val client: Client?,
 val deviceToken: String?
 )

 private data class ClientStateChanges(
 val client: Boolean,
 val deviceToken: Boolean
 )

 companion object {
 private var sharedInstance: ClerkExpoModule? = null

 fun emitClientChanged(sourceId: String? = null) {
 val instance = sharedInstance ?: return
 instance.sendEvent(NATIVE_CLIENT_CHANGED_EVENT, instance.clientChangedPayload(sourceId))
 instance.sendEvent(
 NATIVE_CLIENT_CHANGED_EVENT,
 instance.clientChangedPayload(
 sourceId = sourceId,
 changes = ClientStateChanges(client = true, deviceToken = true)
 )
 )
 }
 }

Expand DownExpand Up@@ -73,11 +89,17 @@ class ClerkExpoModule : Module() {
 getClientToken(promise)
 }

 AsyncFunction("syncFromJsClientToken") { clientToken: String?, sourceId: String?, shouldRefreshClient: Boolean?, promise: Promise ->
 syncFromJsClientToken(
 clientToken,
 AsyncFunction("syncClientStateFromJs") {
 deviceToken: String?,
 sourceId: String?,
 didChangeClient: Boolean,
 didChangeDeviceToken: Boolean,
 promise: Promise ->
 syncClientStateFromJs(
 deviceToken,
 sourceId,
 shouldRefreshClient ?: clientToken.isNullOrBlank(),
 didChangeClient,
 didChangeDeviceToken,
 promise
 )
 }
Expand All@@ -91,42 +113,80 @@ class ClerkExpoModule : Module() {
 return
 }

lastObservedClient = Clerk.clientFlow.value
lastObservedClientState = clientStateSnapshot()

 clientStateObserverJob = coroutineScope.launch {
 Clerk.clientFlow.collect { client ->
 if (client == lastObservedClient) {
 val previousClientState = lastObservedClientState
 val newClientState = clientStateSnapshot(client)

 if (newClientState == previousClientState) {
 return@collect
 }

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

 emitClientChanged()
 sendEvent(
 NATIVE_CLIENT_CHANGED_EVENT,
 clientChangedPayload(
 deviceToken = newClientState.deviceToken,
 changes = ClientStateChanges(
 client = newClientState.client != previousClientState?.client,
 deviceToken = newClientState.deviceToken != previousClientState?.deviceToken
 )
 )
 )
 }
 }
 }

 private fun clientChangedPayload(sourceId: String? = null): Map<String, Any?> {
 val result = mutableMapOf<String, Any?>(
 "clientToken" to try {
 private fun clientStateSnapshot(client: Client? = Clerk.clientFlow.value): ClientStateSnapshot {
 return ClientStateSnapshot(
 client = client,
 deviceToken = try {
 Clerk.getDeviceToken()
 } catch (e: Exception) {
 debugLog(TAG, "clientChangedPayload - getDeviceToken failed: ${e.message}")
 debugLog(TAG, "clientStateSnapshot - getDeviceToken failed: ${e.message}")
 null
 }
 )
 }

 private fun clientChangedPayload(
 sourceId: String? = null,
 changes: ClientStateChanges,
 deviceToken: String? = clientStateSnapshot().deviceToken
 ): Map<String, Any?> {
 val result = mutableMapOf<String, Any?>(
 "changed" to mapOf(
 "client" to changes.client,
 "deviceToken" to changes.deviceToken
 ),
 "deviceToken" to deviceToken
 )
 if (!sourceId.isNullOrEmpty()) {
 result["sourceId"] = sourceId
 }
 return result
 }

 private fun emitSyncedClientChanged(sourceId: String?) {
 lastObservedClient = Clerk.clientFlow.value
 emitClientChanged(sourceId)
 private fun emitSyncedClientChanged(
 sourceId: String?,
 changes: ClientStateChanges,
 snapshot: ClientStateSnapshot = clientStateSnapshot()
 ) {
 lastObservedClientState = snapshot
 sendEvent(
 NATIVE_CLIENT_CHANGED_EVENT,
 clientChangedPayload(
 sourceId = sourceId,
 changes = changes,
 deviceToken = snapshot.deviceToken
 )
 )
 }

 // MARK: - configure
Expand DownExpand Up@@ -288,12 +348,13 @@ class ClerkExpoModule : Module() {
 }
 }

 // MARK: - syncFromJsClientToken
 // MARK: - syncClientStateFromJs

 private fun syncFromJsClientToken(
clientToken: String?,
 private fun syncClientStateFromJs(
deviceToken: String?,
 sourceId: String?,
 shouldRefreshClient: Boolean,
 didChangeClient: Boolean,
 didChangeDeviceToken: Boolean,
 promise: Promise
 ) {
 if (!Clerk.isInitialized.value) {
Expand All@@ -304,25 +365,21 @@ class ClerkExpoModule : Module() {
 coroutineScope.launch {
 try {
 jsOriginatedClientSyncDepth += 1
 if (!clientToken.isNullOrBlank()) {
 val previousClientState = clientStateSnapshot()

 if (didChangeDeviceToken && !deviceToken.isNullOrBlank()) {
 val currentDeviceToken = try {
 Clerk.getDeviceToken()
 } catch (_: Exception) {
 null
 }

 if (currentDeviceToken == clientToken) {
 if (!shouldRefreshClient) {
 emitSyncedClientChanged(sourceId)
 promise.resolve(null)
 return@launch
 }
 } else {
 when (val result = Clerk.updateDeviceToken(clientToken)) {
 if (currentDeviceToken != deviceToken) {
 when (val result = Clerk.updateDeviceToken(deviceToken)) {
 is ClerkResult.Failure -> {
 promise.reject(
 "E_SYNC_FROM_JS_FAILED",
 result.error?.firstMessage() ?: result.throwable?.message ?: "Client token sync failed",
 result.error?.firstMessage() ?: result.throwable?.message ?: "Device token sync failed",
 null
 )
 return@launch
Expand All@@ -333,19 +390,14 @@ class ClerkExpoModule : Module() {
 Clerk.clientFlow.first { it != null }
 }
 } catch (_: TimeoutCancellationException) {
 debugLog(TAG, "syncFromJsClientToken - client did not appear after token update")
 }
 if (!shouldRefreshClient) {
 emitSyncedClientChanged(sourceId)
 promise.resolve(null)
 return@launch
 debugLog(TAG, "syncClientStateFromJs - client did not appear after token update")
 }
 }
 }
 }
 }

 if (shouldRefreshClient) {
 if (didChangeClient || didChangeDeviceToken) {
 when (val result = Clerk.refreshClient()) {
 is ClerkResult.Failure -> {
 promise.reject(
Expand All@@ -355,17 +407,33 @@ class ClerkExpoModule : Module() {
 )
 }
 is ClerkResult.Success -> {
 emitSyncedClientChanged(sourceId)
 val newClientState = clientStateSnapshot()
 emitSyncedClientChanged(
 sourceId,
 ClientStateChanges(
 client = newClientState.client != previousClientState.client,
 deviceToken = newClientState.deviceToken != previousClientState.deviceToken
 ),
 newClientState
 )
 promise.resolve(null)
 }
 }
 return@launch
 }

 emitSyncedClientChanged(sourceId)
 val newClientState = clientStateSnapshot()
 emitSyncedClientChanged(
 sourceId,
 ClientStateChanges(
 client = newClientState.client != previousClientState.client,
 deviceToken = newClientState.deviceToken != previousClientState.deviceToken
 ),
 newClientState
 )
 promise.resolve(null)
 } catch (e: Exception) {
 promise.reject("E_SYNC_FROM_JS_FAILED", e.message ?: "Client token sync failed", e)
 promise.reject("E_SYNC_FROM_JS_FAILED", e.message ?: "Client state sync failed", e)
 } finally {
 jsOriginatedClientSyncDepth = maxOf(0, jsOriginatedClientSyncDepth - 1)
 }
Expand Down

5 changes: 3 additions & 2 deletions
packages/expo/ios/ClerkExpoModule.m

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,9 +11,10 @@ @interface RCT_EXTERN_MODULE(ClerkExpo, RCTEventEmitter)
RCT_EXTERN_METHOD(getClientToken:(RCTPromiseResolveBlock)resolve
 reject:(RCTPromiseRejectBlock)reject)

RCT_EXTERN_METHOD(syncFromJsClientToken:(id)clientToken
RCT_EXTERN_METHOD(syncClientStateFromJs:(id)deviceToken
 sourceId:(id)sourceId
 shouldRefreshClient:(id)shouldRefreshClient
 didChangeClient:(BOOL)didChangeClient
 didChangeDeviceToken:(BOOL)didChangeDeviceToken
 resolve:(RCTPromiseResolveBlock)resolve
 reject:(RCTPromiseRejectBlock)reject)

Expand Down

18 changes: 9 additions & 9 deletions
packages/expo/ios/ClerkExpoModule.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -86,23 +86,23 @@ class ClerkExpoModule: RCTEventEmitter {
 }
 }

 // MARK: - syncFromJsClientToken
 // MARK: - syncClientStateFromJs

 @objc func syncFromJsClientToken(_ clientToken: Any?,
 @objc func syncClientStateFromJs(_ deviceToken: Any?,
 sourceId: Any?,
 shouldRefreshClient: Any?,
 didChangeClient: Bool,
 didChangeDeviceToken: Bool,
 resolve: @escaping RCTPromiseResolveBlock,
 reject: @escaping RCTPromiseRejectBlock) {
 let normalizedClientToken = clientToken as? String
 let normalizedDeviceToken = deviceToken as? String
 let normalizedSourceId = sourceId as? String
 let defaultShouldRefreshClient = normalizedClientToken?.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty ?? true
 let normalizedShouldRefreshClient = (shouldRefreshClient as? Bool) ?? defaultShouldRefreshClient
 Task {
 do {
 try await ClerkNativeBridge.shared.syncFromJsClientToken(
normalizedClientToken,
 try await ClerkNativeBridge.shared.syncClientStateFromJs(
deviceToken: normalizedDeviceToken,
 sourceId: normalizedSourceId,
 shouldRefreshClient: normalizedShouldRefreshClient
 didChangeClient: didChangeClient,
 didChangeDeviceToken: didChangeDeviceToken
 )
 resolve(nil)
 } catch {
Expand Down
Loading
Loading

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

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Merged

wobsoriano
merged 2 commits into

from

Jun 19, 2026
 Merged


fix(expo): make native client sync client-driven
#8929
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
3d49aa7

fix(expo): make native client sync client-driven


mikepitre Jun 19, 2026
5bfdca0

fix(expo): suppress overlapping native token cache echoes


mikepitre Jun 19, 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/client-driven-native-sync.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
"@clerk/expo": patch
---

Fix JS/native client syncing so native and JavaScript client or device-token changes refresh each other consistently.

150 changes: 109 additions & 41 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@@ -35,16 +35,32 @@ private fun debugLog(tag: String, message: String) {
class ClerkExpoModule : Module() {
 private val coroutineScope = CoroutineScope(Dispatchers.Main)
 private var clientStateObserverJob: Job? = null
 private var lastObservedClient: Client? = null
 private var lastObservedClientState: ClientStateSnapshot? = null
 private var jsOriginatedClientSyncDepth = 0
 private var configuredPublishableKey: String? = null

 private data class ClientStateSnapshot(
 val client: Client?,
 val deviceToken: String?
 )

 private data class ClientStateChanges(
 val client: Boolean,
 val deviceToken: Boolean
 )

 companion object {
 private var sharedInstance: ClerkExpoModule? = null

 fun emitClientChanged(sourceId: String? = null) {
 val instance = sharedInstance ?: return
 instance.sendEvent(NATIVE_CLIENT_CHANGED_EVENT, instance.clientChangedPayload(sourceId))
 instance.sendEvent(
 NATIVE_CLIENT_CHANGED_EVENT,
 instance.clientChangedPayload(
 sourceId = sourceId,
 changes = ClientStateChanges(client = true, deviceToken = true)
 )
 )
 }
 }

Expand DownExpand Up@@ -73,11 +89,17 @@ class ClerkExpoModule : Module() {
 getClientToken(promise)
 }

 AsyncFunction("syncFromJsClientToken") { clientToken: String?, sourceId: String?, shouldRefreshClient: Boolean?, promise: Promise ->
 syncFromJsClientToken(
 clientToken,
 AsyncFunction("syncClientStateFromJs") {
 deviceToken: String?,
 sourceId: String?,
 didChangeClient: Boolean,
 didChangeDeviceToken: Boolean,
 promise: Promise ->
 syncClientStateFromJs(
 deviceToken,
 sourceId,
 shouldRefreshClient ?: clientToken.isNullOrBlank(),
 didChangeClient,
 didChangeDeviceToken,
 promise
 )
 }
Expand All@@ -91,42 +113,80 @@ class ClerkExpoModule : Module() {
 return
 }

lastObservedClient = Clerk.clientFlow.value
lastObservedClientState = clientStateSnapshot()

 clientStateObserverJob = coroutineScope.launch {
 Clerk.clientFlow.collect { client ->
 if (client == lastObservedClient) {
 val previousClientState = lastObservedClientState
 val newClientState = clientStateSnapshot(client)

 if (newClientState == previousClientState) {
 return@collect
 }

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

 emitClientChanged()
 sendEvent(
 NATIVE_CLIENT_CHANGED_EVENT,
 clientChangedPayload(
 deviceToken = newClientState.deviceToken,
 changes = ClientStateChanges(
 client = newClientState.client != previousClientState?.client,
 deviceToken = newClientState.deviceToken != previousClientState?.deviceToken
 )
 )
 )
 }
 }
 }

 private fun clientChangedPayload(sourceId: String? = null): Map<String, Any?> {
 val result = mutableMapOf<String, Any?>(
 "clientToken" to try {
 private fun clientStateSnapshot(client: Client? = Clerk.clientFlow.value): ClientStateSnapshot {
 return ClientStateSnapshot(
 client = client,
 deviceToken = try {
 Clerk.getDeviceToken()
 } catch (e: Exception) {
 debugLog(TAG, "clientChangedPayload - getDeviceToken failed: ${e.message}")
 debugLog(TAG, "clientStateSnapshot - getDeviceToken failed: ${e.message}")
 null
 }
 )
 }

 private fun clientChangedPayload(
 sourceId: String? = null,
 changes: ClientStateChanges,
 deviceToken: String? = clientStateSnapshot().deviceToken
 ): Map<String, Any?> {
 val result = mutableMapOf<String, Any?>(
 "changed" to mapOf(
 "client" to changes.client,
 "deviceToken" to changes.deviceToken
 ),
 "deviceToken" to deviceToken
 )
 if (!sourceId.isNullOrEmpty()) {
 result["sourceId"] = sourceId
 }
 return result
 }

 private fun emitSyncedClientChanged(sourceId: String?) {
 lastObservedClient = Clerk.clientFlow.value
 emitClientChanged(sourceId)
 private fun emitSyncedClientChanged(
 sourceId: String?,
 changes: ClientStateChanges,
 snapshot: ClientStateSnapshot = clientStateSnapshot()
 ) {
 lastObservedClientState = snapshot
 sendEvent(
 NATIVE_CLIENT_CHANGED_EVENT,
 clientChangedPayload(
 sourceId = sourceId,
 changes = changes,
 deviceToken = snapshot.deviceToken
 )
 )
 }

 // MARK: - configure
Expand DownExpand Up@@ -288,12 +348,13 @@ class ClerkExpoModule : Module() {
 }
 }

 // MARK: - syncFromJsClientToken
 // MARK: - syncClientStateFromJs

 private fun syncFromJsClientToken(
clientToken: String?,
 private fun syncClientStateFromJs(
deviceToken: String?,
 sourceId: String?,
 shouldRefreshClient: Boolean,
 didChangeClient: Boolean,
 didChangeDeviceToken: Boolean,
 promise: Promise
 ) {
 if (!Clerk.isInitialized.value) {
Expand All@@ -304,25 +365,21 @@ class ClerkExpoModule : Module() {
 coroutineScope.launch {
 try {
 jsOriginatedClientSyncDepth += 1
 if (!clientToken.isNullOrBlank()) {
 val previousClientState = clientStateSnapshot()

 if (didChangeDeviceToken && !deviceToken.isNullOrBlank()) {
 val currentDeviceToken = try {
 Clerk.getDeviceToken()
 } catch (_: Exception) {
 null
 }

 if (currentDeviceToken == clientToken) {
 if (!shouldRefreshClient) {
 emitSyncedClientChanged(sourceId)
 promise.resolve(null)
 return@launch
 }
 } else {
 when (val result = Clerk.updateDeviceToken(clientToken)) {
 if (currentDeviceToken != deviceToken) {
 when (val result = Clerk.updateDeviceToken(deviceToken)) {
 is ClerkResult.Failure -> {
 promise.reject(
 "E_SYNC_FROM_JS_FAILED",
 result.error?.firstMessage() ?: result.throwable?.message ?: "Client token sync failed",
 result.error?.firstMessage() ?: result.throwable?.message ?: "Device token sync failed",
 null
 )
 return@launch
Expand All@@ -333,19 +390,14 @@ class ClerkExpoModule : Module() {
 Clerk.clientFlow.first { it != null }
 }
 } catch (_: TimeoutCancellationException) {
 debugLog(TAG, "syncFromJsClientToken - client did not appear after token update")
 }
 if (!shouldRefreshClient) {
 emitSyncedClientChanged(sourceId)
 promise.resolve(null)
 return@launch
 debugLog(TAG, "syncClientStateFromJs - client did not appear after token update")
 }
 }
 }
 }
 }

 if (shouldRefreshClient) {
 if (didChangeClient || didChangeDeviceToken) {
 when (val result = Clerk.refreshClient()) {
 is ClerkResult.Failure -> {
 promise.reject(
Expand All@@ -355,17 +407,33 @@ class ClerkExpoModule : Module() {
 )
 }
 is ClerkResult.Success -> {
 emitSyncedClientChanged(sourceId)
 val newClientState = clientStateSnapshot()
 emitSyncedClientChanged(
 sourceId,
 ClientStateChanges(
 client = newClientState.client != previousClientState.client,
 deviceToken = newClientState.deviceToken != previousClientState.deviceToken
 ),
 newClientState
 )
 promise.resolve(null)
 }
 }
 return@launch
 }

 emitSyncedClientChanged(sourceId)
 val newClientState = clientStateSnapshot()
 emitSyncedClientChanged(
 sourceId,
 ClientStateChanges(
 client = newClientState.client != previousClientState.client,
 deviceToken = newClientState.deviceToken != previousClientState.deviceToken
 ),
 newClientState
 )
 promise.resolve(null)
 } catch (e: Exception) {
 promise.reject("E_SYNC_FROM_JS_FAILED", e.message ?: "Client token sync failed", e)
 promise.reject("E_SYNC_FROM_JS_FAILED", e.message ?: "Client state sync failed", e)
 } finally {
 jsOriginatedClientSyncDepth = maxOf(0, jsOriginatedClientSyncDepth - 1)
 }
Expand Down

5 changes: 3 additions & 2 deletions
packages/expo/ios/ClerkExpoModule.m

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,9 +11,10 @@ @interface RCT_EXTERN_MODULE(ClerkExpo, RCTEventEmitter)
RCT_EXTERN_METHOD(getClientToken:(RCTPromiseResolveBlock)resolve
 reject:(RCTPromiseRejectBlock)reject)

RCT_EXTERN_METHOD(syncFromJsClientToken:(id)clientToken
RCT_EXTERN_METHOD(syncClientStateFromJs:(id)deviceToken
 sourceId:(id)sourceId
 shouldRefreshClient:(id)shouldRefreshClient
 didChangeClient:(BOOL)didChangeClient
 didChangeDeviceToken:(BOOL)didChangeDeviceToken
 resolve:(RCTPromiseResolveBlock)resolve
 reject:(RCTPromiseRejectBlock)reject)

Expand Down

18 changes: 9 additions & 9 deletions
packages/expo/ios/ClerkExpoModule.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -86,23 +86,23 @@ class ClerkExpoModule: RCTEventEmitter {
 }
 }

 // MARK: - syncFromJsClientToken
 // MARK: - syncClientStateFromJs

 @objc func syncFromJsClientToken(_ clientToken: Any?,
 @objc func syncClientStateFromJs(_ deviceToken: Any?,
 sourceId: Any?,
 shouldRefreshClient: Any?,
 didChangeClient: Bool,
 didChangeDeviceToken: Bool,
 resolve: @escaping RCTPromiseResolveBlock,
 reject: @escaping RCTPromiseRejectBlock) {
 let normalizedClientToken = clientToken as? String
 let normalizedDeviceToken = deviceToken as? String
 let normalizedSourceId = sourceId as? String
 let defaultShouldRefreshClient = normalizedClientToken?.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty ?? true
 let normalizedShouldRefreshClient = (shouldRefreshClient as? Bool) ?? defaultShouldRefreshClient
 Task {
 do {
 try await ClerkNativeBridge.shared.syncFromJsClientToken(
normalizedClientToken,
 try await ClerkNativeBridge.shared.syncClientStateFromJs(
deviceToken: normalizedDeviceToken,
 sourceId: normalizedSourceId,
 shouldRefreshClient: normalizedShouldRefreshClient
 didChangeClient: didChangeClient,
 didChangeDeviceToken: didChangeDeviceToken
 )
 resolve(nil)
 } catch {
Expand Down
Loading
Loading

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

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Merged

wobsoriano
merged 2 commits into

from

Jun 19, 2026
 Merged


fix(expo): make native client sync client-driven
#8929
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
3d49aa7

fix(expo): make native client sync client-driven


mikepitre Jun 19, 2026
5bfdca0

fix(expo): suppress overlapping native token cache echoes


mikepitre Jun 19, 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/client-driven-native-sync.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
"@clerk/expo": patch
---

Fix JS/native client syncing so native and JavaScript client or device-token changes refresh each other consistently.

150 changes: 109 additions & 41 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@@ -35,16 +35,32 @@ private fun debugLog(tag: String, message: String) {
class ClerkExpoModule : Module() {
 private val coroutineScope = CoroutineScope(Dispatchers.Main)
 private var clientStateObserverJob: Job? = null
 private var lastObservedClient: Client? = null
 private var lastObservedClientState: ClientStateSnapshot? = null
 private var jsOriginatedClientSyncDepth = 0
 private var configuredPublishableKey: String? = null

 private data class ClientStateSnapshot(
 val client: Client?,
 val deviceToken: String?
 )

 private data class ClientStateChanges(
 val client: Boolean,
 val deviceToken: Boolean
 )

 companion object {
 private var sharedInstance: ClerkExpoModule? = null

 fun emitClientChanged(sourceId: String? = null) {
 val instance = sharedInstance ?: return
 instance.sendEvent(NATIVE_CLIENT_CHANGED_EVENT, instance.clientChangedPayload(sourceId))
 instance.sendEvent(
 NATIVE_CLIENT_CHANGED_EVENT,
 instance.clientChangedPayload(
 sourceId = sourceId,
 changes = ClientStateChanges(client = true, deviceToken = true)
 )
 )
 }
 }

Expand DownExpand Up@@ -73,11 +89,17 @@ class ClerkExpoModule : Module() {
 getClientToken(promise)
 }

 AsyncFunction("syncFromJsClientToken") { clientToken: String?, sourceId: String?, shouldRefreshClient: Boolean?, promise: Promise ->
 syncFromJsClientToken(
 clientToken,
 AsyncFunction("syncClientStateFromJs") {
 deviceToken: String?,
 sourceId: String?,
 didChangeClient: Boolean,
 didChangeDeviceToken: Boolean,
 promise: Promise ->
 syncClientStateFromJs(
 deviceToken,
 sourceId,
 shouldRefreshClient ?: clientToken.isNullOrBlank(),
 didChangeClient,
 didChangeDeviceToken,
 promise
 )
 }
Expand All@@ -91,42 +113,80 @@ class ClerkExpoModule : Module() {
 return
 }

lastObservedClient = Clerk.clientFlow.value
lastObservedClientState = clientStateSnapshot()

 clientStateObserverJob = coroutineScope.launch {
 Clerk.clientFlow.collect { client ->
 if (client == lastObservedClient) {
 val previousClientState = lastObservedClientState
 val newClientState = clientStateSnapshot(client)

 if (newClientState == previousClientState) {
 return@collect
 }

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

 emitClientChanged()
 sendEvent(
 NATIVE_CLIENT_CHANGED_EVENT,
 clientChangedPayload(
 deviceToken = newClientState.deviceToken,
 changes = ClientStateChanges(
 client = newClientState.client != previousClientState?.client,
 deviceToken = newClientState.deviceToken != previousClientState?.deviceToken
 )
 )
 )
 }
 }
 }

 private fun clientChangedPayload(sourceId: String? = null): Map<String, Any?> {
 val result = mutableMapOf<String, Any?>(
 "clientToken" to try {
 private fun clientStateSnapshot(client: Client? = Clerk.clientFlow.value): ClientStateSnapshot {
 return ClientStateSnapshot(
 client = client,
 deviceToken = try {
 Clerk.getDeviceToken()
 } catch (e: Exception) {
 debugLog(TAG, "clientChangedPayload - getDeviceToken failed: ${e.message}")
 debugLog(TAG, "clientStateSnapshot - getDeviceToken failed: ${e.message}")
 null
 }
 )
 }

 private fun clientChangedPayload(
 sourceId: String? = null,
 changes: ClientStateChanges,
 deviceToken: String? = clientStateSnapshot().deviceToken
 ): Map<String, Any?> {
 val result = mutableMapOf<String, Any?>(
 "changed" to mapOf(
 "client" to changes.client,
 "deviceToken" to changes.deviceToken
 ),
 "deviceToken" to deviceToken
 )
 if (!sourceId.isNullOrEmpty()) {
 result["sourceId"] = sourceId
 }
 return result
 }

 private fun emitSyncedClientChanged(sourceId: String?) {
 lastObservedClient = Clerk.clientFlow.value
 emitClientChanged(sourceId)
 private fun emitSyncedClientChanged(
 sourceId: String?,
 changes: ClientStateChanges,
 snapshot: ClientStateSnapshot = clientStateSnapshot()
 ) {
 lastObservedClientState = snapshot
 sendEvent(
 NATIVE_CLIENT_CHANGED_EVENT,
 clientChangedPayload(
 sourceId = sourceId,
 changes = changes,
 deviceToken = snapshot.deviceToken
 )
 )
 }

 // MARK: - configure
Expand DownExpand Up@@ -288,12 +348,13 @@ class ClerkExpoModule : Module() {
 }
 }

 // MARK: - syncFromJsClientToken
 // MARK: - syncClientStateFromJs

 private fun syncFromJsClientToken(
clientToken: String?,
 private fun syncClientStateFromJs(
deviceToken: String?,
 sourceId: String?,
 shouldRefreshClient: Boolean,
 didChangeClient: Boolean,
 didChangeDeviceToken: Boolean,
 promise: Promise
 ) {
 if (!Clerk.isInitialized.value) {
Expand All@@ -304,25 +365,21 @@ class ClerkExpoModule : Module() {
 coroutineScope.launch {
 try {
 jsOriginatedClientSyncDepth += 1
 if (!clientToken.isNullOrBlank()) {
 val previousClientState = clientStateSnapshot()

 if (didChangeDeviceToken && !deviceToken.isNullOrBlank()) {
 val currentDeviceToken = try {
 Clerk.getDeviceToken()
 } catch (_: Exception) {
 null
 }

 if (currentDeviceToken == clientToken) {
 if (!shouldRefreshClient) {
 emitSyncedClientChanged(sourceId)
 promise.resolve(null)
 return@launch
 }
 } else {
 when (val result = Clerk.updateDeviceToken(clientToken)) {
 if (currentDeviceToken != deviceToken) {
 when (val result = Clerk.updateDeviceToken(deviceToken)) {
 is ClerkResult.Failure -> {
 promise.reject(
 "E_SYNC_FROM_JS_FAILED",
 result.error?.firstMessage() ?: result.throwable?.message ?: "Client token sync failed",
 result.error?.firstMessage() ?: result.throwable?.message ?: "Device token sync failed",
 null
 )
 return@launch
Expand All@@ -333,19 +390,14 @@ class ClerkExpoModule : Module() {
 Clerk.clientFlow.first { it != null }
 }
 } catch (_: TimeoutCancellationException) {
 debugLog(TAG, "syncFromJsClientToken - client did not appear after token update")
 }
 if (!shouldRefreshClient) {
 emitSyncedClientChanged(sourceId)
 promise.resolve(null)
 return@launch
 debugLog(TAG, "syncClientStateFromJs - client did not appear after token update")
 }
 }
 }
 }
 }

 if (shouldRefreshClient) {
 if (didChangeClient || didChangeDeviceToken) {
 when (val result = Clerk.refreshClient()) {
 is ClerkResult.Failure -> {
 promise.reject(
Expand All@@ -355,17 +407,33 @@ class ClerkExpoModule : Module() {
 )
 }
 is ClerkResult.Success -> {
 emitSyncedClientChanged(sourceId)
 val newClientState = clientStateSnapshot()
 emitSyncedClientChanged(
 sourceId,
 ClientStateChanges(
 client = newClientState.client != previousClientState.client,
 deviceToken = newClientState.deviceToken != previousClientState.deviceToken
 ),
 newClientState
 )
 promise.resolve(null)
 }
 }
 return@launch
 }

 emitSyncedClientChanged(sourceId)
 val newClientState = clientStateSnapshot()
 emitSyncedClientChanged(
 sourceId,
 ClientStateChanges(
 client = newClientState.client != previousClientState.client,
 deviceToken = newClientState.deviceToken != previousClientState.deviceToken
 ),
 newClientState
 )
 promise.resolve(null)
 } catch (e: Exception) {
 promise.reject("E_SYNC_FROM_JS_FAILED", e.message ?: "Client token sync failed", e)
 promise.reject("E_SYNC_FROM_JS_FAILED", e.message ?: "Client state sync failed", e)
 } finally {
 jsOriginatedClientSyncDepth = maxOf(0, jsOriginatedClientSyncDepth - 1)
 }
Expand Down

5 changes: 3 additions & 2 deletions
packages/expo/ios/ClerkExpoModule.m

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,9 +11,10 @@ @interface RCT_EXTERN_MODULE(ClerkExpo, RCTEventEmitter)
RCT_EXTERN_METHOD(getClientToken:(RCTPromiseResolveBlock)resolve
 reject:(RCTPromiseRejectBlock)reject)

RCT_EXTERN_METHOD(syncFromJsClientToken:(id)clientToken
RCT_EXTERN_METHOD(syncClientStateFromJs:(id)deviceToken
 sourceId:(id)sourceId
 shouldRefreshClient:(id)shouldRefreshClient
 didChangeClient:(BOOL)didChangeClient
 didChangeDeviceToken:(BOOL)didChangeDeviceToken
 resolve:(RCTPromiseResolveBlock)resolve
 reject:(RCTPromiseRejectBlock)reject)

Expand Down

18 changes: 9 additions & 9 deletions
packages/expo/ios/ClerkExpoModule.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -86,23 +86,23 @@ class ClerkExpoModule: RCTEventEmitter {
 }
 }

 // MARK: - syncFromJsClientToken
 // MARK: - syncClientStateFromJs

 @objc func syncFromJsClientToken(_ clientToken: Any?,
 @objc func syncClientStateFromJs(_ deviceToken: Any?,
 sourceId: Any?,
 shouldRefreshClient: Any?,
 didChangeClient: Bool,
 didChangeDeviceToken: Bool,
 resolve: @escaping RCTPromiseResolveBlock,
 reject: @escaping RCTPromiseRejectBlock) {
 let normalizedClientToken = clientToken as? String
 let normalizedDeviceToken = deviceToken as? String
 let normalizedSourceId = sourceId as? String
 let defaultShouldRefreshClient = normalizedClientToken?.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty ?? true
 let normalizedShouldRefreshClient = (shouldRefreshClient as? Bool) ?? defaultShouldRefreshClient
 Task {
 do {
 try await ClerkNativeBridge.shared.syncFromJsClientToken(
normalizedClientToken,
 try await ClerkNativeBridge.shared.syncClientStateFromJs(
deviceToken: normalizedDeviceToken,
 sourceId: normalizedSourceId,
 shouldRefreshClient: normalizedShouldRefreshClient
 didChangeClient: didChangeClient,
 didChangeDeviceToken: didChangeDeviceToken
 )
 resolve(nil)
 } catch {
Expand Down
Loading
Loading