@stripe/stripe-react-native 0.59.2 → 0.61.0

package/README.md

@@ -100,7 +100,7 @@ implementation 'com.google.android.material:material:<version>'
 
 #### iOS
 
-The Stripe React Native SDK requires Xcode 14.1 or later and is compatible with apps targeting iOS 13 or above. For iOS 12 support, please use [`@stripe/stripe-react-native@0.19.0`](https://github.com/stripe/stripe-react-native/releases/tag/v0.19.0).
+The Stripe React Native SDK supports all [Apple supported Xcode versions](https://developer.apple.com/news/upcoming-requirements/) and is compatible with apps targeting iOS 13 or above. For iOS 12 support, please use [`@stripe/stripe-react-native@0.19.0`](https://github.com/stripe/stripe-react-native/releases/tag/v0.19.0).
 
 The SDK uses TypeScript features available in Babel version `7.9.0` and above.
 Alternatively use the `plugin-transform-typescript` plugin in your project.

package/android/gradle.properties

@@ -1,6 +1,6 @@
-StripeSdk_kotlinVersion=1.8.0
+StripeSdk_kotlinVersion=2.3.10
 StripeSdk_compileSdkVersion=30
 StripeSdk_targetSdkVersion=28
 StripeSdk_minSdkVersion=21
 # Keep StripeSdk_stripeVersion in sync with https://github.com/stripe/stripe-identity-react-native/blob/main/android/gradle.properties
-StripeSdk_stripeVersion=22.8.+
+StripeSdk_stripeVersion=23.1.+

package/android/src/main/java/com/reactnativestripesdk/FakeOnrampSdkModule.kt

@@ -78,7 +78,7 @@ class FakeOnrampSdkModule(
     updatedAddress: ReadableMap?,
     promise: Promise,
   ) {
-    promise?.resolveNotImplemented()
+    promise.resolveNotImplemented()
   }
 
   @ReactMethod
@@ -126,7 +126,7 @@ class FakeOnrampSdkModule(
     token: ReadableMap,
     promise: Promise,
   ) {
-    promise?.resolveNotImplemented()
+    promise.resolveNotImplemented()
   }
 
   @ReactMethod

package/android/src/main/java/com/reactnativestripesdk/PaymentSheetManager.kt

@@ -97,17 +97,6 @@ class PaymentSheetManager(
       )
       return
     }
-    val primaryButtonLabel = arguments.getString("primaryButtonLabel")
-    val googlePayConfig = buildGooglePayConfig(arguments.getMap("googlePay"))
-    val linkConfig = buildLinkConfig(arguments.getMap("link"))
-    val allowsDelayedPaymentMethods = arguments.getBooleanOr("allowsDelayedPaymentMethods", false)
-    val billingDetailsMap = arguments.getMap("defaultBillingDetails")
-    val billingConfigParams = arguments.getMap("billingDetailsCollectionConfiguration")
-    val paymentMethodOrder = arguments.getStringList("paymentMethodOrder")
-    val allowsRemovalOfLastSavedPaymentMethod =
-      arguments.getBooleanOr("allowsRemovalOfLastSavedPaymentMethod", true)
-    val opensCardScannerAutomatically =
-      arguments.getBooleanOr("opensCardScannerAutomatically", false)
     paymentIntentClientSecret = arguments.getString("paymentIntentClientSecret").orEmpty()
     setupIntentClientSecret = arguments.getString("setupIntentClientSecret").orEmpty()
     intentConfiguration =
@@ -121,26 +110,6 @@ class PaymentSheetManager(
     // Determine which callback type to use based on what's provided
     val intentConfigMap = arguments.getMap("intentConfiguration")
     val useConfirmationTokenCallback = intentConfigMap?.hasKey("confirmationTokenConfirmHandler") == true
-    val appearance =
-      try {
-        buildPaymentSheetAppearance(arguments.getMap("appearance"), context)
-      } catch (error: PaymentSheetAppearanceException) {
-        initPromise.resolve(createError(ErrorType.Failed.toString(), error))
-        return
-      }
-
-    val customerConfiguration =
-      try {
-        buildCustomerConfiguration(arguments)
-      } catch (error: PaymentSheetException) {
-        initPromise.resolve(createError(ErrorType.Failed.toString(), error))
-        return
-      }
-
-    val shippingDetails =
-      arguments.getMap("defaultShippingDetails")?.let {
-        AddressSheetView.buildAddressDetails(it)
-      }
 
     val paymentOptionCallback =
       PaymentOptionResultCallback { paymentOptionResult ->
@@ -208,8 +177,6 @@ class PaymentSheetManager(
 
             is PaymentSheetResult.Completed -> {
               resolvePaymentResult(Arguments.createMap())
-              paymentSheet = null
-              flowController = null
             }
           }
         }
@@ -268,6 +235,117 @@ class PaymentSheetManager(
           }
       }
 
+    if (arguments.getBooleanOr("customFlow", false)) {
+      if (flowController == null) {
+        flowController =
+          if (intentConfiguration != null) {
+            val builder =
+              PaymentSheet.FlowController
+                .Builder(
+                  resultCallback = paymentResultCallback,
+                  paymentOptionResultCallback = paymentOptionCallback,
+                )
+            if (useConfirmationTokenCallback) {
+              builder.createIntentCallback(createConfirmationTokenCallback)
+            } else {
+              builder.createIntentCallback(createIntentCallback)
+            }
+            builder
+              .confirmCustomPaymentMethodCallback(this)
+              .build(activity)
+          } else {
+            PaymentSheet.FlowController
+              .Builder(
+                resultCallback = paymentResultCallback,
+                paymentOptionResultCallback = paymentOptionCallback,
+              ).confirmCustomPaymentMethodCallback(this)
+              .build(activity)
+          }
+      }
+    } else {
+      if (paymentSheet == null) {
+        paymentSheet =
+          if (intentConfiguration != null) {
+            val builder = PaymentSheet.Builder(paymentResultCallback)
+            if (useConfirmationTokenCallback) {
+              builder.createIntentCallback(createConfirmationTokenCallback)
+            } else {
+              builder.createIntentCallback(createIntentCallback)
+            }
+            @SuppressLint("RestrictedApi")
+            builder
+              .confirmCustomPaymentMethodCallback(this)
+              .build(activity, signal)
+          } else {
+            @SuppressLint("RestrictedApi")
+            PaymentSheet
+              .Builder(paymentResultCallback)
+              .confirmCustomPaymentMethodCallback(this)
+              .build(activity, signal)
+          }
+      }
+    }
+    configure(arguments, initPromise)
+  }
+
+  override fun onDestroy() {
+    flowController = null
+    paymentSheet = null
+  }
+
+  fun configure(
+    args: ReadableMap,
+    promise: Promise,
+  ) {
+    val merchantDisplayName = args.getString("merchantDisplayName").orEmpty()
+    if (merchantDisplayName.isEmpty()) {
+      promise.resolve(
+        createError(ErrorType.Failed.toString(), "merchantDisplayName cannot be empty or null."),
+      )
+      return
+    }
+    val primaryButtonLabel = args.getString("primaryButtonLabel")
+    val googlePayConfig = buildGooglePayConfig(args.getMap("googlePay"))
+    val linkConfig = buildLinkConfig(args.getMap("link"))
+    val allowsDelayedPaymentMethods = args.getBooleanOr("allowsDelayedPaymentMethods", false)
+    val billingDetailsMap = args.getMap("defaultBillingDetails")
+    val billingConfigParams = args.getMap("billingDetailsCollectionConfiguration")
+    val paymentMethodOrder = args.getStringList("paymentMethodOrder")
+    val allowsRemovalOfLastSavedPaymentMethod =
+      args.getBooleanOr("allowsRemovalOfLastSavedPaymentMethod", true)
+    val opensCardScannerAutomatically =
+      args.getBooleanOr("opensCardScannerAutomatically", false)
+    paymentIntentClientSecret = args.getString("paymentIntentClientSecret").orEmpty()
+    setupIntentClientSecret = args.getString("setupIntentClientSecret").orEmpty()
+    intentConfiguration =
+      try {
+        buildIntentConfiguration(args.getMap("intentConfiguration"))
+      } catch (error: PaymentSheetException) {
+        promise.resolve(createError(ErrorType.Failed.toString(), error))
+        return
+      }
+
+    val appearance =
+      try {
+        buildPaymentSheetAppearance(args.getMap("appearance"), context)
+      } catch (error: PaymentSheetAppearanceException) {
+        promise.resolve(createError(ErrorType.Failed.toString(), error))
+        return
+      }
+
+    val customerConfiguration =
+      try {
+        buildCustomerConfiguration(args)
+      } catch (error: PaymentSheetException) {
+        promise.resolve(createError(ErrorType.Failed.toString(), error))
+        return
+      }
+
+    val shippingDetails =
+      args.getMap("defaultShippingDetails")?.let {
+        AddressSheetView.buildAddressDetails(it)
+      }
+
     val billingDetailsConfig = buildBillingDetailsCollectionConfiguration(billingConfigParams)
 
     val defaultBillingDetails = buildBillingDetails(billingDetailsMap)
@@ -283,72 +361,28 @@ class PaymentSheetManager(
         .link(linkConfig)
         .billingDetailsCollectionConfiguration(billingDetailsConfig)
         .preferredNetworks(
-          mapToPreferredNetworks(arguments.getIntegerList("preferredNetworks")),
+          mapToPreferredNetworks(args.getIntegerList("preferredNetworks")),
         ).allowsRemovalOfLastSavedPaymentMethod(allowsRemovalOfLastSavedPaymentMethod)
         .opensCardScannerAutomatically(opensCardScannerAutomatically)
-        .cardBrandAcceptance(mapToCardBrandAcceptance(arguments))
+        .cardBrandAcceptance(mapToCardBrandAcceptance(args))
         .apply {
-          mapToAllowedCardFundingTypes(arguments)?.let { allowedCardFundingTypes(it) }
-        }.customPaymentMethods(parseCustomPaymentMethods(arguments.getMap("customPaymentMethodConfiguration")))
+          mapToAllowedCardFundingTypes(args)?.let { allowedCardFundingTypes(it) }
+        }.customPaymentMethods(parseCustomPaymentMethods(args.getMap("customPaymentMethodConfiguration")))
 
     primaryButtonLabel?.let { configurationBuilder.primaryButtonLabel(it) }
     paymentMethodOrder?.let { configurationBuilder.paymentMethodOrder(it) }
 
     configurationBuilder.paymentMethodLayout(
-      mapToPaymentMethodLayout(arguments.getString("paymentMethodLayout")),
+      mapToPaymentMethodLayout(args.getString("paymentMethodLayout")),
     )
 
-    mapToTermsDisplay(arguments)?.let { configurationBuilder.termsDisplay(it) }
+    mapToTermsDisplay(args)?.let { configurationBuilder.termsDisplay(it) }
 
     paymentSheetConfiguration = configurationBuilder.build()
-
-    if (arguments.getBooleanOr("customFlow", false)) {
-      flowController =
-        if (intentConfiguration != null) {
-          val builder =
-            PaymentSheet.FlowController
-              .Builder(
-                resultCallback = paymentResultCallback,
-                paymentOptionResultCallback = paymentOptionCallback,
-              )
-          if (useConfirmationTokenCallback) {
-            builder.createIntentCallback(createConfirmationTokenCallback)
-          } else {
-            builder.createIntentCallback(createIntentCallback)
-          }
-          builder
-            .confirmCustomPaymentMethodCallback(this)
-            .build(activity)
-        } else {
-          PaymentSheet.FlowController
-            .Builder(
-              resultCallback = paymentResultCallback,
-              paymentOptionResultCallback = paymentOptionCallback,
-            ).confirmCustomPaymentMethodCallback(this)
-            .build(activity)
-        }
-      configureFlowController()
+    if (args.getBooleanOr("customFlow", false)) {
+      configureFlowController(promise)
     } else {
-      paymentSheet =
-        if (intentConfiguration != null) {
-          val builder = PaymentSheet.Builder(paymentResultCallback)
-          if (useConfirmationTokenCallback) {
-            builder.createIntentCallback(createConfirmationTokenCallback)
-          } else {
-            builder.createIntentCallback(createIntentCallback)
-          }
-          @SuppressLint("RestrictedApi")
-          builder
-            .confirmCustomPaymentMethodCallback(this)
-            .build(activity, signal)
-        } else {
-          @SuppressLint("RestrictedApi")
-          PaymentSheet
-            .Builder(paymentResultCallback)
-            .confirmCustomPaymentMethodCallback(this)
-            .build(activity, signal)
-        }
-      initPromise.resolve(Arguments.createMap())
+      promise.resolve(Arguments.createMap())
     }
   }
 
@@ -433,10 +467,10 @@ class PaymentSheetManager(
     flowController?.confirm()
   }
 
-  private fun configureFlowController() {
+  private fun configureFlowController(promise: Promise) {
     val onFlowControllerConfigure =
       PaymentSheet.FlowController.ConfigCallback { success, error ->
-        handleFlowControllerConfigured(success, error, initPromise, flowController)
+        handleFlowControllerConfigured(success, error, promise, flowController)
       }
 
     if (!paymentIntentClientSecret.isNullOrEmpty()) {
@@ -458,7 +492,7 @@ class PaymentSheetManager(
         callback = onFlowControllerConfigure,
       )
     } else {
-      initPromise.resolve(
+      promise.resolve(
         createError(
           ErrorType.Failed.toString(),
           "One of `paymentIntentClientSecret`, `setupIntentClientSecret`, or `intentConfiguration` is required",

package/android/src/main/java/com/reactnativestripesdk/StripeSdkModule.kt

@@ -257,11 +257,14 @@ class StripeSdkModule(
     params: ReadableMap,
     promise: Promise,
   ) {
-    unregisterStripeUIManager(paymentSheetManager)
-    paymentSheetManager =
-      PaymentSheetManager(reactApplicationContext, params, promise).also {
-        registerStripeUIManager(it)
-      }
+    if (paymentSheetManager != null) {
+      paymentSheetManager?.configure(params, promise)
+    } else {
+      paymentSheetManager =
+        PaymentSheetManager(reactApplicationContext, params, promise).also {
+          registerStripeUIManager(it)
+        }
+    }
   }
 
   @ReactMethod
@@ -1340,10 +1343,10 @@ class StripeSdkModule(
       stripeAccountId = stripeAccountId,
       callback =
         object : com.stripe.android.ApiResultCallback<RadarSession> {
-          override fun onSuccess(session: RadarSession) {
-            val result = WritableNativeMap()
-            result.putString("id", session.id)
-            promise.resolve(result)
+          override fun onSuccess(result: RadarSession) {
+            val response = WritableNativeMap()
+            response.putString("id", result.id)
+            promise.resolve(response)
           }
 
           override fun onError(e: Exception) {

package/android/src/oldarch/java/com/reactnativestripesdk/NativeStripeSdkModuleSpec.java

@@ -142,7 +142,8 @@ public abstract class NativeStripeSdkModuleSpec extends ReactContextBaseJavaModu
     Map<String, Object> constants = getTypedExportedConstants();
     if (ReactBuildConfig.DEBUG || ReactBuildConfig.IS_INTERNAL_BUILD) {
       Set<String> obligatoryFlowConstants = new HashSet<>(Arrays.asList(
-          "API_VERSIONS"
+          "API_VERSIONS",
+          "SYSTEM_INFO"
       ));
       Set<String> optionalFlowConstants = new HashSet<>();
       Set<String> undeclaredConstants = new HashSet<>(constants.keySet());
@@ -264,6 +265,10 @@ public abstract class NativeStripeSdkModuleSpec extends ReactContextBaseJavaModu
   @DoNotStrip
   public abstract void clearEmbeddedPaymentOption(double viewTag, Promise promise);
 
+  @ReactMethod
+  @DoNotStrip
+  public abstract void createRadarSession(Promise promise);
+
   @ReactMethod
   @DoNotStrip
   public abstract void setFinancialConnectionsForceNativeFlow(boolean enabled, Promise promise);
@@ -295,8 +300,4 @@ public abstract class NativeStripeSdkModuleSpec extends ReactContextBaseJavaModu
   @ReactMethod
   @DoNotStrip
   public abstract void removeListeners(double count);
-
-  @ReactMethod
-  @DoNotStrip
-  public abstract void createRadarSession(Promise promise);
 }

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

@@ -4,6 +4,9 @@ import android.annotation.SuppressLint
 import androidx.compose.ui.graphics.Color
 import com.facebook.react.bridge.ReadableMap
 import com.stripe.android.crypto.onramp.model.OnrampConfiguration
+import com.stripe.android.crypto.onramp.model.PaymentMethodDisplayData
+import com.stripe.android.googlepaylauncher.GooglePayEnvironment
+import com.stripe.android.googlepaylauncher.GooglePayPaymentMethodLauncher
 import com.stripe.android.link.LinkAppearance
 import com.stripe.android.link.LinkAppearance.Colors
 import com.stripe.android.link.LinkAppearance.PrimaryButton
@@ -25,12 +28,55 @@ internal fun mapConfig(
 
   val displayName = configMap.getString("merchantDisplayName") ?: ""
   val cryptoCustomerId = configMap.getString("cryptoCustomerId")
+  val googlePayConfig = mapGooglePayConfig(configMap.getMap("googlePay"))
 
   return OnrampConfiguration()
     .merchantDisplayName(displayName)
     .publishableKey(publishableKey)
     .appearance(appearance)
     .cryptoCustomerId(cryptoCustomerId)
+    .apply { googlePayConfig?.let { googlePayConfig(it) } }
+}
+
+@SuppressLint("RestrictedApi")
+internal fun mapGooglePayConfig(params: ReadableMap?): GooglePayPaymentMethodLauncher.Config? {
+  if (params == null) return null
+
+  val testEnv = params.hasKey("testEnv") && params.getBoolean("testEnv")
+  val merchantCountryCode = params.getString("merchantCountryCode") ?: return null
+  val merchantName = params.getString("merchantName") ?: return null
+  val existingPaymentMethodRequired =
+    params.hasKey("existingPaymentMethodRequired") && params.getBoolean("existingPaymentMethodRequired")
+
+  val billingAddressConfig =
+    mapGooglePayBillingAddressConfig(params.getMap("billingAddressConfig"))
+
+  return GooglePayPaymentMethodLauncher.Config(
+    environment = if (testEnv) GooglePayEnvironment.Test else GooglePayEnvironment.Production,
+    merchantCountryCode = merchantCountryCode,
+    merchantName = merchantName,
+    billingAddressConfig = billingAddressConfig,
+    existingPaymentMethodRequired = existingPaymentMethodRequired,
+  )
+}
+
+private fun mapGooglePayBillingAddressConfig(params: ReadableMap?): GooglePayPaymentMethodLauncher.BillingAddressConfig {
+  if (params == null) return GooglePayPaymentMethodLauncher.BillingAddressConfig()
+
+  val isRequired = params.hasKey("isRequired") && params.getBoolean("isRequired")
+  val format =
+    when (params.getString("format")) {
+      "Full" -> GooglePayPaymentMethodLauncher.BillingAddressConfig.Format.Full
+      else -> GooglePayPaymentMethodLauncher.BillingAddressConfig.Format.Min
+    }
+  val isPhoneNumberRequired =
+    params.hasKey("isPhoneNumberRequired") && params.getBoolean("isPhoneNumberRequired")
+
+  return GooglePayPaymentMethodLauncher.BillingAddressConfig(
+    isRequired = isRequired,
+    format = format,
+    isPhoneNumberRequired = isPhoneNumberRequired,
+  )
 }
 
 @SuppressLint("RestrictedApi")
@@ -101,3 +147,11 @@ internal fun mapAppearance(appearanceMap: ReadableMap): LinkAppearance {
     .style(style)
     .primaryButton(primaryButton)
 }
+
+@SuppressLint("RestrictedApi")
+internal fun mapPaymentDetailsType(type: PaymentMethodDisplayData.Type): String =
+  when (type) {
+    PaymentMethodDisplayData.Type.Card -> "Card"
+    PaymentMethodDisplayData.Type.BankAccount -> "BankAccount"
+    PaymentMethodDisplayData.Type.GooglePay -> "GooglePay"
+  }

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

@@ -42,12 +42,11 @@ 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.crypto.onramp.model.PaymentMethodSelection
 import com.stripe.android.link.LinkController.PaymentMethodPreview
 import com.stripe.android.link.PaymentMethodPreviewDetails
 import com.stripe.android.model.CardBrand
 import com.stripe.android.model.DateOfBirth
-import com.stripe.android.paymentsheet.PaymentSheet
 import kotlinx.coroutines.CompletableDeferred
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
@@ -289,35 +288,8 @@ class OnrampSdkModule(
       }
     CoroutineScope(Dispatchers.IO).launch {
       val firstName = kycInfo.getString("firstName")
-      if (firstName.isNullOrEmpty()) {
-        promise.resolve(
-          createError(
-            ErrorType.Unknown.toString(),
-            "Missing required field: firstName",
-          ),
-        )
-        return@launch
-      }
       val lastName = kycInfo.getString("lastName")
-      if (lastName.isNullOrEmpty()) {
-        promise.resolve(
-          createError(
-            ErrorType.Unknown.toString(),
-            "Missing required field: lastName",
-          ),
-        )
-        return@launch
-      }
       val idNumber = kycInfo.getString("idNumber")
-      if (idNumber.isNullOrEmpty()) {
-        promise.resolve(
-          createError(
-            ErrorType.Unknown.toString(),
-            "Missing required field: idNumber",
-          ),
-        )
-        return@launch
-      }
 
       val dateOfBirthMap = kycInfo.getMap("dateOfBirth")
       val dob =
@@ -333,17 +305,11 @@ class OnrampSdkModule(
             year = dateOfBirthMap.getInt("year"),
           )
         } else {
-          promise.resolve(
-            createError(
-              ErrorType.Unknown.toString(),
-              "Missing required field: dateOfBirth",
-            ),
-          )
-          return@launch
+          null
         }
 
       val addressMap = kycInfo.getMap("address")
-      val addressObj = mapToPaymentSheetAddress(addressMap) ?: PaymentSheet.Address()
+      val addressObj = mapToPaymentSheetAddress(addressMap)
 
       val kycInfoObj =
         KycInfo(
@@ -431,8 +397,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(
@@ -596,6 +586,12 @@ class OnrampSdkModule(
       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))
     }
   }
@@ -709,6 +705,7 @@ class OnrampSdkModule(
           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))
         }