CheckoutSessions — PMO SFU

Example/PaymentSheet Example/PaymentSheet Example/PlaygroundController.swift

@@ -1110,7 +1110,7 @@ extension PlaygroundController {
         }
 
         // Only set PMO SFU on the Intent if we're Intent-first, never set it for deferred intents.
-        if settings.integrationType == .normal {
+        if settings.integrationType == .normal || settings.integrationType == .checkoutSession {
             body["payment_method_options_setup_future_usage"] = settings.paymentMethodOptionsSetupFutureUsage.toDictionary()
         }
         if shouldCreateCustomerKey {

StripePaymentSheet/StripePaymentSheet/Source/PaymentSheet/Checkout/API Models/STPCheckoutSession.swift

@@ -110,6 +110,10 @@ class STPCheckoutSession: NSObject {
     /// Top-level setup_future_usage for payment-mode checkout sessions.
     let setupFutureUsage: String?
 
+    /// Per-payment-method setup_future_usage overrides for payment-mode checkout sessions.
+    /// Parsed from `setup_future_usage_for_payment_method_type` in the init response.
+    let setupFutureUsageForPaymentMethodType: [String: String]
+
     /// Whether billing address collection is required for this session.
     /// Derived from `billing_address_collection == "required"` in the API response.
     let requiresBillingAddress: Bool
@@ -257,6 +261,7 @@ class STPCheckoutSession: NSObject {
         taxAmounts: [STPCheckoutSessionTaxAmount],
         savedPaymentMethodsOfferSave: STPCheckoutSessionSavedPaymentMethodsOfferSave?,
         setupFutureUsage: String?,
+        setupFutureUsageForPaymentMethodType: [String: String],
         requiresBillingAddress: Bool,
         allowedShippingCountries: [String]?,
         localizedPricesMetas: [STPCheckoutSessionLocalizedPriceMeta],
@@ -292,6 +297,7 @@ class STPCheckoutSession: NSObject {
         self.taxAmounts = taxAmounts
         self.savedPaymentMethodsOfferSave = savedPaymentMethodsOfferSave
         self.setupFutureUsage = setupFutureUsage
+        self.setupFutureUsageForPaymentMethodType = setupFutureUsageForPaymentMethodType
         self.requiresBillingAddress = requiresBillingAddress
         self.allowedShippingCountries = allowedShippingCountries
         self.localizedPricesMetas = localizedPricesMetas
@@ -367,6 +373,7 @@ extension STPCheckoutSession: STPAPIResponseDecodable {
             from: dict["customer_managed_saved_payment_methods_offer_save"] as? [AnyHashable: Any]
         )
         let setupFutureUsage = dict["setup_future_usage"] as? String
+        let setupFutureUsageForPaymentMethodType = dict["setup_future_usage_for_payment_method_type"] as? [String: String] ?? [:]
 
         // Parse address collection settings
         let requiresBillingAddress = (dict["billing_address_collection"] as? String) == "required"
@@ -450,6 +457,7 @@ extension STPCheckoutSession: STPAPIResponseDecodable {
             taxAmounts: taxAmounts,
             savedPaymentMethodsOfferSave: savedPaymentMethodsOfferSave,
             setupFutureUsage: setupFutureUsage,
+            setupFutureUsageForPaymentMethodType: setupFutureUsageForPaymentMethodType,
             requiresBillingAddress: requiresBillingAddress,
             allowedShippingCountries: allowedShippingCountries,
             localizedPricesMetas: localizedPricesMetas,
@@ -465,8 +473,16 @@ extension STPCheckoutSession: STPAPIResponseDecodable {
 // MARK: - Parsing Helpers
 
 extension STPCheckoutSession {
+    var isPaymentMethodOptionsSetupFutureUsageSet: Bool {
+        return !setupFutureUsageForPaymentMethodType.isEmpty
+    }
+
     func setupFutureUsage(for paymentMethodType: STPPaymentMethodType) -> String? {
-        _ = paymentMethodType
+        let perPaymentMethodSetupFutureUsage = setupFutureUsageForPaymentMethodType[paymentMethodType.identifier]
+        if let perPaymentMethodSetupFutureUsage {
+            return perPaymentMethodSetupFutureUsage
+        }
+
         return setupFutureUsage
     }
 

StripePaymentSheet/StripePaymentSheet/Source/PaymentSheet/Intent.swift

@@ -166,9 +166,8 @@ enum Intent {
                 return !setupFutureUsageValues.isEmpty
             }
             return nil
-        case .checkoutSession:
-            // TODO(gbirch): implement during PMO SFU work
-            return nil
+        case .checkoutSession(let checkoutSession):
+            return checkoutSession.isPaymentMethodOptionsSetupFutureUsageSet
         case .setupIntent:
             return nil
         }
@@ -195,7 +194,7 @@ enum Intent {
         case .checkoutSession(let checkoutSession):
             switch checkoutSession.mode {
             case .payment:
-                guard let setupFutureUsage = checkoutSession.setupFutureUsage else {
+                guard let setupFutureUsage = checkoutSession.setupFutureUsage(for: paymentMethodType) else {
                     return false
                 }
                 return setupFutureUsage != "none"

StripePaymentSheet/StripePaymentSheetTests/PaymentSheet/Checkout/STPCheckoutSessionTest.swift

@@ -237,6 +237,24 @@ class STPCheckoutSessionTest: XCTestCase {
         XCTAssertEqual(session.setupFutureUsage, "off_session")
     }
 
+    func testDecodedObjectParsesPerPaymentMethodSetupFutureUsage() {
+        let session = makeCheckoutSession([
+            "payment_method_types": ["card", "us_bank_account"],
+            "setup_future_usage_for_payment_method_type": [
+                "card": "off_session",
+                "us_bank_account": "none",
+            ],
+        ])
+
+        XCTAssertEqual(
+            session.setupFutureUsageForPaymentMethodType as NSDictionary,
+            [
+                "card": "off_session",
+                "us_bank_account": "none",
+            ] as NSDictionary
+        )
+    }
+
     func testDecodedObjectParsesCanDetachPaymentMethodTrue() {
         let json: [String: Any] = [
             "session_id": "cs_test_detach_true",
@@ -386,6 +404,25 @@ class STPCheckoutSessionTest: XCTestCase {
         XCTAssertFalse(session.merchantWillSavePaymentMethod(.card))
     }
 
+    func testMerchantWillSavePaymentMethod_paymentModeWithPerPaymentMethodSetupFutureUsage() {
+        let session = STPCheckoutSession.decodedObject(fromAPIResponse: [
+            "session_id": "cs_test_payment_per_pm_sfu",
+            "object": "checkout.session",
+            "livemode": false,
+            "mode": "payment",
+            "payment_status": "unpaid",
+            "payment_method_types": ["card", "us_bank_account"],
+            "customer": ["id": "cus_123"],
+            "setup_future_usage_for_payment_method_type": [
+                "card": "off_session",
+                "us_bank_account": "none",
+            ],
+        ])!
+
+        XCTAssertTrue(session.merchantWillSavePaymentMethod(.card))
+        XCTAssertFalse(session.merchantWillSavePaymentMethod(.USBankAccount))
+    }
+
     func testMerchantWillSavePaymentMethod_paymentModeWithoutCustomer() {
         let session = STPCheckoutSession.decodedObject(fromAPIResponse: [
             "session_id": "cs_test_payment_no_customer",
@@ -435,6 +472,17 @@ class STPCheckoutSessionTest: XCTestCase {
         XCTAssertEqual(Intent.checkoutSession(session).setupFutureUsageString, "off_session")
     }
 
+    func testCheckoutSessionIntent_isPaymentMethodOptionsSetupFutureUsageSet() {
+        let session = makeCheckoutSession([
+            "setup_future_usage_for_payment_method_type": [
+                "paypal": "off_session",
+            ],
+            "payment_method_types": ["paypal"],
+        ])
+
+        XCTAssertEqual(Intent.checkoutSession(session).isPaymentMethodOptionsSetupFutureUsageSet, true)
+    }
+
     func testCheckoutSessionIntent_isSetupFutureUsageSet_topLevel() {
         let session = makeCheckoutSession([
             "setup_future_usage": "off_session",
@@ -454,4 +502,27 @@ class STPCheckoutSessionTest: XCTestCase {
         XCTAssertFalse(Intent.checkoutSession(session).isSetupFutureUsageSet(for: .payPal))
     }
 
+    func testCheckoutSessionIntent_isSetupFutureUsageSet_perPaymentMethod() {
+        let session = makeCheckoutSession([
+            "setup_future_usage_for_payment_method_type": [
+                "paypal": "off_session",
+            ],
+            "payment_method_types": ["paypal"],
+        ])
+
+        XCTAssertTrue(Intent.checkoutSession(session).isSetupFutureUsageSet(for: .payPal))
+    }
+
+    func testCheckoutSessionIntent_isSetupFutureUsageSet_perPaymentMethodNoneOverridesTopLevel() {
+        let session = makeCheckoutSession([
+            "setup_future_usage": "off_session",
+            "setup_future_usage_for_payment_method_type": [
+                "paypal": "none",
+            ],
+            "payment_method_types": ["paypal"],
+        ])
+
+        XCTAssertFalse(Intent.checkoutSession(session).isSetupFutureUsageSet(for: .payPal))
+    }
+
 }

StripePaymentSheet/StripePaymentSheetTests/PaymentSheet/PaymentSheet+APIMockTest.swift

@@ -537,6 +537,42 @@ final class PaymentSheetAPIMockTest: APIStubbedTestCase {
 
         waitForExpectations(timeout: 10)
     }
+
+    func testCheckoutSessionConfirmWithNonCardPaymentMethodIncludesSavePaymentMethod() {
+        var checkoutSessionJSON = MockJson.checkoutSession
+        checkoutSessionJSON["payment_method_types"] = ["paypal"]
+        let checkoutSession = STPCheckoutSession.decodedObject(fromAPIResponse: checkoutSessionJSON)!
+        let elementsSession = STPElementsSession._testValue(paymentMethodTypes: ["paypal"])
+        let confirmParams = IntentConfirmParams(type: .stripe(.payPal))
+        confirmParams.saveForFutureUseCheckboxState = .selected
+
+        stubCreatePaymentMethodExpecting(allowRedisplay: "always")
+        stubCheckoutSessionConfirm(
+            sessionId: checkoutSession.stripeId,
+            savePaymentMethod: true
+        )
+
+        let configuration = MockParams.configuration(pk: MockParams.publicKey)
+        let exp = expectation(description: "confirm completed")
+        let paymentHandler = STPPaymentHandler(apiClient: configuration.apiClient)
+
+        PaymentSheet.confirm(
+            configuration: configuration,
+            authenticationContext: self,
+            intent: .checkoutSession(checkoutSession),
+            elementsSession: elementsSession,
+            paymentOption: .new(confirmParams: confirmParams),
+            paymentHandler: paymentHandler,
+            analyticsHelper: ._testValue(),
+            completion: { result, _ in
+                XCTAssertEqual(result, .completed)
+                exp.fulfill()
+            }
+        )
+
+        waitForExpectations(timeout: 10)
+    }
+
 }
 
 extension PaymentSheetAPIMockTest: STPAuthenticationContext {

StripePaymentSheet/StripePaymentSheetTests/PaymentSheet/PaymentSheetLPMConfirmFlowTests.swift

@@ -835,13 +835,67 @@ extension PaymentSheetLPMConfirmFlowTests {
 
 // MARK: - Helper methods
 extension PaymentSheetLPMConfirmFlowTests {
+    struct SetupFutureUsageSupport {
+        let paymentIntentSetupFutureUsage: Bool
+        let paymentIntentPaymentMethodOptionsSetupFutureUsage: Bool
+        let checkoutSessionSetupFutureUsage: Bool
+        let checkoutSessionPaymentMethodOptionsSetupFutureUsage: Bool
+
+        static let fullySupported = SetupFutureUsageSupport(
+            paymentIntentSetupFutureUsage: true,
+            paymentIntentPaymentMethodOptionsSetupFutureUsage: true,
+            checkoutSessionSetupFutureUsage: true,
+            checkoutSessionPaymentMethodOptionsSetupFutureUsage: true
+        )
+    }
+
     enum IntentKind: CaseIterable {
         case paymentIntent
         case paymentIntentWithSetupFutureUsage
         case paymentIntentWithPMOSetupFutureUsage
         case setupIntent
     }
 
+    static let setupFutureUsageSupportByPaymentMethod: [STPPaymentMethodType: SetupFutureUsageSupport] = [
+        // Payment+SFU and PMO SFU are not always available on payment methods that support them for intents.
+        // Verified against `/create_checkout_session` on April 18, 2026 for payment methods
+        // that already support PaymentIntent top-level SFU and/or PMO SFU in these tests.
+        .AUBECSDebit: SetupFutureUsageSupport(
+            paymentIntentSetupFutureUsage: true,
+            paymentIntentPaymentMethodOptionsSetupFutureUsage: true,
+            checkoutSessionSetupFutureUsage: true,
+            checkoutSessionPaymentMethodOptionsSetupFutureUsage: false
+        ),
+        .bancontact: SetupFutureUsageSupport(
+            paymentIntentSetupFutureUsage: true,
+            paymentIntentPaymentMethodOptionsSetupFutureUsage: true,
+            checkoutSessionSetupFutureUsage: false,
+            checkoutSessionPaymentMethodOptionsSetupFutureUsage: false
+        ),
+        .klarna: SetupFutureUsageSupport(
+            paymentIntentSetupFutureUsage: true,
+            paymentIntentPaymentMethodOptionsSetupFutureUsage: true,
+            checkoutSessionSetupFutureUsage: true,
+            checkoutSessionPaymentMethodOptionsSetupFutureUsage: false
+        ),
+        .satispay: SetupFutureUsageSupport(
+            paymentIntentSetupFutureUsage: true,
+            paymentIntentPaymentMethodOptionsSetupFutureUsage: true,
+            checkoutSessionSetupFutureUsage: true,
+            checkoutSessionPaymentMethodOptionsSetupFutureUsage: false
+        ),
+        .iDEAL: SetupFutureUsageSupport(
+            paymentIntentSetupFutureUsage: true,
+            paymentIntentPaymentMethodOptionsSetupFutureUsage: true,
+            checkoutSessionSetupFutureUsage: true,
+            checkoutSessionPaymentMethodOptionsSetupFutureUsage: false
+        ),
+    ]
+
+    func setupFutureUsageSupport(for paymentMethod: STPPaymentMethodType) -> SetupFutureUsageSupport {
+        Self.setupFutureUsageSupportByPaymentMethod[paymentMethod] ?? .fullySupported
+    }
+
     func _testConfirm(
         intentKinds: [IntentKind],
         currency: String,
@@ -1040,6 +1094,7 @@ extension PaymentSheetLPMConfirmFlowTests {
 
         var intents: [(String, Intent)] = []
         let paymentMethodTypes = [paymentMethod.identifier].compactMap { $0 }
+        let setupFutureUsageSupport = setupFutureUsageSupport(for: paymentMethod)
         switch intentKind {
         case .paymentIntent:
             let paymentIntent: STPPaymentIntent = try await {
@@ -1133,6 +1188,9 @@ extension PaymentSheetLPMConfirmFlowTests {
 
             return intents
         case .paymentIntentWithSetupFutureUsage:
+            guard setupFutureUsageSupport.paymentIntentSetupFutureUsage else {
+                return []
+            }
             let paymentIntent: STPPaymentIntent = try await {
                 let clientSecret = try await STPTestingAPIClient.shared.fetchPaymentIntent(
                     types: paymentMethodTypes,
@@ -1194,14 +1252,38 @@ extension PaymentSheetLPMConfirmFlowTests {
                 )
             })
 
-            return [
+            var intents: [(String, Intent)] = [
                 ("PaymentIntent", .paymentIntent(paymentIntent)),
                 ("Deferred PaymentIntent w/ setup_future_usage - client side confirmation with payment method flow", makeDeferredIntent(deferredCSC)),
                 ("Deferred PaymentIntent w/ setup_future_usage - server side confirmation with payment method flow", makeDeferredIntent(deferredSSC)),
                 ("Deferred PaymentIntent w/ setup_future_usage - client side confirmation with confirmation token", makeDeferredIntent(deferredCSCWithConfirmationToken)),
                 ("Deferred PaymentIntent w/ setup_future_usage - server side confirmation with confirmation token", makeDeferredIntent(deferredSSCWithConfirmationToken)),
             ]
+
+            // Payment+SFU and PMO SFU are not always available on payment methods that support them for intents.
+            // We conditionally add testing for them accordingly.
+            if setupFutureUsageSupport.checkoutSessionSetupFutureUsage {
+                let checkoutSessionResponse = try await STPTestingAPIClient.shared.fetchCheckoutSessionPaymentMode(
+                    types: paymentMethodTypes,
+                    currency: currency,
+                    amount: amount,
+                    merchantCountry: merchantCountry.rawValue,
+                    customerID: customer,
+                    setupFutureUsage: "off_session"
+                )
+                let csApiClient = STPAPIClient(publishableKey: checkoutSessionResponse.publishableKey)
+                let checkoutSession = try await csApiClient.initCheckoutSession(
+                    checkoutSessionId: checkoutSessionResponse.id,
+                    adaptivePricingAllowed: true
+                )
+                intents.append(("CheckoutSession w/ setup_future_usage", .checkoutSession(checkoutSession)))
+            }
+
+            return intents
         case .paymentIntentWithPMOSetupFutureUsage:
+            guard setupFutureUsageSupport.paymentIntentPaymentMethodOptionsSetupFutureUsage else {
+                return []
+            }
             // This tests the scenario where IntentConfiguration has PMO setup_future_usage.
             let paymentIntent: STPPaymentIntent = try await {
                 // Regular PI: Backend DOES have PMO SFU set
@@ -1283,13 +1365,33 @@ extension PaymentSheetLPMConfirmFlowTests {
                 }
             )
 
-            return [
+            var intents: [(String, Intent)] = [
                 ("PaymentIntent", .paymentIntent(paymentIntent)),
                 ("Deferred PaymentIntent w/ PMO setup_future_usage - client side confirmation", makeDeferredIntent(deferredCSC)),
                 ("Deferred PaymentIntent w/ PMO setup_future_usage - server side confirmation", makeDeferredIntent(deferredSSC)),
                 ("Deferred PaymentIntent w/ PMO setup_future_usage - client side confirmation with confirmation token", makeDeferredIntent(deferredCSCWithConfirmationToken)),
                 ("Deferred PaymentIntent w/ PMO setup_future_usage - server side confirmation with confirmation token", makeDeferredIntent(deferredSSCWithConfirmationToken)),
             ]
+            if setupFutureUsageSupport.checkoutSessionPaymentMethodOptionsSetupFutureUsage {
+                let checkoutSessionResponse = try await STPTestingAPIClient.shared.fetchCheckoutSessionPaymentMode(
+                    types: paymentMethodTypes,
+                    currency: currency,
+                    amount: amount,
+                    merchantCountry: merchantCountry.rawValue,
+                    customerID: customer,
+                    paymentMethodOptionsSetupFutureUsage: [
+                        paymentMethod.identifier: "off_session",
+                    ]
+                )
+                let csApiClient = STPAPIClient(publishableKey: checkoutSessionResponse.publishableKey)
+                let checkoutSession = try await csApiClient.initCheckoutSession(
+                    checkoutSessionId: checkoutSessionResponse.id,
+                    adaptivePricingAllowed: true
+                )
+                intents.append(("CheckoutSession w/ PMO setup_future_usage", .checkoutSession(checkoutSession)))
+            }
+
+            return intents
         case .setupIntent:
             let setupIntent: STPSetupIntent = try await {
                 let clientSecret = try await STPTestingAPIClient.shared.fetchSetupIntent(types: paymentMethodTypes, merchantCountry: merchantCountry.rawValue, customerID: customer)