@veriff/react-native-sdk 2.9.0 → 2.12.0

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/ios/VeriffSdk.swift

@@ -64,7 +64,6 @@ class VeriffSdk: NSObject {
   @objc(launchVeriff:resolver:rejecter:)
   func launchVeriff(_ configuration: [String: AnyObject], resolver resolve: @escaping RCTPromiseResolveBlock, rejecter reject: @escaping RCTPromiseRejectBlock) {
 
-  var sessionUrl: String?
   var veriffConfiguration: Veriff.VeriffSdk.Configuration?
   var branding: Veriff.VeriffSdk.Branding?
 
@@ -145,9 +144,13 @@ class VeriffSdk: NSObject {
       }
     }
 
-    if let sUrl = configuration[VeriffSdk.SESSION_URL] as? String {
+    let sessionURL: URL
+    if let sessionURLString = configuration[VeriffSdk.SESSION_URL] as? String {
       // Using new API
-      sessionUrl = sUrl
+      guard let url = URL(string: sessionURLString) else {
+        return reject(VeriffSdk.ERROR_INVALID_ARGS, "Invalid sessionUrl: \(sessionURLString)", nil)
+      }
+      sessionURL = url
       var locale: Locale?
       if let languageLocale = (configuration[VeriffSdk.LOCALE] as? String) {
         locale = Locale(identifier: languageLocale)
@@ -157,8 +160,11 @@ class VeriffSdk: NSObject {
       veriffConfiguration?.customIntroScreen = VeriffSdk.checkCustomIntro(configuration: configuration)
     } else if let sessionToken = configuration[VeriffSdk.SESSION_TOKEN] as? String {
       // Using deprecated API
-      let baseUrl = (configuration[VeriffSdk.BASE_URL] as? String) ?? VeriffSdk.DEFAULT_BASE_URL
-      sessionUrl = baseUrl + "/" + sessionToken
+      let baseURLString = configuration[VeriffSdk.BASE_URL] as? String ?? VeriffSdk.DEFAULT_BASE_URL
+      guard let baseURL = URL(string: baseURLString) else {
+        return reject(VeriffSdk.ERROR_INVALID_ARGS, "Invalid baseUrl: \(baseURLString)", nil)
+      }
+      sessionURL = baseURL.appendingPathComponent(sessionToken)
 
       veriffConfiguration = Veriff.VeriffSdk.Configuration(branding: branding)
       veriffConfiguration?.customIntroScreen = VeriffSdk.checkCustomIntro(configuration: configuration)
@@ -175,8 +181,8 @@ class VeriffSdk: NSObject {
       let veriff = Veriff.VeriffSdk.shared
       veriff.delegate = self
       veriff.implementationType = .reactNative
-      veriffConfiguration?.queryItems = VeriffSdk.updateConfigWithQueryItems(urlString: sessionUrl!)
-      veriff.startAuthentication(sessionUrl: sessionUrl!, configuration: veriffConfiguration)
+      veriffConfiguration?.queryItems = VeriffSdk.updateConfigWithQueryItems(url: sessionURL)
+      veriff.startAuthentication(sessionUrl: sessionURL.absoluteString, configuration: veriffConfiguration)
     }
   }
 
@@ -188,9 +194,8 @@ class VeriffSdk: NSObject {
     }
   }
 
-  private static func updateConfigWithQueryItems(urlString: String) -> [URLQueryItem]? {
-    let url = URL(string: urlString)
-    let components = URLComponents(url: url!, resolvingAgainstBaseURL: false)
+  private static func updateConfigWithQueryItems(url: URL) -> [URLQueryItem]? {
+    let components = URLComponents(url: url, resolvingAgainstBaseURL: false)
     return components?.queryItems
   }
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@veriff/react-native-sdk",
   "title": "React Native Veriff SDK",
-  "version": "2.9.0",
+  "version": "2.12.0",
   "description": "React Native SDK for Veriff identity verification",
   "main": "index.js",
   "scripts": {