[MBL-1210] Fix logged out and login flow for post campaign checkout

Kickstarter-iOS/Features/PledgePaymentMethods/Controller/PledgePaymentMethodsViewController.swift

@@ -213,6 +213,12 @@ final class PledgePaymentMethodsViewController: UIViewController {
       self.tableView.reloadSections([PaymentMethodsTableViewSection.addNewCard.rawValue], with: .none)
     }
   }
+
+  // MARK: - Public functions
+
+  func cancelModalPresentation(_ hidden: Bool) {
+    self.viewModel.inputs.shouldCancelPaymentSheetAppearance(state: hidden)
+  }
 }
 
 // MARK: - UITableViewDelegate
@@ -231,11 +237,3 @@ extension PledgePaymentMethodsViewController: UITableViewDelegate {
     self.viewModel.inputs.didSelectRowAtIndexPath(indexPath)
   }
 }
-
-// MARK: - PaymentSheetAppearanceDelegate
-
-extension PledgePaymentMethodsViewController: PaymentSheetAppearanceDelegate {
-  func pledgeViewControllerPaymentSheet(_: PledgeViewController, hidden: Bool) {
-    self.viewModel.inputs.shouldCancelPaymentSheetAppearance(state: hidden)
-  }
-}

Kickstarter-iOS/Features/PledgePaymentMethods/Controller/PledgePaymentMethodsViewControllerTests.swift

