Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -830,6 +830,7 @@ extension PlaygroundController {
"link_mode": settings.linkEnabledMode.rawValue,
"use_manual_confirmation": settings.integrationType == .deferred_mc,
"require_cvc_recollection": settings.requireCVCRecollection == .on,
"is_confirmation_token": settings.integrationType == .deferred_csc_ct || settings.integrationType == .deferred_ssc_ct,
"customer_session_component_name": "mobile_payment_element",
"customer_session_payment_method_save": settings.paymentMethodSave.rawValue,
"customer_session_payment_method_remove": settings.paymentMethodRemove.rawValue,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -449,7 +449,7 @@ final class PaymentSheetAnalyticsHelper {
additionalParams["setup_future_usage"] = intent?.setupFutureUsageString
additionalParams["payment_method_options_setup_future_usage"] = intent?.isPaymentMethodOptionsSetupFutureUsageSet
additionalParams["elements_session_config_id"] = elementsSession?.sessionID

additionalParams["is_confirmation_tokens"] = intent?.intentConfig?.confirmationTokenConfirmHandler != nil
if event.shouldLogFcSdkAvailability {
additionalParams["fc_sdk_availability"] = FinancialConnectionsSDKAvailability.analyticsValue
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,6 @@ extension PaymentSheet {
radarOptions: STPRadarOptions? = nil,
completion: @escaping (PaymentSheetResult, STPAnalyticsClient.DeferredIntentConfirmationType?) -> Void
) {
// Assert that exactly one confirm handler is populated
let hasConfirmHandler = intentConfig.confirmHandler != nil
let hasConfirmationTokenHandler = intentConfig.confirmationTokenConfirmHandler != nil
stpAssert(hasConfirmHandler != hasConfirmationTokenHandler, "Exactly one confirm handler should be set (either confirmHandler or confirmationTokenConfirmHandler, but not both or neither)")

// Route based on which handler is available in the intent configuration
if intentConfig.confirmationTokenConfirmHandler != nil {
guard let elementsSession else {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,9 @@ private class ApplePayContextClosureDelegate: NSObject, ApplePayContextDelegate
Task {
do {
// Create the confirmation token
let confirmationToken = try await context.apiClient.createConfirmationToken(with: confirmationTokenParams, ephemeralKeySecret: nil)
let confirmationToken = try await context.apiClient.createConfirmationToken(with: confirmationTokenParams,
ephemeralKeySecret: nil,
additionalPaymentUserAgentValues: PaymentSheet.makeDeferredPaymentUserAgentValue(intentConfiguration: intentConfig))

// Call the confirmation token handler
await MainActor.run {
Expand Down
Loading