Merge pull request #419 from superwall/develop

4.12.6

Author: yusuftor

CHANGELOG.md

@@ -2,6 +2,16 @@
 
 The changelog for `SuperwallKit`. Also see the [releases](https://github.com/superwall/Superwall-iOS/releases) on GitHub.
 
+## 4.12.6
+
+### Enhancements
+
+- Adds post purchase actions support.
+
+### Fixes
+
+- Fixes a rare issue where TestFlight products could display in a different currency on the paywall than on Apple's payment sheet.
+
 ## 4.12.5
 
 ### Enhancements

Examples/Advanced/Advanced.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -105,7 +105,8 @@ enum Logger: Loggable {
         dumping["error"] = error
       }
 
-      var name = "\(Date().isoString) \(logLevel.descriptionEmoji) [Superwall] [\(scope.description)] - \(logLevel.description)"
+      var name = "\(Date().isoString) \(logLevel.descriptionEmoji) "
+        + "[Superwall] [\(scope.description)] - \(logLevel.description)"
 
       if let message = message {
         name += ": \(message)"

Package.resolved

@@ -18,5 +18,5 @@ let sdkVersion = """
 */
 
 let sdkVersion = """
-4.12.5
+4.12.6
 """

Sources/SuperwallKit/Logger/Logger.swift

@@ -51,7 +51,7 @@ enum PaywallMessage: Decodable, Equatable {
   case openUrlInSafari(_ url: URL)
   case openPaymentSheet(_ url: URL)
   case openDeepLink(url: URL)
-  case purchase(productId: String)
+  case purchase(productId: String, shouldDismiss: Bool)
   case custom(data: String)
   case customPlacement(name: String, params: JSON)
   case userAttributesUpdated(attributes: JSON)
@@ -101,9 +101,11 @@ enum PaywallMessage: Decodable, Equatable {
   }
 
   // Everyone write to eventName, other may use the remaining keys
+  // Note: JSONDecoder.fromSnakeCase converts snake_case keys to camelCase automatically
   private enum CodingKeys: String, CodingKey {
     case messageType = "eventName"
     case productId = "productIdentifier"
+    case shouldDismiss
     case url
     case link
     case data
@@ -141,7 +143,8 @@ enum PaywallMessage: Decodable, Equatable {
         return
       case .purchase:
         if let productId = try? values.decode(String.self, forKey: .productId) {
-          self = .purchase(productId: productId)
+          let shouldDismiss = try values.decodeIfPresent(Bool.self, forKey: .shouldDismiss) ?? true
+          self = .purchase(productId: productId, shouldDismiss: shouldDismiss)
           return
         }
       case .restore:

Sources/SuperwallKit/Misc/Constants.swift

@@ -126,16 +126,25 @@ final class PaywallMessageHandler: WebEventDelegate {
         await self.pass(placement: transactionStart, from: paywall)
       }
     case let .transactionComplete(trialEndDate, productIdentifier):
-      let freeTrialStart = SuperwallEventObjc.freeTrialStart.description
       Task {
-        var payload: [String: Any] = ["product_identifier": productIdentifier]
+        // Send transaction_complete to trigger post-purchase actions
+        let transactionComplete = SuperwallEventObjc.transactionComplete.description
+        await self.pass(
+          placement: transactionComplete,
+          from: paywall,
+          payload: ["product_identifier": productIdentifier]
+        )
+
+        // Send freeTrial_start for notification scheduling
+        let freeTrialStart = SuperwallEventObjc.freeTrialStart.description
+        var freeTrialPayload: [String: Any] = ["product_identifier": productIdentifier]
         if let trialEndDate {
-          payload["trial_end_date"] = Int(trialEndDate.timeIntervalSince1970 * 1000)
+          freeTrialPayload["trial_end_date"] = Int(trialEndDate.timeIntervalSince1970 * 1000)
         }
         await self.pass(
           placement: freeTrialStart,
           from: paywall,
-          payload: payload
+          payload: freeTrialPayload
         )
       }
     case .transactionFail:
@@ -163,8 +172,8 @@ final class PaywallMessageHandler: WebEventDelegate {
       openDeepLink(url)
     case .restore:
       restorePurchases()
-    case .purchase(productId: let id):
-      purchaseProduct(withId: id)
+    case let .purchase(productId: id, shouldDismiss: shouldDismiss):
+      purchaseProduct(withId: id, shouldDismiss: shouldDismiss)
     case .custom(data: let name):
       handleCustomEvent(name)
     case let .customPlacement(name: name, params: params):
@@ -342,6 +351,7 @@ final class PaywallMessageHandler: WebEventDelegate {
 
       // block selection
       let selectionString =
+      // swiftlint:disable:next line_length
         "var css = '*{-webkit-touch-callout:none;-webkit-user-select:none} .w-webflow-badge { display: none !important; }'; "
         + "var head = document.head || document.getElementsByTagName('head')[0]; "
         + "var style = document.createElement('style'); style.type = 'text/css'; "
@@ -355,6 +365,7 @@ final class PaywallMessageHandler: WebEventDelegate {
       self.delegate?.webView.configuration.userContentController.addUserScript(selectionScript)
 
       let preventSelection =
+      // swiftlint:disable:next line_length
         "var css = '*{-webkit-touch-callout:none;-webkit-user-select:none}'; var head = document.head || document.getElementsByTagName('head')[0]; var style = document.createElement('style'); style.type = 'text/css'; style.appendChild(document.createTextNode(css)); head.appendChild(style);"
       self.delegate?.webView.evaluateJavaScript(preventSelection)
 
@@ -431,10 +442,18 @@ final class PaywallMessageHandler: WebEventDelegate {
     delegate?.eventDidOccur(.initiateRestore)
   }
 
-  private func purchaseProduct(withId id: String) {
+  private func purchaseProduct(
+    withId id: String,
+    shouldDismiss: Bool
+  ) {
     detectHiddenPaywallEvent("purchase")
     hapticFeedback()
-    delegate?.eventDidOccur(.initiatePurchase(productId: id))
+    delegate?.eventDidOccur(
+      .initiatePurchase(
+        productId: id,
+        shouldDismiss: shouldDismiss
+      )
+    )
   }
 
   private func handleCustomEvent(_ customEvent: String) {

Sources/SuperwallKit/Paywall/View Controller/Web View/Message Handling/PaywallMessage.swift

@@ -9,7 +9,10 @@ import Foundation
 
 enum PaywallWebEvent: Equatable {
   case closed
-  case initiatePurchase(productId: String)
+  case initiatePurchase(
+    productId: String,
+    shouldDismiss: Bool
+  )
   case initiateRestore
   case custom(string: String)
   case openedURL(url: URL)

Sources/SuperwallKit/Paywall/View Controller/Web View/Message Handling/PaywallMessageHandler.swift

@@ -71,16 +71,23 @@ class Cache {
       guard let self = self else { return }
       guard
         let documentDirectory = self.fileManager.urls(for: .documentDirectory, in: .userDomainMask).first,
-        let applicationSupportDirectory = self.fileManager.urls(for: .applicationSupportDirectory, in: .userDomainMask).first
+        let applicationSupportDirectory = self.fileManager.urls(
+          for: .applicationSupportDirectory,
+          in: .userDomainMask
+        ).first
       else {
         return
       }
 
-      let userSpecificDocumentUrl = documentDirectory.appendingPathComponent(Cache.userSpecificDocumentDirectoryPrefix)
-      let appSpecificDocumentUrl = documentDirectory.appendingPathComponent(Cache.appSpecificDocumentDirectoryPrefix)
+      let userSpecificDocumentUrl = documentDirectory
+        .appendingPathComponent(Cache.userSpecificDocumentDirectoryPrefix)
+      let appSpecificDocumentUrl = documentDirectory
+        .appendingPathComponent(Cache.appSpecificDocumentDirectoryPrefix)
 
-      let userSpecificSupportUrl = applicationSupportDirectory.appendingPathComponent(Cache.userSpecificDocumentDirectoryPrefix)
-      let appSpecificSupportUrl = applicationSupportDirectory.appendingPathComponent(Cache.appSpecificDocumentDirectoryPrefix)
+      let userSpecificSupportUrl = applicationSupportDirectory
+        .appendingPathComponent(Cache.userSpecificDocumentDirectoryPrefix)
+      let appSpecificSupportUrl = applicationSupportDirectory
+        .appendingPathComponent(Cache.appSpecificDocumentDirectoryPrefix)
 
       do {
         // Create the destination directories if they don't exist.