@@ -99,7 +99,7 @@ final class PledgePaymentMethodsViewControllerTests: TestCase {
 
         self.scheduler.advance(by: .seconds(1))
 
-        controller.pledgeViewControllerPaymentSheet(PledgeViewController(), hidden: false)
+        controller.cancelModalPresentation(false)
 
         self.scheduler.advance(by: .seconds(1))
 

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

@@ -21,10 +21,6 @@ protocol PledgeViewControllerDelegate: AnyObject {
   func pledgeViewControllerDidUpdatePledge(_ viewController: PledgeViewController, message: String)
 }
 
-protocol PaymentSheetAppearanceDelegate: AnyObject {
-  func pledgeViewControllerPaymentSheet(_ viewController: PledgeViewController, hidden: Bool)
-}
-
 final class PledgeViewController: UIViewController,
   MessageBannerViewControllerPresenting, ProcessingViewPresenting {
   // MARK: - Properties
@@ -34,7 +30,6 @@ final class PledgeViewController: UIViewController,
   }()
 
   public weak var delegate: PledgeViewControllerDelegate?
-  public weak var paymentSheetAppearanceDelegate: PaymentSheetAppearanceDelegate?
 
   private lazy var descriptionSectionSeparator: UIView = {
     UIView(frame: .zero)
@@ -362,7 +357,6 @@ final class PledgeViewController: UIViewController,
       .observeForUI()
       .observeValues { [weak self] value in
         self?.paymentMethodsViewController.configure(with: value)
-        self?.paymentSheetAppearanceDelegate = self?.paymentMethodsViewController
       }
 
     self.viewModel.outputs.goToLoginSignup
@@ -460,7 +454,7 @@ final class PledgeViewController: UIViewController,
       .observeForControllerAction()
       .observeValues { [weak self] helpType in
         guard let self = self else { return }
-        self.paymentSheetAppearanceDelegate?.pledgeViewControllerPaymentSheet(self, hidden: true)
+        self.paymentMethodsViewController.cancelModalPresentation(true)
         self.presentHelpWebViewController(with: helpType, presentationStyle: .formSheet)
       }
 
@@ -601,22 +595,22 @@ extension PledgeViewController: PKPaymentAuthorizationViewControllerDelegate {
 
 extension PledgeViewController: PledgeViewCTAContainerViewDelegate {
   func goToLoginSignup() {
-    self.paymentSheetAppearanceDelegate?.pledgeViewControllerPaymentSheet(self, hidden: true)
+    self.paymentMethodsViewController.cancelModalPresentation(true)
     self.viewModel.inputs.goToLoginSignupTapped()
   }
 
   func applePayButtonTapped() {
-    self.paymentSheetAppearanceDelegate?.pledgeViewControllerPaymentSheet(self, hidden: true)
+    self.paymentMethodsViewController.cancelModalPresentation(true)
     self.viewModel.inputs.applePayButtonTapped()
   }
 
   func submitButtonTapped() {
-    self.paymentSheetAppearanceDelegate?.pledgeViewControllerPaymentSheet(self, hidden: true)
+    self.paymentMethodsViewController.cancelModalPresentation(true)
     self.viewModel.inputs.submitButtonTapped()
   }
 
   func termsOfUseTapped(with helpType: HelpType) {
-    self.paymentSheetAppearanceDelegate?.pledgeViewControllerPaymentSheet(self, hidden: true)
+    self.paymentMethodsViewController.cancelModalPresentation(true)
     self.viewModel.inputs.termsOfUseTapped(with: helpType)
   }
 }

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

@@ -22,7 +22,7 @@ final class PostCampaignCheckoutViewController: UIViewController {
   private lazy var pledgeCTAContainerView: PledgeViewCTAContainerView = {
     PledgeViewCTAContainerView(frame: .zero)
       |> \.translatesAutoresizingMaskIntoConstraints .~ false
-    // TODO: Add self as delegate and add support for delegate methods.
+      |> \.delegate .~ self
   }()
 
   private lazy var pledgeDisclaimerView: PledgeDisclaimerView = {
@@ -50,6 +50,8 @@ final class PostCampaignCheckoutViewController: UIViewController {
       |> \.translatesAutoresizingMaskIntoConstraints .~ false
   }()
 
+  private var sessionStartedObserver: Any?
+
   private let viewModel: PostCampaignCheckoutViewModelType = PostCampaignCheckoutViewModel()
 
   // MARK: - Lifecycle
@@ -79,6 +81,10 @@ final class PostCampaignCheckoutViewController: UIViewController {
     self.viewModel.inputs.viewDidLoad()
   }
 
+  deinit {
+    self.sessionStartedObserver.doIfSome(NotificationCenter.default.removeObserver)
+  }
+
   // MARK: - Configuration
 
   private func configureChildViewControllers() {
@@ -179,12 +185,40 @@ final class PostCampaignCheckoutViewController: UIViewController {
         self?.paymentMethodsViewController.configure(with: value)
       }
 
+    self.viewModel.outputs.goToLoginSignup
+      .observeForControllerAction()
+      .observeValues { [weak self] intent, project, reward in
+        self?.goToLoginSignup(with: intent, project: project, reward: reward)
+      }
+
     self.viewModel.outputs.showWebHelp
       .observeForControllerAction()
       .observeValues { [weak self] helpType in
         guard let self = self else { return }
         self.presentHelpWebViewController(with: helpType, presentationStyle: .formSheet)
       }
+
+    self.sessionStartedObserver = NotificationCenter.default
+      .addObserver(forName: .ksr_sessionStarted, object: nil, queue: nil) { [weak self] _ in
+        self?.viewModel.inputs.userSessionStarted()
+      }
+
+    self.paymentMethodsViewController.view.rac.hidden = self.viewModel.outputs.paymentMethodsViewHidden
+  }
+
+  // MARK: - Functions
+
+  private func goToLoginSignup(with intent: LoginIntent, project: Project, reward: Reward?) {
+    let loginSignupViewController = LoginToutViewController.configuredWith(
+      loginIntent: intent,
+      project: project,
+      reward: reward
+    )
+
+    let navigationController = UINavigationController(rootViewController: loginSignupViewController)
+    let navigationBarHeight = navigationController.navigationBar.bounds.height
+
+    self.present(navigationController, animated: true)
   }
 }
 
@@ -195,3 +229,27 @@ extension PostCampaignCheckoutViewController: PledgeDisclaimerViewDelegate {
     self.viewModel.inputs.pledgeDisclaimerViewDidTapLearnMore()
   }
 }
+
+// MARK: - PledgeViewCTAContainerViewDelegate
+
+extension PostCampaignCheckoutViewController: PledgeViewCTAContainerViewDelegate {
+  func goToLoginSignup() {
+    self.paymentMethodsViewController.cancelModalPresentation(true)
+    self.viewModel.inputs.goToLoginSignupTapped()
+  }
+
+  func applePayButtonTapped() {
+    self.paymentMethodsViewController.cancelModalPresentation(true)
+    // TODO: Respond to button tap
+  }
+
+  func submitButtonTapped() {
+    self.paymentMethodsViewController.cancelModalPresentation(true)
+    // TODO: Respond to button tap
+  }
+
+  func termsOfUseTapped(with helpType: HelpType) {
+    self.paymentMethodsViewController.cancelModalPresentation(true)
+    self.viewModel.inputs.termsOfUseTapped(with: helpType)
+  }
+}

Library/ViewModels/PledgePaymentMethodsViewModel.swift

@@ -283,6 +283,15 @@ public final class PledgePaymentMethodsViewModel: PledgePaymentMethodsViewModelT
     self.shouldCancelPaymentSheetAppearance <~ updatedCards.signal
       .mapConst(true)
 
+    // Only ever use the value if the view model is configured and the payment sheet could exist.
+    // In the logged out state, the payment sheet is part of the view without being configured,
+    // so this is a real risk.
+    let safeShouldCancelPaymentSheet = Signal.combineLatest(
+      self.shouldCancelPaymentSheetAppearance.signal,
+      configureWithValue
+    )
+    .map(first)
+
     let createSetupIntentEvent = Signal.combineLatest(
       project,
       paymentSheetOnPledgeContext.filter(isTrue)
@@ -310,7 +319,7 @@ public final class PledgePaymentMethodsViewModel: PledgePaymentMethodsViewModelT
     }
 
     self.goToAddCardViaStripeScreen = createSetupIntentEvent.values()
-      .withLatestFrom(self.shouldCancelPaymentSheetAppearance.signal)
+      .withLatestFrom(safeShouldCancelPaymentSheet)
       .map { (data, shouldCancel) -> PaymentSheetSetupData? in
         shouldCancel ? nil : data
       }
@@ -322,7 +331,7 @@ public final class PledgePaymentMethodsViewModel: PledgePaymentMethodsViewModelT
 
     self.updateAddNewCardLoading = Signal.merge(
       createSetupIntentEvent.errors().mapConst(false),
-      self.shouldCancelPaymentSheetAppearance.signal.negate()
+      safeShouldCancelPaymentSheet.negate()
     )
 
     self.willSelectRowAtIndexPathReturnProperty <~ self.reloadPaymentMethods

Library/ViewModels/PostCampaignCheckoutViewModel.swift

@@ -20,7 +20,10 @@ public struct PostCampaignCheckoutData: Equatable {
 
 public protocol PostCampaignCheckoutViewModelInputs {
   func configure(with data: PostCampaignCheckoutData)
+  func goToLoginSignupTapped()
   func pledgeDisclaimerViewDidTapLearnMore()
+  func termsOfUseTapped(with: HelpType)
+  func userSessionStarted()
   func viewDidLoad()
 }
 
@@ -31,6 +34,8 @@ public protocol PostCampaignCheckoutViewModelOutputs {
     Never
   > { get }
   var configurePledgeViewCTAContainerView: Signal<PledgeViewCTAContainerViewData, Never> { get }
+  var goToLoginSignup: Signal<(LoginIntent, Project, Reward?), Never> { get }
+  var paymentMethodsViewHidden: Signal<Bool, Never> { get }
   var showWebHelp: Signal<HelpType, Never> { get }
 }
 
@@ -52,16 +57,23 @@ public class PostCampaignCheckoutViewModel: PostCampaignCheckoutViewModelType,
 
     let context = initialData.map(\.context)
 
-    self.configurePaymentMethodsViewControllerWithValue = initialData
+    let configurePaymentMethodsData = Signal.merge(
+      initialData,
+      initialData.takeWhen(self.userSessionStartedSignal)
+    )
+
+    self.configurePaymentMethodsViewControllerWithValue = configurePaymentMethodsData
       .compactMap { data -> PledgePaymentMethodsValue? in
         guard let user = AppEnvironment.current.currentUser else { return nil }
         guard let reward = data.rewards.first else { return nil }
 
         return (user, data.project, reward, data.context, data.refTag)
       }
 
-    // TODO: Respond to login flow.
-    let isLoggedIn = initialData.ignoreValues()
+    self.goToLoginSignup = initialData.takeWhen(self.goToLoginSignupSignal)
+      .map { (LoginIntent.backProject, $0.project, $0.rewards.first) }
+
+    let isLoggedIn = Signal.merge(initialData.ignoreValues(), self.userSessionStartedSignal)
       .map { _ in AppEnvironment.current.currentUser }
       .map(isNotNil)
 
@@ -70,11 +82,23 @@ public class PostCampaignCheckoutViewModel: PostCampaignCheckoutViewModelType,
       context
     )
     .map { isLoggedIn, context in
-      // TODO: Calculate isEnabled and willRetryPaymentMethod fields instead of defaulting to true.
-      PledgeViewCTAContainerViewData(isLoggedIn, true, context, true)
+      PledgeViewCTAContainerViewData(
+        isLoggedIn: isLoggedIn,
+        isEnabled: true, // Pledge button never needs to be disabled on checkout page.
+        context: context,
+        willRetryPaymentMethod: false // Only retry in the `fixPaymentMethod` context.
+      )
     }
 
-    self.showWebHelp = self.pledgeDisclaimerViewDidTapLearnMoreSignal.mapConst(.trust)
+    self.paymentMethodsViewHidden = Signal.combineLatest(isLoggedIn, context)
+      .map { isLoggedIn, context in
+        !isLoggedIn || context.paymentMethodsViewHidden
+      }
+
+    self.showWebHelp = Signal.merge(
+      self.termsOfUseTappedSignal,
+      self.pledgeDisclaimerViewDidTapLearnMoreSignal.mapConst(.trust)
+    )
 
     self.configurePledgeRewardsSummaryViewWithData = initialData
       .compactMap { data in
@@ -101,12 +125,27 @@ public class PostCampaignCheckoutViewModel: PostCampaignCheckoutViewModelType,
     self.configureWithDataProperty.value = data
   }
 
+  private let (goToLoginSignupSignal, goToLoginSignupObserver) = Signal<Void, Never>.pipe()
+  public func goToLoginSignupTapped() {
+    self.goToLoginSignupObserver.send(value: ())
+  }
+
   private let (pledgeDisclaimerViewDidTapLearnMoreSignal, pledgeDisclaimerViewDidTapLearnMoreObserver)
     = Signal<Void, Never>.pipe()
   public func pledgeDisclaimerViewDidTapLearnMore() {
     self.pledgeDisclaimerViewDidTapLearnMoreObserver.send(value: ())
   }
 
+  private let (termsOfUseTappedSignal, termsOfUseTappedObserver) = Signal<HelpType, Never>.pipe()
+  public func termsOfUseTapped(with helpType: HelpType) {
+    self.termsOfUseTappedObserver.send(value: helpType)
+  }
+
+  private let (userSessionStartedSignal, userSessionStartedObserver) = Signal<Void, Never>.pipe()
+  public func userSessionStarted() {
+    self.userSessionStartedObserver.send(value: ())
+  }
+
   private let viewDidLoadProperty = MutableProperty(())
   public func viewDidLoad() {
     self.viewDidLoadProperty.value = ()
@@ -121,6 +160,8 @@ public class PostCampaignCheckoutViewModel: PostCampaignCheckoutViewModelType,
     PledgeSummaryViewData
   ), Never>
   public let configurePledgeViewCTAContainerView: Signal<PledgeViewCTAContainerViewData, Never>
+  public let goToLoginSignup: Signal<(LoginIntent, Project, Reward?), Never>
+  public let paymentMethodsViewHidden: Signal<Bool, Never>
   public let showWebHelp: Signal<HelpType, Never>
 
   public var inputs: PostCampaignCheckoutViewModelInputs { return self }