@stripe/stripe-react-native 0.59.1 → 0.60.0

package/android/src/onramp/java/com/reactnativestripesdk/OnrampSdkModule.kt

@@ -3,8 +3,6 @@ package com.reactnativestripesdk
 import android.annotation.SuppressLint
 import android.app.Application
 import androidx.activity.ComponentActivity
-import androidx.compose.ui.graphics.Color
-import androidx.core.content.ContextCompat
 import androidx.fragment.app.FragmentActivity
 import androidx.lifecycle.SavedStateHandle
 import com.facebook.react.bridge.Arguments
@@ -30,12 +28,10 @@ import com.stripe.android.crypto.onramp.model.CryptoNetwork
 import com.stripe.android.crypto.onramp.model.KycInfo
 import com.stripe.android.crypto.onramp.model.LinkUserInfo
 import com.stripe.android.crypto.onramp.model.OnrampAttachKycInfoResult
-import com.stripe.android.crypto.onramp.model.OnrampAuthenticateResult
 import com.stripe.android.crypto.onramp.model.OnrampAuthorizeResult
 import com.stripe.android.crypto.onramp.model.OnrampCallbacks
 import com.stripe.android.crypto.onramp.model.OnrampCheckoutResult
 import com.stripe.android.crypto.onramp.model.OnrampCollectPaymentMethodResult
-import com.stripe.android.crypto.onramp.model.OnrampConfiguration
 import com.stripe.android.crypto.onramp.model.OnrampConfigurationResult
 import com.stripe.android.crypto.onramp.model.OnrampCreateCryptoPaymentTokenResult
 import com.stripe.android.crypto.onramp.model.OnrampHasLinkAccountResult
@@ -46,11 +42,7 @@ import com.stripe.android.crypto.onramp.model.OnrampTokenAuthenticationResult
 import com.stripe.android.crypto.onramp.model.OnrampUpdatePhoneNumberResult
 import com.stripe.android.crypto.onramp.model.OnrampVerifyIdentityResult
 import com.stripe.android.crypto.onramp.model.OnrampVerifyKycInfoResult
-import com.stripe.android.crypto.onramp.model.PaymentMethodType
-import com.stripe.android.link.LinkAppearance
-import com.stripe.android.link.LinkAppearance.Colors
-import com.stripe.android.link.LinkAppearance.PrimaryButton
-import com.stripe.android.link.LinkAppearance.Style
+import com.stripe.android.crypto.onramp.model.PaymentMethodSelection
 import com.stripe.android.link.LinkController.PaymentMethodPreview
 import com.stripe.android.link.PaymentMethodPreviewDetails
 import com.stripe.android.model.CardBrand
@@ -59,8 +51,11 @@ import com.stripe.android.paymentsheet.PaymentSheet
 import kotlinx.coroutines.CompletableDeferred
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.SupervisorJob
+import kotlinx.coroutines.cancel
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
+import kotlinx.coroutines.withTimeout
 
 @SuppressLint("RestrictedApi")
 @ReactModule(name = NativeOnrampSdkModuleSpec.NAME)
