@veriff/react-native-sdk 2.8.0 → 2.11.0

package/.prettierrc.js

@@ -1,6 +1,5 @@
 module.exports = {
   bracketSpacing: true,
-  jsxBracketSameLine: true,
   singleQuote: true,
   trailingComma: 'all',
 };

package/android/build.gradle

@@ -1,156 +1,46 @@
-// android/build.gradle
+buildscript {
+    ext.safeExtGet = { prop, fallback ->
+        return rootProject.ext.has(prop) ? rootProject.ext.get(prop) : fallback
+    }
 
-// based on:
-//
-// * https://github.com/facebook/react-native/blob/0.60-stable/template/android/build.gradle
-//   original location:
-//   - https://github.com/facebook/react-native/blob/0.58-stable/local-cli/templates/HelloWorld/android/build.gradle
-//
-// * https://github.com/facebook/react-native/blob/0.60-stable/template/android/app/build.gradle
-//   original location:
-//   - https://github.com/facebook/react-native/blob/0.58-stable/local-cli/templates/HelloWorld/android/app/build.gradle
+    repositories {
+        google()
+        mavenCentral()
+    }
 
-def DEFAULT_COMPILE_SDK_VERSION = 28
-def DEFAULT_BUILD_TOOLS_VERSION = '28.0.3'
-def DEFAULT_MIN_SDK_VERSION = 21
-def DEFAULT_TARGET_SDK_VERSION = 28
+    dependencies {
+        classpath 'com.android.tools.build:gradle:7.0.4'
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${safeExtGet('kotlinVersion', '1.6.10')}"
+    }
+}
 
 def safeExtGet(prop, fallback) {
     rootProject.ext.has(prop) ? rootProject.ext.get(prop) : fallback
 }
 
 apply plugin: 'com.android.library'
