Implement support for SetupIntents

payments-core/api/payments-core.api

@@ -520,7 +520,7 @@ public final class com/stripe/android/PaymentIntentResult : com/stripe/android/S
 	public static synthetic fun copy$default (Lcom/stripe/android/PaymentIntentResult;Lcom/stripe/android/model/PaymentIntent;ILjava/lang/String;ILjava/lang/Object;)Lcom/stripe/android/PaymentIntentResult;
 	public fun describeContents ()I
 	public fun equals (Ljava/lang/Object;)Z
-	public final fun getFailureMessage ()Ljava/lang/String;
+	public fun getFailureMessage ()Ljava/lang/String;
 	public fun getIntent ()Lcom/stripe/android/model/PaymentIntent;
 	public synthetic fun getIntent ()Lcom/stripe/android/model/StripeIntent;
 	public fun hashCode ()I
@@ -671,7 +671,7 @@ public final class com/stripe/android/SetupIntentResult : com/stripe/android/Str
 	public static synthetic fun copy$default (Lcom/stripe/android/SetupIntentResult;Lcom/stripe/android/model/SetupIntent;ILjava/lang/String;ILjava/lang/Object;)Lcom/stripe/android/SetupIntentResult;
 	public fun describeContents ()I
 	public fun equals (Ljava/lang/Object;)Z
-	public final fun getFailureMessage ()Ljava/lang/String;
+	public fun getFailureMessage ()Ljava/lang/String;
 	public fun getIntent ()Lcom/stripe/android/model/SetupIntent;
 	public synthetic fun getIntent ()Lcom/stripe/android/model/StripeIntent;
 	public fun hashCode ()I
@@ -919,6 +919,7 @@ public class com/stripe/android/StripeError$Creator : android/os/Parcelable$Crea
 }
 
 public abstract class com/stripe/android/StripeIntentResult : com/stripe/android/model/StripeModel {
+	public abstract fun getFailureMessage ()Ljava/lang/String;
 	public abstract fun getIntent ()Lcom/stripe/android/model/StripeIntent;
 	public final fun getOutcome ()I
 }
@@ -2508,6 +2509,7 @@ public final class com/stripe/android/model/PaymentIntent : com/stripe/android/m
 	public final fun getCurrency ()Ljava/lang/String;
 	public fun getDescription ()Ljava/lang/String;
 	public fun getId ()Ljava/lang/String;
+	public fun getLastErrorMessage ()Ljava/lang/String;
 	public final fun getLastPaymentError ()Lcom/stripe/android/model/PaymentIntent$Error;
 	public final fun getNextAction ()Ljava/util/Map;
 	public fun getNextActionData ()Lcom/stripe/android/model/StripeIntent$NextActionData;
@@ -3887,6 +3889,7 @@ public final class com/stripe/android/model/SetupIntent : com/stripe/android/mod
 	public fun getCreated ()J
 	public fun getDescription ()Ljava/lang/String;
 	public fun getId ()Ljava/lang/String;
+	public fun getLastErrorMessage ()Ljava/lang/String;
 	public final fun getLastSetupError ()Lcom/stripe/android/model/SetupIntent$Error;
 	public fun getNextActionData ()Lcom/stripe/android/model/StripeIntent$NextActionData;
 	public fun getNextActionType ()Lcom/stripe/android/model/StripeIntent$NextActionType;
@@ -4851,6 +4854,7 @@ public abstract interface class com/stripe/android/model/StripeIntent : com/stri
 	public abstract fun getCreated ()J
 	public abstract fun getDescription ()Ljava/lang/String;
 	public abstract fun getId ()Ljava/lang/String;
+	public abstract fun getLastErrorMessage ()Ljava/lang/String;
 	public abstract fun getNextActionData ()Lcom/stripe/android/model/StripeIntent$NextActionData;
 	public abstract fun getNextActionType ()Lcom/stripe/android/model/StripeIntent$NextActionType;
 	public abstract fun getPaymentMethod ()Lcom/stripe/android/model/PaymentMethod;
