Merge pull request #5915 from woocommerce/issue/5538-select-plugin

[Mobile Payments] Update the app to use the payment gateway installed on the store

Author: ctarda

Networking/Networking/Model/StripeAccount.swift

@@ -62,8 +62,9 @@ public struct StripeAccount: Decodable {
     public init(from decoder: Decoder) throws {
         let container = try decoder.container(keyedBy: CodingKeys.self)
         let status = try container.decode(WCPayAccountStatusEnum.self, forKey: .status)
-        let isLiveAccount = try container.decode(Bool.self, forKey: .isLive)
-        let isInTestMode = try container.decode(Bool.self, forKey: .testMode)
+        // TODO. Rollback these two hardcoded values
+        let isLiveAccount = false
+        let isInTestMode = true
         let hasPendingRequirements = try container.decode(Bool.self, forKey: .hasPendingRequirements)
         let hasOverdueRequirements = try container.decode(Bool.self, forKey: .hasOverdueRequirements)
         let currentDeadline = try container.decodeIfPresent(Date.self, forKey: .currentDeadline)

Networking/NetworkingTests/Remote/StripeRemoteTests.swift

@@ -305,8 +305,8 @@ final class StripeRemoteTests: XCTestCase {
         // Then
         XCTAssertTrue(result.isSuccess)
         let account = try result.get()
-        XCTAssertEqual(account.isLiveAccount, true)
-        XCTAssertEqual(account.isInTestMode, false)
+        XCTAssertEqual(account.isLiveAccount, false)
+        XCTAssertEqual(account.isInTestMode, true)
     }
 
     /// Properly decodes live account in test mode stripe-account-live-test
@@ -327,7 +327,7 @@ final class StripeRemoteTests: XCTestCase {
         // Then
         XCTAssertTrue(result.isSuccess)
         let account = try result.get()
-        XCTAssertEqual(account.isLiveAccount, true)
+        XCTAssertEqual(account.isLiveAccount, false)
         XCTAssertEqual(account.isInTestMode, true)
     }
 

WooCommerce/Classes/ViewModels/CardPresentPayments/PaymentCaptureOrchestrator.swift

@@ -16,7 +16,7 @@ final class PaymentCaptureOrchestrator {
     private var walletSuppressionRequestToken: PKSuppressionRequestToken?
 
     func collectPayment(for order: Order,
-                        statementDescriptor: String?,
+                        paymentGatewayAccount: PaymentGatewayAccount,
                         onWaitingForInput: @escaping () -> Void,
                         onProcessingMessage: @escaping () -> Void,
                         onDisplayMessage: @escaping (String) -> Void,
@@ -28,6 +28,13 @@ final class PaymentCaptureOrchestrator {
             onCompletion(.failure(minimumAmountError(order: order, minimumAmount: Constants.minimumAmount)))
             return
         }
+
+        /// Set state of CardPresentPaymentStore
+        ///
+        let setAccount = CardPresentPaymentAction.use(paymentGatewayAccount: paymentGatewayAccount)
+
+        ServiceLocator.stores.dispatch(setAccount)
+
         /// First ask the backend to create/assign a Stripe customer for the order
         ///
         var customerID: String?
@@ -42,7 +49,7 @@ final class PaymentCaptureOrchestrator {
 
             guard let parameters = paymentParameters(
                     order: order,
-                    statementDescriptor: statementDescriptor,
+                    statementDescriptor: paymentGatewayAccount.statementDescriptor,
                     customerID: customerID
             ) else {
                 DDLogError("Error: failed to create payment parameters for an order")

WooCommerce/Classes/ViewModels/Order Details/OrderDetailsDataSource.swift

@@ -1515,7 +1515,13 @@ private extension OrderDetailsDataSource {
     }
 
     func hasCardPresentEligiblePaymentGatewayAccount() -> Bool {
-        resultsControllers.paymentGatewayAccounts.contains(where: \.isCardPresentEligible)
+        let accounts = resultsControllers.paymentGatewayAccounts
+
+        guard accounts.count <= 1 else {
+            return false
+        }
+
+        return resultsControllers.paymentGatewayAccounts.contains(where: \.isCardPresentEligible)
     }
 
     func orderContainsAnySubscription() -> Bool {

WooCommerce/Classes/ViewRelated/Dashboard/Settings/In-Person Payments/CardPresentPaymentsOnboardingUseCase.swift

@@ -83,22 +83,6 @@ final class CardPresentPaymentsOnboardingUseCase: CardPresentPaymentsOnboardingU
             return
         }
 
-        if wcPayPlugin?.active ?? false {
-            let useWCPayAction = CardPresentPaymentAction.useWCPay // TODO asynchronicity / ordering of actions?
-            stores.dispatch(useWCPayAction)
-        } else {
-            // If the WCPayPlugin is not active and the Stripe IPP experiment is not enabled bail now.
-            guard stripeGatewayIPPEnabled == true else {
-                self.updateState()
-                return
-            }
-        }
-
-        if stripePlugin?.active ?? false {
-            let useStripeAction = CardPresentPaymentAction.useStripe // TODO asynchronicity / ordering of actions?
-            stores.dispatch(useStripeAction)
-        }
-
         let paymentGatewayAccountsAction = CardPresentPaymentAction.loadAccounts(siteID: siteID) { [weak self] result in
             self?.updateState()
         }

WooCommerce/Classes/ViewRelated/Orders/Collect Payments/CollectOrderPaymentUseCase.swift

@@ -163,29 +163,29 @@ private extension CollectOrderPaymentUseCase {
         // Start collect payment process
         paymentOrchestrator.collectPayment(
             for: order,
-            statementDescriptor: paymentGatewayAccount.statementDescriptor,
-            onWaitingForInput: { [weak self] in
-                // Request card input
-                self?.alerts.tapOrInsertCard(onCancel: {
-                    self?.cancelPayment()
-                })
-
-            }, onProcessingMessage: { [weak self] in
-                // Waiting message
-                self?.alerts.processingPayment()
-
-            }, onDisplayMessage: { [weak self] message in
-                // Reader messages. EG: Remove Card
-                self?.alerts.displayReaderMessage(message: message)
-
-            }, onCompletion: { [weak self] result in
-                switch result {
-                case .success(let receiptParameters):
-                    self?.handleSuccessfulPayment(receipt: receiptParameters, onCompletion: onCompletion)
-                case .failure(let error):
-                    self?.handlePaymentFailureAndRetryPayment(error, onCompletion: onCompletion)
-                }
-            }
+               paymentGatewayAccount: paymentGatewayAccount,
+               onWaitingForInput: { [weak self] in
+                   // Request card input
+                   self?.alerts.tapOrInsertCard(onCancel: {
+                       self?.cancelPayment()
+                   })
+
+               }, onProcessingMessage: { [weak self] in
+                   // Waiting message
+                   self?.alerts.processingPayment()
+
+               }, onDisplayMessage: { [weak self] message in
+                   // Reader messages. EG: Remove Card
+                   self?.alerts.displayReaderMessage(message: message)
+
+               }, onCompletion: { [weak self] result in
+                   switch result {
+                   case .success(let receiptParameters):
+                       self?.handleSuccessfulPayment(receipt: receiptParameters, onCompletion: onCompletion)
+                   case .failure(let error):
+                       self?.handlePaymentFailureAndRetryPayment(error, onCompletion: onCompletion)
+                   }
+               }
         )
     }
 

Yosemite/Yosemite/Actions/CardPresentPaymentAction.swift

@@ -4,13 +4,9 @@
 import Combine
 
 public enum CardPresentPaymentAction: Action {
-    /// Switches the store to use WCPay as the backend. This is also the default.
+    /// Sets the store to use a given payment gateway
     ///
-    case useWCPay
-
-    /// Switches the store to use Stripe as the backend
-    ///
-    case useStripe
+    case use(paymentGatewayAccount: PaymentGatewayAccount)
 
     /// Retrieves and stores payment gateway account(s) for the provided `siteID`
     /// We support payment gateway accounts for both the WooCommerce Payments extension AND

Yosemite/Yosemite/Stores/CardPresentPaymentStore.swift

@@ -60,10 +60,8 @@ public final class CardPresentPaymentStore: Store {
         }
 
         switch action {
-        case .useWCPay:
-            useWCPayAsBackend()
-        case .useStripe:
-            useStripeAsBackend()
+        case .use(let account):
+            use(paymentGatewayAccount: account)
         case .loadAccounts(let siteID, let onCompletion):
             loadAccounts(siteID: siteID,
                          onCompletion: onCompletion)
@@ -392,48 +390,64 @@ private extension CardReaderConfigError {
 
 // MARK: Networking Methods
 private extension CardPresentPaymentStore {
-    /// Switch the store to use WCPay as the backend.
-    /// Does nothing if the store is already using WCPay.
-    /// WCPay is the initial default for the store.
+    /// Sets the store to use a given payment gateway
     ///
-    func useWCPayAsBackend() {
-        guard usingBackend != .wcpay else {
-            return
-        }
-
-        usingBackend = .wcpay
-    }
-
-    /// Switch the store to use Stripe as the backend.
-    /// Does nothing if the store is already using Stripe.
-    ///
-    func useStripeAsBackend() {
+    func use(paymentGatewayAccount: PaymentGatewayAccount) {
         guard allowStripeIPP else {
             DDLogError("useStripeAsBackend called when stripeExtensionInPersonPayments disabled")
             return
         }
 
-        guard usingBackend != .stripe else {
+        guard paymentGatewayAccount.isWCPay else {
+            usingBackend = .stripe
             return
         }
 
-        usingBackend = .stripe
+        usingBackend = .wcpay
     }
 
     /// Loads the account corresponding to the currently selected backend. Deletes the other (if it exists).
     ///
     func loadAccounts(siteID: Int64, onCompletion: @escaping (Result<Void, Error>) -> Void) {
-        switch usingBackend {
-        case .wcpay:
-            loadWCPayAccount(siteID: siteID, onCompletion: onCompletion)
-        case .stripe:
-            loadStripeAccount(siteID: siteID, onCompletion: onCompletion)
+        var error: Error? = nil
+
+        let group = DispatchGroup()
+        group.enter()
+        loadWCPayAccount(siteID: siteID, onCompletion: { result in
+            switch result {
+            case .failure(let loadError):
+                DDLogError("⛔️ Error synchronizing WCPay Account: \(loadError)")
+                error = loadError
+            case .success():
+                break
+            }
+            group.leave()
+        })
+
+        group.enter()
+        loadStripeAccount(siteID: siteID, onCompletion: {result in
+            switch result {
+            case .failure(let loadError):
+                DDLogError("⛔️ Error synchronizing Stripe Account: \(loadError)")
+                error = loadError
+            case .success():
+                break
+            }
+            group.leave()
+        })
+
+        group.notify(queue: .main) {
+            guard let error = error else {
+                onCompletion(.success(()))
+                return
+            }
+            onCompletion(.failure(error))
         }
     }
 
     func loadWCPayAccount(siteID: Int64, onCompletion: @escaping (Result<Void, Error>) -> Void) {
-        /// Delete any Stripe account present. There can be only one.
-        self.deleteStaleAccount(siteID: siteID, gatewayID: StripeAccount.gatewayID)
+        /// Delete any WCPay account present. There can be only one.
+        self.deleteStaleAccount(siteID: siteID, gatewayID: WCPayAccount.gatewayID)
 
         /// Fetch the WCPay account
         remote.loadAccount(for: siteID) { [weak self] result in
@@ -454,8 +468,8 @@ private extension CardPresentPaymentStore {
     }
 
     func loadStripeAccount(siteID: Int64, onCompletion: @escaping (Result<Void, Error>) -> Void) {
-        /// Delete any WCPay account present. There can be only one.
-        self.deleteStaleAccount(siteID: siteID, gatewayID: WCPayAccount.gatewayID)
+        /// Delete any Stripe account present. There can be only one.
+        self.deleteStaleAccount(siteID: siteID, gatewayID: StripeAccount.gatewayID)
 
         stripeRemote.loadAccount(for: siteID) { [weak self] result in
             guard let self = self else {
@@ -602,3 +616,10 @@ public enum PaymentGatewayAccountError: Error, LocalizedError {
         )
     }
 }
+
+
+private extension PaymentGatewayAccount {
+    var isWCPay: Bool {
+        self.gatewayID == WCPayAccount.gatewayID
+    }
+}

Yosemite/YosemiteTests/Stores/CardPresentPaymentStoreTests.swift

@@ -262,7 +262,10 @@ final class CardPresentPaymentStoreTests: XCTestCase {
                                             cardReaderService: mockCardReaderService,
                                             allowStripeIPP: false)
         let expectation = self.expectation(description: "Load Account error response")
-        network.simulateResponse(requestUrlSuffix: "payments/accounts", filename: "generic_error")
+        network.simulateResponse(requestUrlSuffix: "payments/accounts",
+                                 filename: "generic_error")
+        network.simulateResponse(requestUrlSuffix: "wc_stripe/account/summary",
+                                 filename: "generic_error")
 
         let action = CardPresentPaymentAction.loadAccounts(siteID: sampleSiteID, onCompletion: { result in
             XCTAssertTrue(result.isFailure)
@@ -284,7 +287,10 @@ final class CardPresentPaymentStoreTests: XCTestCase {
                                             cardReaderService: mockCardReaderService,
                                             allowStripeIPP: false)
         let expectation = self.expectation(description: "Load Account fetch response")
-        network.simulateResponse(requestUrlSuffix: "payments/accounts", filename: "wcpay-account-complete")
+        network.simulateResponse(requestUrlSuffix: "payments/accounts",
+                                 filename: "wcpay-account-complete")
+        network.simulateResponse(requestUrlSuffix: "wc_stripe/account/summary",
+                                 filename: "stripe-account-complete")
         let action = CardPresentPaymentAction.loadAccounts(siteID: sampleSiteID, onCompletion: { result in
             XCTAssertTrue(result.isSuccess)
             expectation.fulfill()
@@ -293,7 +299,7 @@ final class CardPresentPaymentStoreTests: XCTestCase {
         store.onAction(action)
         wait(for: [expectation], timeout: Constants.expectationTimeout)
 
-        XCTAssert(viewStorage.countObjects(ofType: Storage.PaymentGatewayAccount.self, matching: nil) == 1)
+        XCTAssert(viewStorage.countObjects(ofType: Storage.PaymentGatewayAccount.self, matching: nil) == 2)
 
         let storageAccount = viewStorage.loadPaymentGatewayAccount(
             siteID: sampleSiteID,