@@ -81,6 +76,7 @@ class OnrampSdkModule(
   private var verifyKycPromise: Promise? = null
 
   private var checkoutClientSecretDeferred: CompletableDeferred<String>? = null
+  private val rnScope = CoroutineScope(SupervisorJob() + Dispatchers.Main.immediate)
 
   @ReactMethod
   override fun initialise(
@@ -95,6 +91,11 @@ class OnrampSdkModule(
     promise.resolve(null)
   }
 
+  override fun invalidate() {
+    super.invalidate()
+    rnScope.cancel()
+  }
+
   /**
    * Safely get and cast the current activity as an AppCompatActivity. If that fails, the promise
    * provided will be resolved with an error message instructing the user to retry the method.
@@ -124,33 +125,37 @@ class OnrampSdkModule(
       return
     }
 
+    val onrampCallbacks =
+      OnrampCallbacks()
+        .verifyIdentityCallback { result ->
+          handleOnrampIdentityVerificationResult(result, identityVerificationPromise!!)
+        }.collectPaymentCallback { result ->
+          handleOnrampCollectPaymentResult(result, collectPaymentPromise!!)
+        }.authorizeCallback { result ->
+          handleOnrampAuthorizationResult(result, authorizePromise!!)
+        }.checkoutCallback { result ->
+          handleOnrampCheckoutResult(result, checkoutPromise!!)
+        }.verifyKycCallback { result ->
+          handleOnrampKycVerificationResult(result, verifyKycPromise!!)
+        }.onrampSessionClientSecretProvider { sessionId ->
+          checkoutClientSecretDeferred = CompletableDeferred()
+
+          val params = Arguments.createMap()
+          params.putString("onrampSessionId", sessionId)
+
+          emitOnCheckoutClientSecretRequested(params)
+
+          checkoutClientSecretDeferred!!.await()
+        }
+
     val coordinator =
       onrampCoordinator ?: OnrampCoordinator
         .Builder()
-        .build(application, SavedStateHandle())
+        .build(application, SavedStateHandle(), onrampCallbacks)
         .also { this.onrampCoordinator = it }
 
     CoroutineScope(Dispatchers.IO).launch {
-      val appearanceMap = config.getMap("appearance")
-      val appearance =
-        if (appearanceMap != null) {
-          mapAppearance(appearanceMap)
-        } else {
-          LinkAppearance(style = Style.AUTOMATIC)
-        }
-
-      val displayName = config.getString("merchantDisplayName") ?: ""
-
-      val cryptoCustomerId = config.getString("cryptoCustomerId")
-
-      val configuration =
-        OnrampConfiguration(
-          merchantDisplayName = displayName,
-          publishableKey = publishableKey,
-          appearance = appearance,
-          cryptoCustomerId = cryptoCustomerId,
-        )
-
+      val configuration = mapConfig(config, publishableKey)
       val configureResult = coordinator.configure(configuration)
 
       CoroutineScope(Dispatchers.Main).launch {
@@ -182,30 +187,8 @@ class OnrampSdkModule(
       return
     }
 
-    val onrampCallbacks =
-      OnrampCallbacks(
-        authenticateUserCallback = { result ->
-          handleOnrampAuthenticationResult(result, authenticateUserPromise!!)
-        },
-        verifyIdentityCallback = { result ->
-          handleOnrampIdentityVerificationResult(result, identityVerificationPromise!!)
-        },
-        collectPaymentCallback = { result ->
-          handleOnrampCollectPaymentResult(result, collectPaymentPromise!!)
-        },
-        authorizeCallback = { result ->
-          handleOnrampAuthorizationResult(result, authorizePromise!!)
-        },
-        checkoutCallback = { result ->
-          handleOnrampCheckoutResult(result, checkoutPromise!!)
-        },
-        verifyKycCallback = { result ->
-          handleOnrampKycVerificationResult(result, verifyKycPromise!!)
-        },
-      )
-
     try {
-      onrampPresenter = onrampCoordinator!!.createPresenter(activity, onrampCallbacks)
+      onrampPresenter = onrampCoordinator!!.createPresenter(activity)
       promise.resolveVoid()
     } catch (e: Exception) {
       promise.resolve(createFailedError(e))
@@ -394,7 +377,7 @@ class OnrampSdkModule(
       }
     CoroutineScope(Dispatchers.IO).launch {
       when (val result = coordinator.updatePhoneNumber(phone)) {
-        OnrampUpdatePhoneNumberResult.Completed -> {
+        is OnrampUpdatePhoneNumberResult.Completed -> {
           promise.resolveVoid()
         }
         is OnrampUpdatePhoneNumberResult.Failed -> {
@@ -404,19 +387,6 @@ class OnrampSdkModule(
     }
   }
 
-  @ReactMethod
-  override fun authenticateUser(promise: Promise) {
-    val presenter =
-      onrampPresenter ?: run {
-        promise.resolve(createOnrampNotConfiguredError())
-        return
-      }
-
-    authenticateUserPromise = promise
-
-    presenter.authenticateUser()
-  }
-
   @ReactMethod
   override fun verifyIdentity(promise: Promise) {
     val presenter =
@@ -461,8 +431,32 @@ class OnrampSdkModule(
 
     val method =
       when (paymentMethod) {
-        "Card" -> PaymentMethodType.Card
-        "BankAccount" -> PaymentMethodType.BankAccount
+        "Card" -> PaymentMethodSelection.Card()
+        "BankAccount" -> PaymentMethodSelection.BankAccount()
+        "CardAndBankAccount" -> PaymentMethodSelection.CardAndBankAccount()
+        "PlatformPay" -> {
+          val googlePayParams =
+            platformPayParams.getMap("googlePay")
+              ?: run {
+                promise.resolve(
+                  createFailedError(
+                    IllegalArgumentException("Missing googlePay params in platformPayParams"),
+                  ),
+                )
+                return
+              }
+          val currencyCode = googlePayParams.getString("currencyCode") ?: ""
+          val amount = googlePayParams.getDouble("amount").toLong()
+          val transactionId = googlePayParams.getString("transactionId")
+          val label = googlePayParams.getString("label")
+
+          PaymentMethodSelection.GooglePay(
+            currencyCode = currencyCode,
+            amount = amount,
+            transactionId = transactionId,
+            label = label,
+          )
+        }
         else -> {
           promise.resolve(
             createFailedError(
@@ -505,20 +499,9 @@ class OnrampSdkModule(
         return
       }
 
-    val checkoutHandler: suspend () -> String = {
-      checkoutClientSecretDeferred = CompletableDeferred()
-
-      val params = Arguments.createMap()
-      params.putString("onrampSessionId", onrampSessionId)
-
-      emitOnCheckoutClientSecretRequested(params)
-
-      checkoutClientSecretDeferred!!.await()
-    }
-
     checkoutPromise = promise
 
-    presenter.performCheckout(onrampSessionId, checkoutHandler)
+    presenter.performCheckout(onrampSessionId)
   }
 
   @ReactMethod
@@ -579,6 +562,7 @@ class OnrampSdkModule(
             null
           }
         }
+
         token.hasKey("us_bank_account") -> {
           val bankMap = token.getMap("us_bank_account")
           if (bankMap != null) {
@@ -597,6 +581,7 @@ class OnrampSdkModule(
             null
           }
         }
+
         else -> null
       }
 
@@ -608,19 +593,41 @@ class OnrampSdkModule(
       )
       return
     }
+    rnScope.launch {
+      val iconDataUri: String =
+        try {
+          val base64 =
+            withContext(Dispatchers.Default) {
+              val drawable =
+                withTimeout(5_000L) {
+                  withContext(Dispatchers.IO) {
+                    paymentDetails.imageLoader()
+                  }
+                }
+
+              getBitmapFromDrawable(drawable)?.let { bitmap ->
+                getBase64FromBitmap(bitmap)
+              } ?: ""
+            }
+
+          if (base64.isNotEmpty()) "data:image/png;base64,$base64" else ""
+        } catch (_: Exception) {
+          ""
+        }
 
-    val icon =
-      reactApplicationContext.currentActivity
-        ?.let { ContextCompat.getDrawable(it, paymentDetails.iconRes) }
-        ?.let { "data:image/png;base64," + getBase64FromBitmap(getBitmapFromDrawable(it)) }
-
-    val displayData = Arguments.createMap()
+      val displayData = Arguments.createMap()
+      displayData.putString("icon", iconDataUri)
+      displayData.putString("label", paymentDetails.label)
+      displayData.putString("sublabel", paymentDetails.sublabel)
 
-    displayData.putString("icon", icon)
-    displayData.putString("label", paymentDetails.label)
-    displayData.putString("sublabel", paymentDetails.sublabel)
+      if (token.hasKey("card")) {
+        displayData.putString("type", "Card")
+      } else if (token.hasKey("us_bank_account")) {
+        displayData.putString("type", "BankAccount")
+      }
 
-    promise.resolve(createResult("displayData", displayData))
+      promise.resolve(createResult("displayData", displayData))
+    }
   }
 
   @ReactMethod
@@ -659,95 +666,6 @@ class OnrampSdkModule(
     }
   }
 
-  private fun mapAppearance(appearanceMap: ReadableMap): LinkAppearance {
-    val lightColorsMap = appearanceMap.getMap("lightColors")
-    val darkColorsMap = appearanceMap.getMap("darkColors")
-    val styleStr = appearanceMap.getString("style")
-    val primaryButtonMap = appearanceMap.getMap("primaryButton")
-
-    val lightColors =
-      if (lightColorsMap != null) {
-        val primaryColorStr = lightColorsMap.getString("primary")
-        val contentColorStr = lightColorsMap.getString("contentOnPrimary")
-        val borderSelectedColorStr = lightColorsMap.getString("borderSelected")
-
-        Colors(
-          primary = Color(android.graphics.Color.parseColor(primaryColorStr)),
-          contentOnPrimary = Color(android.graphics.Color.parseColor(contentColorStr)),
-          borderSelected = Color(android.graphics.Color.parseColor(borderSelectedColorStr)),
-        )
-      } else {
-        null
-      }
-
-    val darkColors =
-      if (darkColorsMap != null) {
-        val primaryColorStr = darkColorsMap.getString("primary")
-        val contentColorStr = darkColorsMap.getString("contentOnPrimary")
-        val borderSelectedColorStr = darkColorsMap.getString("borderSelected")
-
-        Colors(
-          primary = Color(android.graphics.Color.parseColor(primaryColorStr)),
-          contentOnPrimary = Color(android.graphics.Color.parseColor(contentColorStr)),
-          borderSelected = Color(android.graphics.Color.parseColor(borderSelectedColorStr)),
-        )
-      } else {
-        null
-      }
-
-    val style =
-      when (styleStr) {
-        "ALWAYS_LIGHT" -> Style.ALWAYS_LIGHT
-        "ALWAYS_DARK" -> Style.ALWAYS_DARK
-        else -> Style.AUTOMATIC
-      }
-
-    val primaryButton =
-      if (primaryButtonMap != null) {
-        PrimaryButton(
-          cornerRadiusDp =
-            if (primaryButtonMap.hasKey("cornerRadius")) {
-              primaryButtonMap.getDouble("cornerRadius").toFloat()
-            } else {
-              null
-            },
-          heightDp =
-            if (primaryButtonMap.hasKey("height")) {
-              primaryButtonMap.getDouble("height").toFloat()
-            } else {
-              null
-            },
-        )
-      } else {
-        null
-      }
-
-    val default = LinkAppearance(style = Style.AUTOMATIC)
-    return LinkAppearance(
-      lightColors = lightColors ?: default.lightColors,
-      darkColors = darkColors ?: default.darkColors,
-      style = style,
-      primaryButton = primaryButton ?: default.primaryButton,
-    )
-  }
-
-  private fun handleOnrampAuthenticationResult(
-    result: OnrampAuthenticateResult,
-    promise: Promise,
-  ) {
-    when (result) {
-      is OnrampAuthenticateResult.Completed -> {
-        promise.resolveString("customerId", result.customerId)
-      }
-      is OnrampAuthenticateResult.Cancelled -> {
-        promise.resolve(createCanceledError("Authentication was cancelled"))
-      }
-      is OnrampAuthenticateResult.Failed -> {
-        promise.resolve(createFailedError(result.error))
-      }
-    }
-  }
-
   private fun handleOnrampIdentityVerificationResult(
     result: OnrampVerifyIdentityResult,
     promise: Promise,
@@ -795,19 +713,42 @@ class OnrampSdkModule(
   ) {
     when (result) {
       is OnrampCollectPaymentMethodResult.Completed -> {
-        val displayData = Arguments.createMap()
-        val icon =
-          reactApplicationContext.currentActivity
-            ?.let { ContextCompat.getDrawable(it, result.displayData.iconRes) }
-            ?.let { "data:image/png;base64," + getBase64FromBitmap(getBitmapFromDrawable(it)) }
-        displayData.putString("icon", icon)
-        displayData.putString("label", result.displayData.label)
-        result.displayData.sublabel?.let { displayData.putString("sublabel", it) }
-        promise.resolve(createResult("displayData", displayData))
+        rnScope.launch {
+          val iconDataUri =
+            try {
+              val base64 =
+                withContext(Dispatchers.Default) {
+                  val drawable =
+                    withTimeout(5_000L) {
+                      withContext(Dispatchers.IO) {
+                        result.displayData.imageLoader()
+                      }
+                    }
+
+                  getBitmapFromDrawable(drawable)?.let { bitmap ->
+                    getBase64FromBitmap(bitmap)
+                  } ?: ""
+                }
+
+              if (base64.isNotEmpty()) "data:image/png;base64,$base64" else ""
+            } catch (_: Exception) {
+              ""
+            }
+
+          val displayData = Arguments.createMap()
+          displayData.putString("icon", iconDataUri)
+          displayData.putString("label", result.displayData.label)
+          result.displayData.sublabel?.let { displayData.putString("sublabel", it) }
+          displayData.putString("type", mapPaymentDetailsType(result.displayData.type))
+
+          promise.resolve(createResult("displayData", displayData))
+        }
       }
+
       is OnrampCollectPaymentMethodResult.Cancelled -> {
         promise.resolve(createCanceledError("Payment collection was cancelled"))
       }
+
       is OnrampCollectPaymentMethodResult.Failed -> {
         promise.resolve(createFailedError(result.error))
       }

package/android/src/test/java/com/reactnativestripesdk/PaymentElementConfigTest.kt

@@ -3,6 +3,7 @@ package com.reactnativestripesdk
 import com.reactnativestripesdk.utils.PaymentSheetException
 import com.reactnativestripesdk.utils.readableArrayOf
 import com.reactnativestripesdk.utils.readableMapOf
+import com.stripe.android.model.PaymentMethod
 import com.stripe.android.paymentelement.PaymentMethodOptionsSetupFutureUsagePreview
 import com.stripe.android.paymentsheet.CardFundingFilteringPrivatePreview
 import com.stripe.android.paymentsheet.PaymentSheet
@@ -1098,6 +1099,77 @@ class PaymentElementConfigTest {
     assertNull(result)
   }
 
+  // ============================================
+  // mapToTermsDisplay Tests
+  // ============================================
+
+  @Test
+  fun mapToTermsDisplay_NullParams_ReturnsNull() {
+    val result = mapToTermsDisplay(null)
+    assertNull(result)
+  }
+
+  @Test
+  fun mapToTermsDisplay_NoTermsDisplayKey_ReturnsNull() {
+    val params = readableMapOf("someOtherKey" to "value")
+    val result = mapToTermsDisplay(params)
+    assertNull(result)
+  }
+
+  @Test
+  fun mapToTermsDisplay_CardNever_ReturnsSingleEntry() {
+    val params =
+      readableMapOf(
+        "termsDisplay" to readableMapOf("card" to "never"),
+      )
+    val result = mapToTermsDisplay(params)
+    assertNotNull(result)
+    assertEquals(1, result!!.size)
+    assertEquals(PaymentSheet.TermsDisplay.NEVER, result[PaymentMethod.Type.Card])
+  }
+
+  @Test
+  fun mapToTermsDisplay_CardAutomatic_ReturnsSingleEntry() {
+    val params =
+      readableMapOf(
+        "termsDisplay" to readableMapOf("card" to "automatic"),
+      )
+    val result = mapToTermsDisplay(params)
+    assertNotNull(result)
+    assertEquals(1, result!!.size)
+    assertEquals(PaymentSheet.TermsDisplay.AUTOMATIC, result[PaymentMethod.Type.Card])
+  }
+
+  @Test
+  fun mapToTermsDisplay_InvalidValue_Skipped() {
+    val params =
+      readableMapOf(
+        "termsDisplay" to readableMapOf("card" to "invalid"),
+      )
+    val result = mapToTermsDisplay(params)
+    assertNull(result)
+  }
+
+  @Test
+  fun mapToTermsDisplay_InvalidPaymentMethodType_Skipped() {
+    val params =
+      readableMapOf(
+        "termsDisplay" to readableMapOf("foobar" to "never"),
+      )
+    val result = mapToTermsDisplay(params)
+    assertNull(result)
+  }
+
+  @Test
+  fun mapToTermsDisplay_EmptyMap_ReturnsNull() {
+    val params =
+      readableMapOf(
+        "termsDisplay" to readableMapOf(),
+      )
+    val result = mapToTermsDisplay(params)
+    assertNull(result)
+  }
+
   @Test
   fun mapToAllowedCardFundingTypes_MissingAllowedCardFundingTypes_ReturnsNull() {
     val params =

package/android/src/test/java/com/reactnativestripesdk/PaymentMethodMessagingElementConfigTest.kt

@@ -365,7 +365,7 @@ class PaymentMethodMessagingElementConfigTest {
         val colors =
           PaymentMethodMessagingElement.Appearance
             .Colors()
-            .infoIconColor("#0000FF".toColorInt())
+            .linkTextColor("#0000FF".toColorInt())
         colors(colors)
       }
 
@@ -391,7 +391,7 @@ class PaymentMethodMessagingElementConfigTest {
         val colors =
           PaymentMethodMessagingElement.Appearance
             .Colors()
-            .infoIconColor("#0000FF".toColorInt())
+            .linkTextColor("#0000FF".toColorInt())
         colors(colors)
       }
 
@@ -526,7 +526,7 @@ class PaymentMethodMessagingElementConfigTest {
     expected: Any,
     actual: Any,
   ) {
-    val fieldNames = listOf("textColor", "infoIconColor")
+    val fieldNames = listOf("textColor", "linkTextColor")
 
     for (fieldName in fieldNames) {
       val expectedField = expected.javaClass.getDeclaredField(fieldName)