Undo previous commit, restoring pass mgmt to orchestrator

Author: allendav

WooCommerce/Classes/ViewModels/CardPresentPayments/PaymentCaptureOrchestrator.swift

@@ -1,4 +1,5 @@
 import Yosemite
+import PassKit
 
 /// Orchestrates the sequence of actions required to capture a payment:
 /// 1. Check if there is a card reader connected
@@ -11,6 +12,8 @@ final class PaymentCaptureOrchestrator {
 
     private let celebration = PaymentCaptureCelebration()
 
+    private var walletSuppressionRequestToken: PKSuppressionRequestToken?
+
     func collectPayment(for order: Order,
                         paymentsAccount: PaymentGatewayAccount?,
                         onPresentMessage: @escaping (String) -> Void,
@@ -35,6 +38,11 @@ final class PaymentCaptureOrchestrator {
                 return
             }
 
+            /// Briefly suppress pass (wallet) presentation so that the merchant doesn't attempt to pay for the buyer's order when the
+            /// reader begins to collect payment.
+            ///
+            suppressPassPresentation()
+
             let paymentAction = CardPresentPaymentAction.collectPayment(
                 siteID: order.siteID,
                 orderID: order.orderID,
@@ -53,6 +61,7 @@ final class PaymentCaptureOrchestrator {
                 },
                 onCompletion: { [weak self] result in
                     onProcessingMessage()
+                    self?.allowPassPresentation()
                     self?.completePaymentIntentCapture(
                         order: order,
                         captureResult: result,
@@ -102,6 +111,54 @@ final class PaymentCaptureOrchestrator {
     }
 }
 
+private extension PaymentCaptureOrchestrator {
+    /// Supress wallet presentation. This requires a special entitlement from Apple:
+    /// `com.apple.developer.passkit.pass-presentation-suppression`
+    /// See Woo-*.entitlements in WooCommerce/Resources
+    ///
+    func suppressPassPresentation() {
+        /// iPads don't support NFC passes. Attempting to call `requestAutomaticPassPresentationSuppression` on them will
+        /// return 0 `notSupported`
+        ///
+        guard !UIDevice.isPad() else {
+            return
+        }
+
+        guard !PKPassLibrary.isSuppressingAutomaticPassPresentation() else {
+            return
+        }
+
+        walletSuppressionRequestToken = PKPassLibrary.requestAutomaticPassPresentationSuppression() { result in
+            guard result == .success else {
+                DDLogWarn("Automatic pass presentation suppression request failed. Reason: \(result.rawValue)")
+
+                let logProperties: [String: Any] = ["PKAutomaticPassPresentationSuppressionResult": result.rawValue]
+                ServiceLocator.crashLogging.logMessage(
+                    "Automatic pass presentation suppression request failed",
+                    properties: logProperties,
+                    level: .warning
+                )
+                return
+            }
+        }
+    }
+
+    /// Restore wallet presentation.
+    func allowPassPresentation() {
+        /// iPads don't have passes (wallets) to present
+        ///
+        guard !UIDevice.isPad() else {
+            return
+        }
+
+        guard let walletSuppressionRequestToken = walletSuppressionRequestToken, walletSuppressionRequestToken != 0 else {
+            return
+        }
+
+        PKPassLibrary.endAutomaticPassPresentationSuppression(withRequestToken: walletSuppressionRequestToken)
+    }
+}
+
 private extension PaymentCaptureOrchestrator {
     func completePaymentIntentCapture(order: Order,
                                     captureResult: Result<PaymentIntent, Error>,

Yosemite/Yosemite/Stores/CardPresentPaymentStore.swift

@@ -2,7 +2,6 @@ import Storage
 import Hardware
 import Networking
 import Combine
-import PassKit
 
 /// MARK: CardPresentPaymentStore
 ///
@@ -19,8 +18,6 @@ public final class CardPresentPaymentStore: Store {
     /// We need to be able to cancel the process of collecting a payment.
     private var paymentCancellable: AnyCancellable? = nil
 
-    private var walletSuppressionRequestToken: PKSuppressionRequestToken?
-
     public init(dispatcher: Dispatcher, storageManager: StorageManagerType, network: Network, cardReaderService: CardReaderService) {
         self.cardReaderService = cardReaderService
         self.remote = WCPayRemote(network: network)
@@ -164,15 +161,12 @@ private extension CardPresentPaymentStore {
                         parameters: PaymentParameters,
                         onCardReaderMessage: @escaping (CardReaderEvent) -> Void,
                         onCompletion: @escaping (Result<PaymentIntent, Error>) -> Void) {
-        suppressPassPresentation()
-
         // Observe status events fired by the card reader
         let readerEventsSubscription = cardReaderService.readerEvents.sink { event in
             onCardReaderMessage(event)
         }
 
         paymentCancellable = cardReaderService.capturePayment(parameters).sink { error in
-            self.allowPassPresentation()
             readerEventsSubscription.cancel()
             switch error {
             case .failure(let error):
@@ -191,8 +185,6 @@ private extension CardPresentPaymentStore {
 
         cardReaderService.cancelPaymentIntent()
             .subscribe(Subscribers.Sink(receiveCompletion: { value in
-                self.allowPassPresentation()
-
                 switch value {
                 case .failure(let error):
                     onCompletion?(.failure(error))
@@ -267,43 +259,6 @@ private extension CardPresentPaymentStore {
     }
 }
 
-private extension CardPresentPaymentStore {
-    /// Supress wallet presentation. This requires a special entitlement from Apple:
-    /// `com.apple.developer.passkit.pass-presentation-suppression`
-    /// See Woo-*.entitlements in WooCommerce/Resources
-    ///
-    /// Note: iPads don't support NFC passes.
-    ///
-    func suppressPassPresentation() {
-        guard UIDevice.current.userInterfaceIdiom != .pad else {
-            return
-        }
-
-        guard !PKPassLibrary.isSuppressingAutomaticPassPresentation() else {
-            return
-        }
-
-        walletSuppressionRequestToken = PKPassLibrary.requestAutomaticPassPresentationSuppression() { result in
-            guard result == .success else {
-                DDLogWarn("Automatic pass presentation suppression request failed. Reason: \(result.rawValue)")
-                return
-            }
-        }
-    }
-
-    func allowPassPresentation() {
-        guard UIDevice.current.userInterfaceIdiom != .pad else {
-            return
-        }
-
-        guard let walletSuppressionRequestToken = walletSuppressionRequestToken, walletSuppressionRequestToken != 0 else {
-            return
-        }
-
-        PKPassLibrary.endAutomaticPassPresentationSuppression(withRequestToken: walletSuppressionRequestToken)
-    }
-}
-
 /// Implementation of the CardReaderNetworkingAdapter
 /// that fetches a token using WCPayRemote
 private final class WCPayTokenProvider: CardReaderConfigProvider {