judokit-react-native 3.3.7 → 3.4.0

package/JudoPay.tsx

@@ -144,20 +144,30 @@ class JudoPay {
      *
      * @param mode - a JudoTransactionMode value that defines if the transaction is either a payment or pre-auth.
      * @param configuration - a JudoConfiguration object that is used to configure/customize the payment flow.
-     * @param token - the saved card token string.
+     * @param cardToken - the saved card token string.
+     * @param securityCode - the saved card token security code.
+     * @param cardholderName - the saved card token cardholder name.
+     * @param cardScheme - the saved card token scheme name.
      *
      * @returns an asynchronous JudoResponse object, containing the transaction results.
      */
     public async performTokenTransaction(
         mode: JudoTransactionMode,
         configuration: JudoConfiguration,
-        token: string
+        cardToken: string,
+        securityCode: string,
+        cardholderName: string,
+        cardScheme: string
     ): Promise<JudoResponse> {
         const params = this.generateTransactionModeParameters(
             mode,
             configuration
         )
-        params['cardToken'] = token
+        params['cardToken'] = cardToken
+        params['securityCode'] = securityCode
+        params['cardholderName'] = cardholderName
+        params['cardScheme'] = cardScheme
+
         return NativeModules.RNJudo.performTokenTransaction(params)
     }
 

package/README.md

@@ -60,9 +60,9 @@ JudoPay's React Native module and sample app. This module is a wrapper around th
     allprojects {
         repositories {
             mavenLocal()
+
+            mavenCentral()
             google()
-            jcenter()
-            maven { url 'https://jitpack.io' }
             maven {
                 // All of React Native (JS, Obj-C sources, Android binaries) is installed from npm
                 url("$rootDir/../node_modules/react-native/android")

package/RNJudopay.podspec

@@ -15,7 +15,7 @@ Pod::Spec.new do |s|
   s.source_files = "ios/Classes/**/*.{h,m}"
   s.requires_arc = true
   s.dependency "React"
-  s.dependency "JudoKit-iOS", "2.4.6"
+  s.dependency "JudoKit-iOS", "3.0.2"
 
   s.test_spec 'RNJudoTests' do |test_spec|
     test_spec.source_files = 'ios/RNJudoTests/**/*.{h,m}'

package/android/build.gradle

@@ -7,37 +7,32 @@ apply plugin: 'de.mannodermaus.android-junit5'
 
 import groovy.json.JsonSlurper
 
-def DEFAULT_COMPILE_SDK_VERSION = 29
-def DEFAULT_BUILD_TOOLS_VERSION = "29.0.3"
+def DEFAULT_COMPILE_SDK_VERSION = 31
+def DEFAULT_BUILD_TOOLS_VERSION = "30.0.3"
 def DEFAULT_MIN_SDK_VERSION = 19
-def DEFAULT_TARGET_SDK_VERSION = 29
+def DEFAULT_TARGET_SDK_VERSION = 31
 
 def safeExtGet(prop, fallback) {
     rootProject.ext.has(prop) ? rootProject.ext.get(prop) : fallback
 }
 
 buildscript {
-    ext.kotlin_version = '1.3.72'
+    ext.kotlin_version = '1.6.10'
     ext.junit5_version = '5.7.0'
 
     repositories {
+        maven { url 'https://plugins.gradle.org/m2/' }
+
+        mavenCentral()
         google()
-        jcenter()
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.5.2'
+        classpath 'com.android.tools.build:gradle:3.5.4'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath "org.jetbrains.kotlin:kotlin-android-extensions:$kotlin_version"
-        classpath 'de.mannodermaus.gradle.plugins:android-junit5:1.7.0.0'
-    }
-
-    allprojects {
-        repositories {
-            maven { url "http://pay.cards/maven" }
-        }
+        classpath 'de.mannodermaus.gradle.plugins:android-junit5:1.7.1.1'
     }
-
 }
 
 android {
@@ -86,9 +81,12 @@ android {
 }
 
 repositories {
+    mavenLocal()
+
     mavenCentral()
     google()
-    jcenter()
+
+    maven { url 'https://vocalinkzapp.jfrog.io/artifactory/merchant-library-maven/' }
 
     maven { url "$projectDir/../node_modules/react-native/android" }
 }
@@ -96,14 +94,14 @@ repositories {
 dependencies {
     //noinspection GradleDynamicVersion
     implementation 'com.facebook.react:react-native:+'
-    implementation 'androidx.appcompat:appcompat:1.1.0'
-    implementation 'androidx.appcompat:appcompat-resources:1.1.0'
+    implementation 'androidx.appcompat:appcompat:1.4.1'
+    implementation 'androidx.appcompat:appcompat-resources:1.4.1'
     implementation 'com.google.android.gms:play-services-wallet:18.0.0'
-    implementation 'androidx.core:core-ktx:1.3.0'
+    implementation 'androidx.core:core-ktx:1.7.0'
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-    implementation 'androidx.localbroadcastmanager:localbroadcastmanager:1.0.0'
+    implementation 'androidx.localbroadcastmanager:localbroadcastmanager:1.1.0'
 
-    implementation 'com.judopay:judokit-android:2.1.5'
+    implementation 'com.judopay:judokit-android:3.0.3'
 
     //JUnit 5
     testImplementation "org.junit.jupiter:junit-jupiter-api:$junit5_version"
@@ -111,7 +109,7 @@ dependencies {
     testImplementation "org.junit.jupiter:junit-jupiter-params:$junit5_version"
     testRuntimeOnly "org.junit.vintage:junit-vintage-engine:$junit5_version"
 
-    testImplementation 'androidx.test:core:1.2.0'
+    testImplementation 'androidx.test:core:1.4.0'
     testImplementation 'io.mockk:mockk:1.10.0'
     testImplementation 'android.arch.core:core-testing:1.1.1'
 }
@@ -174,8 +172,8 @@ afterEvaluate { project ->
 
     android.libraryVariants.all { variant ->
         def name = variant.name.capitalize()
-        task "jar${name}"(type: Jar, dependsOn: variant.javaCompile) {
-            from variant.javaCompile.destinationDir
+        task "jar${name}"(type: Jar, dependsOn: variant.javaCompileProvider.get()) {
+            from variant.javaCompileProvider.get().destinationDir
         }
     }
 

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

@@ -7,6 +7,18 @@ import com.facebook.react.bridge.ReadableMap
 import com.judopay.judokit.android.JUDO_OPTIONS
 import com.judopay.judokit.android.Judo
 import com.judopay.judokit.android.JudoActivity
+import com.judopay.judokit.android.model.CardNetwork
+
+const val CARD_SCHEME_VISA = "visa"
+const val CARD_SCHEME_MASTERCARD = "mastercard"
+const val CARD_SCHEME_AMEX = "amex"
+
+internal fun ReadableMap?.hasKey(key: String): Boolean {
+    if (this != null) {
+        return this.hasKey(key)
+    }
+    return false
+}
 
 internal val ReadableMap.configuration: ReadableMap?
     get() = getMap("configuration")
@@ -31,6 +43,30 @@ internal val ReadableMap.securityCode: String?
         return null
     }
 
+internal val ReadableMap.cardholderName: String?
+    get() {
+        if (hasKey("cardholderName")) {
+            return getString("cardholderName")
+        }
+        return null
+    }
+
+internal val ReadableMap.cardType: CardNetwork
+    get() {
+        val cardScheme = if (hasKey("cardScheme")) {
+            getString("cardScheme") ?: ""
+        } else {
+            ""
+        }
+
+        return when (cardScheme.lowercase()) {
+            CARD_SCHEME_VISA -> CardNetwork.VISA
+            CARD_SCHEME_MASTERCARD -> CardNetwork.MASTERCARD
+            CARD_SCHEME_AMEX -> CardNetwork.AMEX
+            else -> CardNetwork.OTHER
+        }
+    }
+
 internal val ReadableMap.judoId: String?
     get() = configuration?.getString("judoId")
 
@@ -64,10 +100,153 @@ internal val ReadableMap.paymentReference: String?
 internal val ReadableMap.isInitialRecurringPayment: Boolean?
     get() = configuration?.getBoolean("isInitialRecurringPayment")
 
+internal val ReadableMap.networkTimeout: ReadableMap?
+    get() {
+        if (configuration.hasKey("networkTimeout")) {
+            return configuration?.getMap("networkTimeout")
+        }
+        return null
+    }
+
+internal val ReadableMap.cardAddress: ReadableMap?
+    get() {
+        if (configuration.hasKey("cardAddress")) {
+            return configuration?.getMap("cardAddress")
+        }
+        return null
+    }
+
+internal val ReadableMap.cardAddressLine1: String?
+get() {
+    if (cardAddress.hasKey("line1")) {
+        return cardAddress?.getString("line1")
+    }
+
+    return null
+}
+
+internal val ReadableMap.cardAddressLine2: String?
+    get() {
+        if (cardAddress.hasKey("line2")) {
+            return cardAddress?.getString("line2")
+        }
+
+        return null
+    }
+
+internal val ReadableMap.cardAddressLine3: String?
+    get() {
+        if (cardAddress.hasKey("line3")) {
+            return cardAddress?.getString("line3")
+        }
+
+        return null
+    }
+
+internal val ReadableMap.cardAddressPostCode: String?
+    get() {
+        if (cardAddress.hasKey("postCode")) {
+            return cardAddress?.getString("postCode")
+        }
+
+        return null
+    }
+
+internal val ReadableMap.cardAddressTown: String?
+    get() {
+        if (cardAddress.hasKey("town")) {
+            return cardAddress?.getString("town")
+        }
+
+        return null
+    }
+
+internal val ReadableMap.cardAddressCountryCode: Int?
+    get() {
+        if (cardAddress.hasKey("countryCode")) {
+            return cardAddress?.getString("countryCode")?.toInt()
+        }
+
+        return null
+    }
+
+internal val ReadableMap.cardAddressBillingCountry: String?
+    get() {
+        if (cardAddress.hasKey("billingCountry")) {
+            return cardAddress?.getString("billingCountry")
+        }
+
+        return null
+    }
+
+internal val ReadableMap.networkConnectTimeout: Long?
+    get() = networkTimeout?.getDouble("connectTimeout")?.toLong()
+
+internal val ReadableMap.networkReadTimeout: Long?
+    get() = networkTimeout?.getDouble("readTimeout")?.toLong()
+
+internal val ReadableMap.networkWriteTimeout: Long?
+    get() = networkTimeout?.getDouble("writeTimeout")?.toLong()
+
+internal val ReadableMap.challengeRequestIndicator: String?
+    get() {
+        if (configuration.hasKey("challengeRequestIndicator")) {
+            return configuration?.getString("challengeRequestIndicator")
+        }
+        return null
+    }
+
+internal val ReadableMap.scaExemption: String?
+    get() {
+        if (configuration.hasKey("scaExemption")) {
+            return configuration?.getString("scaExemption")
+        }
+        return null
+    }
+
+internal val ReadableMap.mobileNumber: String?
+    get() {
+        if (configuration.hasKey("mobileNumber")) {
+            return configuration?.getString("mobileNumber")
+        }
+        return null
+    }
+
+internal val ReadableMap.phoneCountryCode: String?
+    get() {
+        if (configuration.hasKey("phoneCountryCode")) {
+            return configuration?.getString("phoneCountryCode")
+        }
+        return null
+    }
+
+internal val ReadableMap.emailAddress: String?
+    get() {
+        if (configuration.hasKey("emailAddress")) {
+            return configuration?.getString("emailAddress")
+        }
+        return null
+    }
+
+internal val ReadableMap.threeDSTwoMaxTimeout: Int?
+    get() {
+        if (configuration.hasKey("threeDSTwoMaxTimeout")) {
+            return configuration?.getString("threeDSTwoMaxTimeout")?.toInt()
+        }
+        return null
+    }
+
+internal val ReadableMap.threeDSTwoMessageVersion: String?
+    get() {
+        if (configuration.hasKey("threeDSTwoMessageVersion")) {
+            return configuration?.getString("threeDSTwoMessageVersion")
+        }
+        return null
+    }
+
 internal val ReadableMap.metadata: ReadableMap?
     get() {
-        val hasKey = reference?.hasKey("metadata") ?: false
-        if (hasKey) {
+        if (reference.hasKey("metadata")) {
             return reference?.getMap("metadata")
         }
         return null
@@ -75,8 +254,7 @@ internal val ReadableMap.metadata: ReadableMap?
 
 internal val ReadableMap.cardNetworkValue: Int?
     get() {
-        val hasKey = configuration?.hasKey("supportedCardNetworks") ?: false
-        if (hasKey) {
+        if (configuration.hasKey("supportedCardNetworks")) {
             return configuration?.getInt("supportedCardNetworks")
         }
         return null
@@ -84,8 +262,7 @@ internal val ReadableMap.cardNetworkValue: Int?
 
 internal val ReadableMap.paymentMethodValue: Int?
     get() {
-        val hasKey = configuration?.hasKey("paymentMethods") ?: false
-        if (hasKey) {
+        if (configuration.hasKey("paymentMethods")) {
             return configuration?.getInt("paymentMethods")
         }
         return null
@@ -93,8 +270,7 @@ internal val ReadableMap.paymentMethodValue: Int?
 
 internal val ReadableMap.uiConfiguration: ReadableMap?
     get() {
-        val hasKey = configuration?.hasKey("uiConfiguration") ?: false
-        if (hasKey) {
+        if (configuration.hasKey("uiConfiguration")) {
             return configuration?.getMap("uiConfiguration")
         }
         return null
@@ -112,10 +288,17 @@ internal val ReadableMap.shouldPaymentButtonDisplayAmount: Boolean?
 internal val ReadableMap.shouldPaymentMethodsVerifySecurityCode: Boolean?
     get() = uiConfiguration?.getBoolean("shouldPaymentMethodsVerifySecurityCode")
 
+internal val ReadableMap.shouldAskForBillingInformation: Boolean
+    get() {
+        if (uiConfiguration.hasKey("shouldAskForBillingInformation")) {
+            return uiConfiguration?.getBoolean("shouldAskForBillingInformation") ?: true
+        }
+        return true
+    }
+
 internal val ReadableMap.primaryAccountDetails: ReadableMap?
     get() {
-        val hasKey = configuration?.hasKey("primaryAccountDetails") ?: false
-        if (hasKey) {
+        if (configuration.hasKey("primaryAccountDetails")) {
             return configuration?.getMap("primaryAccountDetails")
         }
         return null
@@ -123,8 +306,7 @@ internal val ReadableMap.primaryAccountDetails: ReadableMap?
 
 internal val ReadableMap.name: String?
     get() {
-        val hasKey = primaryAccountDetails?.hasKey("name") ?: false
-        if (hasKey) {
+        if (primaryAccountDetails.hasKey("name")) {
             return primaryAccountDetails?.getString("name")
         }
         return null
@@ -132,8 +314,7 @@ internal val ReadableMap.name: String?
 
 internal val ReadableMap.accountNumber: String?
     get() {
-        val hasKey = primaryAccountDetails?.hasKey("accountNumber") ?: false
-        if (hasKey) {
+        if (primaryAccountDetails.hasKey("accountNumber")) {
             return primaryAccountDetails?.getString("accountNumber")
         }
         return null
@@ -141,8 +322,7 @@ internal val ReadableMap.accountNumber: String?
 
 internal val ReadableMap.dateOfBirth: String?
     get() {
-        val hasKey = primaryAccountDetails?.hasKey("dateOfBirth") ?: false
-        if (hasKey) {
+        if (primaryAccountDetails.hasKey("dateOfBirth")) {
             return primaryAccountDetails?.getString("dateOfBirth")
         }
         return null
@@ -150,8 +330,7 @@ internal val ReadableMap.dateOfBirth: String?
 
 internal val ReadableMap.postCode: String?
     get() {
-        val hasKey = primaryAccountDetails?.hasKey("postCode") ?: false
-        if (hasKey) {
+        if (primaryAccountDetails.hasKey("postCode")) {
             return primaryAccountDetails?.getString("postCode")
         }
         return null
@@ -159,8 +338,7 @@ internal val ReadableMap.postCode: String?
 
 internal val ReadableMap.googlePayConfiguration: ReadableMap?
     get() {
-        val hasKey = configuration?.hasKey("googlePayConfiguration") ?: false
-        if (hasKey) {
+        if (configuration.hasKey("googlePayConfiguration")) {
             return configuration?.getMap("googlePayConfiguration")
         }
         return null
@@ -183,8 +361,7 @@ internal val ReadableMap.isShippingAddressRequired: Boolean?
 
 internal val ReadableMap.billingAddressParameters: ReadableMap?
     get() {
-        val hasKey = googlePayConfiguration?.hasKey("billingAddressParameters") ?: false
-        if (hasKey) {
+        if (googlePayConfiguration.hasKey("billingAddressParameters")) {
             return googlePayConfiguration?.getMap("billingAddressParameters")
         }
         return null
@@ -192,8 +369,7 @@ internal val ReadableMap.billingAddressParameters: ReadableMap?
 
 internal val ReadableMap.shippingAddressParameters: ReadableMap?
     get() {
-        val hasKey = googlePayConfiguration?.hasKey("shippingAddressParameters") ?: false
-        if (hasKey) {
+        if (googlePayConfiguration.hasKey("shippingAddressParameters")) {
             return googlePayConfiguration?.getMap("shippingAddressParameters")
         }
         return null
@@ -210,8 +386,7 @@ internal val ReadableMap.isShippingPhoneNumberRequired: Boolean?
 
 internal val ReadableMap.allowedCountryCodeList: ReadableArray?
     get() {
-        val hasKey = shippingAddressParameters?.hasKey("allowedCountryCodes") ?: false
-        if (hasKey) {
+        if (shippingAddressParameters.hasKey("allowedCountryCodes")) {
             return shippingAddressParameters?.getArray("allowedCountryCodes")
         }
         return null
@@ -219,17 +394,16 @@ internal val ReadableMap.allowedCountryCodeList: ReadableArray?
 
 internal val ReadableMap.pbbaConfiguration: ReadableMap?
     get() {
-        val hasKey = configuration?.hasKey("pbbaConfiguration") ?: false
-        if (hasKey) {
+        if (configuration.hasKey("pbbaConfiguration")) {
             return configuration?.getMap("pbbaConfiguration")
         }
         return null
     }
 
-internal val ReadableMap.mobileNumber: String?
+internal val ReadableMap.pbbaMobileNumber: String?
     get() = pbbaConfiguration?.getString("mobileNumber")
 
-internal val ReadableMap.emailAddress: String?
+internal val ReadableMap.pbbaEmailAddress: String?
     get() = pbbaConfiguration?.getString("emailAddress")
 
 internal val ReadableMap.deeplinkScheme: String?
@@ -237,8 +411,7 @@ internal val ReadableMap.deeplinkScheme: String?
 
 internal val ReadableMap.deeplinkURL: String?
     get() {
-        val hasKey = pbbaConfiguration?.hasKey("deeplinkURL") ?: false
-        return if (hasKey) {
+        return if (pbbaConfiguration.hasKey("deeplinkURL")) {
             pbbaConfiguration?.getString("deeplinkURL")
         } else {
             null
@@ -246,5 +419,5 @@ internal val ReadableMap.deeplinkURL: String?
     }
 
 fun Judo.toJudoActivityIntent(packageContext: Context): Intent =
-        Intent(packageContext, JudoActivity::class.java)
-                .also { it.putExtra(JUDO_OPTIONS, this) }
+    Intent(packageContext, JudoActivity::class.java)
+        .also { it.putExtra(JUDO_OPTIONS, this) }