MBL-1123: Implement CreatePaymentIntent #1994

amy-at-kickstarter · 2024-03-22T02:59:36Z

📲 What

For late pledges, create an PaymentIntent instead of a SetupIntent, and use the associated Stripe payment sheet.

This PR includes quite a bit of refactoring, which is to make the intent type significantly more explicit in PledgePaymentsViewController/ViewModel.

🤔 Why

Swapping late pledges to use PaymentIntent is a requirement of the broader project.

👀 See

…ViewController

…odel

amy-at-kickstarter · 2024-03-22T03:00:36Z

Library/ViewModels/PledgePaymentMethodsViewModel.swift

+        clientSecretSignal = AppEnvironment.current.apiService
+          .createPaymentIntentInput(input: CreatePaymentIntentInput(
+            projectId: project.graphID,
+            amountDollars: "10.00",


This is the important // TODO here - we need the actual pledge amount in this view model.

…mentMethodCellViewModel

nativeksr · 2024-03-25T17:24:50Z

	1 Warning
⚠️	Big PR

Generated by 🚫 Danger

…SheetType

amy-at-kickstarter · 2024-03-25T17:47:45Z

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

+      case let .success(paymentSheetFlowController):
+        let topViewController = strongSelf.navigationController?.topViewController
+
+        assert(


Note that I got rid of the if paymentSheetShownWithinPledgeContext and changed it to an assert, instead. AFAIK this view controller is already only ever used from a pledge context.

amy-at-kickstarter · 2024-03-25T17:48:32Z

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

@@ -195,7 +212,7 @@ final class PledgePaymentMethodsViewController: UIViewController {
          label: existingPaymentOption.label
        )
        strongSelf.viewModel.inputs
-          .paymentSheetDidAdd(newCard: paymentDisplayData, setupIntent: clientSecret)
+          .paymentSheetDidAdd(newCard: paymentDisplayData, clientSecret: clientSecret)


I've been trying to rename setupIntent to clientSecret or stripeIntent wherever I can, but definitely have missed some spots.

amy-at-kickstarter · 2024-03-25T17:49:37Z

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

@@ -50,7 +50,9 @@ final class PledgePaymentMethodsViewControllerTests: TestCase {
          project: project,
          reward: reward,
          context: .pledge,
-          refTag: nil
+          refTag: nil,
+          pledgeTotal: Double.nan,


See here for an explanation.

amy-at-kickstarter · 2024-03-25T17:50:32Z

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

+    self.viewModel.outputs.configureStripeIntegration
+      .observeForUI()
+      .observeValues { merchantIdentifier, publishableKey in
+        STPAPIClient.shared.publishableKey = publishableKey


Thanks @scottkicks! Just copied this directly over from PledgeViewModel/PledgeViewController.

It's not clear to me why we only set the Stripe keys if the payment view isn't hidden - does Stripe charge us for setup? Seems odd, but I'm not willing to plumb those depths right now.

amy-at-kickstarter · 2024-03-25T17:51:48Z

Library/ViewModels/PaymentMethodsViewModel.swift

@@ -155,7 +155,8 @@ public final class PaymentMethodsViewModel: PaymentMethodsViewModelType,
            configuration.allowsDelayedPaymentMethods = true
            let data = PaymentSheetSetupData(
              clientSecret: envelope.clientSecret,
-              configuration: configuration
+              configuration: configuration,
+              paymentSheetType: .setupIntent


PaymentMethodsViewModel is used by PaymentMethodSettingsViewControllerDelegate, which is in the settings. That page only ever needs to use a SetupIntent.

amy-at-kickstarter · 2024-03-25T17:53:17Z

Library/ViewModels/PledgePaymentMethodsViewModel.swift

@@ -16,12 +16,20 @@ public typealias PledgePaymentMethodsValue = (
  project: Project,
  reward: Reward,
  context: PledgeViewContext,
-  refTag: RefTag?
+  refTag: RefTag?,
+  pledgeTotal: Double,


Passing the pledgeTotal in this way is a bit ugly, since it means I'm setting it to an empty value for non-late-pledge usages of this screen. I tried to document it in the code with asserts.

amy-at-kickstarter · 2024-03-25T17:54:24Z

Library/ViewModels/PledgePaymentMethodsViewModel.swift

@@ -198,22 +207,26 @@ public final class PledgePaymentMethodsViewModel: PledgePaymentMethodsViewModelT

        if indexPath.row < paymentSheetPaymentMethodCount {
          // we are selecting a new payment sheet card
-          let setupIntent = data.paymentSheetPaymentMethodsCellData[indexPath.row].setupIntent
+          let clientSecret = data.paymentSheetPaymentMethodsCellData[indexPath.row].clientSecret


At the level of each individual payment row, it just tracks a clientSecret as a string. The PledgePaymentMethodsViewModel, one level up, keeps track of whether that string is a PaymentIntent or a SetupIntent.

amy-at-kickstarter · 2024-03-25T17:55:11Z

Library/ViewModels/PledgePaymentMethodsViewModel.swift

-          configuration.allowsDelayedPaymentMethods = true
+    case .paymentIntent:
+      assert(
+        !pledgeTotal.isNaN,


This is my protection for the slightly ugly plumbing, here. I can't think of a good way around passing in the pledgeTotal in the overall configuration of this page - there's nowhere else we can get it from, correct?

amy-at-kickstarter · 2024-03-25T17:56:27Z

Library/ViewModels/PledgeViewModel.swift

+        // This second to last value - pledgeTotal - is only needed when the payment methods controller
+        // is used in late campaign pledges. There is an assert in PledgePaymentMethodsViewModel to ensure
+        // we don't accidentally propagate this nan downstream.
+        return (user, project, reward, context, refTag, Double.nan, .setupIntent)


@scottkicks @ifosli Can someone confirm that PledgeViewModel is never used for late pledges?

I can confirm! We're only using PostCampaignCheckoutViewModel in this new flow. PledgeViewModel should never get initialized.

amy-at-kickstarter · 2024-03-25T17:56:50Z

Library/ViewModels/PostCampaignCheckoutViewModel.swift

@@ -67,7 +67,7 @@ public class PostCampaignCheckoutViewModel: PostCampaignCheckoutViewModelType,
        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)
+        return (user, data.project, reward, data.context, data.refTag, data.total, .paymentIntent)


@scottkicks @ifosli Can someone confirm that data.total is the correct value for the pledge total?

Correct 👍

…ller

scottkicks

LGTM 👍
Great Job!

amy-at-kickstarter added 3 commits March 21, 2024 22:56

MBL-1123: Add payment intent type to PaymentSourceSelected

e79db85

MBL-1123: Use PaymentIntent Stripe controller in PledgePaymentMethods…

8299ef0

…ViewController

MBL-1233: Add new PaymentIntent mutation to PledgePaymentMethodsViewM…

0939141

…odel

amy-at-kickstarter mentioned this pull request Mar 22, 2024

[WIP] MBL-1123: Implement CreatePaymentIntent #1993

Closed

amy-at-kickstarter commented Mar 22, 2024

View reviewed changes

amy-at-kickstarter force-pushed the feat/adyer/MBL-1123/create-payment-intent-2 branch from a494263 to daa6386 Compare March 25, 2024 13:44

MBL-1123: Rename setupIntent to clientSecret in PledgePaymentSheetPay…

5e1faf8

…mentMethodCellViewModel

amy-at-kickstarter force-pushed the feat/adyer/MBL-1123/create-payment-intent-2 branch 2 times, most recently from 10b8daa to 921c2a7 Compare March 25, 2024 17:19

MBL-1123: Clarify payments methods flow by explicitly passing payment…

bdfb97c

…SheetType

amy-at-kickstarter force-pushed the feat/adyer/MBL-1123/create-payment-intent-2 branch from 921c2a7 to 3c48918 Compare March 25, 2024 17:39

amy-at-kickstarter requested review from ifosli and scottkicks March 25, 2024 17:47

amy-at-kickstarter commented Mar 25, 2024

View reviewed changes

amy-at-kickstarter marked this pull request as ready for review March 25, 2024 17:47

amy-at-kickstarter commented Mar 25, 2024

View reviewed changes

MBL-1123: Supply Stripe credentials in PostCampaignCheckoutViewContro…

5e9baef

…ller

amy-at-kickstarter force-pushed the feat/adyer/MBL-1123/create-payment-intent-2 branch from 3c48918 to 5e9baef Compare March 25, 2024 18:04

scottkicks approved these changes Mar 25, 2024

View reviewed changes

amy-at-kickstarter changed the title ~~[WIP] MBL-1123: Implement CreatePaymentIntent~~ MBL-1123: Implement CreatePaymentIntent Mar 25, 2024

amy-at-kickstarter merged commit ee1d256 into main Mar 25, 2024
5 checks passed

amy-at-kickstarter deleted the feat/adyer/MBL-1123/create-payment-intent-2 branch March 25, 2024 19:17

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

MBL-1123: Implement CreatePaymentIntent #1994

MBL-1123: Implement CreatePaymentIntent #1994

amy-at-kickstarter commented Mar 22, 2024 •

edited

amy-at-kickstarter Mar 22, 2024

nativeksr commented Mar 25, 2024

amy-at-kickstarter Mar 25, 2024

amy-at-kickstarter Mar 25, 2024

amy-at-kickstarter Mar 25, 2024 •

edited

amy-at-kickstarter Mar 25, 2024

amy-at-kickstarter Mar 25, 2024

amy-at-kickstarter Mar 25, 2024

amy-at-kickstarter Mar 25, 2024

amy-at-kickstarter Mar 25, 2024

amy-at-kickstarter Mar 25, 2024

amy-at-kickstarter Mar 25, 2024

scottkicks Mar 25, 2024

amy-at-kickstarter Mar 25, 2024

scottkicks Mar 25, 2024

scottkicks left a comment

MBL-1123: Implement CreatePaymentIntent #1994

MBL-1123: Implement CreatePaymentIntent #1994

Conversation

amy-at-kickstarter commented Mar 22, 2024 • edited

📲 What

🤔 Why

👀 See

Choose a reason for hiding this comment

nativeksr commented Mar 25, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

amy-at-kickstarter Mar 25, 2024 • edited

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

scottkicks left a comment

Choose a reason for hiding this comment

amy-at-kickstarter commented Mar 22, 2024 •

edited

amy-at-kickstarter Mar 25, 2024 •

edited