-apply plugin: 'maven'
-
-buildscript {
-    // The Android Gradle plugin is only required when opening the android folder stand-alone.
-    // This avoids unnecessary downloads and potential conflicts when the library is included as a
-    // module dependency in an application project.
-    // ref: https://docs.gradle.org/current/userguide/tutorial_using_tasks.html#sec:build_script_external_dependencies
-    if (project == rootProject) {
-        repositories {
-            google()
-            jcenter()
-        }
-        dependencies {
-            classpath 'com.android.tools.build:gradle:3.4.3'
-        }
-    }
-}
-
-apply plugin: 'com.android.library'
-apply plugin: 'maven'
+apply plugin: 'kotlin-android'
+apply plugin: 'maven-publish'
 
 android {
-    compileSdkVersion safeExtGet('compileSdkVersion', DEFAULT_COMPILE_SDK_VERSION)
-    buildToolsVersion safeExtGet('buildToolsVersion', DEFAULT_BUILD_TOOLS_VERSION)
+    compileSdkVersion safeExtGet('compileSdkVersion', 31)
+    buildToolsVersion safeExtGet('buildToolsVersion', '31.0.0')
+
     defaultConfig {
-        minSdkVersion safeExtGet('minSdkVersion', DEFAULT_MIN_SDK_VERSION)
-        targetSdkVersion safeExtGet('targetSdkVersion', DEFAULT_TARGET_SDK_VERSION)
-        versionCode 1
-        versionName "1.0"
-    }
-    compileOptions {
-      sourceCompatibility JavaVersion.VERSION_1_8
-      targetCompatibility JavaVersion.VERSION_1_8
-    }
-    lintOptions {
-        abortOnError false
+        minSdkVersion safeExtGet('minSdkVersion', 21)
+        targetSdkVersion safeExtGet('targetSdkVersion', 31)
     }
 }
 
 repositories {
-    // ref: https://www.baeldung.com/maven-local-repository
     mavenLocal()
-    maven {
-        // All of React Native (JS, Obj-C sources, Android binaries) is installed from npm
-        url "$rootDir/../node_modules/react-native/android"
-    }
-    maven {
-        // Android JSC is installed from npm
-        url "$rootDir/../node_modules/jsc-android/dist"
-    }
-    maven { url "https://cdn.veriff.me/android/" } //veriff public repo
     google()
-    jcenter()
     mavenCentral()
+    maven { url "https://cdn.veriff.me/android/" } //veriff public repo
 }
 
 dependencies {
     //noinspection GradleDynamicVersion
     implementation 'com.facebook.react:react-native:+'
-    implementation 'com.veriff:veriff-library:4.6.0'
-}
-
-def configureReactNativePom(def pom) {
-    def packageJson = new groovy.json.JsonSlurper().parseText(file('../package.json').text)
-
-    pom.project {
-        name packageJson.title
-        artifactId packageJson.name
-        version = packageJson.version
-        group = "com.reactlibrary"
-        description packageJson.description
-        url = "https://github.com/veriff/react-native-sdk"
-
-        licenses {
-            license {
-                name packageJson.license
-                url "https://github.com/veriff/react-native-sdk" + '/blob/master/' + packageJson.licenseFilename
-                distribution 'repo'
-            }
-        }
-
-        developers {
-            developer {
-                id packageJson.author.username
-                name packageJson.author.name
-            }
-        }
-    }
-}
-
-afterEvaluate { project ->
-    // some Gradle build hooks ref:
-    // https://www.oreilly.com/library/view/gradle-beyond-the/9781449373801/ch03.html
-    task androidJavadoc(type: Javadoc) {
-        source = android.sourceSets.main.java.srcDirs
-        classpath += files(android.bootClasspath)
-        classpath += files(project.getConfigurations().getByName('compile').asList())
-        include '**/*.java'
-    }
-
-    task androidJavadocJar(type: Jar, dependsOn: androidJavadoc) {
-        classifier = 'javadoc'
-        from androidJavadoc.destinationDir
-    }
-
-    task androidSourcesJar(type: Jar) {
-        classifier = 'sources'
-        from android.sourceSets.main.java.srcDirs
-        include '**/*.java'
-    }
-
-    android.libraryVariants.all { variant ->
-        def name = variant.name.capitalize()
-        def javaCompileTask = variant.javaCompileProvider.get()
-
-        task "jar${name}"(type: Jar, dependsOn: javaCompileTask) {
-            from javaCompileTask.destinationDir
-        }
-    }
-
-    artifacts {
-        archives androidSourcesJar
-        archives androidJavadocJar
-    }
-
-    task installArchives(type: Upload) {
-        configuration = configurations.archives
-        repositories.mavenDeployer {
-            // Deploy to react-native-event-bridge/maven, ready to publish to npm
-            repository url: "file://${projectDir}/../android/maven"
-            configureReactNativePom pom
-        }
-    }
+    implementation 'com.veriff:veriff-library:4.7.0'
 }

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

