@stripe/stripe-react-native 0.5.0 → 0.8.0

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

@@ -5,11 +5,12 @@ import com.stripe.android.model.*
 
 class PaymentMethodCreateParamsFactory(
   private val clientSecret: String,
-  private val params: ReadableMap,
+  private val paymentMethodData: ReadableMap?,
+  private val options: ReadableMap,
   private val cardFieldView: CardFieldView?,
   private val cardFormView: CardFormView?,
 ) {
-  private val billingDetailsParams = mapToBillingDetails(getMapOrNull(params, "billingDetails"), cardFieldView?.cardAddress ?: cardFormView?.cardAddress)
+  private val billingDetailsParams = mapToBillingDetails(getMapOrNull(paymentMethodData, "billingDetails"), cardFieldView?.cardAddress ?: cardFormView?.cardAddress)
 
   @Throws(PaymentMethodCreateParamsException::class)
   fun createConfirmParams(paymentMethodType: PaymentMethod.Type): ConfirmPaymentIntentParams {
@@ -30,6 +31,7 @@ class PaymentMethodCreateParamsFactory(
         PaymentMethod.Type.AfterpayClearpay -> createAfterpayClearpayPaymentConfirmParams()
         PaymentMethod.Type.AuBecsDebit -> createAuBecsDebitPaymentConfirmParams()
         PaymentMethod.Type.Klarna -> createKlarnaPaymentConfirmParams()
+        PaymentMethod.Type.USBankAccount -> createUSBankAccountPaymentConfirmParams()
         else -> {
           throw Exception("This paymentMethodType is not supported yet")
         }
@@ -49,6 +51,7 @@ class PaymentMethodCreateParamsFactory(
         PaymentMethod.Type.Bancontact -> createBancontactPaymentSetupParams()
         PaymentMethod.Type.SepaDebit -> createSepaPaymentSetupParams()
         PaymentMethod.Type.AuBecsDebit -> createAuBecsDebitPaymentSetupParams()
+        PaymentMethod.Type.USBankAccount -> createUSBankAccountPaymentSetupParams()
         else -> {
           throw Exception("This paymentMethodType is not supported yet")
         }
@@ -60,18 +63,17 @@ class PaymentMethodCreateParamsFactory(
 
   @Throws(PaymentMethodCreateParamsException::class)
   private fun createIDEALPaymentConfirmParams(): ConfirmPaymentIntentParams {
-    val bankName = getValOr(params, "bankName", null)
+    val bankName = getValOr(paymentMethodData, "bankName", null)
 
     val idealParams = PaymentMethodCreateParams.Ideal(bankName)
     val createParams =
       PaymentMethodCreateParams.create(ideal = idealParams, billingDetails = billingDetailsParams)
-    val setupFutureUsage = mapToPaymentIntentFutureUsage(getValOr(params, "setupFutureUsage"))
 
     return ConfirmPaymentIntentParams
       .createWithPaymentMethodCreateParams(
         paymentMethodCreateParams = createParams,
         clientSecret = clientSecret,
-        setupFutureUsage = setupFutureUsage,
+        setupFutureUsage = mapToPaymentIntentFutureUsage(getValOr(options, "setupFutureUsage")),
       )
   }
 
@@ -84,6 +86,7 @@ class PaymentMethodCreateParamsFactory(
         .createWithPaymentMethodCreateParams(
           paymentMethodCreateParams = params,
           clientSecret = clientSecret,
+          setupFutureUsage = mapToPaymentIntentFutureUsage(getValOr(options, "setupFutureUsage")),
         )
     }
 
@@ -92,8 +95,8 @@ class PaymentMethodCreateParamsFactory(
 
   @Throws(PaymentMethodCreateParamsException::class)
   private fun createCardPaymentConfirmParams(): ConfirmPaymentIntentParams {
-    val paymentMethodId = getValOr(params, "paymentMethodId", null)
-    val token = getValOr(params, "token", null)
+    val paymentMethodId = getValOr(paymentMethodData, "paymentMethodId", null)
+    val token = getValOr(paymentMethodData, "token", null)
 
     val cardParams = cardFieldView?.cardParams ?: cardFormView?.cardParams
 
@@ -101,10 +104,10 @@ class PaymentMethodCreateParamsFactory(
       throw PaymentMethodCreateParamsException("Card details not complete")
     }
 
-    val setupFutureUsage = mapToPaymentIntentFutureUsage(getValOr(params, "setupFutureUsage"))
+    val setupFutureUsage = mapToPaymentIntentFutureUsage(getValOr(options, "setupFutureUsage"))
 
     if (paymentMethodId != null) {
-      val cvc = getValOr(params, "cvc", null)
+      val cvc = getValOr(paymentMethodData, "cvc", null)
       val paymentMethodOptionParams =
         if (cvc != null) PaymentMethodOptionsParams.Card(cvc) else null
 
@@ -132,7 +135,7 @@ class PaymentMethodCreateParamsFactory(
 
   @Throws(PaymentMethodCreateParamsException::class)
   private fun createIDEALPaymentSetupParams(): ConfirmSetupIntentParams {
-    val bankName = getValOr(params, "bankName", null)
+    val bankName = getValOr(paymentMethodData, "bankName", null)
 
     val idealParams = PaymentMethodCreateParams.Ideal(bankName)
     val createParams =
@@ -147,15 +150,15 @@ class PaymentMethodCreateParamsFactory(
   @Throws(PaymentMethodCreateParamsException::class)
   private fun createSepaPaymentSetupParams(): ConfirmSetupIntentParams {
     billingDetailsParams?.let {
-      val iban = getValOr(params, "iban", null) ?: run {
+      val iban = getValOr(paymentMethodData, "iban", null) ?: run {
         throw PaymentMethodCreateParamsException("You must provide IBAN")
       }
 
       val sepaParams = PaymentMethodCreateParams.SepaDebit(iban)
       val createParams =
         PaymentMethodCreateParams.create(
-                     sepaDebit = sepaParams, 
-                     billingDetails = it
+          sepaDebit = sepaParams,
+          billingDetails = it
         )
 
       return ConfirmSetupIntentParams.create(
@@ -170,7 +173,7 @@ class PaymentMethodCreateParamsFactory(
   @Throws(PaymentMethodCreateParamsException::class)
   private fun createCardPaymentSetupParams(): ConfirmSetupIntentParams {
     val cardParams = cardFieldView?.cardParams ?: cardFormView?.cardParams
-      ?: throw PaymentMethodCreateParamsException("Card details not complete")
+    ?: throw PaymentMethodCreateParamsException("Card details not complete")
 
     val paymentMethodCreateParams =
       PaymentMethodCreateParams.create(cardParams, billingDetailsParams)
@@ -186,10 +189,9 @@ class PaymentMethodCreateParamsFactory(
 
   @Throws(PaymentMethodCreateParamsException::class)
   private fun createSofortPaymentConfirmParams(): ConfirmPaymentIntentParams {
-    val country = getValOr(params, "country", null) ?: run {
+    val country = getValOr(paymentMethodData, "country", null) ?: run {
       throw PaymentMethodCreateParamsException("You must provide bank account country")
     }
-    val setupFutureUsage = mapToPaymentIntentFutureUsage(getValOr(params, "setupFutureUsage"))
 
     val params = PaymentMethodCreateParams.create(
       PaymentMethodCreateParams.Sofort(country = country),
@@ -200,13 +202,13 @@ class PaymentMethodCreateParamsFactory(
       .createWithPaymentMethodCreateParams(
         paymentMethodCreateParams = params,
         clientSecret = clientSecret,
-        setupFutureUsage = setupFutureUsage,
+        setupFutureUsage = mapToPaymentIntentFutureUsage(getValOr(options, "setupFutureUsage")),
       )
   }
 
   @Throws(PaymentMethodCreateParamsException::class)
   private fun createSofortPaymentSetupParams(): ConfirmSetupIntentParams {
-    val country = getValOr(params, "country", null)
+    val country = getValOr(paymentMethodData, "country", null)
       ?: throw PaymentMethodCreateParamsException("You must provide country")
 
     val params = PaymentMethodCreateParams.create(
@@ -229,20 +231,20 @@ class PaymentMethodCreateParamsFactory(
       .createWithPaymentMethodCreateParams(
         paymentMethodCreateParams = params,
         clientSecret = clientSecret,
+        setupFutureUsage = mapToPaymentIntentFutureUsage(getValOr(options, "setupFutureUsage")),
       )
   }
 
   @Throws(PaymentMethodCreateParamsException::class)
   private fun createBancontactPaymentConfirmParams(): ConfirmPaymentIntentParams {
     billingDetailsParams?.let {
-      val setupFutureUsage = mapToPaymentIntentFutureUsage(getValOr(params, "setupFutureUsage", null))
       val params = PaymentMethodCreateParams.createBancontact(it)
 
       return ConfirmPaymentIntentParams
         .createWithPaymentMethodCreateParams(
           paymentMethodCreateParams = params,
           clientSecret = clientSecret,
-          setupFutureUsage = setupFutureUsage,
+          setupFutureUsage = mapToPaymentIntentFutureUsage(getValOr(options, "setupFutureUsage")),
         )
     }
 
@@ -272,6 +274,7 @@ class PaymentMethodCreateParamsFactory(
         .createWithPaymentMethodCreateParams(
           paymentMethodCreateParams = params,
           clientSecret = clientSecret,
+          setupFutureUsage = mapToPaymentIntentFutureUsage(getValOr(options, "setupFutureUsage"))
         )
     }
 
@@ -287,6 +290,7 @@ class PaymentMethodCreateParamsFactory(
         .createWithPaymentMethodCreateParams(
           paymentMethodCreateParams = params,
           clientSecret = clientSecret,
+          setupFutureUsage = mapToPaymentIntentFutureUsage(getValOr(options, "setupFutureUsage"))
         )
     }
 
@@ -302,6 +306,7 @@ class PaymentMethodCreateParamsFactory(
         .createWithPaymentMethodCreateParams(
           paymentMethodCreateParams = params,
           clientSecret = clientSecret,
+          setupFutureUsage = mapToPaymentIntentFutureUsage(getValOr(options, "setupFutureUsage"))
         )
     }
 
@@ -311,10 +316,10 @@ class PaymentMethodCreateParamsFactory(
   @Throws(PaymentMethodCreateParamsException::class)
   private fun createSepaPaymentConfirmParams(): ConfirmPaymentIntentParams {
     billingDetailsParams?.let {
-      val iban = getValOr(params, "iban", null) ?: run {
+      val iban = getValOr(paymentMethodData, "iban", null) ?: run {
         throw PaymentMethodCreateParamsException("You must provide IBAN")
       }
-      val setupFutureUsage = mapToPaymentIntentFutureUsage(getValOr(params, "setupFutureUsage"))
+
       val params = PaymentMethodCreateParams.create(
         sepaDebit = PaymentMethodCreateParams.SepaDebit(iban),
         billingDetails = it
@@ -324,7 +329,7 @@ class PaymentMethodCreateParamsFactory(
         .createWithPaymentMethodCreateParams(
           paymentMethodCreateParams = params,
           clientSecret = clientSecret,
-          setupFutureUsage = setupFutureUsage
+          setupFutureUsage = mapToPaymentIntentFutureUsage(getValOr(options, "setupFutureUsage"))
         )
     }
 
@@ -333,7 +338,7 @@ class PaymentMethodCreateParamsFactory(
 
   @Throws(PaymentMethodCreateParamsException::class)
   private fun createFpxPaymentConfirmParams(): ConfirmPaymentIntentParams {
-    val bank = getBooleanOrFalse(params, "testOfflineBank").let { "test_offline_bank" }
+    val bank = getBooleanOrFalse(paymentMethodData, "testOfflineBank").let { "test_offline_bank" }
     val params = PaymentMethodCreateParams.create(
       PaymentMethodCreateParams.Fpx(bank)
     )
@@ -342,6 +347,7 @@ class PaymentMethodCreateParamsFactory(
       .createWithPaymentMethodCreateParams(
         paymentMethodCreateParams = params,
         clientSecret = clientSecret,
+        setupFutureUsage = mapToPaymentIntentFutureUsage(getValOr(options, "setupFutureUsage"))
       )
   }
 
@@ -354,6 +360,7 @@ class PaymentMethodCreateParamsFactory(
         .createWithPaymentMethodCreateParams(
           paymentMethodCreateParams = params,
           clientSecret = clientSecret,
+          setupFutureUsage = mapToPaymentIntentFutureUsage(getValOr(options, "setupFutureUsage"))
         )
     }
 
@@ -362,7 +369,7 @@ class PaymentMethodCreateParamsFactory(
 
   @Throws(PaymentMethodCreateParamsException::class)
   private fun createAuBecsDebitPaymentConfirmParams(): ConfirmPaymentIntentParams {
-    val formDetails = getMapOrNull(params, "formDetails") ?: run {
+    val formDetails = getMapOrNull(paymentMethodData, "formDetails") ?: run {
       throw PaymentMethodCreateParamsException("You must provide form details")
     }
 
@@ -388,12 +395,13 @@ class PaymentMethodCreateParamsFactory(
       .createWithPaymentMethodCreateParams(
         paymentMethodCreateParams = params,
         clientSecret = clientSecret,
+        setupFutureUsage = mapToPaymentIntentFutureUsage(getValOr(options, "setupFutureUsage"))
       )
   }
 
   @Throws(PaymentMethodCreateParamsException::class)
   private fun createAuBecsDebitPaymentSetupParams(): ConfirmSetupIntentParams {
-    val formDetails = getMapOrNull(params, "formDetails") ?: run {
+    val formDetails = getMapOrNull(paymentMethodData, "formDetails") ?: run {
       throw PaymentMethodCreateParamsException("You must provide form details")
     }
 
@@ -422,11 +430,32 @@ class PaymentMethodCreateParamsFactory(
       )
   }
 
+  @Throws(PaymentMethodCreateParamsException::class)
+  private fun createUSBankAccountPaymentSetupParams(): ConfirmSetupIntentParams {
+    // If payment method data is supplied, assume they are passing in the bank details manually
+    paymentMethodData?.let {
+      if (billingDetailsParams?.name.isNullOrBlank()) {
+        throw PaymentMethodCreateParamsException("When creating a US bank account payment method, you must provide the following billing details: name")
+      }
+      return ConfirmSetupIntentParams.create(
+        paymentMethodCreateParams = createUSBankAccountParams(paymentMethodData),
+        clientSecret = clientSecret,
+      )
+    } ?: run {
+      // Payment method is assumed to be already attached through via collectBankAccount
+      return ConfirmSetupIntentParams.create(
+        clientSecret = clientSecret,
+        paymentMethodType = PaymentMethod.Type.USBankAccount
+      )
+    }
+  }
+
+
   @Throws(PaymentMethodCreateParamsException::class)
   private fun createKlarnaPaymentConfirmParams(): ConfirmPaymentIntentParams {
     if (billingDetailsParams == null ||
-        billingDetailsParams.address?.country.isNullOrBlank() ||
-        billingDetailsParams.email.isNullOrBlank()
+      billingDetailsParams.address?.country.isNullOrBlank() ||
+      billingDetailsParams.email.isNullOrBlank()
     ) {
       throw PaymentMethodCreateParamsException("Klarna requires that you provide the following billing details: email, country")
     }
@@ -437,8 +466,64 @@ class PaymentMethodCreateParamsFactory(
       .createWithPaymentMethodCreateParams(
         paymentMethodCreateParams = params,
         clientSecret = clientSecret,
+        setupFutureUsage = mapToPaymentIntentFutureUsage(getValOr(options, "setupFutureUsage"))
       )
   }
+
+  @Throws(PaymentMethodCreateParamsException::class)
+  private fun createUSBankAccountPaymentConfirmParams(): ConfirmPaymentIntentParams {
+    // If payment method data is supplied, assume they are passing in the bank details manually
+    paymentMethodData?.let {
+      if (billingDetailsParams?.name.isNullOrBlank()) {
+        throw PaymentMethodCreateParamsException("When creating a US bank account payment method, you must provide the following billing details: name")
+      }
+
+      return ConfirmPaymentIntentParams.createWithPaymentMethodCreateParams(
+        paymentMethodCreateParams = createUSBankAccountParams(paymentMethodData),
+        clientSecret,
+        setupFutureUsage = mapToPaymentIntentFutureUsage(getValOr(options, "setupFutureUsage"))
+      )
+    } ?: run {
+      // Payment method is assumed to be already attached through via collectBankAccount
+      return ConfirmPaymentIntentParams.create(
+        clientSecret = clientSecret,
+        paymentMethodType = PaymentMethod.Type.USBankAccount
+      )
+    }
+  }
+
+  @Throws(PaymentMethodCreateParamsException::class)
+  private fun createUSBankAccountParams(params: ReadableMap): PaymentMethodCreateParams {
+    val accountNumber = getValOr(params, "accountNumber", null)
+    val routingNumber = getValOr(params, "routingNumber", null)
+
+    if (accountNumber.isNullOrBlank()) {
+      throw PaymentMethodCreateParamsException("When creating a US bank account payment method, you must provide the bank account number")
+    } else if (routingNumber.isNullOrBlank()) {
+      throw PaymentMethodCreateParamsException("When creating a US bank account payment method, you must provide the bank routing number")
+    }
+
+    val usBankAccount = PaymentMethodCreateParams.USBankAccount(
+      accountNumber,
+      routingNumber,
+      mapToUSBankAccountType(
+        getValOr(
+          params,
+          "accountType",
+          null)),
+      mapToUSBankAccountHolderType(
+        getValOr(
+          params,
+          "accountHolderType",
+          null))
+    )
+
+    return PaymentMethodCreateParams.Companion.create(
+      usBankAccount,
+      billingDetailsParams,
+      null
+    )
+  }
 }
 
 class PaymentMethodCreateParamsException(message: String) : Exception(message)

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

@@ -8,7 +8,6 @@ class StripeContainerManager : ViewGroupManager<StripeContainerView>() {
   override fun getName() = "StripeContainer"
 
   @ReactProp(name = "keyboardShouldPersistTaps")
-  @SuppressWarnings("unused")
   fun setKeyboardShouldPersistTaps(view: StripeContainerView, keyboardShouldPersistTaps: Boolean) {
     view.setKeyboardShouldPersistTaps(keyboardShouldPersistTaps)
   }