Merge branch 'develop' into ir/feat/dynamic-notifications

Author: yusuftor

CHANGELOG.md

@@ -2,6 +2,19 @@
 
 The changelog for `SuperwallKit`. Also see the [releases](https://github.com/superwall/Superwall-iOS/releases) on GitHub.
 
+## 4.10.7
+
+### Fixes
+
+- Fixes issue returning the `PurchaseResult` from `Superwall.shared.purchase(_:)` when using StoreKit 1 inside a `PurchaseController`.
+- Fixes `handleDeepLink` returning true for non-Superwall URLs when called before configuration completes.
+
+## 4.10.6
+
+### Fixes
+
+- Fixes issue that prevented the SDK from being built on old Xcode versions.
+
 ## 4.10.5
 
 ### Enhancements

Examples/Advanced/Advanced/SuperwallAdvancedApp.swift

@@ -22,7 +22,7 @@ struct SuperwallAdvancedApp: App {
 
     // MARK: - Option 1: Let Superwall handle everything
     Superwall.configure(apiKey: apiKey)
-    
+
     // MARK: - Option 2: Use a Purchase Controller with StoreKit
     /*
     // Step 1 - Create your Purchase Controller

Sources/SuperwallKit/Config/Models/FeatureFlags.swift

@@ -22,6 +22,7 @@ struct FeatureFlags: Codable, Equatable {
   var enableMultiplePaywallUrls: Bool
   var enableConfigRefresh: Bool
   var enableTextInteraction: Bool
+  var enableIframeNavigation: Bool
 
   enum CodingKeys: String, CodingKey {
     case toggles
@@ -43,6 +44,7 @@ struct FeatureFlags: Codable, Equatable {
     enableMultiplePaywallUrls = rawFeatureFlags.value(forKey: "enable_multiple_paywall_urls", default: false)
     enableConfigRefresh = rawFeatureFlags.value(forKey: "enable_config_refresh_v2", default: false)
     enableTextInteraction = rawFeatureFlags.value(forKey: "enable_text_interaction", default: false)
+    enableIframeNavigation = rawFeatureFlags.value(forKey: "enable_iframe_navigation", default: false)
   }
 
   func encode(to encoder: Encoder) throws {
@@ -57,7 +59,8 @@ struct FeatureFlags: Codable, Equatable {
       RawFeatureFlag(key: "enable_none_scheduling_policy", enabled: enableNoneSchedulingPolicy),
       RawFeatureFlag(key: "enable_multiple_paywall_urls", enabled: enableMultiplePaywallUrls),
       RawFeatureFlag(key: "enable_config_refresh_v2", enabled: enableConfigRefresh),
-      RawFeatureFlag(key: "enable_text_interaction", enabled: enableTextInteraction)
+      RawFeatureFlag(key: "enable_text_interaction", enabled: enableTextInteraction),
+      RawFeatureFlag(key: "enable_iframe_navigation", enabled: enableIframeNavigation)
     ]
 
     try container.encode(rawFeatureFlags, forKey: .toggles)
@@ -73,7 +76,8 @@ struct FeatureFlags: Codable, Equatable {
     enableMultiplePaywallUrls: Bool,
     enableConfigRefresh: Bool,
     enableTextInteraction: Bool,
-    enableCELLogging: Bool
+    enableCELLogging: Bool,
+    enableIframeNavigation: Bool
   ) {
     self.enableExpressionParameters = enableExpressionParameters
     self.enableUserIdSeed = enableUserIdSeed
@@ -84,6 +88,7 @@ struct FeatureFlags: Codable, Equatable {
     self.enableMultiplePaywallUrls = enableMultiplePaywallUrls
     self.enableConfigRefresh = enableConfigRefresh
     self.enableTextInteraction = enableTextInteraction
+    self.enableIframeNavigation = enableIframeNavigation
   }
 }
 
@@ -111,7 +116,8 @@ extension FeatureFlags: Stubbable {
       enableMultiplePaywallUrls: true,
       enableConfigRefresh: true,
       enableTextInteraction: true,
-      enableCELLogging: true
+      enableCELLogging: true,
+      enableIframeNavigation: true
     )
   }
 }

Sources/SuperwallKit/DeepLinkRouter.swift

@@ -38,7 +38,9 @@ final class DeepLinkRouter {
     }
 
     let deepLinkUrl: URL
-    if url.isSuperwallDeepLink {
+    let isSuperwallDeepLink = url.isSuperwallDeepLink
+
+    if isSuperwallDeepLink {
       deepLinkUrl = url.superwallDeepLinkMappedURL
 
       Task { @MainActor in
@@ -52,11 +54,26 @@ final class DeepLinkRouter {
       deepLinkUrl = url
     }
 
-
     Task {
       await Superwall.shared.track(InternalSuperwallEvent.DeepLink(url: deepLinkUrl))
     }
-    return debugManager.handle(deepLinkUrl: deepLinkUrl)
+
+    // Check if this is a debug URL
+    if debugManager.handle(deepLinkUrl: deepLinkUrl) {
+      return true
+    }
+
+    // Return true for Superwall deep links (we handled it above)
+    if isSuperwallDeepLink {
+      return true
+    }
+
+    // Return true if there's a deepLink_open trigger configured
+    if configManager.triggersByPlacementName[SuperwallEventObjc.deepLink.description] != nil {
+      return true
+    }
+
+    return false
   }
 
   private func listenToConfig() {
@@ -80,9 +97,54 @@ final class DeepLinkRouter {
   }
 
   /// Stores the deep link until it can be handled.
+  ///
+  /// Called when `handleDeepLink` is invoked before Superwall configuration completes.
+  /// The URL is always stored so it can be processed once config loads, but the return
+  /// value indicates whether Superwall will definitely handle this URL.
+  ///
+  /// - Note: The URL is always stored regardless of return value because the fresh config
+  ///   might have a `deepLink_open` trigger even if cached config doesn't. This ensures
+  ///   deep links aren't lost during app launch. If the URL isn't a Superwall URL,
+  ///   returning `false` allows other handlers in a handler chain to process it.
+  ///
+  /// - Parameter url: The deep link URL to store.
+  /// - Returns: `true` if the URL is a Superwall URL that will be handled, `false` otherwise.
   static func storeDeepLink(_ url: URL) -> Bool {
+    // Always store the URL - the fresh config might have deepLink_open trigger
+    // even if cached config doesn't
     pendingDeepLink = url
-    return true
+
+    // Only return true if we're confident Superwall will handle this URL
+    return isSuperwallURL(url)
+  }
+
+  /// Checks if the URL is one that Superwall will handle.
+  private static func isSuperwallURL(_ url: URL) -> Bool {
+    // Superwall universal links (*.superwall.app/app-link/*)
+    if url.isSuperwallDeepLink {
+      return true
+    }
+
+    // Redemption codes
+    if url.redeemableCode != nil {
+      return true
+    }
+
+    // Debug/preview URLs
+    if DebugManager.outcomeForDeepLink(url: url) != nil {
+      return true
+    }
+
+    // Check cached config for deepLink_open trigger
+    let cache = Cache()
+    if let config = cache.read(LatestConfig.self) {
+      let triggers = ConfigLogic.getTriggersByPlacementName(from: config.triggers)
+      if triggers[SuperwallEventObjc.deepLink.description] != nil {
+        return true
+      }
+    }
+
+    return false
   }
 }
 

Sources/SuperwallKit/Misc/Constants.swift

@@ -18,5 +18,5 @@ let sdkVersion = """
 */
 
 let sdkVersion = """
-4.10.5
+4.10.7
 """

Sources/SuperwallKit/Network/Device Helper/DeviceHelper.swift

@@ -200,33 +200,53 @@ class DeviceHelper {
     if #available(iOS 14.5, *) {
       networks += [.mir]
     }
+
     if #available(iOS 15.0, *) {
       networks += [.nanaco]
     }
     if #available(iOS 15.1, *) {
       networks += [.dankort]
     }
