empathicqubit/Signal-Android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Add handling for payment_intent with missing status.

Browse source
This commit is contained in:
Alex Hart 2022-11-18 13:22:30 -04:00
parent 0c615e2fc2
commit be12a17ff7
2 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/StripeRepository.kt
View file

@ -174,14 +174,20 @@ class StripeRepository(activity: Activity) : StripeApi.PaymentIntentFetcher, Str
} }
} }
// We need to get the status and payment id from the intent. /**
* Note: There seem to be times when PaymentIntent does not return a status. In these cases, we assume
* that we are successful and proceed as normal. If the payment didn't actually succeed, then we
* expect an error later in the chain to inform us of this.
*/
fun getStatusAndPaymentMethodId(stripeIntentAccessor: StripeIntentAccessor): Single<StatusAndPaymentMethodId> { fun getStatusAndPaymentMethodId(stripeIntentAccessor: StripeIntentAccessor): Single<StatusAndPaymentMethodId> {
return Single.fromCallable { return Single.fromCallable {
when (stripeIntentAccessor.objectType) { when (stripeIntentAccessor.objectType) {
StripeIntentAccessor.ObjectType.NONE -> StatusAndPaymentMethodId(StripeIntentStatus.SUCCEEDED, null) StripeIntentAccessor.ObjectType.NONE -> StatusAndPaymentMethodId(StripeIntentStatus.SUCCEEDED, null)
StripeIntentAccessor.ObjectType.PAYMENT_INTENT -> stripeApi.getPaymentIntent(stripeIntentAccessor).let { StripeIntentAccessor.ObjectType.PAYMENT_INTENT -> stripeApi.getPaymentIntent(stripeIntentAccessor).let {
StatusAndPaymentMethodId(it.status, it.paymentMethod) if (it.status == null) {
Log.d(TAG, "Returned payment intent had a null status.", true)
}
StatusAndPaymentMethodId(it.status ?: StripeIntentStatus.SUCCEEDED, it.paymentMethod)
} }
StripeIntentAccessor.ObjectType.SETUP_INTENT -> stripeApi.getSetupIntent(stripeIntentAccessor).let { StripeIntentAccessor.ObjectType.SETUP_INTENT -> stripeApi.getSetupIntent(stripeIntentAccessor).let {
StatusAndPaymentMethodId(it.status, it.paymentMethod) StatusAndPaymentMethodId(it.status, it.paymentMethod)

2
donations/lib/src/main/java/org/signal/donations/json/StripePaymentIntent.kt
View file

@ -13,6 +13,6 @@ import com.fasterxml.jackson.annotation.JsonProperty
data class StripePaymentIntent @JsonCreator constructor( data class StripePaymentIntent @JsonCreator constructor(
@JsonProperty("id") val id: String, @JsonProperty("id") val id: String,
@JsonProperty("client_secret") val clientSecret: String, @JsonProperty("client_secret") val clientSecret: String,
@JsonProperty("status") val status: StripeIntentStatus, @JsonProperty("status") val status: StripeIntentStatus?,
@JsonProperty("payment_method") val paymentMethod: String? @JsonProperty("payment_method") val paymentMethod: String?
) )