fix(expo): forward inbound callback URLs to the native SDK on iOS

.changeset/olive-pugs-repeat.md

@@ -0,0 +1,5 @@
+---
+'@clerk/expo': patch
+---
+
+Fix email link sign-in never completing on iOS. Callback URLs opened by the "Return to App" button are now forwarded to the native SDK, including on a cold launch, so a flow started from `<AuthView />` signs the user in instead of leaving them signed out with no error.

packages/expo/expo-module.config.json

@@ -1,7 +1,8 @@
 {
  "platforms": ["apple", "android"],
  "apple": {
- "modules": ["ClerkExpoModule", "ClerkAuthViewModule", "ClerkUserProfileViewModule", "ClerkUserButtonViewModule"]
+ "modules": ["ClerkExpoModule", "ClerkAuthViewModule", "ClerkUserProfileViewModule", "ClerkUserButtonViewModule"],
+ "appDelegateSubscribers": ["ClerkAppDelegateSubscriber"]
  },
  "android": {
  "modules": [

packages/expo/ios/ClerkAppDelegateSubscriber.swift

@@ -0,0 +1,16 @@
+// ClerkAppDelegateSubscriber - Forwards inbound URLs to the native Clerk SDK.
+
+import ExpoModulesCore
+import UIKit
+
+public class ClerkAppDelegateSubscriber: ExpoAppDelegateSubscriber {
+ public func application(
+ _ app: UIApplication,
+ open url: URL,
+ options: [UIApplication.OpenURLOptionsKey: Any] = [:]
+ ) -> Bool {
+ ClerkNativeBridge.shared.handle(url: url)
+ // Returning false leaves the URL available to React Native's Linking.
+ return false
+ }
+}

packages/expo/ios/ClerkExpo.podspec

@@ -52,6 +52,7 @@ Pod::Spec.new do |s|
  end
 
  s.source_files = "ClerkNativeBridge.swift",
+ "ClerkAppDelegateSubscriber.swift",
  "ClerkExpoModule.swift",
  "ClerkNativeViewHost.swift",
  "ClerkAuthNativeView.swift",

packages/expo/ios/ClerkNativeBridge.swift

@@ -429,6 +429,8 @@ final class ClerkNativeBridge {
  private var lastObservedClientState: ClientStateSnapshot?
  private var configurationDepth = 0
  private var jsOriginatedClientSyncDepth = 0
+ private var pendingURL: URL?
+ private var shouldFlushPendingURL = false
 
  private init() {}
 
@@ -459,6 +461,13 @@ final class ClerkNativeBridge {
  defer {
  lastObservedClientState = Self.clerkConfigured ? Self.clientStateSnapshot() : nil
  configurationDepth = max(0, configurationDepth - 1)
+
+ // Overlapping calls can finish out of order, so replay once the last one settles and any
+ // of them succeeded. A batch where every call threw keeps the URL for the next attempt.
+ if configurationDepth == 0, shouldFlushPendingURL {
+ shouldFlushPendingURL = false
+ flushPendingURL()
+ }
  }
 
  loadThemes()
@@ -472,6 +481,7 @@ final class ClerkNativeBridge {
  let shouldWaitForClient = try await Self.syncTokenState(bearerToken: bearerToken)
  await Self.waitForLoadedClientIfNeeded(shouldWaitForClient)
  Self.postConfiguredNotification()
+ shouldFlushPendingURL = true
  return
  }
 
@@ -486,6 +496,7 @@ final class ClerkNativeBridge {
  _ = try await Clerk.shared.refreshClient()
  await Self.waitForLoadedClient()
  }
+ shouldFlushPendingURL = true
  return
  }
 
@@ -497,6 +508,32 @@ final class ClerkNativeBridge {
  let shouldWaitForClient = try await Self.syncTokenState(bearerToken: bearerToken)
  await Self.waitForLoadedClientIfNeeded(shouldWaitForClient)
  Self.postConfiguredNotification()
+ shouldFlushPendingURL = true
+ }
+
+ @MainActor
+ private func flushPendingURL() {
+ guard let url = pendingURL else { return }
+ pendingURL = nil
+ handle(url: url)
+ }
+
+ /// `AuthView` only reaches `Clerk.handle(_:)` from `.onOpenURL`, which never fires for a UIKit-hosted controller.
+ @MainActor
+ func handle(url: URL) {
+ // A cold launch delivers the callback before, or partway through, JS calling `configure`.
+ guard Self.clerkConfigured, configurationDepth == 0 else {
+ pendingURL = url
+ return
+ }
+
+ Task { @MainActor in
+ do {
+ try await Clerk.shared.handle(url)
+ } catch {
+ NSLog("[Clerk] Failed to handle callback URL: \(error.localizedDescription)")
+ }
+ }
  }
 
  @MainActor

.changeset/olive-pugs-repeat.md

@@ -0,0 +1,5 @@
+---
+'@clerk/expo': patch
+---
+
+Fix email link sign-in never completing on iOS. Callback URLs opened by the "Return to App" button are now forwarded to the native SDK, including on a cold launch, so a flow started from `<AuthView />` signs the user in instead of leaving them signed out with no error.

packages/expo/expo-module.config.json

@@ -1,7 +1,8 @@
 {
  "platforms": ["apple", "android"],
  "apple": {
- "modules": ["ClerkExpoModule", "ClerkAuthViewModule", "ClerkUserProfileViewModule", "ClerkUserButtonViewModule"]
+ "modules": ["ClerkExpoModule", "ClerkAuthViewModule", "ClerkUserProfileViewModule", "ClerkUserButtonViewModule"],
+ "appDelegateSubscribers": ["ClerkAppDelegateSubscriber"]
  },
  "android": {
  "modules": [

packages/expo/ios/ClerkAppDelegateSubscriber.swift

@@ -0,0 +1,16 @@
+// ClerkAppDelegateSubscriber - Forwards inbound URLs to the native Clerk SDK.
+
+import ExpoModulesCore
+import UIKit
+
+public class ClerkAppDelegateSubscriber: ExpoAppDelegateSubscriber {
+ public func application(
+ _ app: UIApplication,
+ open url: URL,
+ options: [UIApplication.OpenURLOptionsKey: Any] = [:]
+ ) -> Bool {
+ ClerkNativeBridge.shared.handle(url: url)
+ // Returning false leaves the URL available to React Native's Linking.
+ return false
+ }
+}

packages/expo/ios/ClerkExpo.podspec

@@ -52,6 +52,7 @@ Pod::Spec.new do |s|
  end
 
  s.source_files = "ClerkNativeBridge.swift",
+ "ClerkAppDelegateSubscriber.swift",
  "ClerkExpoModule.swift",
  "ClerkNativeViewHost.swift",
  "ClerkAuthNativeView.swift",

packages/expo/ios/ClerkNativeBridge.swift

@@ -429,6 +429,8 @@ final class ClerkNativeBridge {
  private var lastObservedClientState: ClientStateSnapshot?
  private var configurationDepth = 0
  private var jsOriginatedClientSyncDepth = 0
+ private var pendingURL: URL?
+ private var shouldFlushPendingURL = false
 
  private init() {}
 
@@ -459,6 +461,13 @@ final class ClerkNativeBridge {
  defer {
  lastObservedClientState = Self.clerkConfigured ? Self.clientStateSnapshot() : nil
  configurationDepth = max(0, configurationDepth - 1)
+
+ // Overlapping calls can finish out of order, so replay once the last one settles and any
+ // of them succeeded. A batch where every call threw keeps the URL for the next attempt.
+ if configurationDepth == 0, shouldFlushPendingURL {
+ shouldFlushPendingURL = false
+ flushPendingURL()
+ }
  }
 
  loadThemes()
@@ -472,6 +481,7 @@ final class ClerkNativeBridge {
  let shouldWaitForClient = try await Self.syncTokenState(bearerToken: bearerToken)
  await Self.waitForLoadedClientIfNeeded(shouldWaitForClient)
  Self.postConfiguredNotification()
+ shouldFlushPendingURL = true
  return
  }
 
@@ -486,6 +496,7 @@ final class ClerkNativeBridge {
  _ = try await Clerk.shared.refreshClient()
  await Self.waitForLoadedClient()
  }
+ shouldFlushPendingURL = true
  return
  }
 
@@ -497,6 +508,32 @@ final class ClerkNativeBridge {
  let shouldWaitForClient = try await Self.syncTokenState(bearerToken: bearerToken)
  await Self.waitForLoadedClientIfNeeded(shouldWaitForClient)
  Self.postConfiguredNotification()
+ shouldFlushPendingURL = true
+ }
+
+ @MainActor
+ private func flushPendingURL() {
+ guard let url = pendingURL else { return }
+ pendingURL = nil
+ handle(url: url)
+ }
+
+ /// `AuthView` only reaches `Clerk.handle(_:)` from `.onOpenURL`, which never fires for a UIKit-hosted controller.
+ @MainActor
+ func handle(url: URL) {
+ // A cold launch delivers the callback before, or partway through, JS calling `configure`.
+ guard Self.clerkConfigured, configurationDepth == 0 else {
+ pendingURL = url
+ return
+ }
+
+ Task { @MainActor in
+ do {
+ try await Clerk.shared.handle(url)
+ } catch {
+ NSLog("[Clerk] Failed to handle callback URL: \(error.localizedDescription)")
+ }
+ }
  }
 
  @MainActor

.changeset/olive-pugs-repeat.md

@@ -0,0 +1,5 @@
+---
+'@clerk/expo': patch
+---
+
+Fix email link sign-in never completing on iOS. Callback URLs opened by the "Return to App" button are now forwarded to the native SDK, including on a cold launch, so a flow started from `<AuthView />` signs the user in instead of leaving them signed out with no error.

packages/expo/expo-module.config.json

@@ -1,7 +1,8 @@
 {
  "platforms": ["apple", "android"],
  "apple": {
- "modules": ["ClerkExpoModule", "ClerkAuthViewModule", "ClerkUserProfileViewModule", "ClerkUserButtonViewModule"]
+ "modules": ["ClerkExpoModule", "ClerkAuthViewModule", "ClerkUserProfileViewModule", "ClerkUserButtonViewModule"],
+ "appDelegateSubscribers": ["ClerkAppDelegateSubscriber"]
  },
  "android": {
  "modules": [

packages/expo/ios/ClerkAppDelegateSubscriber.swift

@@ -0,0 +1,16 @@
+// ClerkAppDelegateSubscriber - Forwards inbound URLs to the native Clerk SDK.
+
+import ExpoModulesCore
+import UIKit
+
+public class ClerkAppDelegateSubscriber: ExpoAppDelegateSubscriber {
+ public func application(
+ _ app: UIApplication,
+ open url: URL,
+ options: [UIApplication.OpenURLOptionsKey: Any] = [:]
+ ) -> Bool {
+ ClerkNativeBridge.shared.handle(url: url)
+ // Returning false leaves the URL available to React Native's Linking.
+ return false
+ }
+}

packages/expo/ios/ClerkExpo.podspec

@@ -52,6 +52,7 @@ Pod::Spec.new do |s|
  end
 
  s.source_files = "ClerkNativeBridge.swift",
+ "ClerkAppDelegateSubscriber.swift",
  "ClerkExpoModule.swift",
  "ClerkNativeViewHost.swift",
  "ClerkAuthNativeView.swift",

packages/expo/ios/ClerkNativeBridge.swift

@@ -429,6 +429,8 @@ final class ClerkNativeBridge {
  private var lastObservedClientState: ClientStateSnapshot?
  private var configurationDepth = 0
  private var jsOriginatedClientSyncDepth = 0
+ private var pendingURL: URL?
+ private var shouldFlushPendingURL = false
 
  private init() {}
 
@@ -459,6 +461,13 @@ final class ClerkNativeBridge {
  defer {
  lastObservedClientState = Self.clerkConfigured ? Self.clientStateSnapshot() : nil
  configurationDepth = max(0, configurationDepth - 1)
+
+ // Overlapping calls can finish out of order, so replay once the last one settles and any
+ // of them succeeded. A batch where every call threw keeps the URL for the next attempt.
+ if configurationDepth == 0, shouldFlushPendingURL {
+ shouldFlushPendingURL = false
+ flushPendingURL()
+ }
  }
 
  loadThemes()
@@ -472,6 +481,7 @@ final class ClerkNativeBridge {
  let shouldWaitForClient = try await Self.syncTokenState(bearerToken: bearerToken)
  await Self.waitForLoadedClientIfNeeded(shouldWaitForClient)
  Self.postConfiguredNotification()
+ shouldFlushPendingURL = true
  return
  }
 
@@ -486,6 +496,7 @@ final class ClerkNativeBridge {
  _ = try await Clerk.shared.refreshClient()
  await Self.waitForLoadedClient()
  }
+ shouldFlushPendingURL = true
  return
  }
 
@@ -497,6 +508,32 @@ final class ClerkNativeBridge {
  let shouldWaitForClient = try await Self.syncTokenState(bearerToken: bearerToken)
  await Self.waitForLoadedClientIfNeeded(shouldWaitForClient)
  Self.postConfiguredNotification()
+ shouldFlushPendingURL = true
+ }
+
+ @MainActor
+ private func flushPendingURL() {
+ guard let url = pendingURL else { return }
+ pendingURL = nil
+ handle(url: url)
+ }
+
+ /// `AuthView` only reaches `Clerk.handle(_:)` from `.onOpenURL`, which never fires for a UIKit-hosted controller.
+ @MainActor
+ func handle(url: URL) {
+ // A cold launch delivers the callback before, or partway through, JS calling `configure`.
+ guard Self.clerkConfigured, configurationDepth == 0 else {
+ pendingURL = url
+ return
+ }
+
+ Task { @MainActor in
+ do {
+ try await Clerk.shared.handle(url)
+ } catch {
+ NSLog("[Clerk] Failed to handle callback URL: \(error.localizedDescription)")
+ }
+ }
  }
 
  @MainActor

.changeset/olive-pugs-repeat.md

@@ -0,0 +1,5 @@
+---
+'@clerk/expo': patch
+---
+
+Fix email link sign-in never completing on iOS. Callback URLs opened by the "Return to App" button are now forwarded to the native SDK, including on a cold launch, so a flow started from `<AuthView />` signs the user in instead of leaving them signed out with no error.

packages/expo/expo-module.config.json

@@ -1,7 +1,8 @@
 {
  "platforms": ["apple", "android"],
  "apple": {
- "modules": ["ClerkExpoModule", "ClerkAuthViewModule", "ClerkUserProfileViewModule", "ClerkUserButtonViewModule"]
+ "modules": ["ClerkExpoModule", "ClerkAuthViewModule", "ClerkUserProfileViewModule", "ClerkUserButtonViewModule"],
+ "appDelegateSubscribers": ["ClerkAppDelegateSubscriber"]
  },
  "android": {
  "modules": [

packages/expo/ios/ClerkAppDelegateSubscriber.swift

@@ -0,0 +1,16 @@
+// ClerkAppDelegateSubscriber - Forwards inbound URLs to the native Clerk SDK.
+
+import ExpoModulesCore
+import UIKit
+
+public class ClerkAppDelegateSubscriber: ExpoAppDelegateSubscriber {
+ public func application(
+ _ app: UIApplication,
+ open url: URL,
+ options: [UIApplication.OpenURLOptionsKey: Any] = [:]
+ ) -> Bool {
+ ClerkNativeBridge.shared.handle(url: url)
+ // Returning false leaves the URL available to React Native's Linking.
+ return false
+ }
+}

packages/expo/ios/ClerkExpo.podspec

@@ -52,6 +52,7 @@ Pod::Spec.new do |s|
  end
 
  s.source_files = "ClerkNativeBridge.swift",
+ "ClerkAppDelegateSubscriber.swift",
  "ClerkExpoModule.swift",
  "ClerkNativeViewHost.swift",
  "ClerkAuthNativeView.swift",

packages/expo/ios/ClerkNativeBridge.swift

@@ -429,6 +429,8 @@ final class ClerkNativeBridge {
  private var lastObservedClientState: ClientStateSnapshot?
  private var configurationDepth = 0
  private var jsOriginatedClientSyncDepth = 0
+ private var pendingURL: URL?
+ private var shouldFlushPendingURL = false
 
  private init() {}
 
@@ -459,6 +461,13 @@ final class ClerkNativeBridge {
  defer {
  lastObservedClientState = Self.clerkConfigured ? Self.clientStateSnapshot() : nil
  configurationDepth = max(0, configurationDepth - 1)
+
+ // Overlapping calls can finish out of order, so replay once the last one settles and any
+ // of them succeeded. A batch where every call threw keeps the URL for the next attempt.
+ if configurationDepth == 0, shouldFlushPendingURL {
+ shouldFlushPendingURL = false
+ flushPendingURL()
+ }
  }
 
  loadThemes()
@@ -472,6 +481,7 @@ final class ClerkNativeBridge {
  let shouldWaitForClient = try await Self.syncTokenState(bearerToken: bearerToken)
  await Self.waitForLoadedClientIfNeeded(shouldWaitForClient)
  Self.postConfiguredNotification()
+ shouldFlushPendingURL = true
  return
  }
 
@@ -486,6 +496,7 @@ final class ClerkNativeBridge {
  _ = try await Clerk.shared.refreshClient()
  await Self.waitForLoadedClient()
  }
+ shouldFlushPendingURL = true
  return
  }
 
@@ -497,6 +508,32 @@ final class ClerkNativeBridge {
  let shouldWaitForClient = try await Self.syncTokenState(bearerToken: bearerToken)
  await Self.waitForLoadedClientIfNeeded(shouldWaitForClient)
  Self.postConfiguredNotification()
+ shouldFlushPendingURL = true
+ }
+
+ @MainActor
+ private func flushPendingURL() {
+ guard let url = pendingURL else { return }
+ pendingURL = nil
+ handle(url: url)
+ }
+
+ /// `AuthView` only reaches `Clerk.handle(_:)` from `.onOpenURL`, which never fires for a UIKit-hosted controller.
+ @MainActor
+ func handle(url: URL) {
+ // A cold launch delivers the callback before, or partway through, JS calling `configure`.
+ guard Self.clerkConfigured, configurationDepth == 0 else {
+ pendingURL = url
+ return
+ }
+
+ Task { @MainActor in
+ do {
+ try await Clerk.shared.handle(url)
+ } catch {
+ NSLog("[Clerk] Failed to handle callback URL: \(error.localizedDescription)")
+ }
+ }
  }
 
  @MainActor

.changeset/olive-pugs-repeat.md

@@ -0,0 +1,5 @@
+---
+'@clerk/expo': patch
+---
+
+Fix email link sign-in never completing on iOS. Callback URLs opened by the "Return to App" button are now forwarded to the native SDK, including on a cold launch, so a flow started from `<AuthView />` signs the user in instead of leaving them signed out with no error.

packages/expo/expo-module.config.json

@@ -1,7 +1,8 @@
 {
  "platforms": ["apple", "android"],
  "apple": {
- "modules": ["ClerkExpoModule", "ClerkAuthViewModule", "ClerkUserProfileViewModule", "ClerkUserButtonViewModule"]
+ "modules": ["ClerkExpoModule", "ClerkAuthViewModule", "ClerkUserProfileViewModule", "ClerkUserButtonViewModule"],
+ "appDelegateSubscribers": ["ClerkAppDelegateSubscriber"]
  },
  "android": {
  "modules": [

packages/expo/ios/ClerkAppDelegateSubscriber.swift

@@ -0,0 +1,16 @@
+// ClerkAppDelegateSubscriber - Forwards inbound URLs to the native Clerk SDK.
+
+import ExpoModulesCore
+import UIKit
+
+public class ClerkAppDelegateSubscriber: ExpoAppDelegateSubscriber {
+ public func application(
+ _ app: UIApplication,
+ open url: URL,
+ options: [UIApplication.OpenURLOptionsKey: Any] = [:]
+ ) -> Bool {
+ ClerkNativeBridge.shared.handle(url: url)
+ // Returning false leaves the URL available to React Native's Linking.
+ return false
+ }
+}

packages/expo/ios/ClerkExpo.podspec

@@ -52,6 +52,7 @@ Pod::Spec.new do |s|
  end
 
  s.source_files = "ClerkNativeBridge.swift",
+ "ClerkAppDelegateSubscriber.swift",
  "ClerkExpoModule.swift",
  "ClerkNativeViewHost.swift",
  "ClerkAuthNativeView.swift",

packages/expo/ios/ClerkNativeBridge.swift

@@ -429,6 +429,8 @@ final class ClerkNativeBridge {
  private var lastObservedClientState: ClientStateSnapshot?
  private var configurationDepth = 0
  private var jsOriginatedClientSyncDepth = 0
+ private var pendingURL: URL?
+ private var shouldFlushPendingURL = false
 
  private init() {}
 
@@ -459,6 +461,13 @@ final class ClerkNativeBridge {
  defer {
  lastObservedClientState = Self.clerkConfigured ? Self.clientStateSnapshot() : nil
  configurationDepth = max(0, configurationDepth - 1)
+
+ // Overlapping calls can finish out of order, so replay once the last one settles and any
+ // of them succeeded. A batch where every call threw keeps the URL for the next attempt.
+ if configurationDepth == 0, shouldFlushPendingURL {
+ shouldFlushPendingURL = false
+ flushPendingURL()
+ }
  }
 
  loadThemes()
@@ -472,6 +481,7 @@ final class ClerkNativeBridge {
  let shouldWaitForClient = try await Self.syncTokenState(bearerToken: bearerToken)
  await Self.waitForLoadedClientIfNeeded(shouldWaitForClient)
  Self.postConfiguredNotification()
+ shouldFlushPendingURL = true
  return
  }
 
@@ -486,6 +496,7 @@ final class ClerkNativeBridge {
  _ = try await Clerk.shared.refreshClient()
  await Self.waitForLoadedClient()
  }
+ shouldFlushPendingURL = true
  return
  }
 
@@ -497,6 +508,32 @@ final class ClerkNativeBridge {
  let shouldWaitForClient = try await Self.syncTokenState(bearerToken: bearerToken)
  await Self.waitForLoadedClientIfNeeded(shouldWaitForClient)
  Self.postConfiguredNotification()
+ shouldFlushPendingURL = true
+ }
+
+ @MainActor
+ private func flushPendingURL() {
+ guard let url = pendingURL else { return }
+ pendingURL = nil
+ handle(url: url)
+ }
+
+ /// `AuthView` only reaches `Clerk.handle(_:)` from `.onOpenURL`, which never fires for a UIKit-hosted controller.
+ @MainActor
+ func handle(url: URL) {
+ // A cold launch delivers the callback before, or partway through, JS calling `configure`.
+ guard Self.clerkConfigured, configurationDepth == 0 else {
+ pendingURL = url
+ return
+ }
+
+ Task { @MainActor in
+ do {
+ try await Clerk.shared.handle(url)
+ } catch {
+ NSLog("[Clerk] Failed to handle callback URL: \(error.localizedDescription)")
+ }
+ }
  }
 
  @MainActor

.changeset/olive-pugs-repeat.md

@@ -0,0 +1,5 @@
+---
+'@clerk/expo': patch
+---
+
+Fix email link sign-in never completing on iOS. Callback URLs opened by the "Return to App" button are now forwarded to the native SDK, including on a cold launch, so a flow started from `<AuthView />` signs the user in instead of leaving them signed out with no error.

packages/expo/expo-module.config.json

@@ -1,7 +1,8 @@
 {
  "platforms": ["apple", "android"],
  "apple": {
- "modules": ["ClerkExpoModule", "ClerkAuthViewModule", "ClerkUserProfileViewModule", "ClerkUserButtonViewModule"]
+ "modules": ["ClerkExpoModule", "ClerkAuthViewModule", "ClerkUserProfileViewModule", "ClerkUserButtonViewModule"],
+ "appDelegateSubscribers": ["ClerkAppDelegateSubscriber"]
  },
  "android": {
  "modules": [

packages/expo/ios/ClerkAppDelegateSubscriber.swift

@@ -0,0 +1,16 @@
+// ClerkAppDelegateSubscriber - Forwards inbound URLs to the native Clerk SDK.
+
+import ExpoModulesCore
+import UIKit
+
+public class ClerkAppDelegateSubscriber: ExpoAppDelegateSubscriber {
+ public func application(
+ _ app: UIApplication,
+ open url: URL,
+ options: [UIApplication.OpenURLOptionsKey: Any] = [:]
+ ) -> Bool {
+ ClerkNativeBridge.shared.handle(url: url)
+ // Returning false leaves the URL available to React Native's Linking.
+ return false
+ }
+}

packages/expo/ios/ClerkExpo.podspec

@@ -52,6 +52,7 @@ Pod::Spec.new do |s|
  end
 
  s.source_files = "ClerkNativeBridge.swift",
+ "ClerkAppDelegateSubscriber.swift",
  "ClerkExpoModule.swift",
  "ClerkNativeViewHost.swift",
  "ClerkAuthNativeView.swift",

packages/expo/ios/ClerkNativeBridge.swift

@@ -429,6 +429,8 @@ final class ClerkNativeBridge {
  private var lastObservedClientState: ClientStateSnapshot?
  private var configurationDepth = 0
  private var jsOriginatedClientSyncDepth = 0
+ private var pendingURL: URL?
+ private var shouldFlushPendingURL = false
 
  private init() {}
 
@@ -459,6 +461,13 @@ final class ClerkNativeBridge {
  defer {
  lastObservedClientState = Self.clerkConfigured ? Self.clientStateSnapshot() : nil
  configurationDepth = max(0, configurationDepth - 1)
+
+ // Overlapping calls can finish out of order, so replay once the last one settles and any
+ // of them succeeded. A batch where every call threw keeps the URL for the next attempt.
+ if configurationDepth == 0, shouldFlushPendingURL {
+ shouldFlushPendingURL = false
+ flushPendingURL()
+ }
  }
 
  loadThemes()
@@ -472,6 +481,7 @@ final class ClerkNativeBridge {
  let shouldWaitForClient = try await Self.syncTokenState(bearerToken: bearerToken)
  await Self.waitForLoadedClientIfNeeded(shouldWaitForClient)
  Self.postConfiguredNotification()
+ shouldFlushPendingURL = true
  return
  }
 
@@ -486,6 +496,7 @@ final class ClerkNativeBridge {
  _ = try await Clerk.shared.refreshClient()
  await Self.waitForLoadedClient()
  }
+ shouldFlushPendingURL = true
  return
  }
 
@@ -497,6 +508,32 @@ final class ClerkNativeBridge {
  let shouldWaitForClient = try await Self.syncTokenState(bearerToken: bearerToken)
  await Self.waitForLoadedClientIfNeeded(shouldWaitForClient)
  Self.postConfiguredNotification()
+ shouldFlushPendingURL = true
+ }
+
+ @MainActor
+ private func flushPendingURL() {
+ guard let url = pendingURL else { return }
+ pendingURL = nil
+ handle(url: url)
+ }
+
+ /// `AuthView` only reaches `Clerk.handle(_:)` from `.onOpenURL`, which never fires for a UIKit-hosted controller.
+ @MainActor
+ func handle(url: URL) {
+ // A cold launch delivers the callback before, or partway through, JS calling `configure`.
+ guard Self.clerkConfigured, configurationDepth == 0 else {
+ pendingURL = url
+ return
+ }
+
+ Task { @MainActor in
+ do {
+ try await Clerk.shared.handle(url)
+ } catch {
+ NSLog("[Clerk] Failed to handle callback URL: \(error.localizedDescription)")
+ }
+ }
  }
 
  @MainActor

.changeset/olive-pugs-repeat.md

@@ -0,0 +1,5 @@
+---
+'@clerk/expo': patch
+---
+
+Fix email link sign-in never completing on iOS. Callback URLs opened by the "Return to App" button are now forwarded to the native SDK, including on a cold launch, so a flow started from `<AuthView />` signs the user in instead of leaving them signed out with no error.

packages/expo/expo-module.config.json

@@ -1,7 +1,8 @@
 {
  "platforms": ["apple", "android"],
  "apple": {
- "modules": ["ClerkExpoModule", "ClerkAuthViewModule", "ClerkUserProfileViewModule", "ClerkUserButtonViewModule"]
+ "modules": ["ClerkExpoModule", "ClerkAuthViewModule", "ClerkUserProfileViewModule", "ClerkUserButtonViewModule"],
+ "appDelegateSubscribers": ["ClerkAppDelegateSubscriber"]
  },
  "android": {
  "modules": [

packages/expo/ios/ClerkAppDelegateSubscriber.swift

@@ -0,0 +1,16 @@
+// ClerkAppDelegateSubscriber - Forwards inbound URLs to the native Clerk SDK.
+
+import ExpoModulesCore
+import UIKit
+
+public class ClerkAppDelegateSubscriber: ExpoAppDelegateSubscriber {
+ public func application(
+ _ app: UIApplication,
+ open url: URL,
+ options: [UIApplication.OpenURLOptionsKey: Any] = [:]
+ ) -> Bool {
+ ClerkNativeBridge.shared.handle(url: url)
+ // Returning false leaves the URL available to React Native's Linking.
+ return false
+ }
+}

packages/expo/ios/ClerkExpo.podspec

@@ -52,6 +52,7 @@ Pod::Spec.new do |s|
  end
 
  s.source_files = "ClerkNativeBridge.swift",
+ "ClerkAppDelegateSubscriber.swift",
  "ClerkExpoModule.swift",
  "ClerkNativeViewHost.swift",
  "ClerkAuthNativeView.swift",

packages/expo/ios/ClerkNativeBridge.swift

@@ -429,6 +429,8 @@ final class ClerkNativeBridge {
  private var lastObservedClientState: ClientStateSnapshot?
  private var configurationDepth = 0
  private var jsOriginatedClientSyncDepth = 0
+ private var pendingURL: URL?
+ private var shouldFlushPendingURL = false
 
  private init() {}
 
@@ -459,6 +461,13 @@ final class ClerkNativeBridge {
  defer {
  lastObservedClientState = Self.clerkConfigured ? Self.clientStateSnapshot() : nil
  configurationDepth = max(0, configurationDepth - 1)
+
+ // Overlapping calls can finish out of order, so replay once the last one settles and any
+ // of them succeeded. A batch where every call threw keeps the URL for the next attempt.
+ if configurationDepth == 0, shouldFlushPendingURL {
+ shouldFlushPendingURL = false
+ flushPendingURL()
+ }
  }
 
  loadThemes()
@@ -472,6 +481,7 @@ final class ClerkNativeBridge {
  let shouldWaitForClient = try await Self.syncTokenState(bearerToken: bearerToken)
  await Self.waitForLoadedClientIfNeeded(shouldWaitForClient)
  Self.postConfiguredNotification()
+ shouldFlushPendingURL = true
  return
  }
 
@@ -486,6 +496,7 @@ final class ClerkNativeBridge {
  _ = try await Clerk.shared.refreshClient()
  await Self.waitForLoadedClient()
  }
+ shouldFlushPendingURL = true
  return
  }
 
@@ -497,6 +508,32 @@ final class ClerkNativeBridge {
  let shouldWaitForClient = try await Self.syncTokenState(bearerToken: bearerToken)
  await Self.waitForLoadedClientIfNeeded(shouldWaitForClient)
  Self.postConfiguredNotification()
+ shouldFlushPendingURL = true
+ }
+
+ @MainActor
+ private func flushPendingURL() {
+ guard let url = pendingURL else { return }
+ pendingURL = nil
+ handle(url: url)
+ }
+
+ /// `AuthView` only reaches `Clerk.handle(_:)` from `.onOpenURL`, which never fires for a UIKit-hosted controller.
+ @MainActor
+ func handle(url: URL) {
+ // A cold launch delivers the callback before, or partway through, JS calling `configure`.
+ guard Self.clerkConfigured, configurationDepth == 0 else {
+ pendingURL = url
+ return
+ }
+
+ Task { @MainActor in
+ do {
+ try await Clerk.shared.handle(url)
+ } catch {
+ NSLog("[Clerk] Failed to handle callback URL: \(error.localizedDescription)")
+ }
+ }
  }
 
  @MainActor

.changeset/olive-pugs-repeat.md

@@ -0,0 +1,5 @@
+---
+'@clerk/expo': patch
+---
+
+Fix email link sign-in never completing on iOS. Callback URLs opened by the "Return to App" button are now forwarded to the native SDK, including on a cold launch, so a flow started from `<AuthView />` signs the user in instead of leaving them signed out with no error.

packages/expo/expo-module.config.json

@@ -1,7 +1,8 @@
 {
  "platforms": ["apple", "android"],
  "apple": {
- "modules": ["ClerkExpoModule", "ClerkAuthViewModule", "ClerkUserProfileViewModule", "ClerkUserButtonViewModule"]
+ "modules": ["ClerkExpoModule", "ClerkAuthViewModule", "ClerkUserProfileViewModule", "ClerkUserButtonViewModule"],
+ "appDelegateSubscribers": ["ClerkAppDelegateSubscriber"]
  },
  "android": {
  "modules": [

packages/expo/ios/ClerkAppDelegateSubscriber.swift

@@ -0,0 +1,16 @@
+// ClerkAppDelegateSubscriber - Forwards inbound URLs to the native Clerk SDK.
+
+import ExpoModulesCore
+import UIKit
+
+public class ClerkAppDelegateSubscriber: ExpoAppDelegateSubscriber {
+ public func application(
+ _ app: UIApplication,
+ open url: URL,
+ options: [UIApplication.OpenURLOptionsKey: Any] = [:]
+ ) -> Bool {
+ ClerkNativeBridge.shared.handle(url: url)
+ // Returning false leaves the URL available to React Native's Linking.
+ return false
+ }
+}

packages/expo/ios/ClerkExpo.podspec

@@ -52,6 +52,7 @@ Pod::Spec.new do |s|
  end
 
  s.source_files = "ClerkNativeBridge.swift",
+ "ClerkAppDelegateSubscriber.swift",
  "ClerkExpoModule.swift",
  "ClerkNativeViewHost.swift",
  "ClerkAuthNativeView.swift",

packages/expo/ios/ClerkNativeBridge.swift

@@ -429,6 +429,8 @@ final class ClerkNativeBridge {
  private var lastObservedClientState: ClientStateSnapshot?
  private var configurationDepth = 0
  private var jsOriginatedClientSyncDepth = 0
+ private var pendingURL: URL?
+ private var shouldFlushPendingURL = false
 
  private init() {}
 
@@ -459,6 +461,13 @@ final class ClerkNativeBridge {
  defer {
  lastObservedClientState = Self.clerkConfigured ? Self.clientStateSnapshot() : nil
  configurationDepth = max(0, configurationDepth - 1)
+
+ // Overlapping calls can finish out of order, so replay once the last one settles and any
+ // of them succeeded. A batch where every call threw keeps the URL for the next attempt.
+ if configurationDepth == 0, shouldFlushPendingURL {
+ shouldFlushPendingURL = false
+ flushPendingURL()
+ }
  }
 
  loadThemes()
@@ -472,6 +481,7 @@ final class ClerkNativeBridge {
  let shouldWaitForClient = try await Self.syncTokenState(bearerToken: bearerToken)
  await Self.waitForLoadedClientIfNeeded(shouldWaitForClient)
  Self.postConfiguredNotification()
+ shouldFlushPendingURL = true
  return
  }
 
@@ -486,6 +496,7 @@ final class ClerkNativeBridge {
  _ = try await Clerk.shared.refreshClient()
  await Self.waitForLoadedClient()
  }
+ shouldFlushPendingURL = true
  return
  }
 
@@ -497,6 +508,32 @@ final class ClerkNativeBridge {
  let shouldWaitForClient = try await Self.syncTokenState(bearerToken: bearerToken)
  await Self.waitForLoadedClientIfNeeded(shouldWaitForClient)
  Self.postConfiguredNotification()
+ shouldFlushPendingURL = true
+ }
+
+ @MainActor
+ private func flushPendingURL() {
+ guard let url = pendingURL else { return }
+ pendingURL = nil
+ handle(url: url)
+ }
+
+ /// `AuthView` only reaches `Clerk.handle(_:)` from `.onOpenURL`, which never fires for a UIKit-hosted controller.
+ @MainActor
+ func handle(url: URL) {
+ // A cold launch delivers the callback before, or partway through, JS calling `configure`.
+ guard Self.clerkConfigured, configurationDepth == 0 else {
+ pendingURL = url
+ return
+ }
+
+ Task { @MainActor in
+ do {
+ try await Clerk.shared.handle(url)
+ } catch {
+ NSLog("[Clerk] Failed to handle callback URL: \(error.localizedDescription)")
+ }
+ }
  }
 
  @MainActor