@qore-id/react-native-qoreid-sdk 1.1.4 → 1.2.2

package/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2023 QoreID
+Copyright (c) 2024 QoreID
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
 in the Software without restriction, including without limitation the rights

package/README.md

@@ -10,4 +10,4 @@ npm install --save  @qore-id/react-native-qoreid-sdk
 
 ```c yarn
 yarn add @qore-id/react-native-qoreid-sdk
-```
+```

package/android/build.gradle

@@ -1,98 +1,104 @@
 buildscript {
-    // Buildscript is evaluated before everything else so we can't use getExtOrDefault
-    def kotlin_version = rootProject.ext.has("kotlinVersion") ? rootProject.ext.get("kotlinVersion") : project.properties["QoreidSdk_kotlinVersion"]
-    repositories {
-        google()
-        mavenCentral()
-    }
+  // Buildscript is evaluated before everything else so we can't use getExtOrDefault
+  def kotlin_version = rootProject.ext.has("kotlinVersion") ? rootProject.ext.get("kotlinVersion") : project.properties["RNQoreIDSdk_kotlinVersion"]
 
-    dependencies {
-        classpath "com.android.tools.build:gradle:7.2.1"
-        // noinspection DifferentKotlinGradleVersion
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-    }
+  repositories {
+    google()
+    mavenCentral()
+  }
+
+  dependencies {
+    classpath "com.android.tools.build:gradle:7.2.1"
+    // noinspection DifferentKotlinGradleVersion
+    classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
+  }
+}
+
+def reactNativeArchitectures() {
+  def value = rootProject.getProperties().get("reactNativeArchitectures")
+  return value ? value.split(",") : ["armeabi-v7a", "x86", "x86_64", "arm64-v8a"]
 }
 
 def isNewArchitectureEnabled() {
-    return rootProject.hasProperty("newArchEnabled") && rootProject.getProperty("newArchEnabled") == "true"
+  return rootProject.hasProperty("newArchEnabled") && rootProject.getProperty("newArchEnabled") == "true"
 }
 
 apply plugin: "com.android.library"
 apply plugin: "kotlin-android"
-apply plugin: "maven-publish"
-
-
-def appProject = rootProject.allprojects.find { it.plugins.hasPlugin('com.android.application') }
 
 if (isNewArchitectureEnabled()) {
-    apply plugin: "com.facebook.react"
+  apply plugin: "com.facebook.react"
 }
 
 def getExtOrDefault(name) {
-    return rootProject.ext.has(name) ? rootProject.ext.get(name) : project.properties["QoreidSdk_" + name]
+  return rootProject.ext.has(name) ? rootProject.ext.get(name) : project.properties["RNQoreIDSdk_" + name]
 }
 
 def getExtOrIntegerDefault(name) {
-    return rootProject.ext.has(name) ? rootProject.ext.get(name) : (project.properties["QoreidSdk_" + name]).toInteger()
+  return rootProject.ext.has(name) ? rootProject.ext.get(name) : (project.properties["RNQoreIDSdk_" + name]).toInteger()
+}
+
+def supportsNamespace() {
+  def parsed = com.android.Version.ANDROID_GRADLE_PLUGIN_VERSION.tokenize('.')
+  def major = parsed[0].toInteger()
+  def minor = parsed[1].toInteger()
+
+  // Namespace support was added in 7.3.0
+  return (major == 7 && minor >= 3) || major >= 8
 }
 
 android {
-    compileSdkVersion getExtOrIntegerDefault("compileSdkVersion")
+  if (supportsNamespace()) {
+    namespace "com.qoreidsdk"
+
     sourceSets {
-        main {
-            // ...
-            res.srcDirs = ['src/main/res']
-        }
-    }
-    defaultConfig {
-        minSdkVersion getExtOrIntegerDefault("minSdkVersion")
-        targetSdkVersion getExtOrIntegerDefault("targetSdkVersion")
-        buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled().toString()
-        buildConfigField "String", "s", "\"react_native_android_sdk\""
-        multiDexEnabled true
-    }
-    buildTypes {
-        release {
-            minifyEnabled false
-        }
-        debug {
-            gradle.properties['isReleaseBuild'] = false
-        }
+      main {
+        manifest.srcFile "src/main/AndroidManifestNew.xml"
+      }
     }
+  }
+
+  compileSdkVersion getExtOrIntegerDefault("compileSdkVersion")
+
+  defaultConfig {
+    minSdkVersion getExtOrIntegerDefault("minSdkVersion")
+    targetSdkVersion getExtOrIntegerDefault("targetSdkVersion")
+    buildConfigField "String", "s", "\"react_native_android_sdk\""
+    multiDexEnabled true
+  }
 
-    lintOptions {
-        disable "GradleCompatible"
+  buildTypes {
+    release {
+      minifyEnabled false
     }
+  }
 
+  lintOptions {
+    disable "GradleCompatible"
+  }
+
+  compileOptions {
+    sourceCompatibility JavaVersion.VERSION_1_8
+    targetCompatibility JavaVersion.VERSION_1_8
+  }
 }
 
 repositories {
-    mavenCentral()
-    google()
-    mavenLocal()
-    maven { url "https://repo.qoreid.com/repository/maven-releases/" }
-    maven { url 'https://jitpack.io' }
+  mavenCentral()
+  google()
+  mavenLocal()
+  maven { url "https://repo.qoreid.com/repository/maven-releases/" }
+  maven { url 'https://jitpack.io' }
 }
 
 def kotlin_version = getExtOrDefault("kotlinVersion")
 
-
 dependencies {
-    // For < 0.71, this will be from the local maven repo
-    // For > 0.71, this will be replaced by `com.facebook.react:react-android:$version` by react gradle plugin
-    //noinspection GradleDynamicVersion
-    implementation 'com.qoreid:qoreid-sdk:+'
-    // implementation 'com.qoreid:qoreid-sdk-dev-min:1.1.43'
-    implementation "com.facebook.react:react-native:+"
-    implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
-
+  implementation 'com.qoreid:qoreid-sdk:+'
+  // For < 0.71, this will be from the local maven repo
+  // For > 0.71, this will be replaced by `com.facebook.react:react-android:$version` by react gradle plugin
+  //noinspection GradleDynamicVersion
+  implementation "com.facebook.react:react-native:+"
+  implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
 }
 
-
-if (isNewArchitectureEnabled()) {
-    react {
-        jsRootDir = file("../src/")
-        libraryName = "QoreidSdk"
-        codegenJavaPackageName = "com.qoreidsdk"
-    }
-}

package/android/gradle.properties

@@ -1,9 +1,5 @@
-QoreidSdk_kotlinVersion=1.7.0
-QoreidSdk_minSdkVersion=21
-QoreidSdk_targetSdkVersion=31
-QoreidSdk_compileSdkVersion=31
-QoreidSdk_ndkversion=21.4.7075529
-android.useAndroidX=true
-android.enableJetifier=true
-isReleaseBuild=true
-
+RNQoreIDSdk_kotlinVersion=1.7.0
+RNQoreIDSdk_minSdkVersion=21
+RNQoreIDSdk_targetSdkVersion=31
+RNQoreIDSdk_compileSdkVersion=31
+RNQoreIDSdk_ndkversion=21.4.7075529

package/android/src/main/AndroidManifest.xml

@@ -1,3 +1,3 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="com.qoreidsdk">
+  package="com.qoreidsdk">
 </manifest>

package/android/src/main/java/com/qoreidsdk/QoreidSdkModule.kt

@@ -1,11 +1,19 @@
 package com.qoreidsdk
 
+import com.facebook.react.bridge.ReactContextBaseJavaModule
 import android.app.Activity
 import android.content.Intent
 import android.os.Build
 import android.util.Log
-import com.facebook.react.bridge.*
+import androidx.annotation.RequiresApi
+import com.facebook.react.bridge.Arguments
+import com.facebook.react.bridge.BaseActivityEventListener
+import com.facebook.react.bridge.ReactApplicationContext
+import com.facebook.react.bridge.ReactMethod
+import com.facebook.react.bridge.ReadableMap
+import com.facebook.react.bridge.WritableMap
 import com.facebook.react.modules.core.DeviceEventManagerModule
+import com.qoreid.sdk.core.OnFlowRequestIdCallback
 import com.qoreid.sdk.core.QoreIDParams
 import com.qoreid.sdk.core.QoreIDSdk
 import com.qoreid.sdk.core.QoreIDSdk.QORE_ID_RESULT_CODE
@@ -15,153 +23,177 @@ import com.qoreid.sdk.core.models.ApplicantData
 import com.qoreid.sdk.core.models.ErrorResult
 import com.qoreid.sdk.core.models.QoreIDResult
 import com.qoreid.sdk.core.models.SuccessResult
-import java.util.HashMap
-
-class QoreidSdkModule(val reactContext: ReactApplicationContext) :
-        ReactContextBaseJavaModule(reactContext) {
-    private var qoreIdResult: QoreIDResult? = null
-
-    private val activityEventListener =
-            object : BaseActivityEventListener() {
-                override fun onActivityResult(
-                        activity: Activity?,
-                        requestCode: Int,
-                        resultCode: Int,
-                        intent: Intent?
-                ) {
-
-                    if (resultCode == QORE_ID_RESULT_CODE && intent != null) {
-                        qoreIdResult =
-                                if (Build.VERSION.SDK_INT < 33) {
-                                    intent.extras?.getSerializable(QORE_ID_RESULT_EXTRA_KEY) as
-                                            QoreIDResult
-                                } else {
-                                    intent.extras?.getSerializable(
-                                            QORE_ID_RESULT_EXTRA_KEY,
-                                            QoreIDResult::class.java
-                                    )
-                                }
-                        processQoreIDResult(reactContext, qoreIdResult!!)
-                    }
-                }
+import com.qoreid.sdk.core.models.VerificationExtraData
+
+class QoreidSdkModule(context: ReactApplicationContext) :
+  ReactContextBaseJavaModule(context) {
+
+  override fun getName(): String {
+    return NAME
+  }
+
+  private var qoreIdResult: QoreIDResult? = null
+
+  private val activityEventListener =
+    object : BaseActivityEventListener() {
+      @RequiresApi(Build.VERSION_CODES.TIRAMISU)
+      override fun onActivityResult(
+        activity: Activity?,
+        requestCode: Int,
+        resultCode: Int,
+        intent: Intent?
+      ) {
+
+        if (resultCode == QORE_ID_RESULT_CODE && intent != null) {
+          qoreIdResult =
+            if (Build.VERSION.SDK_INT < 33) {
+              intent.extras?.getSerializable(QORE_ID_RESULT_EXTRA_KEY) as
+                QoreIDResult
+            } else {
+              intent.extras?.getSerializable(
+                QORE_ID_RESULT_EXTRA_KEY,
+                QoreIDResult::class.java
+              )
             }
-
-    init {
-        reactContext.addActivityEventListener(activityEventListener)
-        QoreIDSdk.Callbacks.onFlowRequestId {
-            Log.i("QORE_ID", it.toString())
-
-            val event =
-                    Arguments.createMap().apply {
-                        putString("data", it.toString())
-                        putString("message", "QOREID SDK INITIALIZED")
-                        putString("event", "SESSION_RESULT")
-                    }
-
-            sendEvent(reactContext, "onResult", event)
+          processQoreIDResult(context, qoreIdResult!!)
         }
+      }
     }
 
-    override fun getName(): String {
-        return NAME
+  init {
+    context.addActivityEventListener(activityEventListener)
+
+    QoreIDSdk.Callbacks.onFlowRequestId(object : OnFlowRequestIdCallback {
+      override fun onValue(flowRequestId: Long) {
+        Log.i("QORE_ID", flowRequestId.toString())
+        val event =
+          Arguments.createMap().apply {
+            putString("data", flowRequestId.toString())
+            putString("message", "QOREID SDK INITIALIZED")
+            putString("event", "SESSION_RESULT")
+          }
+
+        sendEvent(context, "onResult", event)
+      }
+    })
+  }
+
+  @ReactMethod
+  fun launchQoreidSdk(readableData: ReadableMap) {
+    val data = readableData.toHashMap()
+
+    if (currentActivity == null) {
+      Log.e("Error", "No current activity")
+      return
     }
 
-    @ReactMethod
-    fun launchQoreidSdk(readableData: ReadableMap) {
-        val data = readableData.toHashMap()
-
-        if (currentActivity == null) {
-            Log.e("Error", "No current activity")
-            return
-        }
-
-        val config = data?.get("config") as? HashMap<*, *>
-        val apD = data?.get("applicantData") as? HashMap<*, *>
-        val applicantData =
-                ApplicantData(
-                        apD?.get("firstName") as String,
-                        apD?.get("lastName") as String,
-                        apD?.get("phoneNumber") as String?,
-                        apD?.get("middleName") as String?,
-                        apD?.get("dob") as String?,
-                        apD?.get("email") as String?,
-                        apD?.get("gender") as String?
-                )
-
-        val adD = data?.get("addressData") as? HashMap<*, *>
-        val addressData =
-                AddressData(
-                        adD?.get("address") as String?,
-                        adD?.get("city") as String?,
-                        adD?.get("lga") as String?,
-                        adD?.get("state") as String?,
-                )
-        val flowId = config?.get("flowId") as? Double
-
-        val qoreIDParams =
-                if (flowId?.toLong() != 0L) {
-                    QoreIDParams()
-                            .clientId(config?.get("clientId") as String)
-                            .customerReference(config?.get("customerReference") as String)
-                            .inputData(applicantData, addressData)
-                            .ocrAcceptedDocuments(data?.get("acceptedDocuments") as List<String>)
-                            .workflow(flowId!!.toLong())
-                    //                .workflowDefaultIdentity(config?.get("defaultIdType") as
-                    // String)
-                } else {
-                    QoreIDParams()
-                            .clientId(config?.get("clientId") as String)
-                            .customerReference(config?.get("customerReference") as String)
-                            .inputData(applicantData, addressData)
-                            .ocrAcceptedDocuments(data?.get("acceptedDocuments") as List<String>)
-                            .collection(config?.get("productCode") as String)
-                }
-
-        QoreIDSdk.s(BuildConfig.s)
-        QoreIDSdk.params(qoreIDParams)
-        QoreIDSdk.launch(requireNotNull(currentActivity))
+    val config = data?.get("config") as? HashMap<*, *>
+    val apD = data?.get("applicantData") as? HashMap<*, *>
+    val applicantData =
+      ApplicantData(
+        apD?.get("firstName") as String,
+        apD?.get("lastName") as String,
+        apD?.get("phoneNumber") as String?,
+        apD?.get("middleName") as String?,
+        apD?.get("dob") as String?,
+        apD?.get("email") as String?,
+        apD?.get("gender") as String?
+      )
+
+    val adD = data?.get("addressData") as? HashMap<*, *>
+    val addressData =
+      AddressData(
+        adD?.get("address") as String?,
+        adD?.get("city") as String?,
+        adD?.get("lga") as String?,
+        adD?.get("state") as String?,
+      )
+    val flowId = config?.get("flowId") as? Double
+
+    val _extraData = data?.get("extraData") as? HashMap<*, *>?
+    var extraData: VerificationExtraData? = null
+
+    if (!_extraData.isNullOrEmpty()) {
+      extraData = VerificationExtraData(
+        _extraData.get("organisationId") as String,
+        _extraData.get("organisationName") as String,
+        _extraData?.get("requestSource") as String,
+        _extraData?.get("internalReferenceId") as String
+      )
     }
 
-    fun processQoreIDResult(context: ReactContext, qoreIdResult: QoreIDResult) {
-        when (qoreIdResult) {
-            is ErrorResult -> {
-                // Handle error.
-                val event =
-                        Arguments.createMap().apply {
-                            putString("code", qoreIdResult.code.toString())
-                            putString("data", qoreIdResult.data.toString())
-                            putString("message", qoreIdResult.message)
-                            putString("event", "ERROR_RESULT")
-                        }
-
-                sendEvent(context, "onResult", event)
-            }
-            is SuccessResult -> {
-                // Handle success.
-                val event =
-                        Arguments.createMap().apply {
-                            putString("data", qoreIdResult.data.toString())
-                            putString("message", qoreIdResult.message)
-                            putString("event", "SUCCESS_RESULT")
-                        }
-
-                sendEvent(context, "onResult", event)
-            }
-        }
+    val qoreIDParams =
+      if (flowId?.toLong() != 0L) {
+        QoreIDParams()
+          .clientId(config?.get("clientId") as String)
+          .customerReference(config?.get("customerReference") as String)
+          .inputData(applicantData, addressData, null, extraData)
+          .ocrAcceptedDocuments(data?.get("acceptedDocuments") as List<String>)
+          .workflow(flowId!!.toLong())
+          .workflowDefaultIdentity(
+            config?.get("defaultIdType") as
+              String
+          )
+      } else {
+        QoreIDParams()
+          .clientId(config?.get("clientId") as String)
+          .customerReference(config?.get("customerReference") as String)
+          .inputData(applicantData, addressData, null, extraData)
+          .ocrAcceptedDocuments(data?.get("acceptedDocuments") as List<String>)
+          .collection(config?.get("productCode") as String)
+      }
+
+    QoreIDSdk.s(BuildConfig.s)
+    QoreIDSdk.params(qoreIDParams)
+    QoreIDSdk.launch(requireNotNull(currentActivity))
+  }
+
+  fun processQoreIDResult(context: ReactApplicationContext, qoreIdResult: QoreIDResult) {
+    when (qoreIdResult) {
+      is ErrorResult -> {
+        // Handle error.
+        val event =
+          Arguments.createMap().apply {
+            putString("code", qoreIdResult.code.toString())
+            putString("data", qoreIdResult.data.toString())
+            putString("message", qoreIdResult.message)
+            putString("event", "ERROR_RESULT")
+          }
+
+        sendEvent(context, "onResult", event)
+      }
+
+      is SuccessResult -> {
+        // Handle success.
+        val event =
+          Arguments.createMap().apply {
+            putString("data", qoreIdResult.data.toString())
+            putString("message", qoreIdResult.message)
+            putString("event", "SUCCESS_RESULT")
+          }
+
+        sendEvent(context, "onResult", event)
+      }
     }
+  }
 
-    private fun sendEvent(reactContext: ReactContext, eventName: String, params: WritableMap?) {
-        reactContext
-                .getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter::class.java)
-                .emit(eventName, params)
-    }
+  private fun sendEvent(
+    reactContext: ReactApplicationContext,
+    eventName: String,
+    params: WritableMap?
+  ) {
+    reactContext
+      .getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter::class.java)
+      .emit(eventName, params)
+  }
 
-    companion object {
-        const val NAME = "QoreidSdk"
 
-        @JvmStatic
-        fun initialize(activity: Activity) {
-            QoreIDSdk.initialize(activity)
-        }
+  companion object {
+    const val NAME = "QoreidSdk"
+
+    @JvmStatic
+    fun initialize(activity: Activity) {
+      QoreIDSdk.initialize(activity)
     }
+  }
 }

package/android/src/main/java/com/qoreidsdk/QoreidSdkPackage.kt

@@ -1,7 +1,5 @@
 package com.qoreidsdk
 
-
-
 import com.facebook.react.ReactPackage
 import com.facebook.react.bridge.NativeModule
 import com.facebook.react.bridge.ReactApplicationContext
@@ -14,7 +12,6 @@ class QoreidSdkPackage : ReactPackage {
   }
 
   override fun createViewManagers(reactContext: ReactApplicationContext): List<ViewManager<*, *>> {
-    return listOf()
+    return emptyList()
   }
-
 }

package/ios/QoreidSdk.m

@@ -1,21 +1,12 @@
 #import <React/RCTBridgeModule.h>
 #import <UIKit/UIKit.h>
 
+@interface RCT_EXTERN_MODULE (QoreidSdk, NSObject)
 
+RCT_EXTERN_METHOD(launchQoreidSdk : (NSDictionary *)data)
 
-@interface RCT_EXTERN_MODULE(QoreidSdk, NSObject)
-
-RCT_EXTERN_METHOD (launchQoreidSdk: (NSDictionary *) data)
-
-
-// Don't compile this code when we build for the old architecture.
-#ifdef RCT_NEW_ARCH_ENABLED
-- (std::shared_ptr<facebook::react::TurboModule>)getTurboModule:
-    (const facebook::react::ObjCTurboModule::InitParams &)params
-{
-    return std::make_shared<facebook::react::NativeQoreidSdkSpecJSI>(params);
++ (BOOL)requiresMainQueueSetup {
+  return NO;
 }
-#endif
 
 @end
-