judokit-react-native 3.5.0 → 4.1.0

package/android/src/main/java/com/reactlibrary/Helpers.kt

@@ -16,10 +16,42 @@ import com.judopay.judokit.android.api.model.BasicAuthorization
 import com.judopay.judokit.android.api.model.PaymentSessionAuthorization
 import com.judopay.judokit.android.api.model.request.Address
 import com.judopay.judokit.android.model.*
-import com.judopay.judokit.android.model.googlepay.GooglePayAddressFormat
-import com.judopay.judokit.android.model.googlepay.GooglePayBillingAddressParameters
-import com.judopay.judokit.android.model.googlepay.GooglePayEnvironment
-import com.judopay.judokit.android.model.googlepay.GooglePayShippingAddressParameters
+import com.judopay.judokit.android.model.googlepay.*
+
+// For consistency with:
+// https://github.com/Judopay/JudoKit-iOS/blob/master/Source/Models/Response/JPResponse.m#L36
+private const val TRANSACTION_TYPE_PAYMENT = "payment"
+private const val TRANSACTION_TYPE_PRE_AUTH = "preauth"
+private const val TRANSACTION_TYPE_REGISTER = "register"
+private const val TRANSACTION_TYPE_REGISTER_CARD = "registercard"
+private const val TRANSACTION_TYPE_SAVE_CARD = "save"
+private const val TRANSACTION_TYPE_CHECK_CARD = "checkcard"
+
+// For consistency with:
+// https://github.com/Judopay/JudoKit-iOS/blob/master/Source/Models/Transaction/JPTransactionType.h#L30
+private enum class TransactionType(val value: Int, val typeAsStrings: List<String>? = null) {
+    PAYMENT(1, listOf(TRANSACTION_TYPE_PAYMENT)),
+    PRE_AUTH(2, listOf(TRANSACTION_TYPE_PRE_AUTH)),
+    REGISTER_CARD(3, listOf(TRANSACTION_TYPE_REGISTER, TRANSACTION_TYPE_REGISTER_CARD)),
+    CHECK_CARD(4, listOf(TRANSACTION_TYPE_CHECK_CARD)),
+    SAVE_CARD(5, listOf(TRANSACTION_TYPE_SAVE_CARD)),
+    UNKNOWN(-1)
+}
+
+// For consistency with:
+// https://github.com/Judopay/JudoKit-iOS/blob/master/Source/Models/Response/JPResponse.m#L32
+private const val STATUS_DECLINED = "declined"
+private const val STATUS_SUCCESS = "success"
+private const val STATUS_ERROR = "error"
+
+// For consistency with:
+// https://github.com/Judopay/JudoKit-iOS/blob/abd34bbfe4784fb5f074ed30f93d6743ba295622/Source/Models/Transaction/JPTransactionResult.h#L27
+private enum class TransactionResult(val value: Int, val status: String? = null) {
+    ERROR(0, STATUS_ERROR),
+    SUCCESS(1, STATUS_SUCCESS),
+    DECLINED(2, STATUS_DECLINED),
+    UNKNOWN(-1)
+}
 
 internal fun getTransactionConfiguration(options: ReadableMap): Judo {
     val widgetType = getTransactionTypeWidget(options)
@@ -50,20 +82,19 @@ internal fun getPaymentMethodsConfiguration(options: ReadableMap): Judo {
 }
 
 internal fun getMappedType(type: String?): Int {
-    return when (type) {
-        "PreAuth" -> 1
-        "RegisterCard" -> 2
-        "CheckCard" -> 3
-        "Save" -> 4
-        else -> 0
-    }
+    val typeInLowercase = type?.lowercase()
+    val typeValue = TransactionType.values().firstOrNull { it.typeAsStrings?.contains(typeInLowercase) ?: false }
+
+    return typeValue?.value ?: TransactionType.UNKNOWN.value
 }
 
+// consistent with:
+// https://github.com/Judopay/JudoKit-iOS/blob/master/Source/Models/Response/JPResponse.m#L125
 internal fun getMappedResult(result: String?): Int {
-    return when (result) {
-        "Declined" -> 1
-        else -> 0
-    }
+    val resultInLowercase = result?.lowercase()
+    val resultValue = TransactionResult.values().firstOrNull { it.status == resultInLowercase }
+
+    return resultValue?.value ?: TransactionResult.UNKNOWN.value
 }
 
 internal fun getMappedResult(result: JudoResult?): WritableMap {
@@ -123,6 +154,7 @@ internal fun getJudoConfigurationForApiService(options: ReadableMap): Judo {
         .setAuthorization(authorization)
         .setAmount(amount)
         .setReference(reference)
+        .setSubProductInfo(getSubProductInfo(options))
         .build()
 }
 
@@ -164,6 +196,7 @@ internal fun getJudoConfiguration(type: PaymentWidgetType, options: ReadableMap)
         .setThreeDSTwoMessageVersion(options.threeDSTwoMessageVersion)
         .setPhoneCountryCode(options.phoneCountryCode)
         .setAddress(address)
+        .setSubProductInfo(getSubProductInfo(options))
         .build()
 }
 
@@ -219,11 +252,12 @@ internal fun getAuthorization(options: ReadableMap): Authorization {
 }
 
 internal fun getTransactionTypeWidget(options: ReadableMap) = when (options.getInt("transactionType")) {
-    1 -> PaymentWidgetType.PRE_AUTH
-    2 -> PaymentWidgetType.REGISTER_CARD
-    3 -> PaymentWidgetType.CHECK_CARD
-    4 -> PaymentWidgetType.CREATE_CARD_TOKEN
-    else -> PaymentWidgetType.CARD_PAYMENT
+    1 -> PaymentWidgetType.CARD_PAYMENT
+    2 -> PaymentWidgetType.PRE_AUTH
+    3 -> PaymentWidgetType.REGISTER_CARD
+    4 -> PaymentWidgetType.CHECK_CARD
+    5 -> PaymentWidgetType.CREATE_CARD_TOKEN
+    else -> throw IllegalArgumentException("Unknown transaction type")
 }
 
 internal fun getTransactionModeWidget(options: ReadableMap) = when (options.getInt("transactionMode")) {
@@ -242,6 +276,11 @@ internal fun getAmount(options: ReadableMap): Amount {
         .build()
 }
 
+internal fun getSubProductInfo(options: ReadableMap): SubProductInfo {
+    val version = options.packageVersion ?: ""
+    return SubProductInfo.ReactNative(version)
+}
+
 internal fun getReference(options: ReadableMap): Reference? {
 
     var builder = Reference.Builder()
@@ -482,19 +521,38 @@ internal fun getGooglePayConfiguration(options: ReadableMap): GooglePayConfigura
         0 -> GooglePayEnvironment.TEST
         else -> GooglePayEnvironment.PRODUCTION
     }
+    val totalPriceStatus = when (options.totalPriceStatus) {
+        0 -> GooglePayPriceStatus.FINAL
+        1 -> GooglePayPriceStatus.ESTIMATED
+        2 -> GooglePayPriceStatus.NOT_CURRENTLY_KNOWN
+        else -> null
+    }
+
+    val checkoutOption = when (options.checkoutOption) {
+        0 -> GooglePayCheckoutOption.DEFAULT
+        1 -> GooglePayCheckoutOption.COMPLETE_IMMEDIATE_PURCHASE
+        else -> null
+    }
 
     val billingParameters = getBillingParameters(options)
     val shippingParameters = getShippingParameters(options)
 
     return if (options.googlePayConfiguration != null) {
         GooglePayConfiguration.Builder()
-            .setTransactionCountryCode(options.countryCode)
             .setEnvironment(environment)
+            .setMerchantName(options.merchantName)
+            .setTransactionCountryCode(options.countryCode)
+            .setTransactionId(options.transactionId)
+            .setTotalPriceStatus(totalPriceStatus)
+            .setTotalPriceLabel(options.totalPriceLabel)
+            .setCheckoutOption(checkoutOption)
             .setIsEmailRequired(options.isEmailRequired)
             .setIsBillingAddressRequired(options.isBillingAddressRequired)
             .setBillingAddressParameters(billingParameters)
             .setIsShippingAddressRequired(options.isShippingAddressRequired)
             .setShippingAddressParameters(shippingParameters)
+            .setAllowPrepaidCards(options.allowPrepaidCards)
+            .setAllowCreditCards(options.allowCreditCards)
             .build()
     } else {
         null

package/ios/.xcode.env

@@ -0,0 +1,11 @@
+# This `.xcode.env` file is versioned and is used to source the environment
+# used when running script phases inside Xcode.
+# To customize your local environment, you can create an `.xcode.env.local`
+# file that is not versioned.
+
+# NODE_BINARY variable contains the PATH to the node executable.
+#
+# Customize the NODE_BINARY variable here.
+# For example, to use nvm with brew, add the following line
+# . "$(brew --prefix nvm)/nvm.sh" --no-use
+export NODE_BINARY=$(command -v node)

package/ios/Classes/RNJudo.m

@@ -112,7 +112,7 @@ RCT_REMAP_METHOD(performTokenTransaction,
     
     JPCardTransactionDetails *details = [[JPCardTransactionDetails new] initWithConfiguration:configuration];
     details.cardToken = [RNWrappers cardTokenFromProperties:properties];
-    details.secureCode = [RNWrappers securityCodeFromProperties:properties];
+    details.securityCode = [RNWrappers securityCodeFromProperties:properties];
     details.cardholderName = [RNWrappers cardholderNameFromProperties:properties];
     details.cardType = [RNWrappers cardTypeFromProperties:properties];
     

package/ios/Classes/Wrappers/RNWrappers.m

@@ -44,6 +44,8 @@ static NSString *const kCardSchemeAMEX = @"amex";
     id<JPAuthorization> authorization = [RNWrappers authorizationFromProperties:properties];
     JudoKit *judoKit = [[JudoKit alloc] initWithAuthorization:authorization];
     judoKit.isSandboxed = [RNWrappers isSandboxedFromProperties:properties];
+    judoKit.subProductInfo = [RNWrappers subProductInfoFromProperties:properties];
+
     return judoKit;
 }
 
@@ -73,6 +75,11 @@ static NSString *const kCardSchemeAMEX = @"amex";
     return isSandboxed.boolValue;
 }
 
++ (JPSubProductInfo *)subProductInfoFromProperties:(NSDictionary *)properties {
+    NSString *version = [properties optionalStringForKey:@"packageVersion"];;
+    return [[JPSubProductInfo alloc] initWithSubProductType:JPSubProductTypeReactNative andVersion:version];
+}
+
 + (JPCardTransactionService *)cardTransactionServiceFromProperties:(NSDictionary *)properties {
     BOOL isSandboxed = [RNWrappers isSandboxedFromProperties:properties];
     id<JPAuthorization> authorization = [RNWrappers authorizationFromProperties:properties];
@@ -86,15 +93,20 @@ static NSString *const kCardSchemeAMEX = @"amex";
 + (JPTransactionType)transactionTypeFromProperties:(NSDictionary *)properties {
     int type = [properties numberForKey:@"transactionType"].intValue;
 
-    NSArray<NSNumber *> *availableTypes = @[
-        @(JPTransactionTypePayment),
-        @(JPTransactionTypePreAuth),
-        @(JPTransactionTypeRegisterCard),
-        @(JPTransactionTypeCheckCard),
-        @(JPTransactionTypeSaveCard)
-    ];
-
-    return availableTypes[type].intValue;
+    switch (type) {
+        case 1:
+            return JPTransactionTypePayment;
+        case 2:
+            return JPTransactionTypePreAuth;
+        case 3:
+            return JPTransactionTypeRegisterCard;
+        case 4:
+            return JPTransactionTypeCheckCard;
+        case 5:
+            return JPTransactionTypeSaveCard;
+        default:
+            return JPTransactionTypeUnknown;
+    }
 }
 
 + (JPTransactionMode)transactionModeFromProperties:(NSDictionary *)properties {
@@ -745,35 +757,12 @@ static NSString *const kCardSchemeAMEX = @"amex";
 + (NSDictionary *)dictionaryFromResponse:(JPResponse *)response {
 
     NSMutableDictionary *mappedResponse = [NSMutableDictionary new];
-
-    // TODO: remove this ASAP when this https://github.com/Judopay/JudoKit-ReactNative/pull/138
-    // will go to master (mimics the android wrapper behaviour: https://github.com/Judopay/JudoKit-ReactNative/blob/master/android/src/main/java/com/reactlibrary/Helpers.kt#L57)
-    NSNumber *result = @0;
-    if (response.result == JPTransactionResultDeclined) {
-        result = @1;
-    }
-    
-    NSNumber *type = @0;
-
-    switch (response.type) {
-        case JPTransactionTypePreAuth:
-            type = @1;
-            break;
-        case JPTransactionTypeCheckCard:
-            type = @3;
-            break;
-        case JPTransactionTypeSaveCard:
-            type = @4;
-            break;
-        default:
-            break;
-    }
     
     [mappedResponse setValue:response.receiptId forKey:@"receiptId"];
     [mappedResponse setValue:response.paymentReference forKey:@"yourPaymentReference"];
-    [mappedResponse setValue:type forKey:@"type"];
+    [mappedResponse setValue:@(response.type) forKey:@"type"];
     [mappedResponse setValue:response.createdAt forKey:@"createdAt"];
-    [mappedResponse setValue:result forKey:@"result"];
+    [mappedResponse setValue:@(response.result) forKey:@"result"];
     [mappedResponse setValue:response.message forKey:@"message"];
     [mappedResponse setValue:response.judoId forKey:@"judoId"];
     [mappedResponse setValue:response.merchantName forKey:@"merchantName"];

package/ios/Podfile

@@ -1,74 +1,44 @@
+require_relative '../node_modules/react-native/scripts/react_native_pods'
 require_relative '../node_modules/@react-native-community/cli-platform-ios/native_modules'
-platform :ios, '11.0'
 
-pre_install do |installer|
-  puts("Image fix for ios14: remove this when upgradeing to >= 0.63.3")
-  find = "_currentFrame.CGImage;"
-  replace = "_currentFrame.CGImage ;} else { [super displayLayer:layer];"
-  op = `sed -ie "s/#{find}/#{replace}/" ../node_modules/react-native/Libraries/Image/RCTUIImageViewAnimated.m`
-  puts("Image fix for ios14 done")
+platform :ios, '12.4'
+install! 'cocoapods', :deterministic_uuids => false
 
-  ## Fix for XCode 12.5
-  find_and_replace("../node_modules/react-native/React/CxxBridge/RCTCxxBridge.mm",
-  "_initializeModules:(NSArray<id<RCTBridgeModule>> *)modules", "_initializeModules:(NSArray<Class> *)modules")
-  find_and_replace("../node_modules/react-native/ReactCommon/turbomodule/core/platform/ios/RCTTurboModuleManager.mm",
-  "RCTBridgeModuleNameForClass(module))", "RCTBridgeModuleNameForClass(Class(module)))")
-end
+production = ENV["PRODUCTION"] == "1"
 
 target 'RNJudo' do
-  # use_frameworks!
+  config = use_native_modules!
+
+  # Flags change depending on the env values.
+  flags = get_default_flags()
+
+  use_react_native!(
+    :path => config[:reactNativePath],
+    # to enable hermes on iOS, change `false` to `true` and then install pods
+    :production => production,
+    :hermes_enabled => flags[:hermes_enabled],
+    :fabric_enabled => flags[:fabric_enabled],
+    :flipper_configuration => FlipperConfiguration.enabled,
+    # An absolute path to your application root.
+    :app_path => "#{Pod::Config.instance.installation_root}/.."
+  )
 
   # Pods for RNJudo
-  pod "JudoKit-iOS", "3.1.10"
-  pod "Judo3DS2_iOS", "1.1.3"
-
-  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"
-  pod 'RCTTypeSafety', :path => "../node_modules/react-native/Libraries/TypeSafety"
-  pod 'React', :path => '../node_modules/react-native/'
-  pod 'React-Core', :path => '../node_modules/react-native/'
-  pod 'React-CoreModules', :path => '../node_modules/react-native/React/CoreModules'
-  pod 'React-Core/DevSupport', :path => '../node_modules/react-native/'
-  pod 'React-RCTActionSheet', :path => '../node_modules/react-native/Libraries/ActionSheetIOS'
-  pod 'React-RCTAnimation', :path => '../node_modules/react-native/Libraries/NativeAnimation'
-  pod 'React-RCTBlob', :path => '../node_modules/react-native/Libraries/Blob'
-  pod 'React-RCTImage', :path => '../node_modules/react-native/Libraries/Image'
-  pod 'React-RCTLinking', :path => '../node_modules/react-native/Libraries/LinkingIOS'
-  pod 'React-RCTNetwork', :path => '../node_modules/react-native/Libraries/Network'
-  pod 'React-RCTSettings', :path => '../node_modules/react-native/Libraries/Settings'
-  pod 'React-RCTText', :path => '../node_modules/react-native/Libraries/Text'
-  pod 'React-RCTVibration', :path => '../node_modules/react-native/Libraries/Vibration'
-  pod 'React-Core/RCTWebSocket', :path => '../node_modules/react-native/'
-
-  pod 'React-cxxreact', :path => '../node_modules/react-native/ReactCommon/cxxreact'
-  pod 'React-jsi', :path => '../node_modules/react-native/ReactCommon/jsi'
-  pod 'React-jsiexecutor', :path => '../node_modules/react-native/ReactCommon/jsiexecutor'
-  pod 'React-jsinspector', :path => '../node_modules/react-native/ReactCommon/jsinspector'
-  pod 'ReactCommon/jscallinvoker', :path => "../node_modules/react-native/ReactCommon"
-  pod 'ReactCommon/turbomodule/core', :path => "../node_modules/react-native/ReactCommon"
-  pod 'Yoga', :path => '../node_modules/react-native/ReactCommon/yoga'
-  pod 'DoubleConversion', :podspec => '../node_modules/react-native/third-party-podspecs/DoubleConversion.podspec'
-  pod 'glog', :podspec => '../node_modules/react-native/third-party-podspecs/glog.podspec'
-  pod 'Folly', :podspec => '../node_modules/react-native/third-party-podspecs/Folly.podspec'
+  pod "JudoKit-iOS", "3.2.2"
 
   target 'RNJudoTests' do
+    inherit! :complete
+    requires_app_host = true
     # Pods for testing
   end
 
-  use_native_modules!
-end
+  post_install do |installer|
+    react_native_post_install(installer)
+    __apply_Xcode_12_5_M1_post_install_workaround(installer)
 
-## Fix for XCode 12.5
-def find_and_replace(dir, findstr, replacestr)
-  Dir[dir].each do |name|
-    text = File.read(name)
-    replace = text.gsub(findstr,replacestr)
-    if text != replace
-      puts "Fix: " + name
-      File.open(name, "w") { |file| file.puts replace }
-      STDOUT.flush
+    installer.pods_project.build_configurations.each do |config|
+      # https://khushwanttanwar.medium.com/xcode-12-compilation-errors-while-running-with-ios-14-simulators-5731c91326e9
+      config.build_settings["EXCLUDED_ARCHS[sdk=iphonesimulator*]"] = "arm64"
     end
   end
-  Dir[dir + '*/'].each(&method(:find_and_replace))
 end