Async init for embedded and initial selection #4068
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -14,7 +14,7 @@ import Contacts | |
| import PassKit | ||
| @_spi(STP) import StripeCore | ||
| @_spi(STP) import StripePayments | ||
| @_spi(CustomerSessionBetaAccess) @_spi(STP) @_spi(PaymentSheetSkipConfirmation) @_spi(ExperimentalAllowsRemovalOfLastSavedPaymentMethodAPI) @_spi(ExperimentalPaymentMethodLayoutAPI) @_spi(EmbeddedPaymentElementPrivateBeta) import StripePaymentSheet | ||
| import SwiftUI | ||
| import UIKit | ||
|
|
||
|
|
@@ -177,6 +177,75 @@ class PlaygroundController: ObservableObject { | |
| return configuration | ||
| } | ||
|
|
||
| var embeddedConfiguration: EmbeddedPaymentElement.Configuration { | ||
| var configuration = EmbeddedPaymentElement.Configuration(formSheetAction: .confirm(completion: { [weak self] result in | ||
| // TODO(porter) Handle two step confirm | ||
| self?.lastPaymentResult = result | ||
| })) | ||
| configuration.externalPaymentMethodConfiguration = externalPaymentMethodConfiguration | ||
| switch settings.externalPaymentMethods { | ||
| case .paypal: | ||
| configuration.paymentMethodOrder = ["card", "external_paypal"] | ||
| case .off, .all: // When using all EPMs, alphabetize the order by not setting `paymentMethodOrder`. | ||
| break | ||
| } | ||
| configuration.merchantDisplayName = "Example, Inc." | ||
| configuration.applePay = applePayConfiguration | ||
| configuration.customer = customerConfiguration | ||
| configuration.appearance = appearance | ||
| if settings.userOverrideCountry != .off { | ||
| configuration.userOverrideCountry = settings.userOverrideCountry.rawValue | ||
| } | ||
| configuration.returnURL = "payments-example://stripe-redirect" | ||
|
|
||
| if settings.defaultBillingAddress != .off { | ||
| configuration.defaultBillingDetails.name = "Jane Doe" | ||
| configuration.defaultBillingDetails.address = .init( | ||
| city: "San Francisco", | ||
| country: "US", | ||
| line1: "510 Townsend St.", | ||
| postalCode: "94102", | ||
| state: "California" | ||
| ) | ||
| } | ||
| switch settings.defaultBillingAddress { | ||
| case .on: | ||
| configuration.defaultBillingDetails.email = "[email protected]" | ||
| configuration.defaultBillingDetails.phone = "+13105551234" | ||
| case .randomEmail: | ||
| configuration.defaultBillingDetails.email = "test-\(UUID().uuidString)@stripe.com" | ||
| configuration.defaultBillingDetails.phone = "+13105551234" | ||
| case .randomEmailNoPhone: | ||
| configuration.defaultBillingDetails.email = "test-\(UUID().uuidString)@stripe.com" | ||
| case .customEmail: | ||
| configuration.defaultBillingDetails.email = settings.customEmail | ||
| case .off: | ||
| break | ||
| } | ||
|
|
||
| if settings.allowsDelayedPMs == .on { | ||
| configuration.allowsDelayedPaymentMethods = true | ||
| } | ||
|
|
||
| if settings.shippingInfo != .off { | ||
| configuration.allowsPaymentMethodsRequiringShippingAddress = true | ||
| configuration.shippingDetails = { [weak self] in | ||
| return self?.addressDetails | ||
| } | ||
| } | ||
| configuration.primaryButtonLabel = settings.customCtaLabel | ||
|
|
||
| configuration.billingDetailsCollectionConfiguration.name = .init(rawValue: settings.collectName.rawValue)! | ||
| configuration.billingDetailsCollectionConfiguration.phone = .init(rawValue: settings.collectPhone.rawValue)! | ||
| configuration.billingDetailsCollectionConfiguration.email = .init(rawValue: settings.collectEmail.rawValue)! | ||
| configuration.billingDetailsCollectionConfiguration.address = .init(rawValue: settings.collectAddress.rawValue)! | ||
| configuration.billingDetailsCollectionConfiguration.attachDefaultsToPaymentMethod = settings.attachDefaults == .on | ||
| configuration.preferredNetworks = settings.preferredNetworksEnabled == .on ? [.visa, .cartesBancaires] : nil | ||
| configuration.allowsRemovalOfLastSavedPaymentMethod = settings.allowsRemovalOfLastSavedPaymentMethod == .on | ||
|
|
||
| return configuration | ||
| } | ||
|
|
||
| var addressConfiguration: AddressViewController.Configuration { | ||
| var configuration = AddressViewController.Configuration(additionalFields: .init(phone: .optional), appearance: configuration.appearance) | ||
| if case .onWithDefaults = settings.shippingInfo { | ||
|
|
@@ -599,7 +668,7 @@ extension PlaygroundController { | |
| ) | ||
| } | ||
| } else if self.settings.uiStyle == .embedded { | ||
| self.makeEmbeddedPaymentElement() | ||
| self.isLoading = false | ||
| self.currentlyRenderedSettings = self.settings | ||
| } | ||
|
|
@@ -806,14 +875,14 @@ class AnalyticsLogObserver: ObservableObject { | |
| @Published var analyticsLog: [[String: Any]] = [] | ||
| } | ||
|
|
||
| // MARK: Embedded helpers | ||
| extension PlaygroundController { | ||
| func makeEmbeddedPaymentElement() { | ||
| embeddedPlaygroundController = EmbeddedPlaygroundViewController(configuration: embeddedConfiguration, | ||
| intentConfig: intentConfig, | ||
| appearance: appearance) | ||
| } | ||
|
|
||
| func presentEmbedded() { | ||
| guard let embeddedPlaygroundController else { return } | ||
| let closeButton = UIBarButtonItem(barButtonSystemItem: .close, target: self, action: #selector(dismissEmbedded)) | ||
|
|
@@ -826,8 +895,4 @@ extension PlaygroundController: EmbeddedPlaygroundViewControllerDelegate { | |
| @objc func dismissEmbedded() { | ||
| embeddedPlaygroundController?.dismiss(animated: true, completion: nil) | ||
| } | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
ticket or immediate followup? We should probably make an embedded-only
formSheetActiontoggle in the playgroundThere was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I can make a ticket, in my head I was thinking the week of Oct. 7 it would be added but I can add sooner
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'll make a follow up right now and add the hide mandate API too.