Add konbini to PaymentSheet. #7308
+382
−9
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
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
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
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
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 |
|---|---|---|
|
|
@@ -19,6 +19,7 @@ internal class NextActionDataParser : ModelJsonParser<StripeIntent.NextActionDat | |
| val parser = when (nextActionType) { | ||
| StripeIntent.NextActionType.DisplayOxxoDetails -> DisplayOxxoDetailsJsonParser() | ||
| StripeIntent.NextActionType.DisplayBoletoDetails -> DisplayBoletoDetailsJsonParser() | ||
| StripeIntent.NextActionType.DisplayKonbiniDetails -> DisplayKonbiniDetailsJsonParser() | ||
| StripeIntent.NextActionType.RedirectToUrl -> RedirectToUrlParser() | ||
| StripeIntent.NextActionType.UseStripeSdk -> SdkDataJsonParser() | ||
| StripeIntent.NextActionType.AlipayRedirect -> AlipayRedirectParser() | ||
|
|
@@ -66,6 +67,21 @@ internal class NextActionDataParser : ModelJsonParser<StripeIntent.NextActionDat | |
| } | ||
| } | ||
|
|
||
| private class DisplayKonbiniDetailsJsonParser : | ||
| ModelJsonParser<StripeIntent.NextActionData.DisplayKonbiniDetails> { | ||
| override fun parse( | ||
| json: JSONObject | ||
| ): StripeIntent.NextActionData.DisplayKonbiniDetails { | ||
| return StripeIntent.NextActionData.DisplayKonbiniDetails( | ||
| hostedVoucherUrl = optString(json, FIELD_HOSTED_VOUCHER_URL) | ||
| ) | ||
| } | ||
|
|
||
| private companion object { | ||
| private const val FIELD_HOSTED_VOUCHER_URL = "hosted_voucher_url" | ||
| } | ||
| } | ||
|
|
||
| internal class RedirectToUrlParser : | ||
| ModelJsonParser<StripeIntent.NextActionData.RedirectToUrl> { | ||
| override fun parse( | ||
|
|
||
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 |
|---|---|---|
|
|
@@ -8,7 +8,7 @@ import javax.inject.Inject | |
| import javax.inject.Singleton | ||
|
|
||
| /** | ||
| * [PaymentAuthenticator] for [NextActionData.DisplayBoletoDetails], redirects to | ||
| * [WebIntentAuthenticator] or [NoOpIntentAuthenticator] based on whether if there is a | ||
| * hostedVoucherUrl set. | ||
| */ | ||
|
|
||
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 |
|---|---|---|
| @@ -0,0 +1,41 @@ | ||
| package com.stripe.android.payments.core.authentication | ||
|
|
||
| import com.stripe.android.core.networking.ApiRequest | ||
| import com.stripe.android.model.StripeIntent | ||
| import com.stripe.android.model.StripeIntent.NextActionData | ||
| import com.stripe.android.view.AuthActivityStarterHost | ||
| import javax.inject.Inject | ||
| import javax.inject.Singleton | ||
|
|
||
| /** | ||
| * [PaymentAuthenticator] for [NextActionData.DisplayKonbiniDetails], redirects to | ||
| * [WebIntentAuthenticator] or [NoOpIntentAuthenticator] based on whether if there is a | ||
| * hostedVoucherUrl set. | ||
| */ | ||
| @Singleton | ||
| internal class KonbiniAuthenticator @Inject constructor( | ||
| private val webIntentAuthenticator: WebIntentAuthenticator, | ||
| private val noOpIntentAuthenticator: NoOpIntentAuthenticator | ||
| ) : PaymentAuthenticator<StripeIntent>() { | ||
| override suspend fun performAuthentication( | ||
| host: AuthActivityStarterHost, | ||
| authenticatable: StripeIntent, | ||
| requestOptions: ApiRequest.Options | ||
| ) { | ||
| (authenticatable.nextActionData as NextActionData.DisplayKonbiniDetails).let { detailsData -> | ||
| if (detailsData.hostedVoucherUrl == null) { | ||
| noOpIntentAuthenticator.authenticate( | ||
| host, | ||
| authenticatable, | ||
| requestOptions | ||
| ) | ||
| } else { | ||
| webIntentAuthenticator.authenticate( | ||
| host, | ||
| authenticatable, | ||
| requestOptions | ||
| ) | ||
| } | ||
| } | ||
| } | ||
| } |
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 |
|---|---|---|
|
|
@@ -91,6 +91,13 @@ internal class WebIntentAuthenticator @Inject constructor( | |
| returnUrl = null | ||
| shouldCancelIntentOnUserNavigation = false | ||
| } | ||
| is StripeIntent.NextActionData.DisplayKonbiniDetails -> { | ||
| // nextActionData.hostedVoucherUrl will never be null as AuthenticatorRegistry won't direct it here | ||
| authUrl = nextActionData.hostedVoucherUrl.takeIf { it!!.isNotEmpty() } | ||
| ?: throw IllegalArgumentException("null hostedVoucherUrl for DisplayKonbiniDetails") | ||
| returnUrl = null | ||
|
There was a problem hiding this comment. Providing a return URL would cause this to be opened in a Chrome Custom Tab instead of a web view. Should we do that? There was a problem hiding this comment. This is what the other vouchers do, so I just kept with it. There was a problem hiding this comment. We should probably start using CCT. There was a problem hiding this comment. Are you peaceful if I leave it like this for this PR and submit a new PR to update all voucher based LPMs to switch to CCT? There was a problem hiding this comment. Or rather, what's the motivation? There was a problem hiding this comment. I believe for one-click auth to be enabled, we need CCT. There was a problem hiding this comment. Also, I think some payment methods are using CCT while others are using webview right? For example, bancontact uses CCT. There was a problem hiding this comment. These wouldn't have auth though, you'd need to take them to a different app, or to a physical location, so they wouldn't benefit from that. |
||
| shouldCancelIntentOnUserNavigation = false | ||
| } | ||
| is StripeIntent.NextActionData.CashAppRedirect -> { | ||
| authUrl = nextActionData.mobileAuthUrl | ||
| returnUrl = defaultReturnUrl.value | ||
|
|
||
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 |
|---|---|---|
|
|
@@ -8,6 +8,7 @@ import com.stripe.android.model.StripeIntent.NextActionData | |
| import com.stripe.android.payments.DefaultReturnUrl | ||
| import com.stripe.android.payments.core.authentication.BoletoAuthenticator | ||
| import com.stripe.android.payments.core.authentication.DefaultPaymentAuthenticatorRegistry | ||
| import com.stripe.android.payments.core.authentication.KonbiniAuthenticator | ||
| import com.stripe.android.payments.core.authentication.OxxoAuthenticator | ||
| import com.stripe.android.payments.core.authentication.PaymentAuthenticator | ||
| import com.stripe.android.payments.core.authentication.WebIntentAuthenticator | ||
|
|
@@ -57,6 +58,14 @@ internal abstract class AuthenticationModule { | |
| oxxoAuthenticator: OxxoAuthenticator | ||
| ): PaymentAuthenticator<StripeIntent> | ||
|
|
||
| @IntentAuthenticatorMap | ||
| @Binds | ||
| @IntoMap | ||
| @IntentAuthenticatorKey(NextActionData.DisplayKonbiniDetails::class) | ||
| abstract fun bindsKonbiniAuthenticator( | ||
| konbiniAuthenticator: KonbiniAuthenticator | ||
| ): PaymentAuthenticator<StripeIntent> | ||
|
|
||
| @IntentAuthenticatorMap | ||
| @Binds | ||
| @IntoMap | ||
|
|
||
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 |
|---|---|---|
|
|
@@ -461,6 +461,22 @@ public final class com/stripe/android/ui/core/elements/KlarnaCountrySpec$Compani | |
| public final fun serializer ()Lkotlinx/serialization/KSerializer; | ||
| } | ||
|
|
||
| public final class com/stripe/android/ui/core/elements/KonbiniConfirmationNumberSpec$$serializer : kotlinx/serialization/internal/GeneratedSerializer { | ||
| public static final field $stable I | ||
| public static final field INSTANCE Lcom/stripe/android/ui/core/elements/KonbiniConfirmationNumberSpec$$serializer; | ||
| public fun childSerializers ()[Lkotlinx/serialization/KSerializer; | ||
| public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/stripe/android/ui/core/elements/KonbiniConfirmationNumberSpec; | ||
| public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object; | ||
| public fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor; | ||
| public fun serialize (Lkotlinx/serialization/encoding/Encoder;Lcom/stripe/android/ui/core/elements/KonbiniConfirmationNumberSpec;)V | ||
| public synthetic fun serialize (Lkotlinx/serialization/encoding/Encoder;Ljava/lang/Object;)V | ||
| public fun typeParametersSerializers ()[Lkotlinx/serialization/KSerializer; | ||
| } | ||
|
|
||
| public final class com/stripe/android/ui/core/elements/KonbiniConfirmationNumberSpec$Companion { | ||
| public final fun serializer ()Lkotlinx/serialization/KSerializer; | ||
| } | ||
|
|
||
| public final class com/stripe/android/ui/core/elements/LayoutSpec$Companion { | ||
| public final fun create ()Lcom/stripe/android/ui/core/elements/LayoutSpec; | ||
| public final fun create ([Lcom/stripe/android/ui/core/elements/FormItemSpec;)Lcom/stripe/android/ui/core/elements/LayoutSpec; | ||
|
|
||
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 |
|---|---|---|
| @@ -0,0 +1,36 @@ | ||
| <vector xmlns:android="http://schemas.android.com/apk/res/android" | ||
| android:width="16dp" | ||
| android:height="16dp" | ||
| android:viewportWidth="16" | ||
| android:viewportHeight="16"> | ||
| <path | ||
| android:fillColor="#FF000000" | ||
| android:pathData="m4.867,6a2.227,2.227 45,0 1,1.16 -1.867c0.547,-0.4 0.72,-0.533 0.72,-0.88s-0.173,-0.587 -0.493,-0.587 -0.533,0.24 -0.587,0.573l-0.813,0a1.333,1.333 0,0 1,1.4 -1.24c1,0 1.333,0.6 1.333,1.187s-0.227,0.813 -0.92,1.36c-0.48,0.333 -0.667,0.56 -0.733,0.733l1.813,0l-0.107,0.72z" /> | ||
| <path | ||
| android:fillColor="#FF000000" | ||
| android:pathData="m9.893,6l0,-0.88l-1.773,0l0,-0.747l1.627,-2.293l0.92,0l0,2.347l0.467,0l0,0.693l-0.467,0l0,0.88zM9.893,3.733c0,-0.427 0,-0.667 0,-0.92a17.107,17.107 0,0 1,-1.04 1.613l1.027,0z" /> | ||
| <path | ||
| android:fillColor="#FF000000" | ||
| android:pathData="m12,1.333l0,5.333l-8,0l0,-5.333zM12,0l-8,0a1.333,1.333 0,0 0,-1.333 1.333l0,5.333a1.333,1.333 0,0 0,1.333 1.333l8,0a1.333,1.333 0,0 0,1.333 -1.333l0,-5.333a1.333,1.333 0,0 0,-1.333 -1.333z" /> | ||
| <path | ||
| android:fillColor="#FF000000" | ||
| android:pathData="m10.667,10.667l0,4l-5.333,0l0,-4zM10.667,9.333l-5.333,0a1.333,1.333 0,0 0,-1.333 1.333l0,4a1.333,1.333 0,0 0,1.333 1.333l5.333,0a1.333,1.333 0,0 0,1.333 -1.333l0,-4a1.333,1.333 0,0 0,-1.333 -1.333z" /> | ||
| <path | ||
| android:fillColor="#FF000000" | ||
| android:pathData="m7.333,10l1.333,0l0,5.187l-1.333,0z" /> | ||
| <path | ||
| android:fillColor="#FF000000" | ||
| android:pathData="m1.093,5.333l2.707,0l0,2.667l-2.707,0z" /> | ||
| <path | ||
| android:fillColor="#FF000000" | ||
| android:pathData="m1.093,2.667l2.52,0l0,1.36l-2.52,0z" /> | ||
| <path | ||
| android:fillColor="#FF000000" | ||
| android:pathData="m12.413,2.667l2.52,0l0,1.36l-2.52,0z" /> | ||
| <path | ||
| android:fillColor="#FF000000" | ||
| android:pathData="m12.133,5.333l2.987,0l0,2.667l-2.987,0z" /> | ||
| <path | ||
| android:fillColor="#FF000000" | ||
| android:pathData="m14.667,1.333l-2.667,0l0,1.333l2.667,0l0,12l-13.333,0l0,-12l2.667,0l0,-1.333l-2.667,0a1.333,1.333 0,0 0,-1.333 1.333l0,12a1.333,1.333 0,0 0,1.333 1.333l13.333,0a1.333,1.333 0,0 0,1.333 -1.333l0,-12a1.333,1.333 0,0 0,-1.333 -1.333z" /> | ||
| </vector> |
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 |
|---|---|---|
|
|
@@ -77,4 +77,8 @@ | |
| <string name="stripe_setup_button_label">Set up</string> | ||
| <!-- Label for UPI ID number field on form --> | ||
| <string name="stripe_upi_id_label">UPI ID</string> | ||
| <!-- Label for Konbini Payment Method --> | ||
| <string name="stripe_paymentsheet_payment_method_konbini">Konbini</string> | ||
|
Comment on lines
+80
to
+81
There was a problem hiding this comment. Should this be in the no-translate file? There was a problem hiding this comment. This is translated differently in Japanese. |
||
| <!-- Label for Konbini Confirmation Number --> | ||
| <string name="stripe_konbini_confirmation_number_label">Phone</string> | ||
| </resources> | ||
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 |
|---|---|---|
|
|
@@ -1065,5 +1065,26 @@ | |
| "allowed_country_codes": ["BR"] | ||
| } | ||
| ] | ||
| }, | ||
| { | ||
| "type": "konbini", | ||
| "async": false, | ||
| "fields": [ | ||
| { | ||
| "type": "name", | ||
| "api_path": { | ||
| "v1": "billing_details[name]" | ||
| } | ||
| }, | ||
| { | ||
| "type": "email", | ||
| "api_path": { | ||
| "v1": "billing_details[email]" | ||
| } | ||
| }, | ||
| { | ||
| "type": "konbini_confirmation_number" | ||
| } | ||
| ] | ||
| } | ||
| ] | ||
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 |
|---|---|---|
|
|
@@ -289,3 +289,9 @@ internal val BoletoRequirement = PaymentMethodRequirements( | |
| siRequirements = setOf(Delayed), | ||
| confirmPMFromCustomer = true, | ||
| ) | ||
|
|
||
| internal val KonbiniRequirement = PaymentMethodRequirements( | ||
| piRequirements = setOf(Delayed), | ||
| siRequirements = null, | ||
| confirmPMFromCustomer = null, | ||
| ) | ||
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.
Marking this for a future refactor.