judokit-react-native 3.3.7 → 3.4.0

package/ios/Classes/Wrappers/RNWrappers.m

@@ -29,6 +29,10 @@
 #import "NSDictionary+JudoConvert.h"
 #import "UIColor+RNAdditions.h"
 
+static NSString *const kCardSchemeVISA = @"visa";
+static NSString *const kCardSchemeMasterCard = @"mastercard";
+static NSString *const kCardSchemeAMEX = @"amex";
+
 @implementation RNWrappers
 
 //---------------------------------------------------
@@ -36,50 +40,46 @@
 //---------------------------------------------------
 
 + (JudoKit *)judoSessionFromProperties:(NSDictionary *)properties {
-
-    NSDictionary *authorizationDict = [properties dictionaryForKey:@"authorization"];
-
-    NSString *token = [authorizationDict stringForKey:@"token"];
-    NSString *secret = [authorizationDict optionalStringForKey:@"secret"];
-    NSString *paymentSession = [authorizationDict optionalStringForKey:@"paymentSession"];
-
-    JudoKit *judoKit;
-
-    if (secret) {
-        JPBasicAuthorization *authorization = [JPBasicAuthorization authorizationWithToken:token
-                                                                                 andSecret:secret];
-        judoKit = [[JudoKit alloc] initWithAuthorization:authorization];
-    } else {
-        JPSessionAuthorization *authorization = [JPSessionAuthorization authorizationWithToken:token
-                                                                             andPaymentSession:paymentSession];
-        judoKit = [[JudoKit alloc] initWithAuthorization:authorization];
-    }
-
-    NSNumber *isSandboxed = [properties boolForKey:@"sandboxed"];
-    judoKit.isSandboxed = isSandboxed.boolValue;
-
+    id<JPAuthorization> authorization = [RNWrappers authorizationFromProperties:properties];
+    JudoKit *judoKit = [[JudoKit alloc] initWithAuthorization:authorization];
+    judoKit.isSandboxed = [RNWrappers isSandboxedFromProperties:properties];
     return judoKit;
 }
 
 + (JPApiService *)apiServiceFromProperties:(NSDictionary *)properties {
+    BOOL isSandboxed = [RNWrappers isSandboxedFromProperties:properties];
+    id<JPAuthorization> authorization = [RNWrappers authorizationFromProperties:properties];
+
+    return [[JPApiService alloc] initWithAuthorization:authorization isSandboxed:isSandboxed];
+}
 
++ (id<JPAuthorization>)authorizationFromProperties:(NSDictionary *)properties {
     NSDictionary *authorizationDict = [properties dictionaryForKey:@"authorization"];
 
     NSString *token = [authorizationDict stringForKey:@"token"];
     NSString *secret = [authorizationDict optionalStringForKey:@"secret"];
     NSString *paymentSession = [authorizationDict optionalStringForKey:@"paymentSession"];
+    
+    if (secret) {
+        return [JPBasicAuthorization authorizationWithToken:token andSecret:secret];
+    }
 
+    return [JPSessionAuthorization authorizationWithToken:token andPaymentSession:paymentSession];
+}
+
++ (BOOL)isSandboxedFromProperties:(NSDictionary *)properties {
     NSNumber *isSandboxed = [properties boolForKey:@"sandboxed"];
+    return isSandboxed.boolValue;
+}
 
-    if (secret) {
-        JPBasicAuthorization *authorization = [JPBasicAuthorization authorizationWithToken:token
-                                                                                 andSecret:secret];
-        return [[JPApiService alloc] initWithAuthorization:authorization isSandboxed:isSandboxed.boolValue];
-    }
++ (JPCardTransactionService *)cardTransactionServiceFromProperties:(NSDictionary *)properties {
+    BOOL isSandboxed = [RNWrappers isSandboxedFromProperties:properties];
+    id<JPAuthorization> authorization = [RNWrappers authorizationFromProperties:properties];
+    JPConfiguration *configuration = [RNWrappers configurationFromProperties:properties];
 
-    JPSessionAuthorization *authorization = [JPSessionAuthorization authorizationWithToken:token
-                                                                         andPaymentSession:paymentSession];
-    return [[JPApiService alloc] initWithAuthorization:authorization isSandboxed:isSandboxed.boolValue];
+    return [[JPCardTransactionService alloc] initWithAuthorization:authorization
+                                                       isSandboxed:isSandboxed
+                                                  andConfiguration:configuration];
 }
 
 + (JPTransactionType)transactionTypeFromProperties:(NSDictionary *)properties {
@@ -107,6 +107,22 @@
     return availableModes[intType].intValue;
 }
 
