@stripe/stripe-react-native 0.5.0 → 0.8.0

package/ios/Mappers.swift

@@ -82,7 +82,7 @@ class Mappers {
             return nil
         }
         let cardMap: NSDictionary = [
-            "brand": mapCardBrand(card?.brand) ?? NSNull(),
+            "brand": mapFromCardBrand(card?.brand) ?? NSNull(),
             "country": card?.country ?? NSNull(),
             "currency": card?.currency ?? NSNull(),
             "expMonth": card?.expMonth ?? NSNull(),
@@ -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 {
@@ -443,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
     }
@@ -461,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
@@ -493,7 +550,7 @@ class Mappers {
         return billing
     }
 
-    class func mapCardBrand(_ brand: STPCardBrand?) -> String? {
+    class func mapFromCardBrand(_ brand: STPCardBrand?) -> String? {
         if let brand = brand {
             switch brand {
             case STPCardBrand.visa: return "Visa"
@@ -509,13 +566,30 @@ class Mappers {
         }
         return nil
     }
+    
+    class func mapToCardBrand(_ brand: String?) -> STPCardBrand {
+        if let brand = brand {
+            switch brand {
+            case "Visa": return STPCardBrand.visa
+            case "AmericanExpress" : return STPCardBrand.amex
+            case "MasterCard": return STPCardBrand.mastercard
+            case "Discover": return STPCardBrand.discover
+            case "JCB": return STPCardBrand.JCB
+            case "DinersClub": return STPCardBrand.dinersClub
+            case "UnionPay": return STPCardBrand.unionPay
+            case "Unknown": return STPCardBrand.unknown
+            default: return STPCardBrand.unknown
+            }
+        }
+        return STPCardBrand.unknown
+    }
 
     class func mapFromPaymentMethod(_ paymentMethod: STPPaymentMethod?) -> NSDictionary? {
         guard let paymentMethod = paymentMethod else {
             return nil
         }
         let card: NSDictionary = [
-            "brand": Mappers.mapCardBrand(paymentMethod.card?.brand) ?? NSNull(),
+            "brand": Mappers.mapFromCardBrand(paymentMethod.card?.brand) ?? NSNull(),
             "country": paymentMethod.card?.country ?? NSNull(),
             "expYear": paymentMethod.card?.expYear ?? NSNull(),
             "expMonth": paymentMethod.card?.expMonth ?? NSNull(),
@@ -539,9 +613,20 @@ 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),
+            "paymentMethodType": Mappers.mapPaymentMethodType(type: paymentMethod.type),
             "livemode": paymentMethod.liveMode,
             "customerId": paymentMethod.customerId ?? NSNull(),
             "billingDetails": Mappers.mapFromBillingDetails(billingDetails: paymentMethod.billingDetails),
@@ -562,6 +647,7 @@ class Mappers {
             "Upi": [
                 "vpa": paymentMethod.upi?.vpa
             ],
+            "USBankAccount": USBankAccount
         ]
         return method
     }
@@ -619,7 +705,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 +940,51 @@ class Mappers {
         }
         return "Unknown"
     }
+
+    class func mapToPKAddPassButtonStyle(style: String?) -> PKAddPassButtonStyle {
+        if let style = style {
+            if (style == "onDarkBackground") {
+                return .blackOutline
+            }
+        }
+        return .black
+    }
+
+    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

@@ -3,13 +3,15 @@ import Stripe
 
 class PaymentMethodFactory {
     var billingDetailsParams: STPPaymentMethodBillingDetails? = nil
-    var params: NSDictionary? = nil
+    var paymentMethodData: NSDictionary? = nil
+    var paymentMethodOptions: NSDictionary? = nil
     var cardFieldView: CardFieldView? = nil
     var cardFormView: CardFormView? = nil
 
-    init(params: NSDictionary, cardFieldView: CardFieldView?, cardFormView: CardFormView?) {
-        self.billingDetailsParams = Mappers.mapToBillingDetails(billingDetails: params["billingDetails"] as? NSDictionary)
-        self.params = params
+    init(paymentMethodData: NSDictionary?, options: NSDictionary, cardFieldView: CardFieldView?, cardFormView: CardFormView?) {
+        self.paymentMethodData = paymentMethodData
+        self.billingDetailsParams = Mappers.mapToBillingDetails(billingDetails: paymentMethodData?["billingDetails"] as? NSDictionary)
+        self.paymentMethodOptions = options
         self.cardFieldView = cardFieldView
         self.cardFormView = cardFormView
     }
@@ -47,6 +49,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 +96,8 @@ class PaymentMethodFactory {
                 return nil
             case STPPaymentMethodType.weChatPay:
                 return try createWeChatPayPaymentMethodOptions()
+            case STPPaymentMethodType.USBankAccount:
+                return try createUSBankAccountPaymentMethodOptions()
             default:
                 throw PaymentMethodError.paymentNotSupported
             }
@@ -105,8 +111,18 @@ class PaymentMethodFactory {
 //        return STPPaymentMethodParams(weChatPay: params, billingDetails: billingDetailsParams, metadata: nil)
 //    }
 //
+
+    private func createUSBankAccountPaymentMethodOptions() throws -> STPConfirmPaymentMethodOptions {
+        let paymentOptions = STPConfirmPaymentMethodOptions()
+        if let usage = self.paymentMethodOptions?["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 {
+        guard let appId = self.paymentMethodData?["appId"] as? String else {
             throw PaymentMethodError.weChatPayPaymentMissingParams
         }
         let paymentOptions = STPConfirmPaymentMethodOptions()
@@ -117,9 +133,10 @@ class PaymentMethodFactory {
 
     private func createIDEALPaymentMethodParams() throws -> STPPaymentMethodParams {
         let params = STPPaymentMethodiDEALParams()
-        if let bankName = self.params?["bankName"] as? String {
+        if let bankName = self.paymentMethodData?["bankName"] as? String {
             params.bankName = bankName
         }
+        
 
         return STPPaymentMethodParams(iDEAL: params, billingDetails: billingDetailsParams, metadata: nil)
     }
@@ -131,7 +148,7 @@ class PaymentMethodFactory {
     }
 
     private func createCardPaymentMethodParams() throws -> STPPaymentMethodParams {
-        if let token = params?["token"] as? String {
+        if let token = paymentMethodData?["token"] as? String {
             let methodParams = STPPaymentMethodCardParams()
             methodParams.token = RCTConvert.nsString(token)
             return STPPaymentMethodParams(card: methodParams, billingDetails: billingDetailsParams, metadata: nil)
@@ -173,7 +190,7 @@ class PaymentMethodFactory {
 
 
     private func createCardPaymentMethodOptions() -> STPConfirmPaymentMethodOptions? {
-        let cvc = params?["cvc"] as? String
+        let cvc = paymentMethodData?["cvc"] as? String
         guard cvc != nil else {
             return nil
         }
@@ -189,7 +206,7 @@ class PaymentMethodFactory {
     private func createFPXPaymentMethodParams() throws -> STPPaymentMethodParams {
         let params = STPPaymentMethodFPXParams()
 
-        if self.params?["testOfflineBank"] as? Bool == true {
+        if self.paymentMethodData?["testOfflineBank"] as? Bool == true {
             params.rawBankString = "test_offline_bank"
         }
 
@@ -217,7 +234,7 @@ class PaymentMethodFactory {
     }
 
     private func createSofortPaymentMethodParams() throws -> STPPaymentMethodParams {
-        guard let country = self.params?["country"] as? String else {
+        guard let country = self.paymentMethodData?["country"] as? String else {
             throw PaymentMethodError.sofortPaymentMissingParams
         }
         let params = STPPaymentMethodSofortParams()
@@ -242,7 +259,7 @@ class PaymentMethodFactory {
         guard let billingDetails = billingDetailsParams else {
             throw PaymentMethodError.sepaPaymentMissingParams
         }
-        guard let iban = self.params?["iban"] as? String else {
+        guard let iban = self.paymentMethodData?["iban"] as? String else {
             throw PaymentMethodError.sepaPaymentMissingParams
         }
 
@@ -285,7 +302,7 @@ class PaymentMethodFactory {
         let params = STPPaymentMethodAUBECSDebitParams()
 
         let billingDetails = STPPaymentMethodBillingDetails()
-        let formDetails = self.params?["formDetails"] as? NSDictionary
+        let formDetails = self.paymentMethodData?["formDetails"] as? NSDictionary
 
         billingDetails.name = formDetails?["name"] as? String
         billingDetails.email = formDetails?["email"] as? String
@@ -307,13 +324,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.paymentMethodData?["accountNumber"] as? String else {
+            throw PaymentMethodError.usBankAccountPaymentMissingAccountNumber
+        }
+        guard let routingNumber = self.paymentMethodData?["routingNumber"] as? String else {
+            throw PaymentMethodError.usBankAccountPaymentMissingRoutingNumber
+        }
+
+        params.accountNumber = accountNumber
+        params.routingNumber = routingNumber
+        params.accountHolderType = Mappers.mapToUSBankAccountHolderType(type: self.paymentMethodData?["accountHolderType"] as? String)
+        params.accountType = Mappers.mapToUSBankAccountType(type: self.paymentMethodData?["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 +369,9 @@ enum PaymentMethodError: Error {
     case afterpayClearpayPaymentMissingParams
     case klarnaPaymentMissingParams
     case weChatPayPaymentMissingParams
+    case usBankAccountPaymentMissingParams
+    case usBankAccountPaymentMissingAccountNumber
+    case usBankAccountPaymentMissingRoutingNumber
 }
 
 extension PaymentMethodError: LocalizedError {
@@ -361,6 +403,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,24 @@ 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
+                  )
+RCT_EXTERN_METHOD(
+                  isCardInWallet:(NSDictionary *)params
+                  resolver: (RCTPromiseResolveBlock)resolve
+                  rejecter: (RCTPromiseRejectBlock)reject
+                  )
 
 @end