read from customersession setting instead of config

Example/PaymentSheet Example/PaymentSheet Example/CustomerSessionPlaygroundView.swift

@@ -50,13 +50,15 @@ struct CustomerSessionPlaygroundView: View {
                     if viewModel.paymentMethodSave == .disabled {
                         SettingPickerView(setting: $viewModel.allowRedisplayOverride)
                     }
+                    else {
+                        SettingPickerView(setting: $viewModel.paymentMethodSetAsDefault)
+                    }
                     SettingPickerView(setting: $viewModel.paymentMethodRemove)
                     SettingPickerView(setting: $viewModel.paymentMethodRemoveLast)
                     SettingPickerView(setting: paymentMethodRedisplayBinding)
                     if viewModel.paymentMethodRedisplay == .enabled {
                         SettingPickerView(setting: $viewModel.paymentMethodAllowRedisplayFilters)
                     }
-                    SettingPickerView(setting: $viewModel.allowsSetAsDefaultPM)
                 }
             }.padding()
 

Example/PaymentSheet Example/PaymentSheet Example/CustomerSheetTestPlayground.swift

@@ -53,7 +53,7 @@ struct CustomerSheetTestPlayground: View {
                                 SettingPickerView(setting: $playgroundController.settings.paymentMethodRemove)
                                 SettingPickerView(setting: $playgroundController.settings.paymentMethodRemoveLast)
                                 SettingPickerView(setting: $playgroundController.settings.paymentMethodAllowRedisplayFilters)
-                                SettingPickerView(setting: $playgroundController.settings.allowsSetAsDefaultPM)
+                                SettingPickerView(setting: $playgroundController.settings.paymentMethodSyncDefault)
                             }
                         }
                     }

Example/PaymentSheet Example/PaymentSheet Example/CustomerSheetTestPlaygroundController.swift

@@ -147,7 +147,6 @@ class CustomerSheetTestPlaygroundController: ObservableObject {
         case .allowVisa:
             configuration.cardBrandAcceptance = .allowed(brands: [.visa])
         }
-        configuration.allowsSetAsDefaultPM = settings.allowsSetAsDefaultPM == .on
         return configuration
     }
 
@@ -328,6 +327,7 @@ class CustomerSheetBackend {
                      "merchant_country_code": settings.merchantCountryCode.rawValue,
                      "customer_session_payment_method_remove": settings.paymentMethodRemove.rawValue,
                      "customer_session_payment_method_remove_last": settings.paymentMethodRemoveLast.rawValue,
+                     "customer_session_payment_method_sync_default": settings.paymentMethodSyncDefault.rawValue,
         ] as [String: Any]
 
         if let allowRedisplayValue = settings.paymentMethodAllowRedisplayFilters.arrayValue() {

Example/PaymentSheet Example/PaymentSheet Example/CustomerSheetTestPlaygroundSettings.swift

@@ -141,19 +141,20 @@ public struct CustomerSheetTestPlaygroundSettings: Codable, Equatable {
         }
     }
 
+    enum PaymentMethodSyncDefault: String, PickerEnum {
+        static let enumName: String = "PaymentMethodSyncDefault"
+
+        case enabled
+        case disabled
+    }
+
     enum CardBrandAcceptance: String, PickerEnum {
         static let enumName: String = "cardBrandAcceptance"
         case all
         case blockAmEx
         case allowVisa
     }
 
-    enum AllowsSetAsDefaultPM: String, PickerEnum {
-        static let enumName: String = "allowsSetAsDefaultPM"
-        case on
-        case off
-    }
-
     var customerMode: CustomerMode
     var customerId: String?
     var customerKeyType: CustomerKeyType
