@veriff/react-native-sdk 3.1.0 → 4.1.0

package/android/build.gradle

@@ -41,6 +41,7 @@ repositories {
 
 dependencies {
     //noinspection GradleDynamicVersion
-    implementation 'com.facebook.react:react-native:+'
-    implementation 'com.veriff:veriff-library:6.1.0'
+    implementation 'com.facebook.react:react-android:+'
+
+    implementation 'com.veriff:veriff-library:6.5.0'
 }

package/android/gradle.properties

@@ -0,0 +1 @@
+android.useAndroidX=true

package/android/src/main/java/com/veriff/sdk/reactnative/VeriffSdkModule.java

@@ -3,7 +3,6 @@ package com.veriff.sdk.reactnative;
 import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
-import android.content.res.Resources;
 import android.graphics.Color;
 import android.text.TextUtils;
 import android.util.Log;
@@ -28,12 +27,17 @@ import com.veriff.Sdk;
 import java.util.*;
 
 import com.veriff.GeneralConfig;
+
 import okhttp3.HttpUrl;
 
 import static android.app.Activity.RESULT_CANCELED;
 import static com.veriff.Result.Status.CANCELED;
 import static com.veriff.Result.Status.ERROR;
 
+import androidx.annotation.NonNull;
+
+import javax.annotation.Nullable;
+
 public class VeriffSdkModule extends ReactContextBaseJavaModule {
     /**
      * Indicates that the parameters passed to {@link #launchVeriff(ReadableMap, Promise)} were invalid.
@@ -84,6 +88,8 @@ public class VeriffSdkModule extends ReactContextBaseJavaModule {
     private static final String KEY_ON_PRIMARY = "onPrimary";
     private static final String KEY_SECONDARY = "secondary";
     private static final String KEY_ON_SECONDARY = "onSecondary";
+    private static final String KEY_CAMERA_OVERLAY = "cameraOverlay";
+    private static final String KEY_ON_CAMERA_OVERLAY = "onCameraOverlay";
     private static final String KEY_OUTLINE = "outline";
     private static final String KEY_SUCCESS = "success";
     private static final String KEY_ERROR = "error";
@@ -125,11 +131,30 @@ public class VeriffSdkModule extends ReactContextBaseJavaModule {
 
     private final ReactApplicationContext reactContext;
 
+    @Nullable
+    private Result lastResult;
+
+    @Nullable
+    private String sessionToken;
+
+    @Nullable
+    private String status;
+
     public VeriffSdkModule(ReactApplicationContext reactContext) {
         super(reactContext);
         this.reactContext = reactContext;
     }
 
+    @ReactMethod
+    public void recoverLastResult(final Promise promise) {
+      if (lastResult != null && status != null && sessionToken != null) {
+        sendResult(lastResult, status, sessionToken, promise);
+        lastResult = null;
+        sessionToken = null;
+        status = null;
+      }
+    }
+
     @Override
     public String getName() {
         return JS_NAME;
@@ -186,6 +211,9 @@ public class VeriffSdkModule extends ReactContextBaseJavaModule {
                 startUrl = baseUrl + "/v/" + sessionToken;
             }
 
+            this.sessionToken = sessionToken;
+            this.lastResult = null;
+            this.status = null;
 
             Activity activity = getCurrentActivity();
             if (activity == null) {
@@ -208,19 +236,10 @@ public class VeriffSdkModule extends ReactContextBaseJavaModule {
                         reactContext.removeActivityEventListener(this);
 
                         Result veriffResult = Result.fromResultIntent(data);
-                        WritableMap result = Arguments.createMap();
-                        result.putString(KEY_TOKEN, sessionToken);
-
-                        Status status = resultCode == RESULT_CANCELED ? CANCELED : ERROR;
-                        if (veriffResult != null) {
-                            status = veriffResult.getStatus();
-                        }
-                        result.putString(KEY_STATUS, statusToString(status));
-                        if (veriffResult != null && veriffResult.getError() != null) {
-                            result.putString(KEY_RESULT_ERROR, codeToError(veriffResult.getError()));
-                        }
+                        lastResult = veriffResult;
+                        status = statusToString(getVeriffStatus(resultCode, veriffResult));
 
-                        promise.resolve(result);
+                        sendResult(veriffResult, status, sessionToken, promise);
                     }
                 }
             };
@@ -269,11 +288,19 @@ public class VeriffSdkModule extends ReactContextBaseJavaModule {
                     if (brandConfig.hasKey(KEY_SECONDARY)) {
                         branding.secondary(parseColor(brandConfig.getString(KEY_SECONDARY)));
                     }
-                    
+
                     if (brandConfig.hasKey(KEY_ON_SECONDARY)) {
                         branding.onSecondary(parseColor(brandConfig.getString(KEY_ON_SECONDARY)));
                     }
 
+                    if (brandConfig.hasKey(KEY_CAMERA_OVERLAY)) {
+                        branding.cameraOverlay(parseColor(brandConfig.getString(KEY_CAMERA_OVERLAY)));
+                    }
+
+                    if (brandConfig.hasKey(KEY_ON_CAMERA_OVERLAY)) {
+                        branding.onCameraOverlay(parseColor(brandConfig.getString(KEY_ON_CAMERA_OVERLAY)));
+                    }
+
                     if (brandConfig.hasKey(KEY_OUTLINE)) {
                         branding.outline(parseColor(brandConfig.getString(KEY_OUTLINE)));
                     }
@@ -312,6 +339,29 @@ public class VeriffSdkModule extends ReactContextBaseJavaModule {
         }
     }
 
+    private void sendResult(Result veriffResult, String status, String sessionToken, Promise promise) {
+        WritableMap result = Arguments.createMap();
+        result.putString(KEY_TOKEN, sessionToken);
+        result.putString(KEY_STATUS, status);
+
+        if (veriffResult != null && veriffResult.getError() != null) {
+            result.putString(KEY_RESULT_ERROR, codeToError(veriffResult.getError()));
+        }
+
+        promise.resolve(result);
+    }
+
+    @NonNull
+    private static Status getVeriffStatus(int resultCode, Result veriffResult) {
+        Status status;
+        if (veriffResult != null) {
+            status = veriffResult.getStatus();
+        } else {
+            status = resultCode == RESULT_CANCELED ? CANCELED : ERROR;
+        }
+        return status;
+    }
+
     private Font buildFont(Context context, ReadableMap src) {
         int regularFont = getFontId(context, src.getString(KEY_FONT_REGULAR));
         int mediumFont = getFontId(context, src.getString(KEY_FONT_MEDIUM));
@@ -321,7 +371,7 @@ public class VeriffSdkModule extends ReactContextBaseJavaModule {
                 src.getString(KEY_FONT_REGULAR), regularFont));
 
         Log.v(TAG, String.format("Medium font: [%s], value [%s]",
-                src.getString(KEY_FONT_MEDIUM), mediumFont));                
+                src.getString(KEY_FONT_MEDIUM), mediumFont));
 
         Log.v(TAG, String.format("Bold font: [%s], value [%s]",
                 src.getString(KEY_FONT_BOLD), boldFont));

package/android/src/main/java/com/veriff/sdk/reactnative/VeriffSdkPackage.java

@@ -9,6 +9,7 @@ import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 
+@SuppressWarnings("unused")
 public class VeriffSdkPackage implements ReactPackage {
     @Override
     public List<NativeModule> createNativeModules(ReactApplicationContext reactContext) {

package/babel.config.js

@@ -0,0 +1,3 @@
+module.exports = {
+  presets: ['module:metro-react-native-babel-preset'],
+};

package/ios/Podfile

@@ -1,11 +1,11 @@
-platform :ios, '11.0'
-install! 'cocoapods', :deterministic_uuids => false
+platform :ios, '12.4'
+
 require_relative '../node_modules/react-native/scripts/react_native_pods'
 require_relative '../node_modules/@react-native-community/cli-platform-ios/native_modules'
 
 target 'VeriffSdk' do
   # Pods for VeriffSdk
-  pod 'VeriffSDK', '6.3.0'
+  pod 'VeriffSDK', '6.7.0'
 
   config = use_native_modules!
 

package/ios/VeriffSdk.swift

@@ -87,6 +87,8 @@ class VeriffSdk: NSObject {
       branding.onPrimary = brandingConfig.color(for: "onPrimary")
       branding.secondary = brandingConfig.color(for: "secondary")
       branding.onSecondary = brandingConfig.color(for: "onSecondary")
+      branding.cameraOverlay = brandingConfig.color(for: "cameraOverlay")
+      branding.onCameraOverlay = brandingConfig.color(for: "onCameraOverlay")
       branding.outline = brandingConfig.color(for: "outline")
       branding.error = brandingConfig.color(for: "error")
       branding.success = brandingConfig.color(for: "success")
@@ -140,7 +142,6 @@ class VeriffSdk: NSObject {
       let veriff = Veriff.VeriffSdk.shared
       veriff.delegate = self
       veriff.implementationType = .reactNative
-      veriffConfiguration?.queryItems = VeriffSdk.updateConfigWithQueryItems(url: sessionURL)
       veriff.startAuthentication(sessionUrl: sessionURL.absoluteString, configuration: veriffConfiguration)
     }
   }
@@ -153,11 +154,6 @@ class VeriffSdk: NSObject {
     }
   }
 
-  private static func updateConfigWithQueryItems(url: URL) -> [URLQueryItem]? {
-    let components = URLComponents(url: url, resolvingAgainstBaseURL: false)
-    return components?.queryItems
-  }
-
   private static func resultToStatus(result: Veriff.VeriffSdk.Result) -> (Veriff.VeriffSdk.Status, String) {
     switch result.status {
     case .done:

package/package.json

@@ -1,11 +1,13 @@
 {
   "name": "@veriff/react-native-sdk",
   "title": "React Native Veriff SDK",
-  "version": "3.1.0",
+  "version": "4.1.0",
   "description": "React Native SDK for Veriff identity verification",
   "main": "index.js",
   "scripts": {
-    "lint": "eslint ."
+    "lint": "eslint .",
+    "check-dependencies": "rnx-align-deps",
+    "fix-dependencies": "rnx-align-deps --write"
   },
   "homepage": "https://developers.veriff.com/#react-native-sdk-integration",
   "keywords": [
@@ -25,14 +27,16 @@
   "licenseFilename": "LICENSE",
   "readmeFilename": "README.md",
   "peerDependencies": {
-    "react": "*",
-    "react-native": "*"
+    "react": "18.2.0",
+    "react-native": "^0.71.0"
   },
   "devDependencies": {
-    "react": "18.1.0",
-    "react-native": "0.68.1",
-    "@react-native-community/eslint-config": "^3.0.1",
-    "eslint": "^7.0.0"
+    "@react-native-community/eslint-config": "^3.2.0",
+    "@rnx-kit/align-deps": "^2.2.0",
+    "eslint": "^8.19.0",
+    "react": "18.2.0",
+    "react-native": "^0.71.0",
+    "prettier": "^2.4.1"
   },
   "resolutions": {
     "ansi-regex": "^5.0.1",
@@ -55,5 +59,27 @@
     "node-fetch": "Resolving to 2.6.7 to fix vulnerability (https://www.npmjs.com/advisories/1064646)",
     "plist": "Resolving to 3.0.4 to fix vulnerability (https://www.npmjs.com/advisories/1064605)",
     "ajv": "Resolving to 6.12.3 to fix vulnerability (https://www.npmjs.com/advisories/1065159)"
+  },
+  "rnx-kit": {
+    "kitType": "library",
+    "alignDeps": {
+      "requirements": {
+        "development": [
+          "react-native@0.71"
+        ],
+        "production": [
+          "react-native@0.71"
+        ]
+      },
+      "capabilities": [
+        "core",
+        "core-android",
+        "core-ios",
+        "react"
+      ]
+    }
+  },
+  "dependencies": {
+    "eslint-plugin-ft-flow": "^2.0.3"
   }
 }

package/react-native-sdk.podspec

@@ -13,12 +13,12 @@ Pod::Spec.new do |s|
   s.license      = "MIT"
   # s.license    = { :type => "MIT", :file => "FILE_LICENSE" }
   s.authors      = { "Veriff" => "support@veriff.com" }
-  s.platforms    = { :ios => "11.0" }
+  s.platforms    = { :ios => "12.4" }
   s.source       = { :git => "https://github.com/veriff/react-native-sdk.git", :tag => "#{s.version}" }
 
   s.source_files = "ios/**/*.{h,m,swift}"
   s.requires_arc = true
 
   s.dependency "React"
-  s.dependency "VeriffSDK", "6.3.0"
+  s.dependency "VeriffSDK", "6.7.0"
 end