judokit-react-native 3.3.6 → 3.3.9

package/JudoPay.tsx

@@ -107,6 +107,18 @@ class JudoPay {
         return NativeModules.RNJudo.isBankingAppAvailable()
     }
 
+    /**
+     * A method used to verify if ApplePay is supported for given configuration object
+     *
+     * This needs to be invoked before invoking ApplePay transactions.
+     *
+     * @returns an asynchronous boolean value that indicates if ApplePay is available.
+     */
+    public isApplePayAvailableWithConfiguration(configuration: JudoConfiguration): Promise<boolean> {
+        const params = this.generateJudoParameters(configuration)
+        return NativeModules.RNJudo.isApplePayAvailableWithConfiguration(params)
+    }
+
     /**
      * A method for invoking the Judo UI for card transactions.
      * Supported operations - payments, pre-auths, register card, save card, check card.
@@ -201,7 +213,7 @@ class JudoPay {
     public async invokePayByBankApp(
         configuration: JudoConfiguration
     ): Promise<JudoResponse> {
-        const params = this.generatePayByBankAppParameters(configuration)
+        const params = this.generateJudoParameters(configuration)
         return NativeModules.RNJudo.invokePayByBankApp(params)
     }
 
@@ -229,7 +241,7 @@ class JudoPay {
     // Private helper methods
     //------------------------------------------------------------------
 
-    private readonly generatePayByBankAppParameters = (
+    private readonly generateJudoParameters = (
         configuration: JudoConfiguration
     ): Record<string, any> => {
         return {

package/README.md

@@ -46,15 +46,23 @@ JudoPay's React Native module and sample app. This module is a wrapper around th
     }
     ```
 
+-   Make sure that you use Android Gradle plugin version 4.0.1+ in your `android/build.gradle`:
+
+    ```
+    dependencies {
+        classpath 'com.android.tools.build:gradle:4.0.1'
+    }
+    ```
+
 -   Add the Judopay maven repository to `allprojects / repositories` in your `android/build.gradle`:
 
     ```
     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.3"
+  s.dependency "JudoKit-iOS", "2.4.6"
 
   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,10 @@ android {
 }
 
 repositories {
+    mavenLocal()
+
     mavenCentral()
     google()
-    jcenter()
 
     maven { url "$projectDir/../node_modules/react-native/android" }
 }
@@ -96,14 +92,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:2.1.10'
 
     //JUnit 5
     testImplementation "org.junit.jupiter:junit-jupiter-api:$junit5_version"
@@ -111,7 +107,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 +170,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/JudoReactNativeActivityEventListener.kt

@@ -1,6 +1,7 @@
 package com.reactlibrary
 
 import android.app.Activity
+import android.app.Activity.RESULT_CANCELED
 import android.content.Intent
 import com.facebook.react.bridge.BaseActivityEventListener
 import com.facebook.react.bridge.Promise
@@ -17,25 +18,29 @@ class JudoReactNativeActivityEventListener : BaseActivityEventListener() {
     internal var transactionPromise: Promise? = null
 
     override fun onActivityResult(
-        activity: Activity,
+        activity: Activity?,
         requestCode: Int,
         resultCode: Int,
-        data: Intent
+        data: Intent?
     ) {
 
-        if (requestCode != JUDO_PAYMENT_WIDGET_REQUEST_CODE) {
+        if (data == null || resultCode == RESULT_CANCELED || requestCode != JUDO_PAYMENT_WIDGET_REQUEST_CODE) {
             return
         }
 
-        when (resultCode) {
-            PAYMENT_ERROR, PAYMENT_CANCELLED -> {
-                val error = data.getParcelableExtra<JudoError>(JUDO_ERROR)
-                transactionPromise?.reject(JUDO_PROMISE_REJECTION_CODE, error?.message)
-            }
-            PAYMENT_SUCCESS -> {
-                val result = data.getParcelableExtra<JudoResult>(JUDO_RESULT)
-                transactionPromise?.resolve(getMappedResult(result))
+        try {
+            when (resultCode) {
+                PAYMENT_ERROR, PAYMENT_CANCELLED -> {
+                    val error = data.getParcelableExtra<JudoError>(JUDO_ERROR)
+                    transactionPromise?.reject(JUDO_PROMISE_REJECTION_CODE, error?.message)
+                }
+                PAYMENT_SUCCESS -> {
+                    val result = data.getParcelableExtra<JudoResult>(JUDO_RESULT)
+                    transactionPromise?.resolve(getMappedResult(result))
+                }
             }
+        } catch (throwable: Throwable) {
+            transactionPromise?.reject(JUDO_PROMISE_REJECTION_CODE, throwable.message)
         }
 
         transactionPromise = null

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

@@ -29,7 +29,7 @@ import retrofit2.Call
 import retrofit2.Callback
 import retrofit2.Response
 
-const val JUDO_PAYMENT_WIDGET_REQUEST_CODE = 1
+const val JUDO_PAYMENT_WIDGET_REQUEST_CODE = 65520
 const val JUDO_PROMISE_REJECTION_CODE = "JUDO_ERROR"
 
 class JudoReactNativeModule internal constructor(val context: ReactApplicationContext) :
@@ -144,6 +144,9 @@ class JudoReactNativeModule internal constructor(val context: ReactApplicationCo
                         is JudoPaymentResult.Error -> {
                             promise.reject(JUDO_PROMISE_REJECTION_CODE, data.error.message)
                         }
+                        else -> {
+                            // noop
+                        }
                     }
                 }
             }

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

@@ -1,17 +1,17 @@
 package com.reactlibrary
 
+import android.widget.Button
 import com.facebook.react.uimanager.SimpleViewManager
 import com.facebook.react.uimanager.ThemedReactContext
-import com.judopay.judokit.android.ui.common.PayByBankButton
 
-class JudoReactNativePBBAManager: SimpleViewManager<PayByBankButton>() {
+class JudoReactNativePBBAManager: SimpleViewManager<Button>() {
 
     override fun getName(): String {
         return "RNPBBAButton"
     }
 
-    override fun createViewInstance(reactContext: ThemedReactContext): PayByBankButton {
-        return PayByBankButton(reactContext)
+    override fun createViewInstance(reactContext: ThemedReactContext): Button {
+        return Button(reactContext)
     }
 
 }

package/ios/Classes/RNJudo.m

@@ -62,6 +62,15 @@ RCT_REMAP_METHOD(isBankingAppAvailable,
     resolve(boolValue);
 }
 
+RCT_REMAP_METHOD(isApplePayAvailableWithConfiguration,
+                 properties:(NSDictionary *)properties
+                 isApplePayAvailableWithResolver:(RCTPromiseResolveBlock)resolve
+                 rejecter:(RCTPromiseRejectBlock)reject) {
+    JPConfiguration *configuration = [RNWrappers configurationFromProperties:properties];
+    NSNumber *boolValue = [NSNumber numberWithBool:[JudoKit isApplePayAvailableWithConfiguration:configuration]];
+    resolve(boolValue);
+}
+
 RCT_REMAP_METHOD(invokeTransaction,
                  properties:(NSDictionary *)properties
                  invokePaymentWithResolver:(RCTPromiseResolveBlock)resolve

package/ios/Podfile

@@ -7,7 +7,7 @@ pre_install do |installer|
   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")
-  
+
   ## 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")
@@ -19,7 +19,7 @@ target 'RNJudo' do
   use_frameworks!
 
   # Pods for RNJudo
-  pod "JudoKit-iOS", "2.4.1"
+  pod "JudoKit-iOS", "2.4.6"
   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/package.json

@@ -1,7 +1,7 @@
 {
     "name": "judokit-react-native",
     "title": "Judopay React Native Module",
-    "version": "3.3.6",
+    "version": "3.3.9",
     "description": "A React Native module for the Judopay native SDKs to take payments on iOS and Android.",
     "main": "JudoPay.tsx",
     "scripts": {