[MBL-1373] ValidateCheckout Before Completing Checkout With ApplePay

Kickstarter-iOS/Features/PledgeView/Controllers/PostCampaignCheckoutViewController.swift

@@ -415,7 +415,7 @@ enum PostCampaignCheckoutApplePayError: Error {
 extension PostCampaignCheckoutViewController: STPApplePayContextDelegate {
   func applePayContext(
     _: StripeApplePay.STPApplePayContext,
-    didCreatePaymentMethod _: StripePayments.STPPaymentMethod,
+    didCreatePaymentMethod paymentMethod: StripePayments.STPPaymentMethod,
     paymentInformation payment: PKPayment,
     completion: @escaping StripeApplePay.STPIntentClientSecretCompletionBlock
   ) {
@@ -440,6 +440,7 @@ extension PostCampaignCheckoutViewController: STPApplePayContextDelegate {
     let transactionId = payment.token.transactionIdentifier
 
     let params = ApplePayParams(
+      paymentMethodId: paymentMethod.stripeId,
       paymentInstrumentName: paymentDisplayName,
       paymentNetwork: paymentNetworkName,
       transactionIdentifier: transactionId,

KsApi/mutations/inputs/ApplePayParams.swift

@@ -1,17 +1,20 @@
 import Foundation
 
 public struct ApplePayParams: Encodable, Equatable {
+  public let paymentMethodId: String?
   let paymentInstrumentName: String
   let paymentNetwork: String
   let transactionIdentifier: String
   let token: String
 
   public init(
+    paymentMethodId: String? = nil,
     paymentInstrumentName: String,
     paymentNetwork: String,
     transactionIdentifier: String,
     token: String
   ) {
+    self.paymentMethodId = paymentMethodId
     self.paymentInstrumentName = paymentInstrumentName
     self.paymentNetwork = paymentNetwork
     self.transactionIdentifier = transactionIdentifier

Library/ViewModels/PledgeViewModel.swift

@@ -497,6 +497,7 @@ public class PledgeViewModel: PledgeViewModelType, PledgeViewModelInputs, Pledge
     )
     .map { paymentData, token in
       (
+        nil,
         paymentData.displayName,
         paymentData.network,
         paymentData.transactionIdentifier,

Library/ViewModels/PostCampaignCheckoutViewModel.swift

@@ -254,12 +254,6 @@ public class PostCampaignCheckoutViewModel: PostCampaignCheckoutViewModelType,
     self.validateCheckoutSuccess = Signal
       .merge(validateCheckoutNewCardSuccess, validateCheckoutExistingCardSuccess)
 
-    let validateCheckoutError = Signal
-      .merge(validateCheckoutExistingCard.errors(), validateCheckoutNewCard.errors())
-
-    self.showErrorBannerWithMessage = validateCheckoutError
-      .map { _ in Strings.Something_went_wrong_please_try_again() }
-
     // MARK: ApplePay
 
     /*
@@ -270,6 +264,7 @@ public class PostCampaignCheckoutViewModel: PostCampaignCheckoutViewModelType,
      3) Present the payment authorization form
      4) Payment authorization form calls applePayContextDidCreatePayment with ApplePay params
      5) Payment authorization form calls paymentAuthorizationDidFinish
+     6) Validate checkout using the checkoutId, payment source id, and payment intent
      */
 
     let createPaymentIntentForApplePay: Signal<Signal<PaymentIntentEnvelope, ErrorEnvelope>.Event, Never> =
@@ -324,6 +319,33 @@ public class PostCampaignCheckoutViewModel: PostCampaignCheckoutViewModelType,
       }
       .skipNil()
 
+    let validateCheckoutWithApplePay = Signal.combineLatest(
+      newPaymentIntentForApplePay,
+      checkoutId,
+      self.applePayParamsSignal.signal
+    )
+    .takeWhen(self.applePayContextDidCompleteSignal)
+    .switchMap { (clientSecret: String, checkoutId: String, applePayParams: ApplePayParams) in
+      AppEnvironment.current.apiService
+        .validateCheckout(
+          checkoutId: checkoutId,
+          paymentSourceId: applePayParams.paymentMethodId ?? "",
+          paymentIntentClientSecret: clientSecret
+        )
+        .ksr_delay(AppEnvironment.current.apiDelayInterval, on: AppEnvironment.current.scheduler)
+        .materialize()
+    }
+
+    let validateCheckoutError = Signal
+      .merge(
+        validateCheckoutExistingCard.errors(),
+        validateCheckoutNewCard.errors(),
+        validateCheckoutWithApplePay.errors()
+      )
+
+    self.showErrorBannerWithMessage = validateCheckoutError
+      .map { _ in Strings.Something_went_wrong_please_try_again() }
+
     // MARK: CompleteOnSessionCheckout
 
     let completeCheckoutWithCreditCardInput: Signal<GraphAPI.CompleteOnSessionCheckoutInput, Never> = Signal
@@ -345,13 +367,12 @@ public class PostCampaignCheckoutViewModel: PostCampaignCheckoutViewModelType,
       }
 
     let completeCheckoutWithApplePayInput: Signal<GraphAPI.CompleteOnSessionCheckoutInput, Never> = Signal
-      .combineLatest(newPaymentIntentForApplePay, checkoutId, self.applePayParamsSignal.mapConst(true))
-      .takeWhen(self.applePayContextDidCompleteSignal)
+      .combineLatest(newPaymentIntentForApplePay, checkoutId)
+      .takeWhen(validateCheckoutWithApplePay.values())
       .map {
         (
           clientSecret: String,
-          checkoutId: String,
-          _: Bool
+          checkoutId: String
         ) -> GraphAPI.CompleteOnSessionCheckoutInput in
         GraphAPI
           .CompleteOnSessionCheckoutInput(