revert(expo): two-way JS/native session sync (#8032)#8065

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
chriscanin merged 2 commits into from
Mar 13, 2026
Merged

revert(expo): two-way JS/native session sync (#8032) #8065

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
e335f90
Revert "feat(expo): add two-way JS/native session sync for expo nativ…
chriscanin Mar 13, 2026
66afec3
add changeset for revert
chriscanin Mar 13, 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: 0 additions & 5 deletions .changeset/native-session-sync-fixes.md
View file
Open in desktop

This file was deleted.

5 changes: 5 additions & 0 deletions .changeset/revert-native-session-sync.md
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
"@clerk/expo": patch
---

Revert two-way JS/native session sync (#8032)
2 changes: 1 addition & 1 deletion packages/expo/android/build.gradle
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -18,7 +18,7 @@ ext {
credentialsVersion = "1.3.0"
googleIdVersion = "1.1.1"
kotlinxCoroutinesVersion = "1.7.3"
clerkAndroidApiVersion = "1.0.9"
clerkAndroidApiVersion = "1.0.6"
clerkAndroidUiVersion = "1.0.9"
composeVersion = "1.7.0"
activityComposeVersion = "1.9.0"
Expand Down
92 changes: 37 additions & 55 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@@ -5,7 +5,6 @@ import android.content.Context
import android.content.Intent
import android.util.Log
import com.clerk.api.Clerk
import com.clerk.api.network.serialization.ClerkResult
import com.facebook.react.bridge.ActivityEventListener
import com.facebook.react.bridge.Promise
import com.facebook.react.bridge.ReactApplicationContext
Expand DownExpand Up@@ -68,63 +67,41 @@ class ClerkExpoModule(reactContext: ReactApplicationContext) :
try {
publishableKey = pubKey

if (!Clerk.isInitialized.value) {
// First-time initialization — write the bearer token to SharedPreferences
// before initializing so the SDK boots with the correct client.
if (!bearerToken.isNullOrEmpty()) {
reactApplicationContext.getSharedPreferences("clerk_preferences", Context.MODE_PRIVATE)
.edit()
.putString("DEVICE_TOKEN", bearerToken)
.apply()
}
// If the JS SDK has a bearer token, write it to the native SDK's
// SharedPreferences so both SDKs share the same Clerk API client.
if (!bearerToken.isNullOrEmpty()) {
reactApplicationContext.getSharedPreferences("clerk_preferences", Context.MODE_PRIVATE)
.edit()
.putString("DEVICE_TOKEN", bearerToken)
.apply()
debugLog(TAG, "configure - wrote JS bearer token to native SharedPreferences")
}

Clerk.initialize(reactApplicationContext, pubKey)

// Wait for initialization to complete with timeout
try {
withTimeout(10_000L) {
Clerk.isInitialized.first { it }
}
} catch (e: TimeoutCancellationException) {
val initError = Clerk.initializationError.value
val message = if (initError != null) {
"Clerk initialization timed out: ${initError.message}"
} else {
"Clerk initialization timed out after 10 seconds"
}
promise.reject("E_TIMEOUT", message)
return@launch
}
Clerk.initialize(reactApplicationContext, pubKey)

// Check for initialization errors
val error = Clerk.initializationError.value
if (error != null) {
promise.reject("E_INIT_FAILED", "Failed to initialize Clerk SDK: ${error.message}")
// Wait for initialization to complete with timeout
try {
withTimeout(10_000L) {
Clerk.isInitialized.first { it }
}
} catch (e: TimeoutCancellationException) {
val initError = Clerk.initializationError.value
val message = if (initError != null) {
"Clerk initialization timed out: ${initError.message}"
} else {
promise.resolve(null)
"Clerk initialization timed out after 10 seconds"
}
promise.reject("E_TIMEOUT", message)
return@launch
}

// Already initialized — use the public SDK API to update
// the device token and trigger a client/environment refresh.
if (!bearerToken.isNullOrEmpty()) {
val result = Clerk.updateDeviceToken(bearerToken)
if (result is ClerkResult.Failure) {
debugLog(TAG, "configure - updateDeviceToken failed: ${result.error}")
}

// Wait for session to appear with the new token (up to 5s)
try {
withTimeout(5_000L) {
Clerk.sessionFlow.first { it != null }
}
} catch (_: TimeoutCancellationException) {
debugLog(TAG, "configure - session did not appear after token update")
}
// Check for initialization errors
val error = Clerk.initializationError.value
if (error != null) {
promise.reject("E_INIT_FAILED", "Failed to initialize Clerk SDK: ${error.message}")
} else {
promise.resolve(null)
}

promise.resolve(null)
} catch (e: Exception) {
promise.reject("E_INIT_FAILED", "Failed to initialize Clerk SDK: ${e.message}", e)
}
Expand DownExpand Up@@ -197,15 +174,15 @@ class ClerkExpoModule(reactContext: ReactApplicationContext) :
@ReactMethod
override fun getSession(promise: Promise) {
if (!Clerk.isInitialized.value) {
// Return null when not initialized (matches iOS behavior)
// so callers can proceed to call configure() with a bearer token.
promise.resolve(null)
promise.reject("E_NOT_INITIALIZED", "Clerk SDK is not initialized. Call configure() first.")
return
}

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

debugLog(TAG, "getSession - hasSession: ${session != null}, hasUser: ${user != null}")

val result = WritableNativeMap()

session?.let {
Expand DownExpand Up@@ -240,6 +217,7 @@ class ClerkExpoModule(reactContext: ReactApplicationContext) :
try {
val prefs = reactApplicationContext.getSharedPreferences("clerk_preferences", Context.MODE_PRIVATE)
val deviceToken = prefs.getString("DEVICE_TOKEN", null)
debugLog(TAG, "getClientToken - deviceToken: ${if (deviceToken != null) "found" else "null"}")
promise.resolve(deviceToken)
} catch (e: Exception) {
debugLog(TAG, "getClientToken failed: ${e.message}")
Expand All@@ -252,8 +230,7 @@ class ClerkExpoModule(reactContext: ReactApplicationContext) :
@ReactMethod
override fun signOut(promise: Promise) {
if (!Clerk.isInitialized.value) {
// Resolve gracefully when not initialized (matches iOS behavior)
promise.resolve(null)
promise.reject("E_NOT_INITIALIZED", "Clerk SDK is not initialized. Call configure() first.")
return
}

Expand DownExpand Up@@ -281,13 +258,17 @@ class ClerkExpoModule(reactContext: ReactApplicationContext) :
}

private fun handleAuthResult(resultCode: Int, data: Intent?) {
debugLog(TAG, "handleAuthResult - resultCode: $resultCode")

val promise = pendingAuthPromise ?: return
pendingAuthPromise = null

if (resultCode == Activity.RESULT_OK) {
val session = Clerk.session
val user = Clerk.user

debugLog(TAG, "handleAuthResult - hasSession: ${session != null}, hasUser: ${user != null}")

val result = WritableNativeMap()

// Top-level sessionId for JS SDK compatibility (matches iOS response format)
Expand DownExpand Up@@ -315,6 +296,7 @@ class ClerkExpoModule(reactContext: ReactApplicationContext) :

promise.resolve(result)
} else {
debugLog(TAG, "handleAuthResult - user cancelled")
val result = WritableNativeMap()
result.putBoolean("cancelled", true)
promise.resolve(result)
Expand Down
53 changes: 23 additions & 30 deletions packages/expo/ios/ClerkExpoModule.swift
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -22,7 +22,6 @@ public protocol ClerkViewFactoryProtocol {
// SDK operations
func configure(publishableKey: String, bearerToken: String?) async throws
func getSession() async -> [String: Any]?
func getClientToken() -> String?
func signOut() async throws
}

Expand All@@ -32,11 +31,9 @@ public protocol ClerkViewFactoryProtocol {
class ClerkExpoModule: RCTEventEmitter {

private static var _hasListeners = false
private static weak var sharedInstance: ClerkExpoModule?

override init() {
super.init()
ClerkExpoModule.sharedInstance = self
}

@objc override static func requiresMainQueueSetup() -> Bool {
Expand All@@ -55,17 +52,6 @@ class ClerkExpoModule: RCTEventEmitter {
ClerkExpoModule._hasListeners = false
}

/// Emits an onAuthStateChange event to JS from anywhere in the native layer.
/// Used by inline views (AuthView, UserProfileView) to notify ClerkProvider
/// of auth state changes in addition to the view-level onAuthEvent callback.
static func emitAuthStateChange(type: String, sessionId: String?) {
guard _hasListeners, let instance = sharedInstance else { return }
instance.sendEvent(withName: "onAuthStateChange", body: [
"type": type,
"sessionId": sessionId as Any,
])
}

/// Returns the topmost presented view controller, avoiding deprecated `keyWindow`.
private static func topViewController() -> UIViewController? {
guard let scene = UIApplication.shared.connectedScenes
Expand DownExpand Up@@ -188,12 +174,31 @@ class ClerkExpoModule: RCTEventEmitter {

@objc func getClientToken(_ resolve: @escaping RCTPromiseResolveBlock,
reject: @escaping RCTPromiseRejectBlock) {
guard let factory = clerkViewFactory else {
// Use a custom keychain service if configured in Info.plist (for extension apps
// sharing a keychain group). Falls back to the main bundle identifier.
let keychainService: String = {
if let custom = Bundle.main.object(forInfoDictionaryKey: "ClerkKeychainService") as? String, !custom.isEmpty {
return custom
}
return Bundle.main.bundleIdentifier ?? ""
}()

let query: [String: Any] = [
kSecClass as String: kSecClassGenericPassword,
kSecAttrService as String: keychainService,
kSecAttrAccount as String: "clerkDeviceToken",
kSecReturnData as String: true,
kSecMatchLimit as String: kSecMatchLimitOne
]

var result: AnyObject?
let status = SecItemCopyMatching(query as CFDictionary, &result)

if status == errSecSuccess, let data = result as? Data {
resolve(String(data: data, encoding: .utf8))
} else {
resolve(nil)
return
}

resolve(factory.getClientToken())
}

// MARK: - signOut
Expand DownExpand Up@@ -272,12 +277,6 @@ public class ClerkAuthNativeView: UIView {
let jsonData = (try? JSONSerialization.data(withJSONObject: data)) ?? Data()
let jsonString = String(data: jsonData, encoding: .utf8) ?? "{}"
self?.onAuthEvent?(["type": eventName, "data": jsonString])

// Also emit module-level event so ClerkProvider's useNativeAuthEvents picks it up
if eventName == "signInCompleted" || eventName == "signUpCompleted" {
let sessionId = data["sessionId"] as? String
ClerkExpoModule.emitAuthStateChange(type: "signedIn", sessionId: sessionId)
}
}
) else { return }

Expand DownExpand Up@@ -360,12 +359,6 @@ public class ClerkUserProfileNativeView: UIView {
let jsonData = (try? JSONSerialization.data(withJSONObject: data)) ?? Data()
let jsonString = String(data: jsonData, encoding: .utf8) ?? "{}"
self?.onProfileEvent?(["type": eventName, "data": jsonString])

// Also emit module-level event for sign-out detection
if eventName == "signedOut" {
let sessionId = data["sessionId"] as? String
ClerkExpoModule.emitAuthStateChange(type: "signedOut", sessionId: sessionId)
}
}
) else { return }

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" + '

Skip to content
revert(expo): two-way JS/native session sync (#8032)#8065

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

chriscanin
merged 2 commits into

from

Mar 13, 2026
 Merged


revert(expo): two-way JS/native session sync (#8032)
#8065
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
e335f90

Revert "feat(expo): add two-way JS/native session sync for expo nativ…


chriscanin Mar 13, 2026
66afec3

add changeset for revert


chriscanin Mar 13, 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: 0 additions & 5 deletions
.changeset/native-session-sync-fixes.md

View file


Open in desktop


This file was deleted.


5 changes: 5 additions & 0 deletions
.changeset/revert-native-session-sync.md

View file


Open in desktop

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

Revert two-way JS/native session sync (#8032)

2 changes: 1 addition & 1 deletion
packages/expo/android/build.gradle

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,7 +18,7 @@ ext {
 credentialsVersion = "1.3.0"
 googleIdVersion = "1.1.1"
 kotlinxCoroutinesVersion = "1.7.3"
 clerkAndroidApiVersion = "1.0.9"
 clerkAndroidApiVersion = "1.0.6"
 clerkAndroidUiVersion = "1.0.9"
 composeVersion = "1.7.0"
 activityComposeVersion = "1.9.0"
Expand Down

92 changes: 37 additions & 55 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@@ -5,7 +5,6 @@ import android.content.Context
import android.content.Intent
import android.util.Log
import com.clerk.api.Clerk
import com.clerk.api.network.serialization.ClerkResult
import com.facebook.react.bridge.ActivityEventListener
import com.facebook.react.bridge.Promise
import com.facebook.react.bridge.ReactApplicationContext
Expand DownExpand Up@@ -68,63 +67,41 @@ class ClerkExpoModule(reactContext: ReactApplicationContext) :
 try {
 publishableKey = pubKey

if (!Clerk.isInitialized.value) {
// First-time initialization — write the bearer token to SharedPreferences
 // before initializing so the SDK boots with the correct client.
if (!bearerToken.isNullOrEmpty()) {
reactApplicationContext.getSharedPreferences("clerk_preferences", Context.MODE_PRIVATE)
 .edit()
 .putString("DEVICE_TOKEN", bearerToken)
 .apply()
}
// If the JS SDK has a bearer token, write it to the native SDK's
 // SharedPreferences so both SDKs share the same Clerk API client.
if (!bearerToken.isNullOrEmpty()) {
reactApplicationContext.getSharedPreferences("clerk_preferences", Context.MODE_PRIVATE)
.edit()
.putString("DEVICE_TOKEN", bearerToken)
.apply()
debugLog(TAG, "configure - wrote JS bearer token to native SharedPreferences")
 }

 Clerk.initialize(reactApplicationContext, pubKey)

 // Wait for initialization to complete with timeout
 try {
 withTimeout(10_000L) {
 Clerk.isInitialized.first { it }
 }
 } catch (e: TimeoutCancellationException) {
 val initError = Clerk.initializationError.value
 val message = if (initError != null) {
 "Clerk initialization timed out: ${initError.message}"
 } else {
 "Clerk initialization timed out after 10 seconds"
 }
 promise.reject("E_TIMEOUT", message)
 return@launch
 }
 Clerk.initialize(reactApplicationContext, pubKey)

 // Check for initialization errors
 val error = Clerk.initializationError.value
 if (error != null) {
 promise.reject("E_INIT_FAILED", "Failed to initialize Clerk SDK: ${error.message}")
 // Wait for initialization to complete with timeout
 try {
 withTimeout(10_000L) {
 Clerk.isInitialized.first { it }
 }
 } catch (e: TimeoutCancellationException) {
 val initError = Clerk.initializationError.value
 val message = if (initError != null) {
 "Clerk initialization timed out: ${initError.message}"
 } else {
promise.resolve(null)
"Clerk initialization timed out after 10 seconds"
 }
 promise.reject("E_TIMEOUT", message)
 return@launch
 }

 // Already initialized — use the public SDK API to update
 // the device token and trigger a client/environment refresh.
 if (!bearerToken.isNullOrEmpty()) {
 val result = Clerk.updateDeviceToken(bearerToken)
 if (result is ClerkResult.Failure) {
 debugLog(TAG, "configure - updateDeviceToken failed: ${result.error}")
 }

 // Wait for session to appear with the new token (up to 5s)
 try {
 withTimeout(5_000L) {
 Clerk.sessionFlow.first { it != null }
 }
 } catch (_: TimeoutCancellationException) {
 debugLog(TAG, "configure - session did not appear after token update")
 }
 // Check for initialization errors
 val error = Clerk.initializationError.value
 if (error != null) {
 promise.reject("E_INIT_FAILED", "Failed to initialize Clerk SDK: ${error.message}")
 } else {
 promise.resolve(null)
 }

 promise.resolve(null)
 } catch (e: Exception) {
 promise.reject("E_INIT_FAILED", "Failed to initialize Clerk SDK: ${e.message}", e)
 }
Expand DownExpand Up@@ -197,15 +174,15 @@ class ClerkExpoModule(reactContext: ReactApplicationContext) :
 @ReactMethod
 override fun getSession(promise: Promise) {
 if (!Clerk.isInitialized.value) {
 // Return null when not initialized (matches iOS behavior)
 // so callers can proceed to call configure() with a bearer token.
 promise.resolve(null)
 promise.reject("E_NOT_INITIALIZED", "Clerk SDK is not initialized. Call configure() first.")
 return
 }

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

 debugLog(TAG, "getSession - hasSession: ${session != null}, hasUser: ${user != null}")

 val result = WritableNativeMap()

 session?.let {
Expand DownExpand Up@@ -240,6 +217,7 @@ class ClerkExpoModule(reactContext: ReactApplicationContext) :
 try {
 val prefs = reactApplicationContext.getSharedPreferences("clerk_preferences", Context.MODE_PRIVATE)
 val deviceToken = prefs.getString("DEVICE_TOKEN", null)
 debugLog(TAG, "getClientToken - deviceToken: ${if (deviceToken != null) "found" else "null"}")
 promise.resolve(deviceToken)
 } catch (e: Exception) {
 debugLog(TAG, "getClientToken failed: ${e.message}")
Expand All@@ -252,8 +230,7 @@ class ClerkExpoModule(reactContext: ReactApplicationContext) :
 @ReactMethod
 override fun signOut(promise: Promise) {
 if (!Clerk.isInitialized.value) {
 // Resolve gracefully when not initialized (matches iOS behavior)
 promise.resolve(null)
 promise.reject("E_NOT_INITIALIZED", "Clerk SDK is not initialized. Call configure() first.")
 return
 }

Expand DownExpand Up@@ -281,13 +258,17 @@ class ClerkExpoModule(reactContext: ReactApplicationContext) :
 }

 private fun handleAuthResult(resultCode: Int, data: Intent?) {
 debugLog(TAG, "handleAuthResult - resultCode: $resultCode")

 val promise = pendingAuthPromise ?: return
 pendingAuthPromise = null

 if (resultCode == Activity.RESULT_OK) {
 val session = Clerk.session
 val user = Clerk.user

 debugLog(TAG, "handleAuthResult - hasSession: ${session != null}, hasUser: ${user != null}")

 val result = WritableNativeMap()

 // Top-level sessionId for JS SDK compatibility (matches iOS response format)
Expand DownExpand Up@@ -315,6 +296,7 @@ class ClerkExpoModule(reactContext: ReactApplicationContext) :

 promise.resolve(result)
 } else {
 debugLog(TAG, "handleAuthResult - user cancelled")
 val result = WritableNativeMap()
 result.putBoolean("cancelled", true)
 promise.resolve(result)
Expand Down

53 changes: 23 additions & 30 deletions
packages/expo/ios/ClerkExpoModule.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,7 +22,6 @@ public protocol ClerkViewFactoryProtocol {
 // SDK operations
 func configure(publishableKey: String, bearerToken: String?) async throws
 func getSession() async -> [String: Any]?
 func getClientToken() -> String?
 func signOut() async throws
}

Expand All@@ -32,11 +31,9 @@ public protocol ClerkViewFactoryProtocol {
class ClerkExpoModule: RCTEventEmitter {

 private static var _hasListeners = false
 private static weak var sharedInstance: ClerkExpoModule?

 override init() {
 super.init()
 ClerkExpoModule.sharedInstance = self
 }

 @objc override static func requiresMainQueueSetup() -> Bool {
Expand All@@ -55,17 +52,6 @@ class ClerkExpoModule: RCTEventEmitter {
 ClerkExpoModule._hasListeners = false
 }

 /// Emits an onAuthStateChange event to JS from anywhere in the native layer.
 /// Used by inline views (AuthView, UserProfileView) to notify ClerkProvider
 /// of auth state changes in addition to the view-level onAuthEvent callback.
 static func emitAuthStateChange(type: String, sessionId: String?) {
 guard _hasListeners, let instance = sharedInstance else { return }
 instance.sendEvent(withName: "onAuthStateChange", body: [
 "type": type,
 "sessionId": sessionId as Any,
 ])
 }

 /// Returns the topmost presented view controller, avoiding deprecated `keyWindow`.
 private static func topViewController() -> UIViewController? {
 guard let scene = UIApplication.shared.connectedScenes
Expand DownExpand Up@@ -188,12 +174,31 @@ class ClerkExpoModule: RCTEventEmitter {

 @objc func getClientToken(_ resolve: @escaping RCTPromiseResolveBlock,
 reject: @escaping RCTPromiseRejectBlock) {
 guard let factory = clerkViewFactory else {
 // Use a custom keychain service if configured in Info.plist (for extension apps
 // sharing a keychain group). Falls back to the main bundle identifier.
 let keychainService: String = {
 if let custom = Bundle.main.object(forInfoDictionaryKey: "ClerkKeychainService") as? String, !custom.isEmpty {
 return custom
 }
 return Bundle.main.bundleIdentifier ?? ""
 }()

 let query: [String: Any] = [
 kSecClass as String: kSecClassGenericPassword,
 kSecAttrService as String: keychainService,
 kSecAttrAccount as String: "clerkDeviceToken",
 kSecReturnData as String: true,
 kSecMatchLimit as String: kSecMatchLimitOne
 ]

 var result: AnyObject?
 let status = SecItemCopyMatching(query as CFDictionary, &result)

 if status == errSecSuccess, let data = result as? Data {
 resolve(String(data: data, encoding: .utf8))
 } else {
 resolve(nil)
 return
 }

 resolve(factory.getClientToken())
 }

 // MARK: - signOut
Expand DownExpand Up@@ -272,12 +277,6 @@ public class ClerkAuthNativeView: UIView {
 let jsonData = (try? JSONSerialization.data(withJSONObject: data)) ?? Data()
 let jsonString = String(data: jsonData, encoding: .utf8) ?? "{}"
 self?.onAuthEvent?(["type": eventName, "data": jsonString])

 // Also emit module-level event so ClerkProvider's useNativeAuthEvents picks it up
 if eventName == "signInCompleted" || eventName == "signUpCompleted" {
 let sessionId = data["sessionId"] as? String
 ClerkExpoModule.emitAuthStateChange(type: "signedIn", sessionId: sessionId)
 }
 }
 ) else { return }

Expand DownExpand Up@@ -360,12 +359,6 @@ public class ClerkUserProfileNativeView: UIView {
 let jsonData = (try? JSONSerialization.data(withJSONObject: data)) ?? Data()
 let jsonString = String(data: jsonData, encoding: .utf8) ?? "{}"
 self?.onProfileEvent?(["type": eventName, "data": jsonString])

 // Also emit module-level event for sign-out detection
 if eventName == "signedOut" {
 let sessionId = data["sessionId"] as? String
 ClerkExpoModule.emitAuthStateChange(type: "signedOut", sessionId: sessionId)
 }
 }
 ) else { return }

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('^' + ".*" + '

Skip to content
revert(expo): two-way JS/native session sync (#8032)#8065

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

chriscanin
merged 2 commits into

from

Mar 13, 2026
 Merged


revert(expo): two-way JS/native session sync (#8032)
#8065
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
e335f90

Revert "feat(expo): add two-way JS/native session sync for expo nativ…


chriscanin Mar 13, 2026
66afec3

add changeset for revert


chriscanin Mar 13, 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: 0 additions & 5 deletions
.changeset/native-session-sync-fixes.md

View file


Open in desktop


This file was deleted.


5 changes: 5 additions & 0 deletions
.changeset/revert-native-session-sync.md

View file


Open in desktop

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

Revert two-way JS/native session sync (#8032)

2 changes: 1 addition & 1 deletion
packages/expo/android/build.gradle

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,7 +18,7 @@ ext {
 credentialsVersion = "1.3.0"
 googleIdVersion = "1.1.1"
 kotlinxCoroutinesVersion = "1.7.3"
 clerkAndroidApiVersion = "1.0.9"
 clerkAndroidApiVersion = "1.0.6"
 clerkAndroidUiVersion = "1.0.9"
 composeVersion = "1.7.0"
 activityComposeVersion = "1.9.0"
Expand Down

92 changes: 37 additions & 55 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@@ -5,7 +5,6 @@ import android.content.Context
import android.content.Intent
import android.util.Log
import com.clerk.api.Clerk
import com.clerk.api.network.serialization.ClerkResult
import com.facebook.react.bridge.ActivityEventListener
import com.facebook.react.bridge.Promise
import com.facebook.react.bridge.ReactApplicationContext
Expand DownExpand Up@@ -68,63 +67,41 @@ class ClerkExpoModule(reactContext: ReactApplicationContext) :
 try {
 publishableKey = pubKey

if (!Clerk.isInitialized.value) {
// First-time initialization — write the bearer token to SharedPreferences
 // before initializing so the SDK boots with the correct client.
if (!bearerToken.isNullOrEmpty()) {
reactApplicationContext.getSharedPreferences("clerk_preferences", Context.MODE_PRIVATE)
 .edit()
 .putString("DEVICE_TOKEN", bearerToken)
 .apply()
}
// If the JS SDK has a bearer token, write it to the native SDK's
 // SharedPreferences so both SDKs share the same Clerk API client.
if (!bearerToken.isNullOrEmpty()) {
reactApplicationContext.getSharedPreferences("clerk_preferences", Context.MODE_PRIVATE)
.edit()
.putString("DEVICE_TOKEN", bearerToken)
.apply()
debugLog(TAG, "configure - wrote JS bearer token to native SharedPreferences")
 }

 Clerk.initialize(reactApplicationContext, pubKey)

 // Wait for initialization to complete with timeout
 try {
 withTimeout(10_000L) {
 Clerk.isInitialized.first { it }
 }
 } catch (e: TimeoutCancellationException) {
 val initError = Clerk.initializationError.value
 val message = if (initError != null) {
 "Clerk initialization timed out: ${initError.message}"
 } else {
 "Clerk initialization timed out after 10 seconds"
 }
 promise.reject("E_TIMEOUT", message)
 return@launch
 }
 Clerk.initialize(reactApplicationContext, pubKey)

 // Check for initialization errors
 val error = Clerk.initializationError.value
 if (error != null) {
 promise.reject("E_INIT_FAILED", "Failed to initialize Clerk SDK: ${error.message}")
 // Wait for initialization to complete with timeout
 try {
 withTimeout(10_000L) {
 Clerk.isInitialized.first { it }
 }
 } catch (e: TimeoutCancellationException) {
 val initError = Clerk.initializationError.value
 val message = if (initError != null) {
 "Clerk initialization timed out: ${initError.message}"
 } else {
promise.resolve(null)
"Clerk initialization timed out after 10 seconds"
 }
 promise.reject("E_TIMEOUT", message)
 return@launch
 }

 // Already initialized — use the public SDK API to update
 // the device token and trigger a client/environment refresh.
 if (!bearerToken.isNullOrEmpty()) {
 val result = Clerk.updateDeviceToken(bearerToken)
 if (result is ClerkResult.Failure) {
 debugLog(TAG, "configure - updateDeviceToken failed: ${result.error}")
 }

 // Wait for session to appear with the new token (up to 5s)
 try {
 withTimeout(5_000L) {
 Clerk.sessionFlow.first { it != null }
 }
 } catch (_: TimeoutCancellationException) {
 debugLog(TAG, "configure - session did not appear after token update")
 }
 // Check for initialization errors
 val error = Clerk.initializationError.value
 if (error != null) {
 promise.reject("E_INIT_FAILED", "Failed to initialize Clerk SDK: ${error.message}")
 } else {
 promise.resolve(null)
 }

 promise.resolve(null)
 } catch (e: Exception) {
 promise.reject("E_INIT_FAILED", "Failed to initialize Clerk SDK: ${e.message}", e)
 }
Expand DownExpand Up@@ -197,15 +174,15 @@ class ClerkExpoModule(reactContext: ReactApplicationContext) :
 @ReactMethod
 override fun getSession(promise: Promise) {
 if (!Clerk.isInitialized.value) {
 // Return null when not initialized (matches iOS behavior)
 // so callers can proceed to call configure() with a bearer token.
 promise.resolve(null)
 promise.reject("E_NOT_INITIALIZED", "Clerk SDK is not initialized. Call configure() first.")
 return
 }

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

 debugLog(TAG, "getSession - hasSession: ${session != null}, hasUser: ${user != null}")

 val result = WritableNativeMap()

 session?.let {
Expand DownExpand Up@@ -240,6 +217,7 @@ class ClerkExpoModule(reactContext: ReactApplicationContext) :
 try {
 val prefs = reactApplicationContext.getSharedPreferences("clerk_preferences", Context.MODE_PRIVATE)
 val deviceToken = prefs.getString("DEVICE_TOKEN", null)
 debugLog(TAG, "getClientToken - deviceToken: ${if (deviceToken != null) "found" else "null"}")
 promise.resolve(deviceToken)
 } catch (e: Exception) {
 debugLog(TAG, "getClientToken failed: ${e.message}")
Expand All@@ -252,8 +230,7 @@ class ClerkExpoModule(reactContext: ReactApplicationContext) :
 @ReactMethod
 override fun signOut(promise: Promise) {
 if (!Clerk.isInitialized.value) {
 // Resolve gracefully when not initialized (matches iOS behavior)
 promise.resolve(null)
 promise.reject("E_NOT_INITIALIZED", "Clerk SDK is not initialized. Call configure() first.")
 return
 }

Expand DownExpand Up@@ -281,13 +258,17 @@ class ClerkExpoModule(reactContext: ReactApplicationContext) :
 }

 private fun handleAuthResult(resultCode: Int, data: Intent?) {
 debugLog(TAG, "handleAuthResult - resultCode: $resultCode")

 val promise = pendingAuthPromise ?: return
 pendingAuthPromise = null

 if (resultCode == Activity.RESULT_OK) {
 val session = Clerk.session
 val user = Clerk.user

 debugLog(TAG, "handleAuthResult - hasSession: ${session != null}, hasUser: ${user != null}")

 val result = WritableNativeMap()

 // Top-level sessionId for JS SDK compatibility (matches iOS response format)
Expand DownExpand Up@@ -315,6 +296,7 @@ class ClerkExpoModule(reactContext: ReactApplicationContext) :

 promise.resolve(result)
 } else {
 debugLog(TAG, "handleAuthResult - user cancelled")
 val result = WritableNativeMap()
 result.putBoolean("cancelled", true)
 promise.resolve(result)
Expand Down

53 changes: 23 additions & 30 deletions
packages/expo/ios/ClerkExpoModule.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,7 +22,6 @@ public protocol ClerkViewFactoryProtocol {
 // SDK operations
 func configure(publishableKey: String, bearerToken: String?) async throws
 func getSession() async -> [String: Any]?
 func getClientToken() -> String?
 func signOut() async throws
}

Expand All@@ -32,11 +31,9 @@ public protocol ClerkViewFactoryProtocol {
class ClerkExpoModule: RCTEventEmitter {

 private static var _hasListeners = false
 private static weak var sharedInstance: ClerkExpoModule?

 override init() {
 super.init()
 ClerkExpoModule.sharedInstance = self
 }

 @objc override static func requiresMainQueueSetup() -> Bool {
Expand All@@ -55,17 +52,6 @@ class ClerkExpoModule: RCTEventEmitter {
 ClerkExpoModule._hasListeners = false
 }

 /// Emits an onAuthStateChange event to JS from anywhere in the native layer.
 /// Used by inline views (AuthView, UserProfileView) to notify ClerkProvider
 /// of auth state changes in addition to the view-level onAuthEvent callback.
 static func emitAuthStateChange(type: String, sessionId: String?) {
 guard _hasListeners, let instance = sharedInstance else { return }
 instance.sendEvent(withName: "onAuthStateChange", body: [
 "type": type,
 "sessionId": sessionId as Any,
 ])
 }

 /// Returns the topmost presented view controller, avoiding deprecated `keyWindow`.
 private static func topViewController() -> UIViewController? {
 guard let scene = UIApplication.shared.connectedScenes
Expand DownExpand Up@@ -188,12 +174,31 @@ class ClerkExpoModule: RCTEventEmitter {

 @objc func getClientToken(_ resolve: @escaping RCTPromiseResolveBlock,
 reject: @escaping RCTPromiseRejectBlock) {
 guard let factory = clerkViewFactory else {
 // Use a custom keychain service if configured in Info.plist (for extension apps
 // sharing a keychain group). Falls back to the main bundle identifier.
 let keychainService: String = {
 if let custom = Bundle.main.object(forInfoDictionaryKey: "ClerkKeychainService") as? String, !custom.isEmpty {
 return custom
 }
 return Bundle.main.bundleIdentifier ?? ""
 }()

 let query: [String: Any] = [
 kSecClass as String: kSecClassGenericPassword,
 kSecAttrService as String: keychainService,
 kSecAttrAccount as String: "clerkDeviceToken",
 kSecReturnData as String: true,
 kSecMatchLimit as String: kSecMatchLimitOne
 ]

 var result: AnyObject?
 let status = SecItemCopyMatching(query as CFDictionary, &result)

 if status == errSecSuccess, let data = result as? Data {
 resolve(String(data: data, encoding: .utf8))
 } else {
 resolve(nil)
 return
 }

 resolve(factory.getClientToken())
 }

 // MARK: - signOut
Expand DownExpand Up@@ -272,12 +277,6 @@ public class ClerkAuthNativeView: UIView {
 let jsonData = (try? JSONSerialization.data(withJSONObject: data)) ?? Data()
 let jsonString = String(data: jsonData, encoding: .utf8) ?? "{}"
 self?.onAuthEvent?(["type": eventName, "data": jsonString])

 // Also emit module-level event so ClerkProvider's useNativeAuthEvents picks it up
 if eventName == "signInCompleted" || eventName == "signUpCompleted" {
 let sessionId = data["sessionId"] as? String
 ClerkExpoModule.emitAuthStateChange(type: "signedIn", sessionId: sessionId)
 }
 }
 ) else { return }

Expand DownExpand Up@@ -360,12 +359,6 @@ public class ClerkUserProfileNativeView: UIView {
 let jsonData = (try? JSONSerialization.data(withJSONObject: data)) ?? Data()
 let jsonString = String(data: jsonData, encoding: .utf8) ?? "{}"
 self?.onProfileEvent?(["type": eventName, "data": jsonString])

 // Also emit module-level event for sign-out detection
 if eventName == "signedOut" {
 let sessionId = data["sessionId"] as? String
 ClerkExpoModule.emitAuthStateChange(type: "signedOut", sessionId: sessionId)
 }
 }
 ) else { return }

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('^' + ".*" + '

Skip to content
revert(expo): two-way JS/native session sync (#8032)#8065

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

chriscanin
merged 2 commits into

from

Mar 13, 2026
 Merged


revert(expo): two-way JS/native session sync (#8032)
#8065
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
e335f90

Revert "feat(expo): add two-way JS/native session sync for expo nativ…


chriscanin Mar 13, 2026
66afec3

add changeset for revert


chriscanin Mar 13, 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: 0 additions & 5 deletions
.changeset/native-session-sync-fixes.md

View file


Open in desktop


This file was deleted.


5 changes: 5 additions & 0 deletions
.changeset/revert-native-session-sync.md

View file


Open in desktop

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

Revert two-way JS/native session sync (#8032)

2 changes: 1 addition & 1 deletion
packages/expo/android/build.gradle

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,7 +18,7 @@ ext {
 credentialsVersion = "1.3.0"
 googleIdVersion = "1.1.1"
 kotlinxCoroutinesVersion = "1.7.3"
 clerkAndroidApiVersion = "1.0.9"
 clerkAndroidApiVersion = "1.0.6"
 clerkAndroidUiVersion = "1.0.9"
 composeVersion = "1.7.0"
 activityComposeVersion = "1.9.0"
Expand Down

92 changes: 37 additions & 55 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@@ -5,7 +5,6 @@ import android.content.Context
import android.content.Intent
import android.util.Log
import com.clerk.api.Clerk
import com.clerk.api.network.serialization.ClerkResult
import com.facebook.react.bridge.ActivityEventListener
import com.facebook.react.bridge.Promise
import com.facebook.react.bridge.ReactApplicationContext
Expand DownExpand Up@@ -68,63 +67,41 @@ class ClerkExpoModule(reactContext: ReactApplicationContext) :
 try {
 publishableKey = pubKey

if (!Clerk.isInitialized.value) {
// First-time initialization — write the bearer token to SharedPreferences
 // before initializing so the SDK boots with the correct client.
if (!bearerToken.isNullOrEmpty()) {
reactApplicationContext.getSharedPreferences("clerk_preferences", Context.MODE_PRIVATE)
 .edit()
 .putString("DEVICE_TOKEN", bearerToken)
 .apply()
}
// If the JS SDK has a bearer token, write it to the native SDK's
 // SharedPreferences so both SDKs share the same Clerk API client.
if (!bearerToken.isNullOrEmpty()) {
reactApplicationContext.getSharedPreferences("clerk_preferences", Context.MODE_PRIVATE)
.edit()
.putString("DEVICE_TOKEN", bearerToken)
.apply()
debugLog(TAG, "configure - wrote JS bearer token to native SharedPreferences")
 }

 Clerk.initialize(reactApplicationContext, pubKey)

 // Wait for initialization to complete with timeout
 try {
 withTimeout(10_000L) {
 Clerk.isInitialized.first { it }
 }
 } catch (e: TimeoutCancellationException) {
 val initError = Clerk.initializationError.value
 val message = if (initError != null) {
 "Clerk initialization timed out: ${initError.message}"
 } else {
 "Clerk initialization timed out after 10 seconds"
 }
 promise.reject("E_TIMEOUT", message)
 return@launch
 }
 Clerk.initialize(reactApplicationContext, pubKey)

 // Check for initialization errors
 val error = Clerk.initializationError.value
 if (error != null) {
 promise.reject("E_INIT_FAILED", "Failed to initialize Clerk SDK: ${error.message}")
 // Wait for initialization to complete with timeout
 try {
 withTimeout(10_000L) {
 Clerk.isInitialized.first { it }
 }
 } catch (e: TimeoutCancellationException) {
 val initError = Clerk.initializationError.value
 val message = if (initError != null) {
 "Clerk initialization timed out: ${initError.message}"
 } else {
promise.resolve(null)
"Clerk initialization timed out after 10 seconds"
 }
 promise.reject("E_TIMEOUT", message)
 return@launch
 }

 // Already initialized — use the public SDK API to update
 // the device token and trigger a client/environment refresh.
 if (!bearerToken.isNullOrEmpty()) {
 val result = Clerk.updateDeviceToken(bearerToken)
 if (result is ClerkResult.Failure) {
 debugLog(TAG, "configure - updateDeviceToken failed: ${result.error}")
 }

 // Wait for session to appear with the new token (up to 5s)
 try {
 withTimeout(5_000L) {
 Clerk.sessionFlow.first { it != null }
 }
 } catch (_: TimeoutCancellationException) {
 debugLog(TAG, "configure - session did not appear after token update")
 }
 // Check for initialization errors
 val error = Clerk.initializationError.value
 if (error != null) {
 promise.reject("E_INIT_FAILED", "Failed to initialize Clerk SDK: ${error.message}")
 } else {
 promise.resolve(null)
 }

 promise.resolve(null)
 } catch (e: Exception) {
 promise.reject("E_INIT_FAILED", "Failed to initialize Clerk SDK: ${e.message}", e)
 }
Expand DownExpand Up@@ -197,15 +174,15 @@ class ClerkExpoModule(reactContext: ReactApplicationContext) :
 @ReactMethod
 override fun getSession(promise: Promise) {
 if (!Clerk.isInitialized.value) {
 // Return null when not initialized (matches iOS behavior)
 // so callers can proceed to call configure() with a bearer token.
 promise.resolve(null)
 promise.reject("E_NOT_INITIALIZED", "Clerk SDK is not initialized. Call configure() first.")
 return
 }

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

 debugLog(TAG, "getSession - hasSession: ${session != null}, hasUser: ${user != null}")

 val result = WritableNativeMap()

 session?.let {
Expand DownExpand Up@@ -240,6 +217,7 @@ class ClerkExpoModule(reactContext: ReactApplicationContext) :
 try {
 val prefs = reactApplicationContext.getSharedPreferences("clerk_preferences", Context.MODE_PRIVATE)
 val deviceToken = prefs.getString("DEVICE_TOKEN", null)
 debugLog(TAG, "getClientToken - deviceToken: ${if (deviceToken != null) "found" else "null"}")
 promise.resolve(deviceToken)
 } catch (e: Exception) {
 debugLog(TAG, "getClientToken failed: ${e.message}")
Expand All@@ -252,8 +230,7 @@ class ClerkExpoModule(reactContext: ReactApplicationContext) :
 @ReactMethod
 override fun signOut(promise: Promise) {
 if (!Clerk.isInitialized.value) {
 // Resolve gracefully when not initialized (matches iOS behavior)
 promise.resolve(null)
 promise.reject("E_NOT_INITIALIZED", "Clerk SDK is not initialized. Call configure() first.")
 return
 }

Expand DownExpand Up@@ -281,13 +258,17 @@ class ClerkExpoModule(reactContext: ReactApplicationContext) :
 }

 private fun handleAuthResult(resultCode: Int, data: Intent?) {
 debugLog(TAG, "handleAuthResult - resultCode: $resultCode")

 val promise = pendingAuthPromise ?: return
 pendingAuthPromise = null

 if (resultCode == Activity.RESULT_OK) {
 val session = Clerk.session
 val user = Clerk.user

 debugLog(TAG, "handleAuthResult - hasSession: ${session != null}, hasUser: ${user != null}")

 val result = WritableNativeMap()

 // Top-level sessionId for JS SDK compatibility (matches iOS response format)
Expand DownExpand Up@@ -315,6 +296,7 @@ class ClerkExpoModule(reactContext: ReactApplicationContext) :

 promise.resolve(result)
 } else {
 debugLog(TAG, "handleAuthResult - user cancelled")
 val result = WritableNativeMap()
 result.putBoolean("cancelled", true)
 promise.resolve(result)
Expand Down

53 changes: 23 additions & 30 deletions
packages/expo/ios/ClerkExpoModule.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,7 +22,6 @@ public protocol ClerkViewFactoryProtocol {
 // SDK operations
 func configure(publishableKey: String, bearerToken: String?) async throws
 func getSession() async -> [String: Any]?
 func getClientToken() -> String?
 func signOut() async throws
}

Expand All@@ -32,11 +31,9 @@ public protocol ClerkViewFactoryProtocol {
class ClerkExpoModule: RCTEventEmitter {

 private static var _hasListeners = false
 private static weak var sharedInstance: ClerkExpoModule?

 override init() {
 super.init()
 ClerkExpoModule.sharedInstance = self
 }

 @objc override static func requiresMainQueueSetup() -> Bool {
Expand All@@ -55,17 +52,6 @@ class ClerkExpoModule: RCTEventEmitter {
 ClerkExpoModule._hasListeners = false
 }

 /// Emits an onAuthStateChange event to JS from anywhere in the native layer.
 /// Used by inline views (AuthView, UserProfileView) to notify ClerkProvider
 /// of auth state changes in addition to the view-level onAuthEvent callback.
 static func emitAuthStateChange(type: String, sessionId: String?) {
 guard _hasListeners, let instance = sharedInstance else { return }
 instance.sendEvent(withName: "onAuthStateChange", body: [
 "type": type,
 "sessionId": sessionId as Any,
 ])
 }

 /// Returns the topmost presented view controller, avoiding deprecated `keyWindow`.
 private static func topViewController() -> UIViewController? {
 guard let scene = UIApplication.shared.connectedScenes
Expand DownExpand Up@@ -188,12 +174,31 @@ class ClerkExpoModule: RCTEventEmitter {

 @objc func getClientToken(_ resolve: @escaping RCTPromiseResolveBlock,
 reject: @escaping RCTPromiseRejectBlock) {
 guard let factory = clerkViewFactory else {
 // Use a custom keychain service if configured in Info.plist (for extension apps
 // sharing a keychain group). Falls back to the main bundle identifier.
 let keychainService: String = {
 if let custom = Bundle.main.object(forInfoDictionaryKey: "ClerkKeychainService") as? String, !custom.isEmpty {
 return custom
 }
 return Bundle.main.bundleIdentifier ?? ""
 }()

 let query: [String: Any] = [
 kSecClass as String: kSecClassGenericPassword,
 kSecAttrService as String: keychainService,
 kSecAttrAccount as String: "clerkDeviceToken",
 kSecReturnData as String: true,
 kSecMatchLimit as String: kSecMatchLimitOne
 ]

 var result: AnyObject?
 let status = SecItemCopyMatching(query as CFDictionary, &result)

 if status == errSecSuccess, let data = result as? Data {
 resolve(String(data: data, encoding: .utf8))
 } else {
 resolve(nil)
 return
 }

 resolve(factory.getClientToken())
 }

 // MARK: - signOut
Expand DownExpand Up@@ -272,12 +277,6 @@ public class ClerkAuthNativeView: UIView {
 let jsonData = (try? JSONSerialization.data(withJSONObject: data)) ?? Data()
 let jsonString = String(data: jsonData, encoding: .utf8) ?? "{}"
 self?.onAuthEvent?(["type": eventName, "data": jsonString])

 // Also emit module-level event so ClerkProvider's useNativeAuthEvents picks it up
 if eventName == "signInCompleted" || eventName == "signUpCompleted" {
 let sessionId = data["sessionId"] as? String
 ClerkExpoModule.emitAuthStateChange(type: "signedIn", sessionId: sessionId)
 }
 }
 ) else { return }

Expand DownExpand Up@@ -360,12 +359,6 @@ public class ClerkUserProfileNativeView: UIView {
 let jsonData = (try? JSONSerialization.data(withJSONObject: data)) ?? Data()
 let jsonString = String(data: jsonData, encoding: .utf8) ?? "{}"
 self?.onProfileEvent?(["type": eventName, "data": jsonString])

 // Also emit module-level event for sign-out detection
 if eventName == "signedOut" {
 let sessionId = data["sessionId"] as? String
 ClerkExpoModule.emitAuthStateChange(type: "signedOut", sessionId: sessionId)
 }
 }
 ) else { return }

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" + '

Skip to content
revert(expo): two-way JS/native session sync (#8032)#8065

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

chriscanin
merged 2 commits into

from

Mar 13, 2026
 Merged


revert(expo): two-way JS/native session sync (#8032)
#8065
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
e335f90

Revert "feat(expo): add two-way JS/native session sync for expo nativ…


chriscanin Mar 13, 2026
66afec3

add changeset for revert


chriscanin Mar 13, 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: 0 additions & 5 deletions
.changeset/native-session-sync-fixes.md

View file


Open in desktop


This file was deleted.


5 changes: 5 additions & 0 deletions
.changeset/revert-native-session-sync.md

View file


Open in desktop

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

Revert two-way JS/native session sync (#8032)

2 changes: 1 addition & 1 deletion
packages/expo/android/build.gradle

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,7 +18,7 @@ ext {
 credentialsVersion = "1.3.0"
 googleIdVersion = "1.1.1"
 kotlinxCoroutinesVersion = "1.7.3"
 clerkAndroidApiVersion = "1.0.9"
 clerkAndroidApiVersion = "1.0.6"
 clerkAndroidUiVersion = "1.0.9"
 composeVersion = "1.7.0"
 activityComposeVersion = "1.9.0"
Expand Down

92 changes: 37 additions & 55 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@@ -5,7 +5,6 @@ import android.content.Context
import android.content.Intent
import android.util.Log
import com.clerk.api.Clerk
import com.clerk.api.network.serialization.ClerkResult
import com.facebook.react.bridge.ActivityEventListener
import com.facebook.react.bridge.Promise
import com.facebook.react.bridge.ReactApplicationContext
Expand DownExpand Up@@ -68,63 +67,41 @@ class ClerkExpoModule(reactContext: ReactApplicationContext) :
 try {
 publishableKey = pubKey

if (!Clerk.isInitialized.value) {
// First-time initialization — write the bearer token to SharedPreferences
 // before initializing so the SDK boots with the correct client.
if (!bearerToken.isNullOrEmpty()) {
reactApplicationContext.getSharedPreferences("clerk_preferences", Context.MODE_PRIVATE)
 .edit()
 .putString("DEVICE_TOKEN", bearerToken)
 .apply()
}
// If the JS SDK has a bearer token, write it to the native SDK's
 // SharedPreferences so both SDKs share the same Clerk API client.
if (!bearerToken.isNullOrEmpty()) {
reactApplicationContext.getSharedPreferences("clerk_preferences", Context.MODE_PRIVATE)
.edit()
.putString("DEVICE_TOKEN", bearerToken)
.apply()
debugLog(TAG, "configure - wrote JS bearer token to native SharedPreferences")
 }

 Clerk.initialize(reactApplicationContext, pubKey)

 // Wait for initialization to complete with timeout
 try {
 withTimeout(10_000L) {
 Clerk.isInitialized.first { it }
 }
 } catch (e: TimeoutCancellationException) {
 val initError = Clerk.initializationError.value
 val message = if (initError != null) {
 "Clerk initialization timed out: ${initError.message}"
 } else {
 "Clerk initialization timed out after 10 seconds"
 }
 promise.reject("E_TIMEOUT", message)
 return@launch
 }
 Clerk.initialize(reactApplicationContext, pubKey)

 // Check for initialization errors
 val error = Clerk.initializationError.value
 if (error != null) {
 promise.reject("E_INIT_FAILED", "Failed to initialize Clerk SDK: ${error.message}")
 // Wait for initialization to complete with timeout
 try {
 withTimeout(10_000L) {
 Clerk.isInitialized.first { it }
 }
 } catch (e: TimeoutCancellationException) {
 val initError = Clerk.initializationError.value
 val message = if (initError != null) {
 "Clerk initialization timed out: ${initError.message}"
 } else {
promise.resolve(null)
"Clerk initialization timed out after 10 seconds"
 }
 promise.reject("E_TIMEOUT", message)
 return@launch
 }

 // Already initialized — use the public SDK API to update
 // the device token and trigger a client/environment refresh.
 if (!bearerToken.isNullOrEmpty()) {
 val result = Clerk.updateDeviceToken(bearerToken)
 if (result is ClerkResult.Failure) {
 debugLog(TAG, "configure - updateDeviceToken failed: ${result.error}")
 }

 // Wait for session to appear with the new token (up to 5s)
 try {
 withTimeout(5_000L) {
 Clerk.sessionFlow.first { it != null }
 }
 } catch (_: TimeoutCancellationException) {
 debugLog(TAG, "configure - session did not appear after token update")
 }
 // Check for initialization errors
 val error = Clerk.initializationError.value
 if (error != null) {
 promise.reject("E_INIT_FAILED", "Failed to initialize Clerk SDK: ${error.message}")
 } else {
 promise.resolve(null)
 }

 promise.resolve(null)
 } catch (e: Exception) {
 promise.reject("E_INIT_FAILED", "Failed to initialize Clerk SDK: ${e.message}", e)
 }
Expand DownExpand Up@@ -197,15 +174,15 @@ class ClerkExpoModule(reactContext: ReactApplicationContext) :
 @ReactMethod
 override fun getSession(promise: Promise) {
 if (!Clerk.isInitialized.value) {
 // Return null when not initialized (matches iOS behavior)
 // so callers can proceed to call configure() with a bearer token.
 promise.resolve(null)
 promise.reject("E_NOT_INITIALIZED", "Clerk SDK is not initialized. Call configure() first.")
 return
 }

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

 debugLog(TAG, "getSession - hasSession: ${session != null}, hasUser: ${user != null}")

 val result = WritableNativeMap()

 session?.let {
Expand DownExpand Up@@ -240,6 +217,7 @@ class ClerkExpoModule(reactContext: ReactApplicationContext) :
 try {
 val prefs = reactApplicationContext.getSharedPreferences("clerk_preferences", Context.MODE_PRIVATE)
 val deviceToken = prefs.getString("DEVICE_TOKEN", null)
 debugLog(TAG, "getClientToken - deviceToken: ${if (deviceToken != null) "found" else "null"}")
 promise.resolve(deviceToken)
 } catch (e: Exception) {
 debugLog(TAG, "getClientToken failed: ${e.message}")
Expand All@@ -252,8 +230,7 @@ class ClerkExpoModule(reactContext: ReactApplicationContext) :
 @ReactMethod
 override fun signOut(promise: Promise) {
 if (!Clerk.isInitialized.value) {
 // Resolve gracefully when not initialized (matches iOS behavior)
 promise.resolve(null)
 promise.reject("E_NOT_INITIALIZED", "Clerk SDK is not initialized. Call configure() first.")
 return
 }

Expand DownExpand Up@@ -281,13 +258,17 @@ class ClerkExpoModule(reactContext: ReactApplicationContext) :
 }

 private fun handleAuthResult(resultCode: Int, data: Intent?) {
 debugLog(TAG, "handleAuthResult - resultCode: $resultCode")

 val promise = pendingAuthPromise ?: return
 pendingAuthPromise = null

 if (resultCode == Activity.RESULT_OK) {
 val session = Clerk.session
 val user = Clerk.user

 debugLog(TAG, "handleAuthResult - hasSession: ${session != null}, hasUser: ${user != null}")

 val result = WritableNativeMap()

 // Top-level sessionId for JS SDK compatibility (matches iOS response format)
Expand DownExpand Up@@ -315,6 +296,7 @@ class ClerkExpoModule(reactContext: ReactApplicationContext) :

 promise.resolve(result)
 } else {
 debugLog(TAG, "handleAuthResult - user cancelled")
 val result = WritableNativeMap()
 result.putBoolean("cancelled", true)
 promise.resolve(result)
Expand Down

53 changes: 23 additions & 30 deletions
packages/expo/ios/ClerkExpoModule.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,7 +22,6 @@ public protocol ClerkViewFactoryProtocol {
 // SDK operations
 func configure(publishableKey: String, bearerToken: String?) async throws
 func getSession() async -> [String: Any]?
 func getClientToken() -> String?
 func signOut() async throws
}

Expand All@@ -32,11 +31,9 @@ public protocol ClerkViewFactoryProtocol {
class ClerkExpoModule: RCTEventEmitter {

 private static var _hasListeners = false
 private static weak var sharedInstance: ClerkExpoModule?

 override init() {
 super.init()
 ClerkExpoModule.sharedInstance = self
 }

 @objc override static func requiresMainQueueSetup() -> Bool {
Expand All@@ -55,17 +52,6 @@ class ClerkExpoModule: RCTEventEmitter {
 ClerkExpoModule._hasListeners = false
 }

 /// Emits an onAuthStateChange event to JS from anywhere in the native layer.
 /// Used by inline views (AuthView, UserProfileView) to notify ClerkProvider
 /// of auth state changes in addition to the view-level onAuthEvent callback.
 static func emitAuthStateChange(type: String, sessionId: String?) {
 guard _hasListeners, let instance = sharedInstance else { return }
 instance.sendEvent(withName: "onAuthStateChange", body: [
 "type": type,
 "sessionId": sessionId as Any,
 ])
 }

 /// Returns the topmost presented view controller, avoiding deprecated `keyWindow`.
 private static func topViewController() -> UIViewController? {
 guard let scene = UIApplication.shared.connectedScenes
Expand DownExpand Up@@ -188,12 +174,31 @@ class ClerkExpoModule: RCTEventEmitter {

 @objc func getClientToken(_ resolve: @escaping RCTPromiseResolveBlock,
 reject: @escaping RCTPromiseRejectBlock) {
 guard let factory = clerkViewFactory else {
 // Use a custom keychain service if configured in Info.plist (for extension apps
 // sharing a keychain group). Falls back to the main bundle identifier.
 let keychainService: String = {
 if let custom = Bundle.main.object(forInfoDictionaryKey: "ClerkKeychainService") as? String, !custom.isEmpty {
 return custom
 }
 return Bundle.main.bundleIdentifier ?? ""
 }()

 let query: [String: Any] = [
 kSecClass as String: kSecClassGenericPassword,
 kSecAttrService as String: keychainService,
 kSecAttrAccount as String: "clerkDeviceToken",
 kSecReturnData as String: true,
 kSecMatchLimit as String: kSecMatchLimitOne
 ]

 var result: AnyObject?
 let status = SecItemCopyMatching(query as CFDictionary, &result)

 if status == errSecSuccess, let data = result as? Data {
 resolve(String(data: data, encoding: .utf8))
 } else {
 resolve(nil)
 return
 }

 resolve(factory.getClientToken())
 }

 // MARK: - signOut
Expand DownExpand Up@@ -272,12 +277,6 @@ public class ClerkAuthNativeView: UIView {
 let jsonData = (try? JSONSerialization.data(withJSONObject: data)) ?? Data()
 let jsonString = String(data: jsonData, encoding: .utf8) ?? "{}"
 self?.onAuthEvent?(["type": eventName, "data": jsonString])

 // Also emit module-level event so ClerkProvider's useNativeAuthEvents picks it up
 if eventName == "signInCompleted" || eventName == "signUpCompleted" {
 let sessionId = data["sessionId"] as? String
 ClerkExpoModule.emitAuthStateChange(type: "signedIn", sessionId: sessionId)
 }
 }
 ) else { return }

Expand DownExpand Up@@ -360,12 +359,6 @@ public class ClerkUserProfileNativeView: UIView {
 let jsonData = (try? JSONSerialization.data(withJSONObject: data)) ?? Data()
 let jsonString = String(data: jsonData, encoding: .utf8) ?? "{}"
 self?.onProfileEvent?(["type": eventName, "data": jsonString])

 // Also emit module-level event for sign-out detection
 if eventName == "signedOut" {
 let sessionId = data["sessionId"] as? String
 ClerkExpoModule.emitAuthStateChange(type: "signedOut", sessionId: sessionId)
 }
 }
 ) else { return }

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('^' + ".*" + '

Skip to content
revert(expo): two-way JS/native session sync (#8032)#8065

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

chriscanin
merged 2 commits into

from

Mar 13, 2026
 Merged


revert(expo): two-way JS/native session sync (#8032)
#8065
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
e335f90

Revert "feat(expo): add two-way JS/native session sync for expo nativ…


chriscanin Mar 13, 2026
66afec3

add changeset for revert


chriscanin Mar 13, 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: 0 additions & 5 deletions
.changeset/native-session-sync-fixes.md

View file


Open in desktop


This file was deleted.


5 changes: 5 additions & 0 deletions
.changeset/revert-native-session-sync.md

View file


Open in desktop

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

Revert two-way JS/native session sync (#8032)

2 changes: 1 addition & 1 deletion
packages/expo/android/build.gradle

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,7 +18,7 @@ ext {
 credentialsVersion = "1.3.0"
 googleIdVersion = "1.1.1"
 kotlinxCoroutinesVersion = "1.7.3"
 clerkAndroidApiVersion = "1.0.9"
 clerkAndroidApiVersion = "1.0.6"
 clerkAndroidUiVersion = "1.0.9"
 composeVersion = "1.7.0"
 activityComposeVersion = "1.9.0"
Expand Down

92 changes: 37 additions & 55 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@@ -5,7 +5,6 @@ import android.content.Context
import android.content.Intent
import android.util.Log
import com.clerk.api.Clerk
import com.clerk.api.network.serialization.ClerkResult
import com.facebook.react.bridge.ActivityEventListener
import com.facebook.react.bridge.Promise
import com.facebook.react.bridge.ReactApplicationContext
Expand DownExpand Up@@ -68,63 +67,41 @@ class ClerkExpoModule(reactContext: ReactApplicationContext) :
 try {
 publishableKey = pubKey

if (!Clerk.isInitialized.value) {
// First-time initialization — write the bearer token to SharedPreferences
 // before initializing so the SDK boots with the correct client.
if (!bearerToken.isNullOrEmpty()) {
reactApplicationContext.getSharedPreferences("clerk_preferences", Context.MODE_PRIVATE)
 .edit()
 .putString("DEVICE_TOKEN", bearerToken)
 .apply()
}
// If the JS SDK has a bearer token, write it to the native SDK's
 // SharedPreferences so both SDKs share the same Clerk API client.
if (!bearerToken.isNullOrEmpty()) {
reactApplicationContext.getSharedPreferences("clerk_preferences", Context.MODE_PRIVATE)
.edit()
.putString("DEVICE_TOKEN", bearerToken)
.apply()
debugLog(TAG, "configure - wrote JS bearer token to native SharedPreferences")
 }

 Clerk.initialize(reactApplicationContext, pubKey)

 // Wait for initialization to complete with timeout
 try {
 withTimeout(10_000L) {
 Clerk.isInitialized.first { it }
 }
 } catch (e: TimeoutCancellationException) {
 val initError = Clerk.initializationError.value
 val message = if (initError != null) {
 "Clerk initialization timed out: ${initError.message}"
 } else {
 "Clerk initialization timed out after 10 seconds"
 }
 promise.reject("E_TIMEOUT", message)
 return@launch
 }
 Clerk.initialize(reactApplicationContext, pubKey)

 // Check for initialization errors
 val error = Clerk.initializationError.value
 if (error != null) {
 promise.reject("E_INIT_FAILED", "Failed to initialize Clerk SDK: ${error.message}")
 // Wait for initialization to complete with timeout
 try {
 withTimeout(10_000L) {
 Clerk.isInitialized.first { it }
 }
 } catch (e: TimeoutCancellationException) {
 val initError = Clerk.initializationError.value
 val message = if (initError != null) {
 "Clerk initialization timed out: ${initError.message}"
 } else {
promise.resolve(null)
"Clerk initialization timed out after 10 seconds"
 }
 promise.reject("E_TIMEOUT", message)
 return@launch
 }

 // Already initialized — use the public SDK API to update
 // the device token and trigger a client/environment refresh.
 if (!bearerToken.isNullOrEmpty()) {
 val result = Clerk.updateDeviceToken(bearerToken)
 if (result is ClerkResult.Failure) {
 debugLog(TAG, "configure - updateDeviceToken failed: ${result.error}")
 }

 // Wait for session to appear with the new token (up to 5s)
 try {
 withTimeout(5_000L) {
 Clerk.sessionFlow.first { it != null }
 }
 } catch (_: TimeoutCancellationException) {
 debugLog(TAG, "configure - session did not appear after token update")
 }
 // Check for initialization errors
 val error = Clerk.initializationError.value
 if (error != null) {
 promise.reject("E_INIT_FAILED", "Failed to initialize Clerk SDK: ${error.message}")
 } else {
 promise.resolve(null)
 }

 promise.resolve(null)
 } catch (e: Exception) {
 promise.reject("E_INIT_FAILED", "Failed to initialize Clerk SDK: ${e.message}", e)
 }
Expand DownExpand Up@@ -197,15 +174,15 @@ class ClerkExpoModule(reactContext: ReactApplicationContext) :
 @ReactMethod
 override fun getSession(promise: Promise) {
 if (!Clerk.isInitialized.value) {
 // Return null when not initialized (matches iOS behavior)
 // so callers can proceed to call configure() with a bearer token.
 promise.resolve(null)
 promise.reject("E_NOT_INITIALIZED", "Clerk SDK is not initialized. Call configure() first.")
 return
 }

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

 debugLog(TAG, "getSession - hasSession: ${session != null}, hasUser: ${user != null}")

 val result = WritableNativeMap()

 session?.let {
Expand DownExpand Up@@ -240,6 +217,7 @@ class ClerkExpoModule(reactContext: ReactApplicationContext) :
 try {
 val prefs = reactApplicationContext.getSharedPreferences("clerk_preferences", Context.MODE_PRIVATE)
 val deviceToken = prefs.getString("DEVICE_TOKEN", null)
 debugLog(TAG, "getClientToken - deviceToken: ${if (deviceToken != null) "found" else "null"}")
 promise.resolve(deviceToken)
 } catch (e: Exception) {
 debugLog(TAG, "getClientToken failed: ${e.message}")
Expand All@@ -252,8 +230,7 @@ class ClerkExpoModule(reactContext: ReactApplicationContext) :
 @ReactMethod
 override fun signOut(promise: Promise) {
 if (!Clerk.isInitialized.value) {
 // Resolve gracefully when not initialized (matches iOS behavior)
 promise.resolve(null)
 promise.reject("E_NOT_INITIALIZED", "Clerk SDK is not initialized. Call configure() first.")
 return
 }

Expand DownExpand Up@@ -281,13 +258,17 @@ class ClerkExpoModule(reactContext: ReactApplicationContext) :
 }

 private fun handleAuthResult(resultCode: Int, data: Intent?) {
 debugLog(TAG, "handleAuthResult - resultCode: $resultCode")

 val promise = pendingAuthPromise ?: return
 pendingAuthPromise = null

 if (resultCode == Activity.RESULT_OK) {
 val session = Clerk.session
 val user = Clerk.user

 debugLog(TAG, "handleAuthResult - hasSession: ${session != null}, hasUser: ${user != null}")

 val result = WritableNativeMap()

 // Top-level sessionId for JS SDK compatibility (matches iOS response format)
Expand DownExpand Up@@ -315,6 +296,7 @@ class ClerkExpoModule(reactContext: ReactApplicationContext) :

 promise.resolve(result)
 } else {
 debugLog(TAG, "handleAuthResult - user cancelled")
 val result = WritableNativeMap()
 result.putBoolean("cancelled", true)
 promise.resolve(result)
Expand Down

53 changes: 23 additions & 30 deletions
packages/expo/ios/ClerkExpoModule.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,7 +22,6 @@ public protocol ClerkViewFactoryProtocol {
 // SDK operations
 func configure(publishableKey: String, bearerToken: String?) async throws
 func getSession() async -> [String: Any]?
 func getClientToken() -> String?
 func signOut() async throws
}

Expand All@@ -32,11 +31,9 @@ public protocol ClerkViewFactoryProtocol {
class ClerkExpoModule: RCTEventEmitter {

 private static var _hasListeners = false
 private static weak var sharedInstance: ClerkExpoModule?

 override init() {
 super.init()
 ClerkExpoModule.sharedInstance = self
 }

 @objc override static func requiresMainQueueSetup() -> Bool {
Expand All@@ -55,17 +52,6 @@ class ClerkExpoModule: RCTEventEmitter {
 ClerkExpoModule._hasListeners = false
 }

 /// Emits an onAuthStateChange event to JS from anywhere in the native layer.
 /// Used by inline views (AuthView, UserProfileView) to notify ClerkProvider
 /// of auth state changes in addition to the view-level onAuthEvent callback.
 static func emitAuthStateChange(type: String, sessionId: String?) {
 guard _hasListeners, let instance = sharedInstance else { return }
 instance.sendEvent(withName: "onAuthStateChange", body: [
 "type": type,
 "sessionId": sessionId as Any,
 ])
 }

 /// Returns the topmost presented view controller, avoiding deprecated `keyWindow`.
 private static func topViewController() -> UIViewController? {
 guard let scene = UIApplication.shared.connectedScenes
Expand DownExpand Up@@ -188,12 +174,31 @@ class ClerkExpoModule: RCTEventEmitter {

 @objc func getClientToken(_ resolve: @escaping RCTPromiseResolveBlock,
 reject: @escaping RCTPromiseRejectBlock) {
 guard let factory = clerkViewFactory else {
 // Use a custom keychain service if configured in Info.plist (for extension apps
 // sharing a keychain group). Falls back to the main bundle identifier.
 let keychainService: String = {
 if let custom = Bundle.main.object(forInfoDictionaryKey: "ClerkKeychainService") as? String, !custom.isEmpty {
 return custom
 }
 return Bundle.main.bundleIdentifier ?? ""
 }()

 let query: [String: Any] = [
 kSecClass as String: kSecClassGenericPassword,
 kSecAttrService as String: keychainService,
 kSecAttrAccount as String: "clerkDeviceToken",
 kSecReturnData as String: true,
 kSecMatchLimit as String: kSecMatchLimitOne
 ]

 var result: AnyObject?
 let status = SecItemCopyMatching(query as CFDictionary, &result)

 if status == errSecSuccess, let data = result as? Data {
 resolve(String(data: data, encoding: .utf8))
 } else {
 resolve(nil)
 return
 }

 resolve(factory.getClientToken())
 }

 // MARK: - signOut
Expand DownExpand Up@@ -272,12 +277,6 @@ public class ClerkAuthNativeView: UIView {
 let jsonData = (try? JSONSerialization.data(withJSONObject: data)) ?? Data()
 let jsonString = String(data: jsonData, encoding: .utf8) ?? "{}"
 self?.onAuthEvent?(["type": eventName, "data": jsonString])

 // Also emit module-level event so ClerkProvider's useNativeAuthEvents picks it up
 if eventName == "signInCompleted" || eventName == "signUpCompleted" {
 let sessionId = data["sessionId"] as? String
 ClerkExpoModule.emitAuthStateChange(type: "signedIn", sessionId: sessionId)
 }
 }
 ) else { return }

Expand DownExpand Up@@ -360,12 +359,6 @@ public class ClerkUserProfileNativeView: UIView {
 let jsonData = (try? JSONSerialization.data(withJSONObject: data)) ?? Data()
 let jsonString = String(data: jsonData, encoding: .utf8) ?? "{}"
 self?.onProfileEvent?(["type": eventName, "data": jsonString])

 // Also emit module-level event for sign-out detection
 if eventName == "signedOut" {
 let sessionId = data["sessionId"] as? String
 ClerkExpoModule.emitAuthStateChange(type: "signedOut", sessionId: sessionId)
 }
 }
 ) else { return }

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('^' + ".*" + '

Skip to content
revert(expo): two-way JS/native session sync (#8032)#8065

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

chriscanin
merged 2 commits into

from

Mar 13, 2026
 Merged


revert(expo): two-way JS/native session sync (#8032)
#8065
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
e335f90

Revert "feat(expo): add two-way JS/native session sync for expo nativ…


chriscanin Mar 13, 2026
66afec3

add changeset for revert


chriscanin Mar 13, 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: 0 additions & 5 deletions
.changeset/native-session-sync-fixes.md

View file


Open in desktop


This file was deleted.


5 changes: 5 additions & 0 deletions
.changeset/revert-native-session-sync.md

View file


Open in desktop

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

Revert two-way JS/native session sync (#8032)

2 changes: 1 addition & 1 deletion
packages/expo/android/build.gradle

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,7 +18,7 @@ ext {
 credentialsVersion = "1.3.0"
 googleIdVersion = "1.1.1"
 kotlinxCoroutinesVersion = "1.7.3"
 clerkAndroidApiVersion = "1.0.9"
 clerkAndroidApiVersion = "1.0.6"
 clerkAndroidUiVersion = "1.0.9"
 composeVersion = "1.7.0"
 activityComposeVersion = "1.9.0"
Expand Down

92 changes: 37 additions & 55 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@@ -5,7 +5,6 @@ import android.content.Context
import android.content.Intent
import android.util.Log
import com.clerk.api.Clerk
import com.clerk.api.network.serialization.ClerkResult
import com.facebook.react.bridge.ActivityEventListener
import com.facebook.react.bridge.Promise
import com.facebook.react.bridge.ReactApplicationContext
Expand DownExpand Up@@ -68,63 +67,41 @@ class ClerkExpoModule(reactContext: ReactApplicationContext) :
 try {
 publishableKey = pubKey

if (!Clerk.isInitialized.value) {
// First-time initialization — write the bearer token to SharedPreferences
 // before initializing so the SDK boots with the correct client.
if (!bearerToken.isNullOrEmpty()) {
reactApplicationContext.getSharedPreferences("clerk_preferences", Context.MODE_PRIVATE)
 .edit()
 .putString("DEVICE_TOKEN", bearerToken)
 .apply()
}
// If the JS SDK has a bearer token, write it to the native SDK's
 // SharedPreferences so both SDKs share the same Clerk API client.
if (!bearerToken.isNullOrEmpty()) {
reactApplicationContext.getSharedPreferences("clerk_preferences", Context.MODE_PRIVATE)
.edit()
.putString("DEVICE_TOKEN", bearerToken)
.apply()
debugLog(TAG, "configure - wrote JS bearer token to native SharedPreferences")
 }

 Clerk.initialize(reactApplicationContext, pubKey)

 // Wait for initialization to complete with timeout
 try {
 withTimeout(10_000L) {
 Clerk.isInitialized.first { it }
 }
 } catch (e: TimeoutCancellationException) {
 val initError = Clerk.initializationError.value
 val message = if (initError != null) {
 "Clerk initialization timed out: ${initError.message}"
 } else {
 "Clerk initialization timed out after 10 seconds"
 }
 promise.reject("E_TIMEOUT", message)
 return@launch
 }
 Clerk.initialize(reactApplicationContext, pubKey)

 // Check for initialization errors
 val error = Clerk.initializationError.value
 if (error != null) {
 promise.reject("E_INIT_FAILED", "Failed to initialize Clerk SDK: ${error.message}")
 // Wait for initialization to complete with timeout
 try {
 withTimeout(10_000L) {
 Clerk.isInitialized.first { it }
 }
 } catch (e: TimeoutCancellationException) {
 val initError = Clerk.initializationError.value
 val message = if (initError != null) {
 "Clerk initialization timed out: ${initError.message}"
 } else {
promise.resolve(null)
"Clerk initialization timed out after 10 seconds"
 }
 promise.reject("E_TIMEOUT", message)
 return@launch
 }

 // Already initialized — use the public SDK API to update
 // the device token and trigger a client/environment refresh.
 if (!bearerToken.isNullOrEmpty()) {
 val result = Clerk.updateDeviceToken(bearerToken)
 if (result is ClerkResult.Failure) {
 debugLog(TAG, "configure - updateDeviceToken failed: ${result.error}")
 }

 // Wait for session to appear with the new token (up to 5s)
 try {
 withTimeout(5_000L) {
 Clerk.sessionFlow.first { it != null }
 }
 } catch (_: TimeoutCancellationException) {
 debugLog(TAG, "configure - session did not appear after token update")
 }
 // Check for initialization errors
 val error = Clerk.initializationError.value
 if (error != null) {
 promise.reject("E_INIT_FAILED", "Failed to initialize Clerk SDK: ${error.message}")
 } else {
 promise.resolve(null)
 }

 promise.resolve(null)
 } catch (e: Exception) {
 promise.reject("E_INIT_FAILED", "Failed to initialize Clerk SDK: ${e.message}", e)
 }
Expand DownExpand Up@@ -197,15 +174,15 @@ class ClerkExpoModule(reactContext: ReactApplicationContext) :
 @ReactMethod
 override fun getSession(promise: Promise) {
 if (!Clerk.isInitialized.value) {
 // Return null when not initialized (matches iOS behavior)
 // so callers can proceed to call configure() with a bearer token.
 promise.resolve(null)
 promise.reject("E_NOT_INITIALIZED", "Clerk SDK is not initialized. Call configure() first.")
 return
 }

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

 debugLog(TAG, "getSession - hasSession: ${session != null}, hasUser: ${user != null}")

 val result = WritableNativeMap()

 session?.let {
Expand DownExpand Up@@ -240,6 +217,7 @@ class ClerkExpoModule(reactContext: ReactApplicationContext) :
 try {
 val prefs = reactApplicationContext.getSharedPreferences("clerk_preferences", Context.MODE_PRIVATE)
 val deviceToken = prefs.getString("DEVICE_TOKEN", null)
 debugLog(TAG, "getClientToken - deviceToken: ${if (deviceToken != null) "found" else "null"}")
 promise.resolve(deviceToken)
 } catch (e: Exception) {
 debugLog(TAG, "getClientToken failed: ${e.message}")
Expand All@@ -252,8 +230,7 @@ class ClerkExpoModule(reactContext: ReactApplicationContext) :
 @ReactMethod
 override fun signOut(promise: Promise) {
 if (!Clerk.isInitialized.value) {
 // Resolve gracefully when not initialized (matches iOS behavior)
 promise.resolve(null)
 promise.reject("E_NOT_INITIALIZED", "Clerk SDK is not initialized. Call configure() first.")
 return
 }

Expand DownExpand Up@@ -281,13 +258,17 @@ class ClerkExpoModule(reactContext: ReactApplicationContext) :
 }

 private fun handleAuthResult(resultCode: Int, data: Intent?) {
 debugLog(TAG, "handleAuthResult - resultCode: $resultCode")

 val promise = pendingAuthPromise ?: return
 pendingAuthPromise = null

 if (resultCode == Activity.RESULT_OK) {
 val session = Clerk.session
 val user = Clerk.user

 debugLog(TAG, "handleAuthResult - hasSession: ${session != null}, hasUser: ${user != null}")

 val result = WritableNativeMap()

 // Top-level sessionId for JS SDK compatibility (matches iOS response format)
Expand DownExpand Up@@ -315,6 +296,7 @@ class ClerkExpoModule(reactContext: ReactApplicationContext) :

 promise.resolve(result)
 } else {
 debugLog(TAG, "handleAuthResult - user cancelled")
 val result = WritableNativeMap()
 result.putBoolean("cancelled", true)
 promise.resolve(result)
Expand Down

53 changes: 23 additions & 30 deletions
packages/expo/ios/ClerkExpoModule.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,7 +22,6 @@ public protocol ClerkViewFactoryProtocol {
 // SDK operations
 func configure(publishableKey: String, bearerToken: String?) async throws
 func getSession() async -> [String: Any]?
 func getClientToken() -> String?
 func signOut() async throws
}

Expand All@@ -32,11 +31,9 @@ public protocol ClerkViewFactoryProtocol {
class ClerkExpoModule: RCTEventEmitter {

 private static var _hasListeners = false
 private static weak var sharedInstance: ClerkExpoModule?

 override init() {
 super.init()
 ClerkExpoModule.sharedInstance = self
 }

 @objc override static func requiresMainQueueSetup() -> Bool {
Expand All@@ -55,17 +52,6 @@ class ClerkExpoModule: RCTEventEmitter {
 ClerkExpoModule._hasListeners = false
 }

 /// Emits an onAuthStateChange event to JS from anywhere in the native layer.
 /// Used by inline views (AuthView, UserProfileView) to notify ClerkProvider
 /// of auth state changes in addition to the view-level onAuthEvent callback.
 static func emitAuthStateChange(type: String, sessionId: String?) {
 guard _hasListeners, let instance = sharedInstance else { return }
 instance.sendEvent(withName: "onAuthStateChange", body: [
 "type": type,
 "sessionId": sessionId as Any,
 ])
 }

 /// Returns the topmost presented view controller, avoiding deprecated `keyWindow`.
 private static func topViewController() -> UIViewController? {
 guard let scene = UIApplication.shared.connectedScenes
Expand DownExpand Up@@ -188,12 +174,31 @@ class ClerkExpoModule: RCTEventEmitter {

 @objc func getClientToken(_ resolve: @escaping RCTPromiseResolveBlock,
 reject: @escaping RCTPromiseRejectBlock) {
 guard let factory = clerkViewFactory else {
 // Use a custom keychain service if configured in Info.plist (for extension apps
 // sharing a keychain group). Falls back to the main bundle identifier.
 let keychainService: String = {
 if let custom = Bundle.main.object(forInfoDictionaryKey: "ClerkKeychainService") as? String, !custom.isEmpty {
 return custom
 }
 return Bundle.main.bundleIdentifier ?? ""
 }()

 let query: [String: Any] = [
 kSecClass as String: kSecClassGenericPassword,
 kSecAttrService as String: keychainService,
 kSecAttrAccount as String: "clerkDeviceToken",
 kSecReturnData as String: true,
 kSecMatchLimit as String: kSecMatchLimitOne
 ]

 var result: AnyObject?
 let status = SecItemCopyMatching(query as CFDictionary, &result)

 if status == errSecSuccess, let data = result as? Data {
 resolve(String(data: data, encoding: .utf8))
 } else {
 resolve(nil)
 return
 }

 resolve(factory.getClientToken())
 }

 // MARK: - signOut
Expand DownExpand Up@@ -272,12 +277,6 @@ public class ClerkAuthNativeView: UIView {
 let jsonData = (try? JSONSerialization.data(withJSONObject: data)) ?? Data()
 let jsonString = String(data: jsonData, encoding: .utf8) ?? "{}"
 self?.onAuthEvent?(["type": eventName, "data": jsonString])

 // Also emit module-level event so ClerkProvider's useNativeAuthEvents picks it up
 if eventName == "signInCompleted" || eventName == "signUpCompleted" {
 let sessionId = data["sessionId"] as? String
 ClerkExpoModule.emitAuthStateChange(type: "signedIn", sessionId: sessionId)
 }
 }
 ) else { return }

Expand DownExpand Up@@ -360,12 +359,6 @@ public class ClerkUserProfileNativeView: UIView {
 let jsonData = (try? JSONSerialization.data(withJSONObject: data)) ?? Data()
 let jsonString = String(data: jsonData, encoding: .utf8) ?? "{}"
 self?.onProfileEvent?(["type": eventName, "data": jsonString])

 // Also emit module-level event for sign-out detection
 if eventName == "signedOut" {
 let sessionId = data["sessionId"] as? String
 ClerkExpoModule.emitAuthStateChange(type: "signedOut", sessionId: sessionId)
 }
 }
 ) else { return }

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); }
})();
})();

Skip to content
revert(expo): two-way JS/native session sync (#8032)#8065

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

chriscanin
merged 2 commits into

from

Mar 13, 2026
 Merged


revert(expo): two-way JS/native session sync (#8032)
#8065
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
e335f90

Revert "feat(expo): add two-way JS/native session sync for expo nativ…


chriscanin Mar 13, 2026
66afec3

add changeset for revert


chriscanin Mar 13, 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: 0 additions & 5 deletions
.changeset/native-session-sync-fixes.md

View file


Open in desktop


This file was deleted.


5 changes: 5 additions & 0 deletions
.changeset/revert-native-session-sync.md

View file


Open in desktop

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

Revert two-way JS/native session sync (#8032)

2 changes: 1 addition & 1 deletion
packages/expo/android/build.gradle

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,7 +18,7 @@ ext {
 credentialsVersion = "1.3.0"
 googleIdVersion = "1.1.1"
 kotlinxCoroutinesVersion = "1.7.3"
 clerkAndroidApiVersion = "1.0.9"
 clerkAndroidApiVersion = "1.0.6"
 clerkAndroidUiVersion = "1.0.9"
 composeVersion = "1.7.0"
 activityComposeVersion = "1.9.0"
Expand Down

92 changes: 37 additions & 55 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@@ -5,7 +5,6 @@ import android.content.Context
import android.content.Intent
import android.util.Log
import com.clerk.api.Clerk
import com.clerk.api.network.serialization.ClerkResult
import com.facebook.react.bridge.ActivityEventListener
import com.facebook.react.bridge.Promise
import com.facebook.react.bridge.ReactApplicationContext
Expand DownExpand Up@@ -68,63 +67,41 @@ class ClerkExpoModule(reactContext: ReactApplicationContext) :
 try {
 publishableKey = pubKey

if (!Clerk.isInitialized.value) {
// First-time initialization — write the bearer token to SharedPreferences
 // before initializing so the SDK boots with the correct client.
if (!bearerToken.isNullOrEmpty()) {
reactApplicationContext.getSharedPreferences("clerk_preferences", Context.MODE_PRIVATE)
 .edit()
 .putString("DEVICE_TOKEN", bearerToken)
 .apply()
}
// If the JS SDK has a bearer token, write it to the native SDK's
 // SharedPreferences so both SDKs share the same Clerk API client.
if (!bearerToken.isNullOrEmpty()) {
reactApplicationContext.getSharedPreferences("clerk_preferences", Context.MODE_PRIVATE)
.edit()
.putString("DEVICE_TOKEN", bearerToken)
.apply()
debugLog(TAG, "configure - wrote JS bearer token to native SharedPreferences")
 }

 Clerk.initialize(reactApplicationContext, pubKey)

 // Wait for initialization to complete with timeout
 try {
 withTimeout(10_000L) {
 Clerk.isInitialized.first { it }
 }
 } catch (e: TimeoutCancellationException) {
 val initError = Clerk.initializationError.value
 val message = if (initError != null) {
 "Clerk initialization timed out: ${initError.message}"
 } else {
 "Clerk initialization timed out after 10 seconds"
 }
 promise.reject("E_TIMEOUT", message)
 return@launch
 }
 Clerk.initialize(reactApplicationContext, pubKey)

 // Check for initialization errors
 val error = Clerk.initializationError.value
 if (error != null) {
 promise.reject("E_INIT_FAILED", "Failed to initialize Clerk SDK: ${error.message}")
 // Wait for initialization to complete with timeout
 try {
 withTimeout(10_000L) {
 Clerk.isInitialized.first { it }
 }
 } catch (e: TimeoutCancellationException) {
 val initError = Clerk.initializationError.value
 val message = if (initError != null) {
 "Clerk initialization timed out: ${initError.message}"
 } else {
promise.resolve(null)
"Clerk initialization timed out after 10 seconds"
 }
 promise.reject("E_TIMEOUT", message)
 return@launch
 }

 // Already initialized — use the public SDK API to update
 // the device token and trigger a client/environment refresh.
 if (!bearerToken.isNullOrEmpty()) {
 val result = Clerk.updateDeviceToken(bearerToken)
 if (result is ClerkResult.Failure) {
 debugLog(TAG, "configure - updateDeviceToken failed: ${result.error}")
 }

 // Wait for session to appear with the new token (up to 5s)
 try {
 withTimeout(5_000L) {
 Clerk.sessionFlow.first { it != null }
 }
 } catch (_: TimeoutCancellationException) {
 debugLog(TAG, "configure - session did not appear after token update")
 }
 // Check for initialization errors
 val error = Clerk.initializationError.value
 if (error != null) {
 promise.reject("E_INIT_FAILED", "Failed to initialize Clerk SDK: ${error.message}")
 } else {
 promise.resolve(null)
 }

 promise.resolve(null)
 } catch (e: Exception) {
 promise.reject("E_INIT_FAILED", "Failed to initialize Clerk SDK: ${e.message}", e)
 }
Expand DownExpand Up@@ -197,15 +174,15 @@ class ClerkExpoModule(reactContext: ReactApplicationContext) :
 @ReactMethod
 override fun getSession(promise: Promise) {
 if (!Clerk.isInitialized.value) {
 // Return null when not initialized (matches iOS behavior)
 // so callers can proceed to call configure() with a bearer token.
 promise.resolve(null)
 promise.reject("E_NOT_INITIALIZED", "Clerk SDK is not initialized. Call configure() first.")
 return
 }

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

 debugLog(TAG, "getSession - hasSession: ${session != null}, hasUser: ${user != null}")

 val result = WritableNativeMap()

 session?.let {
Expand DownExpand Up@@ -240,6 +217,7 @@ class ClerkExpoModule(reactContext: ReactApplicationContext) :
 try {
 val prefs = reactApplicationContext.getSharedPreferences("clerk_preferences", Context.MODE_PRIVATE)
 val deviceToken = prefs.getString("DEVICE_TOKEN", null)
 debugLog(TAG, "getClientToken - deviceToken: ${if (deviceToken != null) "found" else "null"}")
 promise.resolve(deviceToken)
 } catch (e: Exception) {
 debugLog(TAG, "getClientToken failed: ${e.message}")
Expand All@@ -252,8 +230,7 @@ class ClerkExpoModule(reactContext: ReactApplicationContext) :
 @ReactMethod
 override fun signOut(promise: Promise) {
 if (!Clerk.isInitialized.value) {
 // Resolve gracefully when not initialized (matches iOS behavior)
 promise.resolve(null)
 promise.reject("E_NOT_INITIALIZED", "Clerk SDK is not initialized. Call configure() first.")
 return
 }

Expand DownExpand Up@@ -281,13 +258,17 @@ class ClerkExpoModule(reactContext: ReactApplicationContext) :
 }

 private fun handleAuthResult(resultCode: Int, data: Intent?) {
 debugLog(TAG, "handleAuthResult - resultCode: $resultCode")

 val promise = pendingAuthPromise ?: return
 pendingAuthPromise = null

 if (resultCode == Activity.RESULT_OK) {
 val session = Clerk.session
 val user = Clerk.user

 debugLog(TAG, "handleAuthResult - hasSession: ${session != null}, hasUser: ${user != null}")

 val result = WritableNativeMap()

 // Top-level sessionId for JS SDK compatibility (matches iOS response format)
Expand DownExpand Up@@ -315,6 +296,7 @@ class ClerkExpoModule(reactContext: ReactApplicationContext) :

 promise.resolve(result)
 } else {
 debugLog(TAG, "handleAuthResult - user cancelled")
 val result = WritableNativeMap()
 result.putBoolean("cancelled", true)
 promise.resolve(result)
Expand Down

53 changes: 23 additions & 30 deletions
packages/expo/ios/ClerkExpoModule.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,7 +22,6 @@ public protocol ClerkViewFactoryProtocol {
 // SDK operations
 func configure(publishableKey: String, bearerToken: String?) async throws
 func getSession() async -> [String: Any]?
 func getClientToken() -> String?
 func signOut() async throws
}

Expand All@@ -32,11 +31,9 @@ public protocol ClerkViewFactoryProtocol {
class ClerkExpoModule: RCTEventEmitter {

 private static var _hasListeners = false
 private static weak var sharedInstance: ClerkExpoModule?

 override init() {
 super.init()
 ClerkExpoModule.sharedInstance = self
 }

 @objc override static func requiresMainQueueSetup() -> Bool {
Expand All@@ -55,17 +52,6 @@ class ClerkExpoModule: RCTEventEmitter {
 ClerkExpoModule._hasListeners = false
 }

 /// Emits an onAuthStateChange event to JS from anywhere in the native layer.
 /// Used by inline views (AuthView, UserProfileView) to notify ClerkProvider
 /// of auth state changes in addition to the view-level onAuthEvent callback.
 static func emitAuthStateChange(type: String, sessionId: String?) {
 guard _hasListeners, let instance = sharedInstance else { return }
 instance.sendEvent(withName: "onAuthStateChange", body: [
 "type": type,
 "sessionId": sessionId as Any,
 ])
 }

 /// Returns the topmost presented view controller, avoiding deprecated `keyWindow`.
 private static func topViewController() -> UIViewController? {
 guard let scene = UIApplication.shared.connectedScenes
Expand DownExpand Up@@ -188,12 +174,31 @@ class ClerkExpoModule: RCTEventEmitter {

 @objc func getClientToken(_ resolve: @escaping RCTPromiseResolveBlock,
 reject: @escaping RCTPromiseRejectBlock) {
 guard let factory = clerkViewFactory else {
 // Use a custom keychain service if configured in Info.plist (for extension apps
 // sharing a keychain group). Falls back to the main bundle identifier.
 let keychainService: String = {
 if let custom = Bundle.main.object(forInfoDictionaryKey: "ClerkKeychainService") as? String, !custom.isEmpty {
 return custom
 }
 return Bundle.main.bundleIdentifier ?? ""
 }()

 let query: [String: Any] = [
 kSecClass as String: kSecClassGenericPassword,
 kSecAttrService as String: keychainService,
 kSecAttrAccount as String: "clerkDeviceToken",
 kSecReturnData as String: true,
 kSecMatchLimit as String: kSecMatchLimitOne
 ]

 var result: AnyObject?
 let status = SecItemCopyMatching(query as CFDictionary, &result)

 if status == errSecSuccess, let data = result as? Data {
 resolve(String(data: data, encoding: .utf8))
 } else {
 resolve(nil)
 return
 }

 resolve(factory.getClientToken())
 }

 // MARK: - signOut
Expand DownExpand Up@@ -272,12 +277,6 @@ public class ClerkAuthNativeView: UIView {
 let jsonData = (try? JSONSerialization.data(withJSONObject: data)) ?? Data()
 let jsonString = String(data: jsonData, encoding: .utf8) ?? "{}"
 self?.onAuthEvent?(["type": eventName, "data": jsonString])

 // Also emit module-level event so ClerkProvider's useNativeAuthEvents picks it up
 if eventName == "signInCompleted" || eventName == "signUpCompleted" {
 let sessionId = data["sessionId"] as? String
 ClerkExpoModule.emitAuthStateChange(type: "signedIn", sessionId: sessionId)
 }
 }
 ) else { return }

Expand DownExpand Up@@ -360,12 +359,6 @@ public class ClerkUserProfileNativeView: UIView {
 let jsonData = (try? JSONSerialization.data(withJSONObject: data)) ?? Data()
 let jsonString = String(data: jsonData, encoding: .utf8) ?? "{}"
 self?.onProfileEvent?(["type": eventName, "data": jsonString])

 // Also emit module-level event for sign-out detection
 if eventName == "signedOut" {
 let sessionId = data["sessionId"] as? String
 ClerkExpoModule.emitAuthStateChange(type: "signedOut", sessionId: sessionId)
 }
 }
 ) else { return }

Expand Down
Loading
Loading