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

Author: chriscanin

.changeset/native-session-sync-fixes.md

@@ -0,0 +1,5 @@
+---
+"@clerk/expo": patch
+---
+
+Revert two-way JS/native session sync (#8032)

.changeset/revert-native-session-sync.md

@@ -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"

packages/expo/android/build.gradle

@@ -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
@@ -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)
             }
@@ -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 {
@@ -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}")
@@ -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
         }
 
@@ -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)
@@ -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)

packages/expo/android/src/main/java/expo/modules/clerk/ClerkExpoModule.kt

@@ -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
 }
 
@@ -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 {
@@ -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
@@ -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
@@ -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 }
 
@@ -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 }