+
+    #if compiler(>=5.7)
     if #available(iOS 16.0, *) {
       networks += [.bancomat, .nanaco, .waon]
     }
+    #endif
+
+    #if compiler(>=5.8)
     if #available(iOS 16.4, *) {
       networks += [.postFinance]
     }
+    #endif
+
+    #if compiler(>=5.9)
     if #available(iOS 17.0, *) {
       networks += [.tmoney, .pagoBancomat]
     }
+    #endif
+
+    #if compiler(>=5.10)
     if #available(iOS 17.4, visionOS 1.1, *) {
       networks += [.meeza]
     }
+
     if #available(iOS 17.5, visionOS 1.2, *) {
       networks += [.bankAxept, .NAPAS]
     }
+    #endif
+
+    #if compiler(>=6.1)
     if #available(iOS 18.4, visionOS 2.4, *) {
       networks += [.himyan, .jaywan]
     }
+    #endif
+
+    #if compiler(>=6.2)
     if #available(iOS 26.0, visionOS 26.0, *) {
       networks += [.myDebit]
     }
+    #endif
 
     return PKPaymentAuthorizationViewController.canMakePayments(
       usingNetworks: networks

Sources/SuperwallKit/Network/Device Helper/SwiftVersion.swift

@@ -8,8 +8,10 @@
 
 extension DeviceHelper {
   func currentSwiftVersion() -> String {
-  #if swift(>=6.1)
-    return "6.1+"
+  #if swift(>=6.2)
+    return "6.2"
+  #elseif swift(>=6.1)
+    return "6.1"
   #elseif swift(>=6.0)
     return "6.0"
   #elseif swift(>=5.10)
@@ -108,7 +110,9 @@ extension DeviceHelper {
   }
 
   func currentCompilerVersion() -> String {
-  #if compiler(>=6.1)
+  #if compiler(>=6.2)
+    return "6.2"
+  #elseif compiler(>=6.1)
     return "6.1+"
   #elseif compiler(>=6.0)
     return "6.0"

Sources/SuperwallKit/Paywall/View Controller/Web View/SWWebView.swift

@@ -43,6 +43,7 @@ class SWWebView: WKWebView {
   private let isMac: Bool
   private let isOnDeviceCacheEnabled: Bool
   private var completion: ((Error?) -> Void)?
+  private let enableIframeNavigation: Bool
 
   init(
     isMac: Bool,
@@ -54,6 +55,7 @@ class SWWebView: WKWebView {
     self.messageHandler = messageHandler
     self.isOnDeviceCacheEnabled = isOnDeviceCacheEnabled
     let featureFlags = factory.makeFeatureFlags()
+    self.enableIframeNavigation = featureFlags?.enableIframeNavigation ?? false
 
     self.loadingHandler = SWWebViewLoadingHandler(
       enableMultiplePaywallUrls: featureFlags?.enableMultiplePaywallUrls == true
@@ -214,6 +216,10 @@ extension SWWebView: WKNavigationDelegate {
     if navigationAction.navigationType == .reload {
       return .allow
     }
+    if enableIframeNavigation,
+      navigationAction.targetFrame?.isMainFrame == false {
+      return .allow
+    }
     return .cancel
   }
 

Sources/SuperwallKit/StoreKit/Transactions/Purchasing/StoreKit 1/ProductPurchaserSK1.swift

@@ -178,12 +178,12 @@ extension ProductPurchaserSK1: SKPaymentTransactionObserver {
     let source = await coordinator.source
     if let source = source {
       switch source {
-      case .internal,
-        .purchaseFunc:
+      case .internal:
         if factory.makeHasExternalPurchaseController() {
           return
         }
-      case .observeFunc:
+      case .purchaseFunc,
+        .observeFunc:
         break
       }
     } else if skTransaction.transactionState == .purchasing {

Sources/SuperwallKit/Superwall.swift

@@ -913,16 +913,25 @@ public final class Superwall: NSObject, ObservableObject {
     return dependencyContainer.deepLinkRouter.route(url: url)
   }
 
-  /// Handles a deep link sent to your app to open a preview of your paywall.
+  /// Handles a deep link sent to your app.
   ///
-  /// You can preview your paywall on-device before going live by utilizing paywall previews. This uses a deep link to render a
-  /// preview of a paywall you've configured on the Superwall dashboard on your device. See
-  /// [In-App Previews](https://docs.superwall.com/docs/in-app-paywall-previews) for
-  /// more.
+  /// This method handles several types of deep links:
+  /// - **Paywall previews**: Preview paywalls on-device before going live. See
+  ///   [In-App Previews](https://docs.superwall.com/docs/in-app-paywall-previews).
+  /// - **Redemption codes**: Redeem web checkout codes via deep link.
+  /// - **Superwall universal links**: Links in the format `*.superwall.app/app-link/*`.
+  /// - **`deepLink_open` trigger**: Any deep link can trigger a paywall if you've configured
+  ///   a `deepLink_open` trigger in your Superwall dashboard.
   ///
-  /// - Parameters:
-  ///   - url: The URL of the deep link.
-  /// - Returns: A `Bool` that is `true` if the deep link was handled. If called before ``Superwall/configure(apiKey:purchaseController:options:completion:)`` completes then it'll always return `true`.
+  /// This method is designed to work in a handler chain pattern where multiple handlers
+  /// process deep links. It returns `true` only for URLs that Superwall will handle,
+  /// allowing other handlers to process non-Superwall URLs.
+  ///
+  /// - Parameter url: The URL of the deep link.
+  /// - Returns: `true` if Superwall will handle this deep link, `false` otherwise.
+  ///   When called before ``Superwall/configure(apiKey:purchaseController:options:completion:)``
+  ///   completes, returns `true` only for recognized Superwall URL formats or if cached
+  ///   config contains a `deepLink_open` trigger.
   @discardableResult
   public static func handleDeepLink(_ url: URL) -> Bool {
     if Superwall.isInitialized,