@@ -25,6 +25,17 @@ public class ImageLoader {
     private final Handler main = new Handler(Looper.getMainLooper());
 
     public Drawable load(Context context, String url) throws IOException {
+        if (isAsyncLogoUrl(url)) {
+            Log.d(TAG, "Async image" + url);
+            return loadAsyncImage(context, url);
+        } else {
+            Log.d(TAG, "Image from resource" + url);
+            int drawableId = getDrawableId(context, url);
+            return context.getDrawable(drawableId);
+        }
+    }
+
+    private Drawable loadAsyncImage(Context context, String url) throws IOException {
         ImageRequest request = ImageRequestBuilder.fromRequest(ImageRequest.fromUri(url)).build();
 
         if (!Fresco.hasBeenInitialized()) {
@@ -69,10 +80,10 @@ public class ImageLoader {
             Result result = atomicResult.get();
 
             if (result.error != null) {
-                Log.w(TAG, "Loading image from " + url + " failed", result.error);
+                Log.w(TAG, "[ImageLoader] Loading image from [" + url + "] failed", result.error);
                 throw result.error;
             } else {
-                Log.w(TAG, "Loading image got a bitmap with size w=" + result.bitmap.getWidth() + " h=" + result.bitmap.getHeight());
+                Log.w(TAG, "[ImageLoader] Loading image [" + url + "] got a bitmap with size w=" + result.bitmap.getWidth() + " h=" + result.bitmap.getHeight());
                 return new BitmapDrawable(context.getResources(), result.bitmap);
             }
         } catch (InterruptedException e) {
@@ -81,6 +92,14 @@ public class ImageLoader {
         }
     }
 
+    private static int getDrawableId(Context context, String name) {
+        return context.getResources().getIdentifier(name, "drawable", context.getPackageName());
+    }
+
+    private boolean isAsyncLogoUrl(String url) {
+        return url.startsWith("https://") || url.startsWith("http://") || url.startsWith("file://");
+    }
+
     private static class Result {
         private final IOException error;
 

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

@@ -24,7 +24,7 @@ import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.atomic.AtomicReference;
 
 public class ReactNativeImageProvider implements Branding.DrawableProvider, Parcelable {
-    private static final String TAG = "ReactNativeImage";
+    private static final String TAG = "ReactNativeImageProvider";
 
     private final String url;
 
@@ -78,10 +78,10 @@ public class ReactNativeImageProvider implements Branding.DrawableProvider, Parc
             Result result = atomicResult.get();
 
             if (result.error != null) {
-                Log.w(TAG, "Loading image from " + this.url + " failed", result.error);
+                Log.w(TAG, "[ReactNativeImageProvider] Loading image from [" + this.url + "] failed", result.error);
                 throw result.error;
             } else {
-                Log.w(TAG, "Loading image got a bitmap with size w=" + result.bitmap.getWidth() + " h=" + result.bitmap.getHeight());
+                Log.w(TAG, "[ReactNativeImageProvider] Loading image [" + this.url + "]  got a bitmap with size w=" + result.bitmap.getWidth() + " h=" + result.bitmap.getHeight());
                 return new BitmapDrawable(context.getResources(), result.bitmap);
             }
         } catch (InterruptedException e) {

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

@@ -323,6 +323,7 @@ public class VeriffSdkModule extends ReactContextBaseJavaModule {
 
     private void handleLogo(Context context, String key, Branding.Builder branding, ReadableMap brandConfig) {
         ReadableType type = brandConfig.getType(key);
+        Log.d(TAG, "Logo type" + type);
         if (ReadableType.String.equals(type)) {
             branding.toolbarIcon(getDrawableId(context, brandConfig.getString(key)));
         } else if (ReadableType.Map.equals(type)) {
@@ -334,8 +335,10 @@ public class VeriffSdkModule extends ReactContextBaseJavaModule {
                     if (!TextUtils.isEmpty(url)) {
                         // check if url has an async scheme
                         if (isAsyncLogoUrl(url)) {
+                            Log.d(TAG, "Async logo" + url);
                             branding.toolbarIconProvider(new ReactNativeImageProvider(url));
                         } else {
+                            Log.d(TAG, "Logo from resource" + url);
                             branding.toolbarIcon(getDrawableId(context, url));
                         }
                     } else {

package/ios/Podfile

@@ -1,4 +1,6 @@
 platform :ios, '11.0'
+install! 'cocoapods', :deterministic_uuids => false
+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
@@ -6,36 +8,11 @@ target 'VeriffSdk' do
   pod 'VeriffSDK'
   pod 'lottie-ios'
 
-  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/'
+  config = use_native_modules!
 
-  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'
-
-  use_native_modules!
+  # Flags change depending on the env values.
+  flags = get_default_flags()
+  use_react_native!(
+    :path => config[:reactNativePath]
+  )
 end

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@veriff/react-native-sdk",
   "title": "React Native Veriff SDK",
-  "version": "2.8.0",
+  "version": "2.11.0",
   "description": "React Native SDK for Veriff identity verification",
   "main": "index.js",
   "scripts": {
@@ -29,10 +29,10 @@
     "react-native": "*"
   },
   "devDependencies": {
-    "react": "16.11.0",
-    "react-native": "0.62.3",
-    "@react-native-community/eslint-config": "^2.0.0",
-    "eslint": "^7.2.0"
+    "react": "18.1.0",
+    "react-native": "0.68.1",
+    "@react-native-community/eslint-config": "^3.0.1",
+    "eslint": "^7.0.0"
   },
   "resolutions": {
     "ansi-regex": "^5.0.1",