From 17d2327266247240410181dad98b63b05e486e70 Mon Sep 17 00:00:00 2001
From: Michael Shafrir <mshafrir@stripe.com>
Date: Thu, 29 Oct 2020 10:07:08 -0400
Subject: [PATCH] Handle null client_secret in result Intent

If a `client_secret` cannot be retrieved from the result Intent,
call `callback.onError()` instead of throwing an exception.

Fixes #2986
---
 .../stripe/android/StripePaymentController.kt | 22 +++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

diff --git a/stripe/src/main/java/com/stripe/android/StripePaymentController.kt b/stripe/src/main/java/com/stripe/android/StripePaymentController.kt
index 3d50130ecb9..a89053f5453 100644
--- a/stripe/src/main/java/com/stripe/android/StripePaymentController.kt
+++ b/stripe/src/main/java/com/stripe/android/StripePaymentController.kt
@@ -264,6 +264,12 @@ internal class StripePaymentController internal constructor(
             return
         }
 
+        val clientSecret = getClientSecret(data)
+        if (clientSecret.isNullOrBlank()) {
+            callback.onError(IllegalArgumentException(CLIENT_SECRET_INTENT_ERROR))
+            return
+        }
+
         val shouldCancelSource = result.shouldCancelSource
         val sourceId = result.sourceId.orEmpty()
         @StripeIntentResult.Outcome val flowOutcome = result.flowOutcome
@@ -274,7 +280,7 @@ internal class StripePaymentController internal constructor(
         )
 
         stripeRepository.retrieveIntent(
-            getClientSecret(data),
+            clientSecret,
             requestOptions,
             expandFields = EXPAND_PAYMENT_METHOD,
             callback = createPaymentIntentCallback(
@@ -307,6 +313,12 @@ internal class StripePaymentController internal constructor(
             return
         }
 
+        val clientSecret = getClientSecret(data)
+        if (clientSecret.isNullOrBlank()) {
+            callback.onError(IllegalArgumentException(CLIENT_SECRET_INTENT_ERROR))
+            return
+        }
+
         val shouldCancelSource = result.shouldCancelSource
         val sourceId = result.sourceId.orEmpty()
         @StripeIntentResult.Outcome val flowOutcome = result.flowOutcome
@@ -317,7 +329,7 @@ internal class StripePaymentController internal constructor(
         )
 
         stripeRepository.retrieveIntent(
-            getClientSecret(data),
+            clientSecret,
             requestOptions,
             expandFields = EXPAND_PAYMENT_METHOD,
             callback = createSetupIntentCallback(
@@ -1231,13 +1243,15 @@ internal class StripePaymentController internal constructor(
         }
 
         @JvmSynthetic
-        internal fun getClientSecret(data: Intent): String {
-            return requireNotNull(PaymentController.Result.fromIntent(data)?.clientSecret)
+        internal fun getClientSecret(data: Intent): String? {
+            return PaymentController.Result.fromIntent(data)?.clientSecret
         }
 
         private val EXPAND_PAYMENT_METHOD = listOf("payment_method")
         internal val CHALLENGE_DELAY = TimeUnit.SECONDS.toMillis(2L)
 
         private const val REQUIRED_ERROR = "API request returned an invalid response."
+
+        private const val CLIENT_SECRET_INTENT_ERROR = "Invalid client_secret value in result Intent."
     }
 }