@@ -174,8 +175,8 @@ public struct CustomerSheetTestPlaygroundSettings: Codable, Equatable {
     var paymentMethodRemove: PaymentMethodRemove
     var paymentMethodRemoveLast: PaymentMethodRemoveLast
     var paymentMethodAllowRedisplayFilters: PaymentMethodAllowRedisplayFilters
+    var paymentMethodSyncDefault: PaymentMethodSyncDefault
     var cardBrandAcceptance: CardBrandAcceptance
-    var allowsSetAsDefaultPM: AllowsSetAsDefaultPM
 
     static func defaultValues() -> CustomerSheetTestPlaygroundSettings {
         return CustomerSheetTestPlaygroundSettings(customerMode: .new,
@@ -197,8 +198,8 @@ public struct CustomerSheetTestPlaygroundSettings: Codable, Equatable {
                                                    paymentMethodRemove: .enabled,
                                                    paymentMethodRemoveLast: .enabled,
                                                    paymentMethodAllowRedisplayFilters: .always,
-                                                   cardBrandAcceptance: .all,
-                                                   allowsSetAsDefaultPM: .off)
+                                                   paymentMethodSyncDefault: .disabled,
+                                                   cardBrandAcceptance: .all)
     }
 
     var base64Data: String {

Example/PaymentSheet Example/PaymentSheet Example/PaymentSheetTestPlaygroundSettings.swift

@@ -235,6 +235,13 @@ struct PaymentSheetTestPlaygroundSettings: Codable, Equatable {
         }
     }
 
+
+    enum PaymentMethodSetAsDefault: String, PickerEnum {
+        static let enumName: String = "PaymentMethodSetAsDefault"
+        case enabled
+        case disabled
+    }
+
     enum DefaultBillingAddress: String, PickerEnum {
         static var enumName: String { "Default billing address" }
 
@@ -446,12 +453,6 @@ struct PaymentSheetTestPlaygroundSettings: Codable, Equatable {
         case allowVisa
     }
 
-    enum AllowsSetAsDefaultPM: String, PickerEnum {
-        static let enumName: String = "allowsSetAsDefaultPM"
-        case on
-        case off
-    }
-
     enum ConfigurationStyle: String, PickerEnum {
         static let enumName: String = "Style"
         case automatic
@@ -482,6 +483,7 @@ struct PaymentSheetTestPlaygroundSettings: Codable, Equatable {
     var paymentMethodRemoveLast: PaymentMethodRemoveLast
     var paymentMethodRedisplay: PaymentMethodRedisplay
     var paymentMethodAllowRedisplayFilters: PaymentMethodAllowRedisplayFilters
+    var paymentMethodSetAsDefault: PaymentMethodSetAsDefault
     var defaultBillingAddress: DefaultBillingAddress
     var customEmail: String?
     var linkPassthroughMode: LinkPassthroughMode
@@ -506,7 +508,6 @@ struct PaymentSheetTestPlaygroundSettings: Codable, Equatable {
     var formSheetAction: FormSheetAction
     var embeddedViewDisplaysMandateText: DisplaysMandateTextEnabled
     var cardBrandAcceptance: CardBrandAcceptance
-    var allowsSetAsDefaultPM: AllowsSetAsDefaultPM
 
     static func defaultValues() -> PaymentSheetTestPlaygroundSettings {
         return PaymentSheetTestPlaygroundSettings(
@@ -531,6 +532,7 @@ struct PaymentSheetTestPlaygroundSettings: Codable, Equatable {
             paymentMethodRemoveLast: .enabled,
             paymentMethodRedisplay: .enabled,
             paymentMethodAllowRedisplayFilters: .always,
+            paymentMethodSetAsDefault: .disabled,
             defaultBillingAddress: .off,
             customEmail: nil,
             linkPassthroughMode: .passthrough,
@@ -553,8 +555,7 @@ struct PaymentSheetTestPlaygroundSettings: Codable, Equatable {
             collectAddress: .automatic,
             formSheetAction: .continue,
             embeddedViewDisplaysMandateText: .on,
-            cardBrandAcceptance: .all,
-            allowsSetAsDefaultPM: .off)
+            cardBrandAcceptance: .all)
     }
 
     static let nsUserDefaultsKey = "PaymentSheetTestPlaygroundSettings"

Example/PaymentSheet Example/PaymentSheet Example/PlaygroundController.swift

@@ -183,7 +183,6 @@ class PlaygroundController: ObservableObject {
         case .allowVisa:
             configuration.cardBrandAcceptance = .allowed(brands: [.visa])
         }
-        configuration.allowsSetAsDefaultPM = settings.allowsSetAsDefaultPM == .on
 
         switch settings.style {
         case .automatic:
@@ -281,7 +280,6 @@ class PlaygroundController: ObservableObject {
         case .allowVisa:
             configuration.cardBrandAcceptance = .allowed(brands: [.visa])
         }
-        configuration.allowsSetAsDefaultPM = settings.allowsSetAsDefaultPM == .on
         return configuration
     }
 
@@ -639,6 +637,7 @@ extension PlaygroundController {
             "customer_session_payment_method_remove": settings.paymentMethodRemove.rawValue,
             "customer_session_payment_method_remove_last": settings.paymentMethodRemoveLast.rawValue,
             "customer_session_payment_method_redisplay": settings.paymentMethodRedisplay.rawValue,
+            "customer_session_payment_method_set_as_default": settings.paymentMethodSetAsDefault.rawValue,
             //            "set_shipping_address": true // Uncomment to make server vend PI with shipping address populated
         ] as [String: Any]
         if settingsToLoad.apmsEnabled == .off, let supportedPaymentMethods = settingsToLoad.supportedPaymentMethods, !supportedPaymentMethods.isEmpty {

StripePaymentSheet/StripePaymentSheet/Source/Internal/API Bindings/v1-elements-sessions/CustomerSession.swift

@@ -42,6 +42,7 @@ struct CustomerSession: Equatable, Hashable {
                 return nil
             }
             let paymentMethodRemoveLast = mobilePaymentElementFeaturesDict["payment_method_remove_last"] as? String ?? "enabled"
+            let paymentMethodSetAsDefault = mobilePaymentElementFeaturesDict["payment_method_set_as_default"] as? String ?? "disabled"
 
             var allowRedisplayOverrideValue: STPPaymentMethodAllowRedisplay?
             if let allowRedisplayOverride = mobilePaymentElementFeaturesDict["payment_method_save_allow_redisplay_override"] as? String {
@@ -52,7 +53,8 @@ struct CustomerSession: Equatable, Hashable {
                                                                           features: MobilePaymentElementComponentFeature(paymentMethodSave: paymentMethodSave == "enabled",
                                                                                                                          paymentMethodRemove: paymentMethodRemove == "enabled",
                                                                                                                          paymentMethodRemoveLast: paymentMethodRemoveLast == "enabled",
-                                                                                                                         paymentMethodSaveAllowRedisplayOverride: allowRedisplayOverrideValue))
+                                                                                                                         paymentMethodSaveAllowRedisplayOverride: allowRedisplayOverrideValue,
+                                                                                                                         paymentMethodSetAsDefault: paymentMethodSetAsDefault == "enabled"))
         } else {
             mobilePaymentElementComponent = MobilePaymentElementComponent(enabled: false, features: nil)
         }
@@ -64,10 +66,11 @@ struct CustomerSession: Equatable, Hashable {
                 return nil
             }
             let paymentMethodRemoveLast = customerSheetFeaturesDict["payment_method_remove_last"] as? String ?? "enabled"
-
+            let paymentMethodSyncDefault = customerSheetFeaturesDict["payment_method_sync_default"] as? String ?? "disabled"
             customerSheetComponent = CustomerSheetComponent(enabled: true,
                                                             features: CustomerSheetComponentFeature(paymentMethodRemove: paymentMethodRemove == "enabled",
-                                                                                                    paymentMethodRemoveLast: paymentMethodRemoveLast == "enabled"))
+                                                                                                    paymentMethodRemoveLast: paymentMethodRemoveLast == "enabled",
+                                                                                                    paymentMethodSyncDefault: paymentMethodSyncDefault == "enabled"))
         } else {
             customerSheetComponent = CustomerSheetComponent(enabled: false, features: nil)
         }
@@ -94,6 +97,7 @@ struct MobilePaymentElementComponentFeature: Equatable, Hashable {
     let paymentMethodRemove: Bool
     let paymentMethodRemoveLast: Bool
     let paymentMethodSaveAllowRedisplayOverride: STPPaymentMethodAllowRedisplay?
+    let paymentMethodSetAsDefault: Bool
 }
 
 struct CustomerSheetComponent: Equatable, Hashable {
@@ -104,4 +108,5 @@ struct CustomerSheetComponent: Equatable, Hashable {
 struct CustomerSheetComponentFeature: Equatable, Hashable {
     let paymentMethodRemove: Bool
     let paymentMethodRemoveLast: Bool
+    let paymentMethodSyncDefault: Bool
 }

StripePaymentSheet/StripePaymentSheet/Source/Internal/API Bindings/v1-elements-sessions/STPElementsSession.swift

@@ -211,6 +211,10 @@ extension STPElementsSession {
         return customer?.customerSession.mobilePaymentElementComponent.features?.paymentMethodRemoveLast ?? true
     }
 
+    var paymentMethodSetAsDefaultForPaymentSheet: Bool {
+        return customer?.customerSession.mobilePaymentElementComponent.features?.paymentMethodSetAsDefault ?? false
+    }
+
     func allowsRemovalOfPaymentMethodsForCustomerSheet() -> Bool {
         var allowsRemovalOfPaymentMethods = false
         if let customerSession = customer?.customerSession {
@@ -227,6 +231,10 @@ extension STPElementsSession {
         return customer?.customerSession.customerSheetComponent.features?.paymentMethodRemoveLast ?? true
     }
 
+    var paymentMethodSyncDefaultForCustomerSheet: Bool {
+        return customer?.customerSession.customerSheetComponent.features?.paymentMethodSyncDefault ?? false
+    }
+
     var isLinkCardBrand: Bool {
         linkSettings?.linkMode == .linkCardBrand
     }

StripePaymentSheet/StripePaymentSheet/Source/PaymentSheet/CustomerSessionAdapter/CustomerSessionAdapter.swift

@@ -107,10 +107,10 @@ extension CustomerSessionAdapter {
         return stripePaymentMethodId
     }
 
-    func fetchSelectedPaymentOption(for customerId: String, customer: ElementsCustomer? = nil) -> CustomerPaymentOption? {
+    func fetchSelectedPaymentOption(for customerId: String, elementsSession: STPElementsSession? = nil) -> CustomerPaymentOption? {
         // if opted in to the "set as default" feature, try to get default payment method from elements session
-        if configuration.allowsSetAsDefaultPM {
-            guard let customer = customer,
+        if let elementsSession = elementsSession, elementsSession.paymentMethodSyncDefaultForCustomerSheet {
+            guard let customer = elementsSession.customer,
                  let defaultPaymentMethod = customer.getDefaultOrFirstPaymentMethod() else { return nil }
             return CustomerPaymentOption.stripeId(defaultPaymentMethod.stripeId)
         }

StripePaymentSheet/StripePaymentSheet/Source/PaymentSheet/CustomerSheet/CustomerSavedPaymentMethodsCollectionViewController.swift

@@ -81,8 +81,8 @@ class CustomerSavedPaymentMethodsCollectionViewController: UIViewController {
         let showApplePay: Bool
         let allowsRemovalOfLastSavedPaymentMethod: Bool
         let paymentMethodRemove: Bool
+        let paymentMethodSyncDefault: Bool
         let isTestMode: Bool
-        let allowsSetAsDefaultPM: Bool
     }
 
     /// Whether or not you can edit save payment methods by removing or updating them.
@@ -243,7 +243,7 @@ class CustomerSavedPaymentMethodsCollectionViewController: UIViewController {
         delegate: CustomerSavedPaymentMethodsCollectionViewControllerDelegate? = nil
     ) {
         // when opted into the set as default feature, only show payment methods that can be set as default (card, US bank account)
-        if configuration.allowsSetAsDefaultPM {
+        if configuration.paymentMethodSyncDefault {
             self.savedPaymentMethods = savedPaymentMethods.filter{ savedPaymentMethod in CustomerSheet.supportedDefaultPaymentMethods.contains{paymentMethodType in
                 savedPaymentMethod.type == paymentMethodType}
             }

StripePaymentSheet/StripePaymentSheet/Source/PaymentSheet/CustomerSheet/CustomerSavedPaymentMethodsViewController.swift

@@ -34,6 +34,7 @@ class CustomerSavedPaymentMethodsViewController: UIViewController {
     let configuration: CustomerSheet.Configuration
     let customerSheetDataSource: CustomerSheetDataSource
     let paymentMethodRemove: Bool
+    let paymentMethodSyncDefault: Bool
     let allowsRemovalOfLastSavedPaymentMethod: Bool
     let cbcEligible: Bool
 
@@ -64,11 +65,11 @@ class CustomerSavedPaymentMethodsViewController: UIViewController {
     private var cachedClientSecret: String?
 
     var showApplePay: Bool {
-        return isApplePayEnabled && !configuration.allowsSetAsDefaultPM
+        return isApplePayEnabled && !paymentMethodSyncDefault
     }
 
     var paymentMethodTypes: [PaymentSheet.PaymentMethodType] {
-        let supportedPaymentMethods = configuration.allowsSetAsDefaultPM ? CustomerSheet.supportedDefaultPaymentMethods : CustomerSheet.supportedPaymentMethods
+        let supportedPaymentMethods = paymentMethodSyncDefault ? CustomerSheet.supportedDefaultPaymentMethods : CustomerSheet.supportedPaymentMethods
         let paymentMethodTypes = merchantSupportedPaymentMethodTypes.customerSheetSupportedPaymentMethodTypesForAdd(canCreateSetupIntents: canCreateSetupIntents, supportedPaymentMethods: supportedPaymentMethods)
         return paymentMethodTypes.toPaymentSheetPaymentMethodTypes()
     }
@@ -108,8 +109,8 @@ class CustomerSavedPaymentMethodsViewController: UIViewController {
                 showApplePay: showApplePay,
                 allowsRemovalOfLastSavedPaymentMethod: allowsRemovalOfLastSavedPaymentMethod,
                 paymentMethodRemove: paymentMethodRemove,
-                isTestMode: configuration.apiClient.isTestmode,
-                allowsSetAsDefaultPM: configuration.allowsSetAsDefaultPM
+                paymentMethodSyncDefault: paymentMethodSyncDefault,
+                isTestMode: configuration.apiClient.isTestmode
             ),
             appearance: configuration.appearance,
             cbcEligible: cbcEligible,
@@ -151,6 +152,7 @@ class CustomerSavedPaymentMethodsViewController: UIViewController {
         customerSheetDataSource: CustomerSheetDataSource,
         isApplePayEnabled: Bool,
         paymentMethodRemove: Bool,
+        paymentMethodSyncDefault: Bool,
         allowsRemovalOfLastSavedPaymentMethod: Bool,
         cbcEligible: Bool,
         csCompletion: CustomerSheet.CustomerSheetCompletion?,
@@ -163,12 +165,13 @@ class CustomerSavedPaymentMethodsViewController: UIViewController {
         self.customerSheetDataSource = customerSheetDataSource
         self.isApplePayEnabled = isApplePayEnabled
         self.paymentMethodRemove = paymentMethodRemove
+        self.paymentMethodSyncDefault = paymentMethodSyncDefault
         self.allowsRemovalOfLastSavedPaymentMethod = allowsRemovalOfLastSavedPaymentMethod
         self.cbcEligible = cbcEligible
         self.csCompletion = csCompletion
         self.delegate = delegate
 
-        if Self.shouldShowPaymentMethodCarousel(savedPaymentMethods: savedPaymentMethods, showApplePay: isApplePayEnabled && !configuration.allowsSetAsDefaultPM) {
+        if Self.shouldShowPaymentMethodCarousel(savedPaymentMethods: savedPaymentMethods, showApplePay: isApplePayEnabled && !paymentMethodSyncDefault) {
             self.mode = .selectingSaved
         } else {
             switch customerSheetDataSource.dataSource {
@@ -659,11 +662,11 @@ class CustomerSavedPaymentMethodsViewController: UIViewController {
             mostRecentlyAddedPaymentMethod: mostRecentlyAddedPaymentMethod,
             savedPaymentMethodsConfiguration: self.configuration,
             configuration: .init(
-                showApplePay: isApplePayEnabled,
+                showApplePay: showApplePay,
                 allowsRemovalOfLastSavedPaymentMethod: allowsRemovalOfLastSavedPaymentMethod,
                 paymentMethodRemove: paymentMethodRemove,
-                isTestMode: configuration.apiClient.isTestmode,
-                allowsSetAsDefaultPM: configuration.allowsSetAsDefaultPM
+                paymentMethodSyncDefault: paymentMethodSyncDefault,
+                isTestMode: configuration.apiClient.isTestmode
             ),
             appearance: configuration.appearance,
             cbcEligible: cbcEligible,