Merge pull request #335 from stripe/release-4.1.0

Release 4.1.0
stripe · Nov 18, 2024 · ac540cc · ac540cc
2 parents b22040e + f48c49d
commit ac540cc
Show file tree

Hide file tree

Showing 752 changed files with 514,957 additions and 86,677 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,14 @@ If you are using CocoaPods, update your Podfile:
 ```
 pod 'StripeTerminal', '~> 4.0'
 ```
+# 4.1.0 2024-11-18
+* Built with Xcode 16.0 Swift version 6.0.
+* Update: Added field `dynamicCurrencyConversion` to [`SCPCardPresentDetails`](https://stripe.dev/stripe-terminal-ios/docs/Classes/SCPCardPresentDetails.html).
+  * If you are interested in joining this preview, please email [stripe-terminal-betas@stripe.com](mailto:stripe-terminal-betas@stripe.com).
+* New: Affirm support for smart readers is now available in private preview.
+  * If you are interested in joining this preview, please email [stripe-terminal-betas@stripe.com](mailto:stripe-terminal-betas@stripe.com).
+* New: Added an `returnUrl` parameter to [`SCPConfirmConfiguration`](https://stripe.dev/stripe-terminal-ios/docs/Classes/SCPConfirmConfiguration.html) to specify desired return_url to redirect to upon completion of a Redirect Payment Method.
+
 
 # 4.0.0 2024-10-31
 4.0.0 includes breaking changes in both symbols and behavior. See the [migration guide](https://stripe.com/docs/terminal/references/sdk-migration-guide) for more details.

diff --git a/Example/Example.xcodeproj/project.pbxproj b/Example/Example.xcodeproj/project.pbxproj
diff --git a/Example/Example/APIClient.swift b/Example/Example/APIClient.swift
@@ -108,10 +108,12 @@ class APIClient: NSObject, ConnectionTokenProvider {
         }
     }
 
-    func capturePaymentIntent(_ paymentIntentId: String, completion: @escaping ErrorCompletionBlock) {
+    func capturePaymentIntent(_ paymentIntentId: String, stripeAccount: String? = nil, additionalParams: [String: Any]? = nil, completion: @escaping ErrorCompletionBlock) {
         let url = self.baseURL.appendingPathComponent("capture_payment_intent")
+        var params = additionalParams ?? [:]
+        params["payment_intent_id"] = paymentIntentId
         AF.request(url, method: .post,
-                          parameters: ["payment_intent_id": paymentIntentId])
+                   parameters: params)
             .validate(statusCode: 200..<300)
             .responseString { response in
                 switch response.result {

diff --git a/Example/Example/Info.plist b/Example/Example/Info.plist
@@ -49,5 +49,7 @@
 	</array>
 	<key>UIUserInterfaceStyle</key>
 	<string>Light</string>
+	<key>LSMinimumSystemVersion</key>
+	<string>12.0</string>
 </dict>
 </plist>
diff --git a/Example/Example/PaymentViewController.swift b/Example/Example/PaymentViewController.swift
@@ -20,6 +20,7 @@ class PaymentViewController: EventDisplayingViewController {
     private var offlineCreateConfig: CreateConfiguration?
     private let isSposReader: Bool
     private let skipCapture: Bool
+    private let onReceiptTip: UInt
 
     init(paymentParams: PaymentIntentParameters,
          collectConfig: CollectConfiguration,
@@ -30,14 +31,17 @@ class PaymentViewController: EventDisplayingViewController {
          offlineTransactionLimit: Int,
          offlineTotalTransactionLimit: Int,
          offlineBehavior: OfflineBehavior,
-         skipCapture: Bool) {
+         skipCapture: Bool,
+         onReceiptTip: UInt
+    ) {
         self.paymentParams = paymentParams
         self.collectConfig = collectConfig
         self.confirmConfig = confirmConfig
         self.declineCardBrand = declineCardBrand
         self.recollectAfterCardBrandDecline = recollectAfterCardBrandDecline
         self.isSposReader = isSposReader
         self.skipCapture = skipCapture
+        self.onReceiptTip = onReceiptTip
 
         var isOverOfflineTransactionLimit = paymentParams.amount >= offlineTransactionLimit
         if let offlinePaymentTotalByCurrency = Terminal.shared.offlineStatus.sdk.paymentAmountsByCurrency[paymentParams.currency]?.intValue {
@@ -306,7 +310,8 @@ class PaymentViewController: EventDisplayingViewController {
             // Online, capture intent.
             var captureEvent = LogEvent(method: .capturePaymentIntent)
             self.events.append(captureEvent)
-            AppDelegate.apiClient?.capturePaymentIntent(piID) { captureError in
+            let additionalParams = ["amount_to_capture": self.onReceiptTip + intent.amount]
+            AppDelegate.apiClient?.capturePaymentIntent(piID, additionalParams: additionalParams) { captureError in
                 if let error = captureError {
                     captureEvent.result = .errored
                     captureEvent.object = .error(error as NSError)

diff --git a/Example/Example/ReaderViewController.swift b/Example/Example/ReaderViewController.swift
@@ -407,7 +407,7 @@ extension ReaderViewController: ReaderDelegate {
             }
         }}
         reconnectionAlertController.addAction(cancelAction)
-        present(reconnectionAlertController, animated: true, completion: nil)
+        topViewController()?.present(reconnectionAlertController, animated: true, completion: nil)
     }
 
     func readerDidFailReconnect(_ reader: Reader) {

diff --git a/Example/Example/StartPaymentViewController.swift b/Example/Example/StartPaymentViewController.swift
@@ -35,6 +35,7 @@ class StartPaymentViewController: TableViewController, CancelingViewController {
         .card,
         .interacPresent,
         .wechatPay,
+        .affirm,
     ]
     private var selectedPaymentMethodTypes: [PaymentMethodType] = [.cardPresent]
     private var allowRedisplay: AllowRedisplay = AllowRedisplay.always
@@ -55,6 +56,8 @@ class StartPaymentViewController: TableViewController, CancelingViewController {
 
     private var offlineBehavior: OfflineBehavior = .preferOnline
 
+    private var onReceiptTip: UInt = 0
+
     private lazy var offlineTransactionLimitTextField: TextFieldView = {
         let textField = TextFieldView(placeholderText: "10000", keyboardType: .numberPad)
         textField.textField.autocorrectionType = .no
@@ -71,6 +74,14 @@ private lazy var offlineStoredTransactionLimitTextField: TextFieldView = {
         return textField
     }()
 
+    private lazy var tipFields: UIStackView = {
+        let textFields = UIStackView()
+        textFields.axis = .vertical
+        textFields.addArrangedSubview(tipEligibleAmountTextField)
+        textFields.addArrangedSubview(postAuthTipAmountTextField)
+        return textFields
+    }()
+
     private lazy var tipEligibleAmountTextField: AmountInputView = {
         let textField = AmountInputView(footer: "Must have on-reader tipping configured to have any effect.", placeholderText: "Tip-eligible amount")
         textField.textField.text = nil
@@ -79,6 +90,14 @@ private lazy var offlineStoredTransactionLimitTextField: TextFieldView = {
         return textField
     }()
 
+    private lazy var postAuthTipAmountTextField: AmountInputView = {
+        let textField = AmountInputView(footer: "overcapture_supported must be true for the capture to succeed.", placeholderText: "Post-auth tip amount (overcapture)")
+        textField.textField.text = nil
+        textField.textField.clearButtonMode = .whileEditing
+        textField.textField.keyboardType = .numbersAndPunctuation
+        return textField
+    }()
+
     private lazy var simulatedTipAmountTextField: AmountInputView = {
         let textField = AmountInputView(placeholderText: "Simulated tip amount", keyboardType: .numberPad)
         textField.textField.text = nil
@@ -103,6 +122,14 @@ private lazy var offlineStoredTransactionLimitTextField: TextFieldView = {
         return textField
     }()
 
+    private lazy var returnUrlTextField: TextFieldView = {
+        let textField = TextFieldView(placeholderText: "Return URL", keyboardType: .URL)
+        textField.textField.autocorrectionType = .no
+        textField.textField.autocapitalizationType = .none
+        textField.textField.clearButtonMode = .whileEditing
+        return textField
+    }()
+
     init(isSposReader: Bool) {
         self.isSposReader = isSposReader
         super.init(style: .grouped)
@@ -135,6 +162,8 @@ private lazy var offlineStoredTransactionLimitTextField: TextFieldView = {
         surchargeNoticeTextField.textField.delegate = self
         amountSurchargeTextField.textField.delegate = self
 
+        returnUrlTextField.textField.delegate = self
+
         amountView.onAmountUpdated = { [unowned self] amountString in
             self.startSection?.header = Section.Extremity.title(amountString)
             self.updateContent()
@@ -242,6 +271,10 @@ private lazy var offlineStoredTransactionLimitTextField: TextFieldView = {
             }
         }
 
+        if let returnUrl = returnUrlTextField.textField.text {
+            confirmConfigBuilder.setReturnUrl(returnUrl)
+        }
+
         do {
             if let eligibleAmount = Int(tipEligibleAmountTextField.textField.text ?? "none") {
                 collectConfigBuilder.setTippingConfiguration(
@@ -250,6 +283,9 @@ private lazy var offlineStoredTransactionLimitTextField: TextFieldView = {
                         .build()
                 )
             }
+            if let onReceiptAmount = UInt(postAuthTipAmountTextField.textField.text ?? "0") {
+                onReceiptTip = onReceiptAmount
+            }
             let collectConfig = try collectConfigBuilder.build()
             let confirmConfig = try confirmConfigBuilder.build()
             let vc = PaymentViewController(paymentParams: try paymentParamsBuilder.build(),
@@ -261,7 +297,8 @@ private lazy var offlineStoredTransactionLimitTextField: TextFieldView = {
                 offlineTransactionLimit: Int(offlineTransactionLimitTextField.textField.text ?? "10000") ?? 10000,
                 offlineTotalTransactionLimit: Int(offlineStoredTransactionLimitTextField.textField.text ?? "50000") ?? 50000,
                 offlineBehavior: self.offlineBehavior,
-                skipCapture: self.skipCapture
+                skipCapture: self.skipCapture,
+                onReceiptTip: self.onReceiptTip
             )
             let navController = LargeTitleNavigationController(rootViewController: vc)
             navController.presentationController?.delegate = self
@@ -317,7 +354,7 @@ private lazy var offlineStoredTransactionLimitTextField: TextFieldView = {
                 self.skipTipping.toggle()
                 self.updateContent()
             })],
-            footer: .autoLayoutView(tipEligibleAmountTextField))
+            footer: .autoLayoutView(tipFields))
     }
 
     private func makeTransactionSection() -> Section? {
@@ -557,6 +594,12 @@ private lazy var offlineStoredTransactionLimitTextField: TextFieldView = {
         return offlineTransactionLimitSection
     }
 
+    /// Makes the "Return URL" section.
+    private func makeReturnUrlSection() -> Section {
+        let returnUrlSection = Section(header: .title("Return URL"), rows: [], footer: .autoLayoutView(returnUrlTextField))
+        return returnUrlSection
+    }
+
     private func updateContent() {
 
         let sections: [Section?] = [
@@ -577,6 +620,7 @@ private lazy var offlineStoredTransactionLimitTextField: TextFieldView = {
             self.makeOfflineStoredTransactionLimitSection(),
             self.makeOfflineBehaviorSection(),
             self.makeSetupFutureUsageSection(),
+            self.makeReturnUrlSection(),
             self.startSection
         ]
 

diff --git a/Example/Example/UIViewController+Presentation.swift b/Example/Example/UIViewController+Presentation.swift
@@ -0,0 +1,31 @@
+//
+//  UIViewController+Presentation.swift
+//  Example
+//
+//  Created by Brian Cooke on 10/18/24.
+//  Copyright © 2024 Stripe. All rights reserved.
+//
+
+import UIKit
+
+extension UIViewController {
+    func topViewController() -> UIViewController? {
+        guard let keyWindow = UIApplication.shared.connectedScenes
+            .filter({$0.activationState == .foregroundActive})
+            .compactMap({$0 as? UIWindowScene})
+            .first?.windows
+            .filter({$0.isKeyWindow}).first else {
+            return nil
+        }
+
+
+        guard var topViewController = keyWindow.rootViewController else {
+            return nil
+        }
+
+        while let presentedViewController = topViewController.presentedViewController {
+            topViewController = presentedViewController
+        }
+        return topViewController
+    }
+}
diff --git a/Example/Podfile.lock b/Example/Podfile.lock
@@ -26,4 +26,4 @@ SPEC CHECKSUMS:
 
 PODFILE CHECKSUM: 4b74d0597959469ee954001e3536226231ca6150
 
-COCOAPODS: 1.15.2
+COCOAPODS: 1.16.2
diff --git a/Example/Pods/Manifest.lock b/Example/Pods/Manifest.lock
Original file line number	Diff line number	Diff line change
Expand Up		@@ -26,4 +26,4 @@ SPEC CHECKSUMS:

		PODFILE CHECKSUM: 4b74d0597959469ee954001e3536226231ca6150

		COCOAPODS: 1.15.2
		COCOAPODS: 1.16.2