idwise-nfc-react-native-sdk 4.9.4 → 5.0.2

package/android/build.gradle

@@ -94,10 +94,10 @@ android {
 repositories {
   mavenCentral()
   google()
-  maven{
-            name 'Staging'
-            url 'https://s01.oss.sonatype.org/content/repositories/staging/'
-        }
+  //maven{
+  //          name 'Staging'
+  //          url 'https://s01.oss.sonatype.org/content/repositories/staging/'
+  //      }
 }
 
 def kotlin_version = getExtOrDefault("kotlinVersion")
@@ -112,6 +112,6 @@ dependencies {
   implementation 'com.google.code.gson:gson:2.10.1'
 
   implementation "com.idwise:android-sdk:$idwise_sdk_version"
-  implementation "com.idwise:nfc:4.9.1"
+  implementation "com.idwise:nfc:5.0.2"
 }
 

package/android/gradle.properties

@@ -4,4 +4,4 @@ IdwiseMobileSdk_targetSdkVersion=31
 IdwiseMobileSdk_compileSdkVersion=31
 IdwiseMobileSdk_ndkversion=21.4.7075529
 # Idwise SDK version
-idwise_sdk_version=4.9.1
+idwise_sdk_version=5.0.2

package/android/src/main/java/com/idwisemobilesdk/IdwiseMobileSdkModule.kt

@@ -7,12 +7,10 @@ import com.facebook.react.bridge.*
 import com.facebook.react.modules.core.DeviceEventManagerModule
 import com.google.gson.Gson
 import com.idwise.sdk.IDWise
-import com.idwise.sdk.IDWiseSDKCallback
-import com.idwise.sdk.IDWiseSDKStepCallback
-import com.idwise.sdk.data.models.IDWiseSDKError
-import com.idwise.sdk.data.models.IDWiseSDKTheme
-import com.idwise.sdk.data.models.JourneyInfo
-import com.idwise.sdk.data.models.StepResult
+import com.idwise.sdk.IDWiseDynamic
+import com.idwise.sdk.IDWiseJourneyCallbacks
+import com.idwise.sdk.IDWiseStepCallbacks
+import com.idwise.sdk.data.models.*
 import java.io.ByteArrayOutputStream
 
 class IdwiseMobileSdkModule(private val reactContext: ReactApplicationContext) :
@@ -29,16 +27,15 @@ class IdwiseMobileSdkModule(private val reactContext: ReactApplicationContext) :
 
   @ReactMethod
   fun initialize(clientKey: String, theme: String) {
-    val idwiseTheme: IDWiseSDKTheme = try {
-      IDWiseSDKTheme.valueOf(theme!!)
+    val idwiseTheme: IDWiseTheme = try {
+      IDWiseTheme.valueOf(theme!!)
     } catch (e: Exception) {
-      IDWiseSDKTheme.SYSTEM_DEFAULT
+      IDWiseTheme.SYSTEM_DEFAULT
     }
 
     IDWise.initialize(clientKey, idwiseTheme) { error ->
       val params: WritableMap = Arguments.createMap()
-      error?.errorCode?.let { code -> params.putInt("errorCode", code) }
-      params.putString("errorMessage", error?.message)
+      params.putString("data",Gson().toJson(error))
       sendEvent("onInitializeError", params)
     }
   }
@@ -47,10 +44,16 @@ class IdwiseMobileSdkModule(private val reactContext: ReactApplicationContext) :
   fun startJourney(
     journeyTemplateId: String,
     referenceNo: String?,
-    locale: String
+    locale: String?,
+    applicantDetails: ReadableMap?
   ) {
+    var deconstructedMap: HashMap<String,String>? = null
+    applicantDetails?.let{
+      deconstructedMap = recursivelyDeconstructReadableMap(applicantDetails)
+    }
+    
     currentActivity?.let { activity ->
-      IDWise.startJourney(activity, journeyTemplateId, referenceNo, locale, journeyCallback)
+      IDWise.startJourney(context=activity, flowId=journeyTemplateId, referenceNo=referenceNo, locale=locale, applicantDetails=deconstructedMap, journeyCallbacks=journeyCallback)
     }
   }
 
@@ -58,12 +61,18 @@ class IdwiseMobileSdkModule(private val reactContext: ReactApplicationContext) :
   fun startDynamicJourney(
     journeyTemplateId: String,
     referenceNo: String?,
-    locale: String
+    locale: String?,
+    applicantDetails: ReadableMap?
   ) {
+
+    var deconstructedMap: HashMap<String,String>? = null
+    applicantDetails?.let{
+      deconstructedMap = recursivelyDeconstructReadableMap(applicantDetails)
+    }
+
     currentActivity?.let { activity ->
-      IDWise.startDynamicJourney(
-        activity, journeyTemplateId, referenceNo, locale,
-        journeyCallback, stepCallback
+      IDWiseDynamic.startJourney(
+       context=activity, flowId=journeyTemplateId, referenceNo=referenceNo, locale=locale,applicantDetails=deconstructedMap, journeyCallbacks=journeyCallback, stepCallbacks=stepCallback
       )
     }
   }
@@ -75,9 +84,9 @@ class IdwiseMobileSdkModule(private val reactContext: ReactApplicationContext) :
     locale: String
   ) {
     currentActivity?.let { activity ->
-      IDWise.resumeDynamicJourney(
-        activity, journeyTemplateId, journeyId, locale,
-        journeyCallback, stepCallback
+      IDWiseDynamic.resumeJourney(
+        context=activity, flowId=journeyTemplateId, journeyId=journeyId, locale=locale,
+        journeyCallbacks=journeyCallback, stepCallbacks=stepCallback
       )
     }
   }
@@ -90,54 +99,50 @@ class IdwiseMobileSdkModule(private val reactContext: ReactApplicationContext) :
   ) {
     currentActivity?.let { activity ->
       IDWise.resumeJourney(
-        activity, journeyTemplateId, journeyId, locale,
-        journeyCallback
+       context=activity, flowId=journeyTemplateId, journeyId=journeyId, locale=locale,
+        journeyCallbacks=journeyCallback
       )
     }
   }
 
   @ReactMethod
   fun startStep(stepId: String) {
-    currentActivity?.let { activity -> IDWise.startStep(activity, stepId) }
+    currentActivity?.let { activity -> IDWiseDynamic.startStep(activity, stepId) }
   }
 
   @ReactMethod
   fun startStepFromFileUpload(stepId: String, data: ByteArray) {
-    currentActivity?.let { activity -> IDWise.startStepFromFileUpload(activity, stepId, data) }
+    currentActivity?.let { activity -> IDWiseDynamic.startStepFromFileUpload(activity, stepId, data) }
   }
 
   @ReactMethod
   fun finishDynamicJourney() {
-    IDWise.finishDynamicJourney()
+    IDWiseDynamic.finishJourney()
   }
 
 
   @ReactMethod
   fun skipStep(stepId: String) {
-    IDWise.skipStep(stepId)
+    IDWiseDynamic.skipStep(stepId)
   }
 
   @ReactMethod
   fun getJourneySummary() {
-    IDWise.getJourneySummary() { summary, error ->
+    IDWiseDynamic.getJourneySummary() { summary, error ->
       val gson = Gson()
       val argsMap = Arguments.createMap()
+    
+      val summaryResponse = JourneySummaryExposed(summary,error)
+    
+      argsMap.putString("data", gson.toJson(summaryResponse))
+      sendEvent("onJourneySummary", argsMap)
 
-      summary?.let {
-        argsMap.putString("summary", gson.toJson(summary))
-        sendEvent("onJourneySummary", argsMap)
-      }
-
-      error?.let {
-        argsMap.putString("error", gson.toJson(error))
-        sendEvent("onJourneySummaryError", argsMap)
-      }
     }
   }
 
   @ReactMethod
   fun unloadSDK() {
-    UiThreadUtil.runOnUiThread { IDWise.unloadSDK() }
+    UiThreadUtil.runOnUiThread { IDWiseDynamic.unloadSDK() }
   }
 
   @ReactMethod
@@ -148,75 +153,67 @@ class IdwiseMobileSdkModule(private val reactContext: ReactApplicationContext) :
   fun removeListeners(count: Integer?) {
   }
 
-  val journeyCallback = object : IDWiseSDKCallback {
-    override fun onJourneyStarted(journeyInfo: JourneyInfo) {
+  val journeyCallback = object : IDWiseJourneyCallbacks {
+    override fun onJourneyStarted(journeyInfo: JourneyStartedInfo) {
       val params: WritableMap = Arguments.createMap()
-      params.putString("journeyId", journeyInfo.journeyId)
+
+      params.putString("data", Gson().toJson(journeyInfo))
       sendEvent("onJourneyStarted", params)
     }
 
-    override fun onJourneyResumed(journeyInfo: JourneyInfo) {
+    override fun onJourneyResumed(journeyInfo: JourneyResumedInfo) {
       val params: WritableMap = Arguments.createMap()
-      params.putString("journeyId", journeyInfo.journeyId)
+      params.putString("data", Gson().toJson(journeyInfo))
       sendEvent("onJourneyResumed", params)
     }
 
-    override fun onJourneyCompleted(journeyInfo: JourneyInfo, isCompleted: Boolean) {
+    override fun onJourneyCompleted(journeyInfo: JourneyCompletedInfo) {
       val params: WritableMap = Arguments.createMap()
-      params.putString("journeyId", journeyInfo.journeyId)
-      sendEvent("onJourneyFinished", params)
+      params.putString("data", Gson().toJson(journeyInfo))
+      sendEvent("onJourneyCompleted", params)
     }
 
-    override fun onJourneyCancelled(journeyInfo: JourneyInfo?) {
+    override fun onJourneyCancelled(journeyInfo: JourneyCancelledInfo) {
       val params: WritableMap = Arguments.createMap()
-      params.putString("journeyId", journeyInfo?.journeyId)
+      params.putString("data", Gson().toJson(journeyInfo))
       sendEvent("onJourneyCancelled", params)
     }
 
-    override fun onError(error: IDWiseSDKError) {
+    override fun onError(error: IDWiseError) {
       val params: WritableMap = Arguments.createMap()
-      params.putInt("errorCode", error.errorCode)
-      params.putString("errorMessage", error.message)
+     params.putString("data", Gson().toJson(error))
       sendEvent("onJourneyError", params)
     }
   }
 
-  val stepCallback = object : IDWiseSDKStepCallback {
-    override fun onStepCaptured(stepId: String, bitmap: Bitmap?, croppedBitmap: Bitmap?) {
-      val bitmapString = convertImageToBase64String(croppedBitmap)
+  val stepCallback = object : IDWiseStepCallbacks {
+    override fun onStepCaptured(stepCapturedInfo:StepCapturedInfo) {
       val params: WritableMap = Arguments.createMap()
-      params.putString("stepId", stepId)
-      params.putString("capturedImage", bitmapString)
+      
+      val originalImage = convertImageToBase64String(stepCapturedInfo.originalImage)
+      val croppedImage = convertImageToBase64String(stepCapturedInfo.croppedImage)
+      val response = OnStepCapturedInfoExposed(stepCapturedInfo.stepId.toString(),originalImage,croppedImage)
+      
+      params.putString("data", Gson().toJson(response))
       sendEvent("onStepCaptured", params)
     }
 
-    override fun onStepResult(stepId: String, stepResult: StepResult?) {
+    override fun onStepResult(stepInfo:StepResultInfo) {
       val gson = Gson()
-      val argsMap = Arguments.createMap()
-
-      argsMap.putString("stepId", stepId)
-      stepResult?.let {
-        argsMap.putString("stepResult", gson.toJson(stepResult))
-      }
-
+      val argsMap: WritableMap  = Arguments.createMap()
+      argsMap.putString("data", Gson().toJson(stepInfo))
       sendEvent("onStepResult", argsMap)
     }
 
-    override fun onStepSkipped(stepId: String) {
+    override fun onStepSkipped(stepInfo:StepSkippedInfo) {
       val params: WritableMap = Arguments.createMap()
-      params.putString("stepId", stepId)
+      params.putString("data", Gson().toJson(stepInfo))
       sendEvent("onStepSkipped", params)
     }
 
-    override fun onStepConfirmed(stepId: String) {
-      /**
-       * No need to implement this as for latest version it's not being required.
-       */
-    }
-
-    override fun onStepCancelled(stepId: String) {
+    override fun onStepCancelled(stepInfo:StepCancelledInfo) {
       val params: WritableMap = Arguments.createMap()
-      params.putString("stepId", stepId)
+      params.putString("data", Gson().toJson(stepInfo))
       sendEvent("onStepCancelled", params)
     }
   }
@@ -233,4 +230,28 @@ class IdwiseMobileSdkModule(private val reactContext: ReactApplicationContext) :
   companion object {
     const val NAME = "IdwiseMobileSdk"
   }
+
+  private fun recursivelyDeconstructReadableMap(readableMap: ReadableMap):HashMap<String, String>  {
+    val iterator: ReadableMapKeySetIterator = readableMap.keySetIterator();
+    val deconstructedMap = HashMap<String,String>();
+    while (iterator.hasNextKey()) {
+        val key = iterator.nextKey();
+        deconstructedMap.put(key, readableMap.getString(key)?:"");    
+    }
+    
+    return deconstructedMap;
+}
+
+
+    internal data class OnStepCapturedInfoExposed(
+        val stepId:String,
+        val originalImage:String?,
+        val croppedImage:String
+    )
+
+
+    internal data class JourneySummaryExposed(
+        val summary:JourneySummary?,
+        val error:IDWiseError?
+    )
 }

package/idwise-react-native-sdk.podspec

@@ -17,6 +17,9 @@ Pod::Spec.new do |s|
   s.source_files = "ios/**/*.{h,m,mm,swift}"
   s.static_framework = true
 
+  s.dependency 'DocumentReader', '6.8.2981'
+  s.dependency 'DocumentReaderMRZRFID', '6.8.7687'
+
   s.pod_target_xcconfig    = {
     "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/boost\"",
     "OTHER_CPLUSPLUSFLAGS" => "-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1",
@@ -25,10 +28,6 @@ Pod::Spec.new do |s|
     "CODE_SIGNING_ALLOWED" => 'NO'
 }
 
-
-s.dependency 'DocumentReader', '6.8.2981'
-s.dependency 'DocumentReaderMRZRFID', '6.8.7687'
-
 s.preserve_paths = 'ios/IDWiseNFC.framework/**/*'
 s.xcconfig = { 'OTHER_LDFLAGS' => '-framework IDWiseNFC' }
 s.vendored_frameworks = 'ios/IDWiseNFC.framework'