New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add minimal user key auth support to PaymentSheet #4481

Merged

lng-stripe merged 6 commits into master from lng/payment-sheet-user-key-support

Dec 17, 2021

Contributor

lng-stripe commented Dec 17, 2021 •

edited

Loading

Summary

Add uk support to PaymentSheet similar to what currently exists in the iOS SDK:

1. Using `uk` requires `Stripe-Livemode` header to be set
2. APIClient has to `retrieve` w/ different params, no client secret with a `uk`
3. APIClient has to `confirm` w/ different params, no client secret with a `uk`
4. PaymentSheet must create PM first, then confirm

Motivation

Parity with iOS SDK.

Testing

Added tests
Modified tests
Manually verified


          Add minimal user key auth support to PaymentSheet

ad41991

lng-stripe commented

View reviewed changes

payments-core/src/main/java/com/stripe/android/model/ConfirmPaymentIntentParams.kt

+                          return ConfirmPaymentIntentParams(
+                              clientSecret = clientSecret,
+                              paymentMethodId = paymentMethodId,
+                              paymentMethodOptions = PaymentMethodOptionsParams.Card(moto = true),

Contributor Author

lng-stripe Dec 17, 2021

payments-core/src/main/java/com/stripe/android/networking/ApiRequest.kt

@@ @@ -105,6 +105,9 @@ data class ApiRequest internal constructor( @@
                       internal val idempotencyKey: String? = null
                   ) : Parcelable {
+                      internal val apiKeyIsUserKey: Boolean
+                          get() = apiKey.startsWith("uk_")

Contributor Author

lng-stripe Dec 17, 2021

payments-core/src/main/java/com/stripe/android/networking/RequestHeadersFactory.kt

@@ @@ -64,6 +65,13 @@ internal sealed class RequestHeadersFactory { @@
                                   HEADER_AUTHORIZATION to "Bearer ${options.apiKey}"
                               ).plus(
                                   stripeClientUserAgentHeaderFactory.create(appInfo)
+                              ).plus(
+                                  if (options.apiKeyIsUserKey) {
+                                      val isLiveMode = Os.getenv("Stripe-Livemode") != "false"

Contributor Author

lng-stripe Dec 17, 2021

payments-core/src/main/java/com/stripe/android/networking/StripeApiRepository.kt

                       confirmPaymentIntentParams: ConfirmPaymentIntentParams,
                       options: ApiRequest.Options,
                       expandFields: List<String>
+                  ): PaymentIntent? {
+                      return confirmPaymentIntentInternal(
+                          confirmPaymentIntentParams = confirmPaymentIntentParams.maybeForDashboard(options),

Contributor Author

lng-stripe Dec 17, 2021

payments-core/src/main/java/com/stripe/android/networking/StripeApiRepository.kt

-                              confirmPaymentIntentParams.toParamMap(),
+                              confirmPaymentIntentParams.toParamMap()
+                                  // Omit client_secret with user key auth.
+                                  .let { if (options.apiKeyIsUserKey) it.minus(PARAM_CLIENT_SECRET) else it },

Contributor Author

lng-stripe Dec 17, 2021

payments-core/src/main/java/com/stripe/android/networking/StripeApiRepository.kt Outdated Show resolved Hide resolved

payments-core/src/main/java/com/stripe/android/networking/StripeApiRepository.kt

                       parser: PaymentMethodPreferenceJsonParser<T>,
                       analyticsEvent: PaymentAnalyticsEvent
                   ): T? {
+                      // Unsupported for user key sessions.
+                      if (options.apiKeyIsUserKey) return null

Contributor Author

lng-stripe Dec 17, 2021

...tsheet/src/main/java/com/stripe/android/paymentsheet/flowcontroller/DefaultFlowController.kt Outdated Show resolved Hide resolved

lng-stripe marked this pull request as ready for review

December 17, 2021 03:52

lng-stripe requested review from brnunes-stripe, ccen-stripe, michelleb-stripe and skyler-stripe as code owners

December 17, 2021 03:52

michelleb-stripe self-assigned this


          Address ktlint

5047d3c

michelleb-stripe reviewed

View reviewed changes

payments-core/api/payments-core.api Outdated Show resolved Hide resolved

michelleb-stripe reviewed

View reviewed changes

payments-core/api/payments-core.api Show resolved Hide resolved

michelleb-stripe reviewed

View reviewed changes

payments-core/src/main/java/com/stripe/android/networking/StripeApiRepository.kt Outdated Show resolved Hide resolved

michelleb-stripe reviewed

View reviewed changes

payments-core/src/main/java/com/stripe/android/networking/StripeApiRepository.kt Outdated Show resolved Hide resolved

lng-stripe added 4 commits

December 17, 2021 10:20


          Fix retrievePaymentIntent() with uk

d981054


          rm unnecessary val

189fe42


          Clean up payments-core.api

9bee158


          rm support for ID as client secret

2244aaa

michelleb-stripe approved these changes

View reviewed changes

stripe-ci assigned lng-stripe and unassigned michelleb-stripe

lng-stripe merged commit ebd0616 into master

lng-stripe deleted the lng/payment-sheet-user-key-support branch

December 17, 2021 18:30

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet