@stripe/stripe-react-native 0.5.0 → 0.6.0

package/CHANGELOG.md

@@ -1,6 +1,14 @@
 # CHANGELOG
 
+## 0.6.0
+
+- [#861](https://github.com/stripe/stripe-react-native/pull/861) BREAKING: This library now supports iOS 12 and up, due to `stripe-ios` increasing the deployment target. If you would like to build for iOS 11, please continue to use `@stripe/stripe-react-native@0.5.0`.
+  - To upgrade your iOS deployment target to 12.0, you can either do so in Xcode under your `Build Settings`, or by modifying `IPHONEOS_DEPLOYMENT_TARGET` in your `project.pbxproj` directly. You will also need to update your Podfile to target `:ios, '12.0'`.
+- [#861](https://github.com/stripe/stripe-react-native/pull/861) Feat: Add support for ACHv2 payments **on iOS only**.
+- [#861](https://github.com/stripe/stripe-react-native/pull/861) Chore: Upgrade `stripe-ios` to 22.0.0.
+
 ## 0.5.0
+
 - [#863](https://github.com/stripe/stripe-react-native/pull/863) Feat: add card ID and bankAccount ID to token response
 - [#862](https://github.com/stripe/stripe-react-native/pull/862) Feat: Add support for setting a card's `currency` when creating a Token
 - [#854](https://github.com/stripe/stripe-react-native/pull/854) Chore: Upgrade `stripe-ios` to 21.13.0. Upgrade `stripe-android` to 19.3.0.

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

@@ -5,6 +5,8 @@ import android.util.Log
 import com.facebook.react.bridge.*
 import com.stripe.android.PaymentAuthConfig
 import com.stripe.android.model.*
+import com.stripe.android.model.StripeIntent.NextActionType
+import com.stripe.android.model.StripeIntent.NextActionData
 
 internal fun createResult(key: String, value: WritableMap): WritableMap {
   val map = WritableNativeMap()
@@ -344,6 +346,7 @@ internal fun mapFromPaymentIntentResult(paymentIntent: PaymentIntent): WritableM
   map.putString("created", convertToUnixTimestamp(paymentIntent.created))
   map.putString("captureMethod", mapCaptureMethod(paymentIntent.captureMethod))
   map.putString("confirmationMethod", mapConfirmationMethod(paymentIntent.confirmationMethod))
+  map.putMap("nextAction", mapNextAction(paymentIntent.nextActionType, paymentIntent.nextActionData))
   map.putNull("lastPaymentError")
   map.putNull("shipping")
   map.putNull("amount")
@@ -374,6 +377,48 @@ internal fun mapFromPaymentIntentResult(paymentIntent: PaymentIntent): WritableM
   return map
 }
 
+internal fun mapNextAction(type: NextActionType?, data: NextActionData?): WritableNativeMap? {
+  val nextActionMap = WritableNativeMap()
+  when (type) {
+    NextActionType.RedirectToUrl -> {
+      (data as? NextActionData.RedirectToUrl)?.let {
+        nextActionMap.putString("type", "urlRedirect")
+        nextActionMap.putString("redirectUrl", it.url.toString())
+      }
+    }
+    // TODO: This is currently private. Uncomment when ACHv2 is available on Android.
+    // NextActionType.VerifyWithMicrodeposits -> {
+    //   (data as? NextActionData.VerifyWithMicrodeposits)?.let {
+    //     nextActionMap.putString("type", "verifyWithMicrodeposits")
+    //     nextActionMap.putString("arrivalDate", it.arrivalDate.toString())
+    //     nextActionMap.putString("redirectUrl", it.hostedVerificationUrl)
+    //     nextActionMap.putString("microdepositType", it.microdepositType.toString())
+    //   }
+    // }
+    NextActionType.DisplayOxxoDetails -> {
+      (data as? NextActionData.DisplayOxxoDetails)?.let {
+        nextActionMap.putString("type", "oxxoVoucher")
+        nextActionMap.putInt("expiration", it.expiresAfter)
+        nextActionMap.putString("voucherURL", it.hostedVoucherUrl)
+        nextActionMap.putString("voucherNumber", it.number)
+      }
+    }
+    NextActionType.WeChatPayRedirect -> {
+      (data as? NextActionData.WeChatPayRedirect)?.let {
+        nextActionMap.putString("type", "weChatRedirect")
+        nextActionMap.putString("redirectUrl", it.weChat.qrCodeUrl)
+      }
+    }
+    NextActionType.AlipayRedirect -> { // TODO: Can't access, private
+      return null
+    }
+    NextActionType.BlikAuthorize, NextActionType.UseStripeSdk, null -> {
+      return null
+    }
+  }
+  return nextActionMap
+}
+
 internal fun mapFromPaymentIntentLastErrorType(errorType: PaymentIntent.Error.Type?): String? {
   return when (errorType) {
     PaymentIntent.Error.Type.ApiConnectionError -> "api_connection_error"
@@ -684,6 +729,7 @@ internal fun mapFromSetupIntentResult(setupIntent: SetupIntent): WritableMap {
   map.putString("paymentMethodId", setupIntent.paymentMethodId)
   map.putString("usage", mapSetupIntentUsage(setupIntent.usage))
   map.putString("created", convertToUnixTimestamp(setupIntent.created))
+  map.putMap("nextAction", mapNextAction(setupIntent.nextActionType, setupIntent.nextActionData))
 
   setupIntent.lastSetupError?.let {
     val setupError: WritableMap = WritableNativeMap()

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

@@ -70,7 +70,7 @@ class PaymentLauncherFragment(
             promise.resolve(paymentIntent)
           }
           StripeIntent.Status.RequiresAction -> {
-            if (isPaymentIntentNextActionVoucherBased(result.nextActionType)) {
+            if (isNextActionSuccessState(result.nextActionType)) {
               val paymentIntent = createResult("paymentIntent", mapFromPaymentIntentResult(result))
               promise.resolve(paymentIntent)
             } else {
@@ -102,14 +102,21 @@ class PaymentLauncherFragment(
     })
   }
 
-  /// Check paymentIntent.nextAction is voucher-based payment method.
-  /// If it's voucher-based, the paymentIntent status stays in requiresAction until the voucher is paid or expired.
-  /// Currently only OXXO payment is voucher-based.
-  private fun isPaymentIntentNextActionVoucherBased(nextAction: StripeIntent.NextActionType?): Boolean {
-    nextAction?.let {
-      return it == StripeIntent.NextActionType.DisplayOxxoDetails
+  /**
+   * Check if paymentIntent.nextAction is out-of-band, such as voucher-based or waiting
+   * on customer verification. If it is, then being in this state is considered "successful".
+   */
+  private fun isNextActionSuccessState(nextAction: StripeIntent.NextActionType?): Boolean {
+    return when (nextAction) {
+      StripeIntent.NextActionType.DisplayOxxoDetails,
+      StripeIntent.NextActionType.VerifyWithMicrodeposits -> true
+      StripeIntent.NextActionType.RedirectToUrl,
+      StripeIntent.NextActionType.UseStripeSdk,
+      StripeIntent.NextActionType.AlipayRedirect,
+      StripeIntent.NextActionType.BlikAuthorize,
+      StripeIntent.NextActionType.WeChatPayRedirect,
+      null -> false
     }
-    return false
   }
 }
 

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

@@ -154,7 +154,7 @@ class PaymentMethodCreateParamsFactory(
       val sepaParams = PaymentMethodCreateParams.SepaDebit(iban)
       val createParams =
         PaymentMethodCreateParams.create(
-                     sepaDebit = sepaParams, 
+                     sepaDebit = sepaParams,
                      billingDetails = it
         )
 

package/ios/Errors.swift

@@ -1,35 +1,9 @@
 import Stripe
 
-enum ConfirmPaymentErrorType: String {
-    case Failed, Canceled, Unknown
-}
-
-enum ApplePayErrorType: String {
-    case Failed, Canceled, Unknown
-}
-
-enum NextPaymentActionErrorType: String {
-    case Failed, Canceled, Unknown
-}
-
-enum ConfirmSetupIntentErrorType: String {
-    case Failed, Canceled, Unknown
-}
-
-enum RetrievePaymentIntentErrorType: String {
-    case Unknown
-}
-
-enum RetrieveSetupIntentErrorType: String {
-    case Unknown
-}
-
-enum PaymentSheetErrorType: String {
-    case Failed, Canceled
-}
-
-enum CreateTokenErrorType: String {
-    case Failed
+enum ErrorType {
+    static let Failed = "Failed"
+    static let Canceled = "Canceled"
+    static let Unknown = "Unknown"
 }
 
 class Errors {
@@ -76,11 +50,11 @@ class Errors {
     class func createError (_ code: String, _ error: NSError?) -> NSDictionary {
         let value: NSDictionary = [
             "code": code,
-            "message": error?.userInfo["com.stripe.lib:ErrorMessageKey"] ?? error?.userInfo["NSLocalizedDescription"] ?? NSNull(),
-            "localizedMessage": error?.userInfo["NSLocalizedDescription"] ?? NSNull(),
-            "declineCode": error?.userInfo["com.stripe.lib:DeclineCodeKey"] ?? NSNull(),
-            "stripeErrorCode": error?.userInfo["com.stripe.lib:StripeErrorCodeKey"] ?? NSNull(),
-            "type": error?.userInfo["com.stripe.lib:StripeErrorTypeKey"] ?? NSNull(),
+            "message": error?.userInfo[STPError.errorMessageKey] ?? NSNull(),
+            "localizedMessage": error?.localizedDescription ?? NSNull(),
+            "declineCode": error?.userInfo[STPError.stripeDeclineCodeKey] ?? NSNull(),
+            "stripeErrorCode": error?.userInfo[STPError.stripeErrorCodeKey] ?? NSNull(),
+            "type": error?.userInfo[STPError.stripeErrorTypeKey] ?? NSNull(),
         ]
         
         return ["error": value]

package/ios/Mappers.swift

@@ -282,6 +282,7 @@ class Mappers {
         case STPPaymentMethodType.UPI: return "Upi"
         case STPPaymentMethodType.afterpayClearpay: return "AfterpayClearpay"
         case STPPaymentMethodType.klarna: return "Klarna"
+        case STPPaymentMethodType.USBankAccount: return "USBankAccount"
         case STPPaymentMethodType.unknown: return "Unknown"
         default: return "Unknown"
         }
@@ -309,6 +310,7 @@ class Mappers {
             case "AfterpayClearpay": return STPPaymentMethodType.afterpayClearpay
             case "Klarna": return STPPaymentMethodType.klarna
             case "WeChatPay": return STPPaymentMethodType.weChatPay
+            case "USBankAccount": return STPPaymentMethodType.USBankAccount
             default: return STPPaymentMethodType.unknown
             }
         }
@@ -374,7 +376,8 @@ class Mappers {
             "amount": paymentIntent.amount,
             "lastPaymentError": NSNull(),
             "shipping": NSNull(),
-            "canceledAt": NSNull()
+            "canceledAt": NSNull(),
+            "nextAction": mapNextAction(nextAction: paymentIntent.nextAction) ?? NSNull(),
         ]
 
         if let lastPaymentError = paymentIntent.lastPaymentError {
@@ -400,6 +403,55 @@ class Mappers {
         return intent;
     }
 
+    class func mapNextAction(nextAction: STPIntentAction?) -> NSDictionary? {
+        if let it = nextAction {
+            switch it.type {
+            case .verifyWithMicrodeposits:
+                return [
+                    "type": "verifyWithMicrodeposits",
+                    "redirectUrl": it.verifyWithMicrodeposits?.hostedVerificationURL.absoluteString ?? NSNull(),
+                    "microdepositType": it.verifyWithMicrodeposits?.microdepositType.description ?? NSNull(),
+                    "arrivalDate": it.verifyWithMicrodeposits?.arrivalDate.timeIntervalSince1970.description ?? NSNull(),
+                ]
+            case .redirectToURL:
+                return [
+                    "type": "urlRedirect",
+                    "redirectUrl": it.redirectToURL?.url.absoluteString ?? NSNull()
+                ]
+            case .weChatPayRedirectToApp:
+                return [
+                    "type": "weChatRedirect",
+                    "redirectUrl": it.weChatPayRedirectToApp?.nativeURL?.absoluteString ?? NSNull()
+                ]
+            case .alipayHandleRedirect:
+                return [
+                    "type": "alipayRedirect",
+                    "redirectUrl": it.alipayHandleRedirect?.url.absoluteString ?? NSNull(),
+                    "nativeRedirectUrl": it.alipayHandleRedirect?.nativeURL?.absoluteString ?? NSNull(),
+                ]
+            case .OXXODisplayDetails:
+                return [
+                    "type": "oxxoVoucher",
+                    "expiration": it.oxxoDisplayDetails?.expiresAfter.timeIntervalSince1970 ?? NSNull(),
+                    "voucherURL": it.oxxoDisplayDetails?.hostedVoucherURL.absoluteString ?? NSNull(),
+                    "voucherNumber": it.oxxoDisplayDetails?.number ?? NSNull(),
+                ]
+// TODO: Not supported on Android
+//            case .boletoDisplayDetails:
+//                return [
+//                    "type": "boletoVoucher",
+//                    "expiration": it.boletoDisplayDetails?.expiresAt.timeIntervalSince1970.description ?? NSNull(),
+//                    "voucherURL": it.boletoDisplayDetails?.hostedVoucherURL.absoluteString ?? NSNull(),
+//                    "voucherNumber": it.boletoDisplayDetails?.number ?? NSNull(),
+//                ]
+            default: // .useStripeSDK, .BLIKAuthorize, .unknown
+                return nil
+            }
+        } else {
+            return nil
+        }
+    }
+
     class func mapFromPaymentIntentLastPaymentErrorType(_ errorType: STPPaymentIntentLastPaymentErrorType?) -> String? {
         if let errorType = errorType {
             switch errorType {
@@ -539,6 +591,17 @@ class Mappers {
             "fingerprint": paymentMethod.auBECSDebit?.fingerprint ?? NSNull(),
             "last4": paymentMethod.auBECSDebit?.last4 ?? NSNull()
         ]
+        let USBankAccount: NSDictionary = [
+            "routingNumber": paymentMethod.usBankAccount?.routingNumber ?? NSNull(),
+            "accountHolderType": mapFromUSBankAccountHolderType(type: paymentMethod.usBankAccount?.accountHolderType),
+            "accountType": mapFromUSBankAccountType(type: paymentMethod.usBankAccount?.accountType),
+            "last4": paymentMethod.usBankAccount?.last4 ?? NSNull(),
+            "bankName": paymentMethod.usBankAccount?.bankName ?? NSNull(),
+            "linkedAccount": paymentMethod.usBankAccount?.linkedAccount ?? NSNull(),
+            "fingerprint": paymentMethod.usBankAccount?.fingerprint ?? NSNull(),
+            "preferredNetworks": paymentMethod.usBankAccount?.networks?.preferred ?? NSNull(),
+            "supportedNetworks": paymentMethod.usBankAccount?.networks?.supported ?? NSNull(),
+        ]
         let method: NSDictionary = [
             "id": paymentMethod.stripeId,
             "type": Mappers.mapPaymentMethodType(type: paymentMethod.type),
@@ -562,6 +625,7 @@ class Mappers {
             "Upi": [
                 "vpa": paymentMethod.upi?.vpa
             ],
+            "USBankAccount": USBankAccount
         ]
         return method
     }
@@ -619,7 +683,8 @@ class Mappers {
             "usage": mapFromSetupIntentUsage(usage: setupIntent.usage),
             "paymentMethodId": setupIntent.paymentMethodID ?? NSNull(),
             "created": NSNull(),
-            "lastSetupError": NSNull()
+            "lastSetupError": NSNull(),
+            "nextAction": mapNextAction(nextAction: setupIntent.nextAction) ?? NSNull(),
         ]
 
 
@@ -853,4 +918,42 @@ class Mappers {
         }
         return "Unknown"
     }
+
+    class func mapFromUSBankAccountHolderType(type: STPPaymentMethodUSBankAccountHolderType?) -> String {
+        if let type = type {
+            switch type {
+                case STPPaymentMethodUSBankAccountHolderType.company: return "Company"
+                case STPPaymentMethodUSBankAccountHolderType.individual: return "Individual"
+                case STPPaymentMethodUSBankAccountHolderType.unknown: return "Unknown"
+            }
+        }
+        return "Unknown"
+    }
+    
+    class func mapToUSBankAccountHolderType(type: String?) -> STPPaymentMethodUSBankAccountHolderType {
+        switch type {
+            case "Company": return STPPaymentMethodUSBankAccountHolderType.company
+            case "Individual": return STPPaymentMethodUSBankAccountHolderType.individual
+            default: return STPPaymentMethodUSBankAccountHolderType.individual
+        }
+    }
+
+    class func mapFromUSBankAccountType(type: STPPaymentMethodUSBankAccountType?) -> String {
+        if let type = type {
+            switch type {
+                case STPPaymentMethodUSBankAccountType.savings: return "Savings"
+                case STPPaymentMethodUSBankAccountType.checking: return "Checking"
+                case STPPaymentMethodUSBankAccountType.unknown: return "Unknown"
+            }
+        }
+        return "Unknown"
+    }
+    
+    class func mapToUSBankAccountType(type: String?) -> STPPaymentMethodUSBankAccountType {
+        switch type {
+            case "Savings": return STPPaymentMethodUSBankAccountType.savings
+            case "Checking": return STPPaymentMethodUSBankAccountType.checking
+            default: return STPPaymentMethodUSBankAccountType.checking
+        }
+    }
 }

package/ios/PaymentMethodFactory.swift

@@ -47,6 +47,8 @@ class PaymentMethodFactory {
                 return try createAfterpayClearpayPaymentMethodParams()
             case STPPaymentMethodType.klarna:
                 return try createKlarnaPaymentMethodParams()
+            case STPPaymentMethodType.USBankAccount:
+                return try createUSBankAccountPaymentMethodParams()
 //            case STPPaymentMethodType.weChatPay:
 //                return try createWeChatPayPaymentMethodParams()
             default:
@@ -92,6 +94,8 @@ class PaymentMethodFactory {
                 return nil
             case STPPaymentMethodType.weChatPay:
                 return try createWeChatPayPaymentMethodOptions()
+            case STPPaymentMethodType.USBankAccount:
+                return try createUSBankAccountPaymentMethodOptions()
             default:
                 throw PaymentMethodError.paymentNotSupported
             }
@@ -105,6 +109,16 @@ class PaymentMethodFactory {
 //        return STPPaymentMethodParams(weChatPay: params, billingDetails: billingDetailsParams, metadata: nil)
 //    }
 //
+
+    private func createUSBankAccountPaymentMethodOptions() throws -> STPConfirmPaymentMethodOptions {
+        let paymentOptions = STPConfirmPaymentMethodOptions()
+        if let usage = self.params?["setupFutureUsage"] as? String {
+            paymentOptions.usBankAccountOptions = STPConfirmUSBankAccountOptions(setupFutureUsage: Mappers.mapToPaymentIntentFutureUsage(usage: usage))
+        }
+
+        return paymentOptions
+    }
+
     private func createWeChatPayPaymentMethodOptions() throws -> STPConfirmPaymentMethodOptions {
         guard let appId = self.params?["appId"] as? String else {
             throw PaymentMethodError.weChatPayPaymentMissingParams
@@ -307,13 +321,35 @@ class PaymentMethodFactory {
 
     private func createKlarnaPaymentMethodParams() throws -> STPPaymentMethodParams {
         let params = STPPaymentMethodKlarnaParams()
-        
+
         if let billingDetails = billingDetailsParams, billingDetails.address?.country != nil, billingDetails.email != nil {
             return STPPaymentMethodParams(klarna: params, billingDetails: billingDetails, metadata: nil)
         } else {
             throw PaymentMethodError.klarnaPaymentMissingParams
         }
     }
+    
+    private func createUSBankAccountPaymentMethodParams() throws -> STPPaymentMethodParams {
+        let params = STPPaymentMethodUSBankAccountParams()
+
+        guard let accountNumber = self.params?["accountNumber"] as? String else {
+            throw PaymentMethodError.usBankAccountPaymentMissingAccountNumber
+        }
+        guard let routingNumber = self.params?["routingNumber"] as? String else {
+            throw PaymentMethodError.usBankAccountPaymentMissingRoutingNumber
+        }
+
+        params.accountNumber = accountNumber
+        params.routingNumber = routingNumber
+        params.accountHolderType = Mappers.mapToUSBankAccountHolderType(type: self.params?["accountHolderType"] as? String)
+        params.accountType = Mappers.mapToUSBankAccountType(type: self.params?["accountType"] as? String)
+
+        if let billingDetails = billingDetailsParams, billingDetails.name != nil {
+            return STPPaymentMethodParams(usBankAccount: params, billingDetails: billingDetails, metadata: nil)
+        } else {
+            throw PaymentMethodError.usBankAccountPaymentMissingParams
+        }
+    }
 }
 
 enum PaymentMethodError: Error {
@@ -330,6 +366,9 @@ enum PaymentMethodError: Error {
     case afterpayClearpayPaymentMissingParams
     case klarnaPaymentMissingParams
     case weChatPayPaymentMissingParams
+    case usBankAccountPaymentMissingParams
+    case usBankAccountPaymentMissingAccountNumber
+    case usBankAccountPaymentMissingRoutingNumber
 }
 
 extension PaymentMethodError: LocalizedError {
@@ -361,6 +400,12 @@ extension PaymentMethodError: LocalizedError {
             return NSLocalizedString("You must provide appId", comment: "Create payment error")
         case .klarnaPaymentMissingParams:
             return NSLocalizedString("Klarna requires that you provide the following billing details: email, country", comment: "Create payment error")
+        case .usBankAccountPaymentMissingParams:
+            return NSLocalizedString("When creating a US bank account payment method, you must provide the following billing details: name", comment: "Create payment error")
+        case .usBankAccountPaymentMissingAccountNumber:
+            return NSLocalizedString("When creating a US bank account payment method, you must provide the bank account number", comment: "Create payment error")
+        case .usBankAccountPaymentMissingRoutingNumber:
+            return NSLocalizedString("When creating a US bank account payment method, you must provide the bank routing number", comment: "Create payment error")
         }
     }
 }

package/ios/StripeSdk.m

@@ -107,5 +107,19 @@ RCT_EXTERN_METHOD(
                   rejecter: (RCTPromiseRejectBlock)reject
                   )
 
+RCT_EXTERN_METHOD(
+                  verifyMicrodeposits:(NSString *)intentType
+                  clientSecret:(NSString *)clientSecret
+                  params:(NSDictionary *)params
+                  resolver: (RCTPromiseResolveBlock)resolve
+                  rejecter: (RCTPromiseRejectBlock)reject
+                  )
+RCT_EXTERN_METHOD(
+                  collectBankAccount:(NSString *)intentType
+                  clientSecret:(NSString *)clientSecret
+                  params:(NSDictionary *)params
+                  resolver: (RCTPromiseResolveBlock)resolve
+                  rejecter: (RCTPromiseRejectBlock)reject
+                  )
 
 @end