++ (JPNetworkTimeout *)networkTimeoutFromProperties:(NSDictionary *)properties {
+    NSDictionary *networkTimeout = [properties optionalDictionaryForKey:@"networkTimeout"];
+
+    if (!networkTimeout) {
+        return nil;
+    }
+
+    NSTimeInterval connectTimeout = [networkTimeout numberForKey:@"connectTimeout"].doubleValue;
+    NSTimeInterval readTimeout = [networkTimeout numberForKey:@"readTimeout"].doubleValue;
+    NSTimeInterval writeTimeout = [networkTimeout numberForKey:@"writeTimeout"].doubleValue;
+
+    return [[JPNetworkTimeout alloc] initWithConnectTimeout:connectTimeout
+                                             andReadTimeout:readTimeout
+                                            andWriteTimeout:writeTimeout];
+}
+
 + (JPConfiguration *)configurationFromProperties:(NSDictionary *)properties {
 
     NSDictionary *configurationDict = [properties dictionaryForKey:@"configuration"];
@@ -129,7 +145,36 @@
     configuration.paymentMethods = [RNWrappers paymentMethodsFromConfiguration:configurationDict];
     configuration.applePayConfiguration = [RNApplePayWrappers applePayConfigurationFromConfiguration:configurationDict];
     configuration.pbbaConfiguration = [RNPBBAWrappers pbbaConfigurationFromConfiguration:configurationDict];
+    configuration.networkTimeout = [RNWrappers networkTimeoutFromProperties:configurationDict];
+        
+    NSString *scaExemption = [configurationDict optionalStringForKey:@"scaExemption"];
+    NSString *challengeRequestIndicator = [configurationDict optionalStringForKey:@"challengeRequestIndicator"];
+    NSString *mobileNumber = [configurationDict optionalStringForKey:@"mobileNumber"];
+    NSString *emailAddress = [configurationDict optionalStringForKey:@"emailAddress"];
+    NSString *threeDSTwoMessageVersion = [configurationDict optionalStringForKey:@"threeDSTwoMessageVersion"];
+    NSNumber *threeDSTwoMaxTimeout = [configurationDict optionalNumberForKey:@"threeDSTwoMaxTimeout"];
+    NSString *phoneCountryCode = [configurationDict optionalStringForKey:@"phoneCountryCode"];
+
+    configuration.mobileNumber = mobileNumber;
+    configuration.emailAddress = emailAddress;
+    configuration.phoneCountryCode = phoneCountryCode;
+
+    if (scaExemption) {
+        configuration.scaExemption = scaExemption;
+    }
+
+    if (challengeRequestIndicator) {
+        configuration.challengeRequestIndicator = challengeRequestIndicator;
+    }
+    
+    if (threeDSTwoMessageVersion) {
+        configuration.threeDSTwoMessageVersion = threeDSTwoMessageVersion;
+    }
 
+    if (threeDSTwoMaxTimeout) {
+        configuration.threeDSTwoMaxTimeout = threeDSTwoMaxTimeout.intValue;
+    }
+    
     return configuration;
 }
 
@@ -186,10 +231,36 @@
     return [properties optionalStringForKey:@"cardToken"];
 }
 
++ (NSString *)securityCodeFromProperties:(NSDictionary *)properties {
+    return [properties optionalStringForKey:@"securityCode"];
+}
+
++ (NSString *)cardholderNameFromProperties:(NSDictionary *)properties {
+    return [properties optionalStringForKey:@"cardholderName"];
+}
+
 + (NSString *)receiptIdFromProperties:(NSDictionary *)properties {
     return [properties optionalStringForKey:@"receiptId"];
 }
 
