@stripe/stripe-react-native 0.4.0 → 0.7.0

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

@@ -65,6 +65,7 @@ class Mappers {
             return nil
         }
         let result: NSDictionary = [
+            "id": bankAccount?.stripeID ?? NSNull(),
             "bankName": bankAccount?.bankName ?? NSNull(),
             "accountHolderName": bankAccount?.accountHolderName ?? NSNull(),
             "accountHolderType": mapFromBankAccountHolderType(bankAccount?.accountHolderType) ?? NSNull(),
@@ -72,7 +73,6 @@ class Mappers {
             "currency": bankAccount?.currency ?? NSNull(),
             "routingNumber": bankAccount?.routingNumber ?? NSNull(),
             "status": mapFromBankAccountStatus(bankAccount?.status) ?? NSNull(),
-
         ]
         return result
     }
@@ -90,7 +90,8 @@ class Mappers {
             "last4": card?.last4 ?? NSNull(),
             "funding": mapFromFunding(card?.funding) ?? NSNull(),
             "name": card?.name ?? NSNull(),
-            "address": mapFromAddress(address: card?.address)
+            "address": mapFromAddress(address: card?.address),
+            "id": card?.stripeID ?? NSNull(),
         ]
         return cardMap
     }
@@ -156,6 +157,7 @@ class Mappers {
             "card": mapFromCard(token.card) ?? NSNull(),
             "livemode": token.livemode,
             "type": mapFromTokenType(token.type) ?? NSNull(),
+
         ]
 
         return tokenMap
@@ -280,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"
         }
@@ -307,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
             }
         }
@@ -372,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 {
@@ -398,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 {
@@ -441,16 +495,18 @@ class Mappers {
         billing.phone = RCTConvert.nsString(billingDetails["phone"])
         billing.name = RCTConvert.nsString(billingDetails["name"])
 
-        let billingAddres = STPPaymentMethodAddress()
-
-        billingAddres.city = RCTConvert.nsString(billingDetails["addressCity"])
-        billingAddres.postalCode = RCTConvert.nsString(billingDetails["addressPostalCode"])
-        billingAddres.country = RCTConvert.nsString(billingDetails["addressCountry"])
-        billingAddres.line1 = RCTConvert.nsString(billingDetails["addressLine1"])
-        billingAddres.line2 = RCTConvert.nsString(billingDetails["addressLine2"])
-        billingAddres.state = RCTConvert.nsString(billingDetails["addressState"])
-
-        billing.address = billingAddres
+        let address = STPPaymentMethodAddress()
+        
+        if let addressMap = billingDetails["address"] as? NSDictionary {
+            address.city = RCTConvert.nsString(addressMap["city"])
+            address.postalCode = RCTConvert.nsString(addressMap["postalCode"])
+            address.country = RCTConvert.nsString(addressMap["country"])
+            address.line1 = RCTConvert.nsString(addressMap["line1"])
+            address.line2 = RCTConvert.nsString(addressMap["line2"])
+            address.state = RCTConvert.nsString(addressMap["state"])
+        }
+        
+        billing.address = address
 
         return billing
     }
@@ -459,15 +515,18 @@ class Mappers {
         guard let shippingDetails = shippingDetails else {
             return nil
         }
-        let shippingAddress = STPPaymentIntentShippingDetailsAddressParams(line1: shippingDetails["addressLine1"] as? String ?? "")
-
-        shippingAddress.city = shippingDetails["addressCity"] as? String
-        shippingAddress.postalCode = shippingDetails["addressPostalCode"] as? String
-        shippingAddress.country = shippingDetails["addressCountry"] as? String
-        shippingAddress.line1 = shippingDetails["addressLine1"] as? String ?? ""
-        shippingAddress.line2 = shippingDetails["addressLine2"] as? String
-        shippingAddress.state = shippingDetails["addressState"] as? String
+        
+        let shippingAddress = STPPaymentIntentShippingDetailsAddressParams(line1: "")
 
+        if let addressMap = shippingDetails["address"] as? NSDictionary {
+            shippingAddress.city = addressMap["city"] as? String
+            shippingAddress.postalCode = addressMap["postalCode"] as? String
+            shippingAddress.country = addressMap["country"] as? String
+            shippingAddress.line1 = addressMap["line1"] as? String ?? ""
+            shippingAddress.line2 = addressMap["line2"] as? String
+            shippingAddress.state = addressMap["state"] as? String
+        }
+        
         let shipping = STPPaymentIntentShippingDetailsParams(address: shippingAddress, name: shippingDetails["name"] as? String ?? "")
 
         return shipping
@@ -537,6 +596,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),
@@ -560,6 +630,7 @@ class Mappers {
             "Upi": [
                 "vpa": paymentMethod.upi?.vpa
             ],
+            "USBankAccount": USBankAccount
         ]
         return method
     }
@@ -617,7 +688,8 @@ class Mappers {
             "usage": mapFromSetupIntentUsage(usage: setupIntent.usage),
             "paymentMethodId": setupIntent.paymentMethodID ?? NSNull(),
             "created": NSNull(),
-            "lastSetupError": NSNull()
+            "lastSetupError": NSNull(),
+            "nextAction": mapNextAction(nextAction: setupIntent.nextAction) ?? NSNull(),
         ]
 
 
@@ -839,7 +911,7 @@ class Mappers {
         }
         return nil
     }
-    
+
     class func mapFromCardValidationState(state: STPCardValidationState?) -> String {
         if let state = state {
             switch state {
@@ -851,4 +923,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

@@ -70,7 +70,7 @@ RCT_EXTERN_METHOD(
                   )
 
 RCT_EXTERN_METHOD(
-                  handleCardAction:(NSString *)paymentIntentClientSecret
+                  handleNextAction:(NSString *)paymentIntentClientSecret
                   resolver: (RCTPromiseResolveBlock)resolve
                   rejecter: (RCTPromiseRejectBlock)reject
                   )
@@ -107,5 +107,19 @@ RCT_EXTERN_METHOD(
                   rejecter: (RCTPromiseRejectBlock)reject
                   )
 
+RCT_EXTERN_METHOD(
+                  verifyMicrodeposits:(BOOL)isPaymentIntent
+                  clientSecret:(NSString *)clientSecret
+                  params:(NSDictionary *)params
+                  resolver: (RCTPromiseResolveBlock)resolve
+                  rejecter: (RCTPromiseRejectBlock)reject
+                  )
+RCT_EXTERN_METHOD(
+                  collectBankAccount:(BOOL)isPaymentIntent
+                  clientSecret:(NSString *)clientSecret
+                  params:(NSDictionary *)params
+                  resolver: (RCTPromiseResolveBlock)resolve
+                  rejecter: (RCTPromiseRejectBlock)reject
+                  )
 
 @end