@@ -5363,6 +5367,9 @@ public final class com/stripe/android/paymentsheet/PaymentSheet {
 	public final fun presentWithPaymentIntent (Ljava/lang/String;)V
 	public final fun presentWithPaymentIntent (Ljava/lang/String;Lcom/stripe/android/paymentsheet/PaymentSheet$Configuration;)V
 	public static synthetic fun presentWithPaymentIntent$default (Lcom/stripe/android/paymentsheet/PaymentSheet;Ljava/lang/String;Lcom/stripe/android/paymentsheet/PaymentSheet$Configuration;ILjava/lang/Object;)V
+	public final fun presentWithSetupIntent (Ljava/lang/String;)V
+	public final fun presentWithSetupIntent (Ljava/lang/String;Lcom/stripe/android/paymentsheet/PaymentSheet$Configuration;)V
+	public static synthetic fun presentWithSetupIntent$default (Lcom/stripe/android/paymentsheet/PaymentSheet;Ljava/lang/String;Lcom/stripe/android/paymentsheet/PaymentSheet$Configuration;ILjava/lang/Object;)V
 }
 
 public final class com/stripe/android/paymentsheet/PaymentSheet$Configuration : android/os/Parcelable {
@@ -5428,6 +5435,7 @@ public class com/stripe/android/paymentsheet/PaymentSheet$CustomerConfiguration$
 public abstract interface class com/stripe/android/paymentsheet/PaymentSheet$FlowController {
 	public static final field Companion Lcom/stripe/android/paymentsheet/PaymentSheet$FlowController$Companion;
 	public abstract fun configureWithPaymentIntent (Ljava/lang/String;Lcom/stripe/android/paymentsheet/PaymentSheet$Configuration;Lcom/stripe/android/paymentsheet/PaymentSheet$FlowController$ConfigCallback;)V
+	public abstract fun configureWithSetupIntent (Ljava/lang/String;Lcom/stripe/android/paymentsheet/PaymentSheet$Configuration;Lcom/stripe/android/paymentsheet/PaymentSheet$FlowController$ConfigCallback;)V
 	public abstract fun confirm ()V
 	public static fun create (Landroidx/activity/ComponentActivity;Lcom/stripe/android/paymentsheet/PaymentOptionCallback;Lcom/stripe/android/paymentsheet/PaymentSheetResultCallback;)Lcom/stripe/android/paymentsheet/PaymentSheet$FlowController;
 	public static fun create (Landroidx/fragment/app/Fragment;Lcom/stripe/android/paymentsheet/PaymentOptionCallback;Lcom/stripe/android/paymentsheet/PaymentSheetResultCallback;)Lcom/stripe/android/paymentsheet/PaymentSheet$FlowController;
@@ -5446,6 +5454,7 @@ public abstract interface class com/stripe/android/paymentsheet/PaymentSheet$Flo
 
 public final class com/stripe/android/paymentsheet/PaymentSheet$FlowController$DefaultImpls {
 	public static synthetic fun configureWithPaymentIntent$default (Lcom/stripe/android/paymentsheet/PaymentSheet$FlowController;Ljava/lang/String;Lcom/stripe/android/paymentsheet/PaymentSheet$Configuration;Lcom/stripe/android/paymentsheet/PaymentSheet$FlowController$ConfigCallback;ILjava/lang/Object;)V
+	public static synthetic fun configureWithSetupIntent$default (Lcom/stripe/android/paymentsheet/PaymentSheet$FlowController;Ljava/lang/String;Lcom/stripe/android/paymentsheet/PaymentSheet$Configuration;Lcom/stripe/android/paymentsheet/PaymentSheet$FlowController$ConfigCallback;ILjava/lang/Object;)V
 }
 
 public abstract class com/stripe/android/paymentsheet/PaymentSheet$FlowController$Result {

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

@@ -11,5 +11,5 @@ import kotlinx.parcelize.Parcelize
 data class PaymentIntentResult internal constructor(
     override val intent: PaymentIntent,
     @Outcome private val outcomeFromFlow: Int = 0,
-    val failureMessage: String? = null
+    override val failureMessage: String? = null
 ) : StripeIntentResult<PaymentIntent>(outcomeFromFlow)

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

@@ -11,5 +11,5 @@ import kotlinx.parcelize.Parcelize
 data class SetupIntentResult internal constructor(
     override val intent: SetupIntent,
     @Outcome private val outcomeFromFlow: Int = 0,
-    val failureMessage: String? = null
+    override val failureMessage: String? = null
 ) : StripeIntentResult<SetupIntent>(outcomeFromFlow)

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

@@ -11,10 +11,11 @@ import com.stripe.android.model.StripeModel
  *
  * [intent] is a [StripeIntent] retrieved after confirmation/authentication succeeded or failed.
  */
-abstract class StripeIntentResult<T : StripeIntent> internal constructor(
+abstract class StripeIntentResult<out T : StripeIntent> internal constructor(
     @Outcome private val outcomeFromFlow: Int
 ) : StripeModel {
     abstract val intent: T
+    abstract val failureMessage: String?
 
     @Outcome
     @get:Outcome

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

@@ -30,11 +30,12 @@ import com.stripe.android.networking.DefaultAlipayRepository
 import com.stripe.android.networking.StripeRepository
 import com.stripe.android.payments.BrowserCapabilities
 import com.stripe.android.payments.BrowserCapabilitiesSupplier
-import com.stripe.android.payments.DefaultPaymentFlowResultProcessor
 import com.stripe.android.payments.DefaultReturnUrl
 import com.stripe.android.payments.DefaultStripeChallengeStatusReceiver
 import com.stripe.android.payments.PaymentFlowFailureMessageFactory
 import com.stripe.android.payments.PaymentFlowResult
+import com.stripe.android.payments.PaymentIntentFlowResultProcessor
+import com.stripe.android.payments.SetupIntentFlowResultProcessor
 import com.stripe.android.payments.Stripe3ds2CompletionStarter
 import com.stripe.android.stripe3ds2.init.ui.StripeUiCustomization
 import com.stripe.android.stripe3ds2.service.StripeThreeDs2Service
@@ -85,7 +86,14 @@ internal class StripePaymentController internal constructor(
     private val uiContext: CoroutineContext = Dispatchers.Main
 ) : PaymentController {
     private val failureMessageFactory = PaymentFlowFailureMessageFactory(context)
-    private val paymentFlowResultProcessor = DefaultPaymentFlowResultProcessor(
+    private val paymentIntentFlowResultProcessor = PaymentIntentFlowResultProcessor(
+        context,
+        publishableKey,
+        stripeRepository,
+        enableLogging,
+        workContext
+    )
+    private val setupIntentFlowResultProcessor = SetupIntentFlowResultProcessor(
         context,
         publishableKey,
         stripeRepository,
@@ -404,7 +412,7 @@ internal class StripePaymentController internal constructor(
         IllegalArgumentException::class
     )
     override suspend fun getPaymentIntentResult(data: Intent) =
-        paymentFlowResultProcessor.processPaymentIntent(
+        paymentIntentFlowResultProcessor.processResult(
             PaymentFlowResult.Unvalidated.fromIntent(data)
         )
 
@@ -429,7 +437,7 @@ internal class StripePaymentController internal constructor(
         IllegalArgumentException::class
     )
     override suspend fun getSetupIntentResult(data: Intent) =
-        paymentFlowResultProcessor.processSetupIntent(
+        setupIntentFlowResultProcessor.processResult(
             PaymentFlowResult.Unvalidated.fromIntent(data)
         )
 

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

@@ -151,6 +151,9 @@ data class PaymentIntent internal constructor(
             StripeIntent.Status.Succeeded
         ).contains(status)
 
+    override val lastErrorMessage: String?
+        get() = lastPaymentError?.message
+
     override fun requiresAction(): Boolean {
         return status === StripeIntent.Status.RequiresAction
     }

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

@@ -102,6 +102,9 @@ data class SetupIntent internal constructor(
             StripeIntent.Status.Succeeded
         ).contains(status)
 
+    override val lastErrorMessage: String?
+        get() = lastSetupError?.message
+
     override fun requiresAction(): Boolean {
         return status === StripeIntent.Status.RequiresAction
     }

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

@@ -55,6 +55,8 @@ interface StripeIntent : StripeModel {
      */
     val isConfirmed: Boolean
 
+    val lastErrorMessage: String?
+
     fun requiresAction(): Boolean
 
     fun requiresConfirmation(): Boolean

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

@@ -93,7 +93,7 @@ sealed class PaymentFlowResult {
 
         /**
          * The Source is eligible for cancellation.
-         * See [DefaultPaymentFlowResultProcessor.shouldCancelSource] for usage.
+         * See [PaymentFlowResultProcessor.shouldCancelIntent] for usage.
          */
         internal val canCancelSource: Boolean = false,