++ (JPCardNetworkType)cardTypeFromProperties:(NSDictionary *)properties {
+    NSString *cardScheme = [properties optionalStringForKey:@"cardScheme"].lowercaseString;
+    
+    if ([kCardSchemeVISA isEqualToString:cardScheme]) {
+        return JPCardNetworkTypeVisa;
+    }
+    
+    if ([kCardSchemeMasterCard isEqualToString:cardScheme]) {
+        return JPCardNetworkTypeMasterCard;
+    }
+    
+    if ([kCardSchemeAMEX isEqualToString:cardScheme]) {
+        return JPCardNetworkTypeAMEX;
+    }
+    
+    return JPCardNetworkTypeUnknown;
+}
+
 //---------------------------------------------------
 // MARK: - Helper methods
 //---------------------------------------------------
@@ -251,13 +322,14 @@
     if (!addressDictionary) {
         return nil;
     }
-
-    return [[JPAddress alloc] initWithLine1:[addressDictionary optionalStringForKey:@"line1"]
-                                      line2:[addressDictionary optionalStringForKey:@"line2"]
-                                      line3:[addressDictionary optionalStringForKey:@"line3"]
-                                       town:[addressDictionary optionalStringForKey:@"town"]
-                                countryCode:[addressDictionary optionalNumberForKey:@"countryCode"]
-                                   postCode:[addressDictionary optionalStringForKey:@"postCode"]];
+    
+    return [[JPAddress alloc] initWithAddress1:[addressDictionary optionalStringForKey:@"line1"]
+                                      address2:[addressDictionary optionalStringForKey:@"line2"]
+                                      address3:[addressDictionary optionalStringForKey:@"line3"]
+                                          town:[addressDictionary optionalStringForKey:@"town"]
+                                billingCountry:[addressDictionary optionalStringForKey:@"billingCountry"]
+                                      postCode:[addressDictionary optionalStringForKey:@"postCode"]
+                                   countryCode:[addressDictionary optionalNumberForKey:@"countryCode"]];
 }
 
 + (JPUIConfiguration *)uiConfigurationFromConfiguration:(NSDictionary *)configuration {
@@ -274,12 +346,17 @@
     NSNumber *shouldDisplayAmount = [dictionary boolForKey:@"shouldPaymentMethodsDisplayAmount"];
     NSNumber *isPayButtonAmountVisible = [dictionary boolForKey:@"shouldPaymentButtonDisplayAmount"];
     NSNumber *isSecureCodeCheckEnabled = [dictionary boolForKey:@"shouldPaymentMethodsVerifySecurityCode"];
-
+    NSNumber *shouldAskForBillingInformation = [dictionary optionalBoolForKey:@"shouldAskForBillingInformation"];
+    
     uiConfiguration.isAVSEnabled = isAVSEnabled.boolValue;
     uiConfiguration.shouldPaymentMethodsDisplayAmount = shouldDisplayAmount.boolValue;
     uiConfiguration.shouldPaymentButtonDisplayAmount = isPayButtonAmountVisible.boolValue;
     uiConfiguration.shouldPaymentMethodsVerifySecurityCode = isSecureCodeCheckEnabled.boolValue;
-
+    
+    if (shouldAskForBillingInformation) {
+        uiConfiguration.shouldAskForBillingInformation = shouldAskForBillingInformation.boolValue;
+    }
+    
     uiConfiguration.theme = [self themeFromUIConfiguration:dictionary];
 
     return uiConfiguration;

package/ios/Podfile

@@ -16,10 +16,10 @@ pre_install do |installer|
 end
 
 target 'RNJudo' do
-  use_frameworks!
+  # use_frameworks!
 
   # Pods for RNJudo
-  pod "JudoKit-iOS", "2.4.6"
+  pod "JudoKit-iOS", "3.0.2"
   pod 'FBLazyVector', :path => "../node_modules/react-native/Libraries/FBLazyVector"
   pod 'FBReactNativeSpec', :path => "../node_modules/react-native/Libraries/FBReactNativeSpec"
   pod 'RCTRequired', :path => "../node_modules/react-native/Libraries/RCTRequired"

package/ios/Podfile.lock

@@ -1,6 +1,7 @@
 PODS:
   - boost-for-react-native (1.63.0)
-  - DeviceDNA (1.1.3)
+  - DeviceDNA (2.0.0):
+    - OpenSSL-Universal (~> 1.1.180)
   - DoubleConversion (1.1.6)
   - FBLazyVector (0.61.5)
   - FBReactNativeSpec (0.61.5):
@@ -20,10 +21,13 @@ PODS:
     - DoubleConversion
     - glog
   - glog (0.3.5)
-  - JudoKit-iOS (2.4.1):
-    - DeviceDNA
+  - Judo3DS2_iOS (1.0.1)
+  - JudoKit-iOS (3.0.2):
+    - DeviceDNA (~> 2.0.0)
+    - Judo3DS2_iOS (~> 1.0.1)
     - TrustKit
     - ZappMerchantLib
+  - OpenSSL-Universal (1.1.1700)
   - RCTRequired (0.61.5)
   - RCTTypeSafety (0.61.5):
     - FBLazyVector (= 0.61.5)
@@ -232,7 +236,7 @@ DEPENDENCIES:
   - FBReactNativeSpec (from `../node_modules/react-native/Libraries/FBReactNativeSpec`)
   - Folly (from `../node_modules/react-native/third-party-podspecs/Folly.podspec`)
   - glog (from `../node_modules/react-native/third-party-podspecs/glog.podspec`)
-  - JudoKit-iOS (= 2.4.1)
+  - JudoKit-iOS (= 3.0.2)
   - RCTRequired (from `../node_modules/react-native/Libraries/RCTRequired`)
   - RCTTypeSafety (from `../node_modules/react-native/Libraries/TypeSafety`)
   - React (from `../node_modules/react-native/`)
@@ -261,7 +265,9 @@ SPEC REPOS:
   trunk:
     - boost-for-react-native
     - DeviceDNA
+    - Judo3DS2_iOS
     - JudoKit-iOS
+    - OpenSSL-Universal
     - TrustKit
     - ZappMerchantLib
 
@@ -319,13 +325,15 @@ EXTERNAL SOURCES:
 
 SPEC CHECKSUMS:
   boost-for-react-native: 39c7adb57c4e60d6c5479dd8623128eb5b3f0f2c
-  DeviceDNA: c3d7ba1669cebf7965407e7022769e5a5eda8c35
+  DeviceDNA: 9ff289d1fb983937754b324fa0adade2081210c4
   DoubleConversion: 5805e889d232975c086db112ece9ed034df7a0b2
   FBLazyVector: aaeaf388755e4f29cd74acbc9e3b8da6d807c37f
   FBReactNativeSpec: 118d0d177724c2d67f08a59136eb29ef5943ec75
   Folly: 30e7936e1c45c08d884aa59369ed951a8e68cf51
   glog: 1f3da668190260b06b429bb211bfbee5cd790c28
-  JudoKit-iOS: 434ac818c35ce0fbc7bdd00b93516295d668b496
+  Judo3DS2_iOS: c1ccf49ecacddb4559a73fb7eae6e680e2355b21
+  JudoKit-iOS: 4a96c63d4cfb45bb1a68a1891b2ebaeaa8a46be1
+  OpenSSL-Universal: ee0a7a25f2042782e2df405e66db3e429198e392
   RCTRequired: b153add4da6e7dbc44aebf93f3cf4fcae392ddf1
   RCTTypeSafety: 9aa1b91d7f9310fc6eadc3cf95126ffe818af320
   React: b6a59ef847b2b40bb6e0180a97d0ca716969ac78
@@ -349,6 +357,6 @@ SPEC CHECKSUMS:
   Yoga: f2a7cd4280bfe2cca5a7aed98ba0eb3d1310f18b
   ZappMerchantLib: b14bc5814840426d351190309250347ca9b0983d
 
-PODFILE CHECKSUM: 526e525b881d62f956cd5e564abc0967fde91796
+PODFILE CHECKSUM: bd8176c4a34cb7668ac5120fb4a4145962a52c2c
 
-COCOAPODS: 1.10.1
+COCOAPODS: 1.11.3