idwise-cordova-sdk 5.0.1 → 5.0.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "idwise-cordova-sdk",
-  "version": "5.0.1",
+  "version": "5.0.2",
   "description": "IDWise SDK wrapper for Cordova projects",
   "cordova": {
     "id": "idwise-cordova-sdk",

package/plugin.xml

@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<plugin id="idwise-cordova-sdk" version="4.6.9" xmlns="http://apache.org/cordova/ns/plugins/1.0"
+<plugin id="idwise-cordova-sdk" version="5.0.2" xmlns="http://apache.org/cordova/ns/plugins/1.0"
     xmlns:android="http://schemas.android.com/apk/res/android">
     <name>IDWiseCordovaSDK</name>
     <js-module name="IDWiseCordovaSDK" src="www/IDWiseCordovaSDK.js">
@@ -24,7 +24,7 @@
                 <source url="https://github.com/idwise/ios-sdk.git" />
             </config>
             <pods use-frameworks="true">
-                <pod name="IDWise" spec="5.0.0" />
+                <pod name="IDWise" spec="5.0.1" />
             </pods>
         </podspec>
     </platform>

package/src/android/IDWiseCordovaSDK.kt

@@ -5,8 +5,8 @@ import com.google.gson.Gson
 import com.google.gson.reflect.TypeToken
 import com.idwise.sdk.IDWise
 import com.idwise.sdk.IDWiseDynamic
-import com.idwise.sdk.IDWiseSDKJourneyCallback
-import com.idwise.sdk.IDWiseSDKStepCallback
+import com.idwise.sdk.IDWiseJourneyCallbacks
+import com.idwise.sdk.IDWiseStepCallbacks
 import com.idwise.sdk.data.models.*
 import org.apache.cordova.CallbackContext
 import org.apache.cordova.CordovaPlugin
@@ -38,10 +38,10 @@ class IDWiseCordovaSDK : CordovaPlugin() {
                 val clientKey = args.getString(0)
                 val theme = args.getString(1)
 
-                val idwiseTheme: IDWiseSDKTheme = try {
-                    IDWiseSDKTheme.valueOf(theme!!)
+                val idwiseTheme: IDWiseTheme = try {
+                    IDWiseTheme.valueOf(theme!!)
                 } catch (e: Exception) {
-                    IDWiseSDKTheme.SYSTEM_DEFAULT
+                    IDWiseTheme.SYSTEM_DEFAULT
                 }
 
                 clientKey?.let {
@@ -113,20 +113,17 @@ class IDWiseCordovaSDK : CordovaPlugin() {
                 finishJourney()
                 return true
             }
-
-            
-
         }
         return false
     }
 
     private fun initialize(
         clientKey: String,
-        theme: IDWiseSDKTheme,
+        theme: IDWiseTheme,
         callbackContext: CallbackContext
     ) {
 
-        IDWise.initialize(clientKey, theme) { error: IDWiseSDKError? ->
+        IDWise.initialize(clientKey, theme) { error: IDWiseError? ->
             val params = JSONObject()
             params.put("event", "onError")
 
@@ -239,13 +236,13 @@ class IDWiseCordovaSDK : CordovaPlugin() {
           IDWiseDynamic.getJourneySummary { journeySummary, error ->
             if (journeySummary != null) {
                 val params = JSONObject()
-                params.put("journeySummary", gson.toJson(journeySummary))
+                params.put("data", gson.toJson(journeySummary))
                 val result = PluginResult(PluginResult.Status.OK, params)
                 result.keepCallback = false
                 callbackContext.sendPluginResult(result)
             } else if(error != null){
                  val params = JSONObject()
-                 params.put("error", gson.toJson(error!!))
+                 params.put("data", gson.toJson(error!!))
                 val result = PluginResult(PluginResult.Status.ERROR, params)
                 result.keepCallback = false
                 callbackContext.sendPluginResult(result)
@@ -253,7 +250,7 @@ class IDWiseCordovaSDK : CordovaPlugin() {
         }
     }
 
-    private val journeyCallbacks = object : IDWiseSDKJourneyCallback {
+    private val journeyCallbacks = object : IDWiseJourneyCallbacks {
         override fun onJourneyStarted(journeyInfo: JourneyStartedInfo) {
             val params = JSONObject()
             params.put("event", "onJourneyStarted")
@@ -304,7 +301,7 @@ class IDWiseCordovaSDK : CordovaPlugin() {
 
         }
 
-        override fun onError(error: IDWiseSDKError) {
+        override fun onError(error: IDWiseError) {
             val params = JSONObject()
             params.put("event", "onError")
             params.put("data", gson.toJson(error))
@@ -315,7 +312,7 @@ class IDWiseCordovaSDK : CordovaPlugin() {
         }
     }
 
-    private val stepCallbacks = object : IDWiseSDKStepCallback {
+    private val stepCallbacks = object : IDWiseStepCallbacks {
         override fun onStepCaptured(stepCapturedInfo: StepCapturedInfo) {
             Log.d("stepCallbacks", "onStepCaptured ${stepCapturedInfo.stepId}")
             val params = JSONObject()
@@ -324,12 +321,9 @@ class IDWiseCordovaSDK : CordovaPlugin() {
             val originalImage = convertImageToBase64String(stepCapturedInfo.originalImage)
             val croppedImage = convertImageToBase64String(stepCapturedInfo.croppedImage)
             
-            val resp = JSONObject()
-            resp.put("stepId", stepCapturedInfo.stepId)
-            resp.put("croppedImage",croppedImage)
-            resp.put("originalImage", originalImage)
+            val capturedResponse = OnStepCapturedInfoExposed(stepCapturedInfo.stepId,originalImage,croppedImage)
 
-            params.put("data", gson.toJson(resp))
+            params.put("data", gson.toJson(capturedResponse))
 
             Log.d("stepCallbacks", "onStepCaptured ${params}")
             val result = PluginResult(PluginResult.Status.OK, params)
@@ -385,4 +379,9 @@ class IDWiseCordovaSDK : CordovaPlugin() {
         return Base64.encodeToString(b, Base64.DEFAULT)
   }
 
+    internal data class OnStepCapturedInfoExposed(
+        val stepId:String,
+        val originalImage:String?,
+        val croppedImage:String?
+    )
 }

package/src/android/idwise-sdk.gradle

@@ -1,4 +1,4 @@
 dependencies {
-  implementation 'com.idwise:android-sdk:5.0.0'
+  implementation 'com.idwise:android-sdk:5.0.1'
   implementation 'com.google.code.gson:gson:2.10.1'
 }

package/src/ios/IDWiseCordovaSDK.swift

@@ -12,7 +12,7 @@ import Foundation
     let clientKey = command.arguments[0] as? String ?? ""
     let theme = command.arguments[1] as? String ?? ""
 
-    var sdkTheme: IDWiseSDKTheme = .systemDefault
+    var sdkTheme: IDWiseTheme = .systemDefault
     if theme == "LIGHT" {
       sdkTheme = .light
     } else if theme == "DARK" {
@@ -52,7 +52,7 @@ import Foundation
 
     IDWise.startJourney(
       flowId: flowId, referenceNumber: referenceNumber,
-      locale: locale, applicantDetails: nil, journeyDelegate: self)
+      locale: locale, applicantDetails: nil, journeyCallbacks: self)
   }
 
   @objc(startDynamicJourney:)
@@ -66,7 +66,7 @@ import Foundation
 
     IDWiseDynamic.startJourney(
       flowId: flowId, referenceNumber: referenceNumber,
-      locale: locale, applicantDetails: nil, journeyDelegate: self, stepDelegate: self)
+      locale: locale, applicantDetails: nil, journeyCallbacks: self, stepCallbacks: self)
   }
 
   @objc(resumeJourney:)
@@ -79,7 +79,7 @@ import Foundation
 
     IDWise.resumeJourney(
       flowId: flowId, journeyId: journeyId,
-      locale: locale, journeyDelegate: self)
+      locale: locale, journeyCallbacks: self)
   }
 
   @objc(resumeDynamicJourney:)
@@ -92,21 +92,22 @@ import Foundation
 
     IDWiseDynamic.resumeJourney(
       flowId: flowId, journeyId: journeyId,
-      locale: locale, journeyDelegate: self, stepDelegate: self)
+      locale: locale, journeyCallbacks: self, stepCallbacks: self)
   }
 
   @objc(getJourneySummary:)
   func getJourneySummary(_ command: CDVInvokedUrlCommand) {
-    print("swift getjourneysummary")
+    
     IDWiseDynamic.getJourneySummary(
-      callback: { journeySummary, error in
+      callback: { journeySummary, summaryError in
         if let summary = journeySummary {
           print("swift getjourneysummary success")
           do {
-              let jsonEncoder = JSONEncoder()
-              let jsonData = try jsonEncoder.encode(summary)
-              let json = String(data: jsonData, encoding: String.Encoding.utf8)
-              let arguments = ["journeySummary": json] as [String: Any]
+              let responseSummary = JourneySummaryExposed(summary: summary,error: summaryError)
+              let jsonData = try JSONEncoder().encode(responseSummary)
+              let jsonString = String(data: jsonData, encoding: String.Encoding.utf8)
+              let arguments = ["data": jsonString] as [String: Any]
+
               var pluginResult = CDVPluginResult(
                 status: CDVCommandStatus_OK,
                 messageAs: arguments
@@ -120,10 +121,10 @@ import Foundation
         } else {
           if let err = error {
             do {
-              let jsonEncoder = JSONEncoder()
-              let jsonData = try jsonEncoder.encode(error)
-              let jsonResp = String(data: jsonData, encoding: String.Encoding.utf8)
-              let arguments = ["error": jsonResp] as [String: Any]
+              let responseSummary = JourneySummaryExposed(summary: summary,error: summaryError)
+              let jsonData = try JSONEncoder().encode(responseSummary)
+              let jsonString = String(data: jsonData, encoding: String.Encoding.utf8)
+              let arguments = ["data": jsonString] as [String: Any]
               var pluginResult = CDVPluginResult(
                 status: CDVCommandStatus_ERROR,
                 messageAs: arguments
@@ -160,8 +161,8 @@ import Foundation
   }
 }
 
-extension IDWiseCordovaSDK: IDWiseSDKJourneyDelegate {
-  func onError(error: IDWiseSDKError) {
+extension IDWiseCordovaSDK: IDWiseJourneyCallbacks {
+  func onError(error: IDWiseError) {
     do {
       let jsonEncoder = JSONEncoder()
       let jsonData = try jsonEncoder.encode(error)
@@ -250,7 +251,7 @@ extension IDWiseCordovaSDK: IDWiseSDKJourneyDelegate {
   }
 }
 
-extension IDWiseCordovaSDK: IDWiseSDKStepDelegate {
+extension IDWiseCordovaSDK: IDWiseStepCallbacks {
   func onStepSkipped(stepSkippedInfo: StepSkippedInfo) {
 
     let jsonEncoder = JSONEncoder()
@@ -309,10 +310,16 @@ extension IDWiseCordovaSDK: IDWiseSDKStepDelegate {
   func onStepCaptured(stepCapturedInfo: StepCapturedInfo) {
 
     do {
+
       let originalImage = convertImageToBase64String(img: stepCapturedInfo.originalImage)
       let croppedImage = convertImageToBase64String(img: stepCapturedInfo.croppedImage)
       
-      let arguments = ["event": "onStepCaptured", "data": "{\"stepId\":\"\(stepCapturedInfo.stepId)\", \"originalImage\":\"\(originalImage)\", \"croppedImage\":\"\(croppedImage)\"}"] as [String: Any]
+      let captureResponse = OnStepCapturedExposed(stepId: stepCapturedInfo.stepId, originalImage: originalImage, croppedImage: croppedImage)
+           
+      let jsonData = try  JSONEncoder().encode(captureResponse)
+      let json = String(data: jsonData, encoding: String.Encoding.utf8)
+
+      let arguments = ["event": "onStepCaptured", "data":json ] as [String: Any]
       
       var pluginResult = CDVPluginResult(
         status: CDVCommandStatus_OK,
@@ -330,3 +337,16 @@ extension IDWiseCordovaSDK: IDWiseSDKStepDelegate {
     return img?.jpegData(compressionQuality: 1)?.base64EncodedString() ?? ""
   }
 }
+
+
+private struct JourneySummaryExposed: Codable {
+    var summary: IDWiseSDK.JourneySummary?
+    var error: IDWiseError?
+}
+
+private struct OnStepCapturedExposed: Codable {
+    var stepId: String
+    var originalImage: String?
+    var croppedImage: String?
+}
+

package/www/IDWiseDynamicCordovaSDK.js

@@ -85,12 +85,12 @@ exports.getJourneySummary = function (success, error) {
   console.log("IDWISE-Dynamic.JS -> getJourneySummary");
 
   function onSuccess(response) {
-    success(JSON.parse(response.journeySummary));
+    success(JSON.parse(response.data));
   }
 
   function onError(errorResponse) {
     console.log(`getjourneysummary error ${JSON.stringify(errorResponse)}`);
-    error(JSON.parse(errorResponse.error));
+    error(JSON.parse(errorResponse.data));
   }
 
   exec(onSuccess, onError, "IDWiseCordovaSDK", "getJourneySummary", []);