react-native-hyperkyc-sdk 0.2.0-alpha2 → 0.3.0

package/android/build.gradle

@@ -56,9 +56,10 @@ repositories {
 dependencies {
     //noinspection GradleDynamicVersion
     implementation "com.facebook.react:react-native:+"  // From node_modules
-        
-    implementation('co.hyperverge:hyperkyc:0.0.2-alpha02@aar', {
+    implementation("com.google.code.gson:gson:2.8.6")   
+    implementation('co.hyperverge:hyperkyc:0.2.0@aar', {
         transitive = true
     })
+
 }
 

package/android/src/main/java/com/reactnativehyperkycsdk/HyperkycSdkModule.java

@@ -65,20 +65,22 @@ public class HyperkycSdkModule extends ReactContextBaseJavaModule implements Act
     public void launch(ReadableMap kycConfig, Callback resultCallback ){
         callback = resultCallback;
 
+
+
+
         ReactActivity currentActivity = (ReactActivity)getCurrentActivity();
-        List<HyperKycFlow> workflow = processWorkFlow(kycConfig.getString("workflow"));
+        String workflowId = kycConfig.getString("workflowId");
         String appId = kycConfig.hasKey("appId") ? kycConfig.getString("appId") : null;
         String appKey = kycConfig.hasKey("appKey") ? kycConfig.getString("appKey") : null;
         String transactionId = kycConfig.hasKey("transactionId") ? kycConfig.getString("transactionId") : null;
-        String defaultCountryId = kycConfig.hasKey("defaultCountryId") ? kycConfig.getString("defaultCountryId"): null;
         String accessToken = kycConfig.hasKey("accessToken")? kycConfig.getString("accessToken") : null;
 
         HyperKycConfig config = null;
         if(accessToken != null){
-            config = new HyperKycConfig(accessToken, workflow, transactionId, defaultCountryId );
+            config = new HyperKycConfig(accessToken, workflowId, transactionId);
         }else if(appId != null && appKey != null) {
 
-            config = new HyperKycConfig(appId, appKey, workflow, transactionId, defaultCountryId);
+            config = new HyperKycConfig(appId, appKey, workflowId, transactionId);
         }
         contract = new HyperKyc.Contract();
         Intent newIntent = contract.createIntent(currentActivity, config);
@@ -101,11 +103,11 @@ public class HyperkycSdkModule extends ReactContextBaseJavaModule implements Act
 
     private void parseKYCResult(HyperKycResult hyperKycResult){
 
-        String errorMessage="";
+        
         HyperKycData hyperKycData = hyperKycResult.getData();
         WritableMap resultMap = new WritableNativeMap();
-        resultMap.putString("result", hyperKycResult.getStatus().toString());
-        resultMap.putString("errorMessage", errorMessage);
+        resultMap.putString("status", hyperKycResult.getStatus().toString());
+        resultMap.putString("reason", hyperKycResult.getReason());
         try {
             if (hyperKycData != null) {
 
@@ -130,35 +132,7 @@ public class HyperkycSdkModule extends ReactContextBaseJavaModule implements Act
     }
 
 
-    private List<HyperKycFlow> processWorkFlow(String workflowArray){
-        List<HyperKycFlow> workflows = new ArrayList<>();
-        try {
-            JSONArray kycFlows = null;
-
-            kycFlows = new JSONArray(workflowArray);
-
-            for(int i = 0; i < kycFlows.length(); i++){
-                JSONObject kycFlow = kycFlows.getJSONObject(i);
-                if(kycFlow.has("type")){
-                    String flowStr = kycFlow.getString("type");
-                    switch (flowStr) {
-                        case "document":
-                            String countryId = kycFlow.has(HyperkycConstants.COUNTRY_ID) ? kycFlow.getString(HyperkycConstants.COUNTRY_ID): null;
-                            String documentId = kycFlow.has(HyperkycConstants.DOCUMENT_ID) ? kycFlow.getString(HyperkycConstants.DOCUMENT_ID): null;
-                            boolean useForFaceMatch = kycFlow.has(HyperkycConstants.USE_FOR_FACE_MATCH)?  kycFlow.getBoolean(HyperkycConstants.USE_FOR_FACE_MATCH): false;
-
-                            workflows.add(new HyperKycFlow.Document(new DocFlowConfig(useForFaceMatch, countryId, documentId )));
-                        case "face":
-                            workflows.add(new HyperKycFlow.Face());
-
-                    }
-                }
-            }
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        return workflows;
-    }
+
     @Override
     public void onNewIntent(Intent intent) {
 

package/ios/HyperkycSdk.swift

@@ -5,216 +5,180 @@ import HyperKYC
 
 @objc(Hyperkyc)
 class Hyperkyc: NSObject  {
-   @objc  static func requiresMainQueueSetup() -> Bool {return true}
-  
-  @objc(launch:callback:)
-  func launch(_config: NSDictionary, callback: @escaping RCTResponseSenderBlock) {
-    let appId = _config["appId"] as? String
-    let transactionId = _config["transactionId"] as? String
-    let appKey = _config["appKey"] as? String
-    let accessToken = _config["accessToken"] as? String
-    let kycFlow = _config["workflow"] as? String
-    let defaultCountryId = _config["defaultCountryId"] as? String ?? nil
+    @objc  static func requiresMainQueueSetup() -> Bool {return true}
     
-    let hyperKycWorkflows = processKYCFlowStates(flows: kycFlow!)
-    DispatchQueue.main.async {
-      let controller = RCTPresentedViewController()
+    internal var skipKeysArray : [String] = ["responseResult", "variables", "moduleId"]
+    @objc(launch:callback:)
+    func launch(_config: NSDictionary, callback: @escaping RCTResponseSenderBlock) {
+      let appId = _config["appId"] as? String
+      let transactionId = _config["transactionId"] as? String
+      let appKey = _config["appKey"] as? String
+      let accessToken = _config["accessToken"] as? String
+      let workflowId = _config["workflowId"] as? String
       
-      if let accessTokenConfig = accessToken{
-        let hyperKYCConfig = HyperKycConfig(accessToken: accessTokenConfig, workFlow: hyperKycWorkflows, transactionId: transactionId!, defaultCountryId: defaultCountryId)
-        HyperKyc.launch(controller!, hyperKycConfig: hyperKYCConfig) { hyperKycResult in
-        
-        }
-      }
       
-      if(appKey != nil && appId != nil){
-        let hyperKYCConfig = HyperKycConfig(appId: appId!, appKey: appKey!, workFlow: hyperKycWorkflows, transactionId: transactionId!, defaultCountryId: defaultCountryId)
+      DispatchQueue.main.async {
+        let controller = RCTPresentedViewController()
         
-        HyperKyc.launch(controller!, hyperKycConfig: hyperKYCConfig) { hyperKycResult in
+        if let accessTokenConfig = accessToken{
+          let hyperKYCConfig = HyperKycConfig(accessToken: accessTokenConfig, workflowId: workflowId!, transactionId: transactionId!)
+          HyperKyc.launch(controller!, hyperKycConfig: hyperKYCConfig) { hyperKycResult in
+            
+          }
+        }
         
-         let result =  self.processHyperKycResult(hyperKycResult: hyperKycResult)
-          callback( [result])
+        if(appKey != nil && appId != nil){
+          let hyperKYCConfig = HyperKycConfig(appId: appId!, appKey: appKey!, workflowId: workflowId!, transactionId: transactionId!)
+          
+          HyperKyc.launch(controller!, hyperKycConfig: hyperKYCConfig) { hyperKycResult in
+            
+            let result =  self.processHyperKycResult(hyperKycResult: hyperKycResult)
+            callback( [result])
+          }
         }
+        
       }
-      
     }
-  }
-  
-  
-  
-  
-  func processHyperKycResult(hyperKycResult: HyperKycResult) -> [String : Any]  {
-    
-    let resultEnum = hyperKycResult.result! as KYCResult
-    var resultEnumString = ""
-    var kycData = [
-      "selectedCountryId" : "",
-      
-    ] as [String: Any]
-    var errorMessage = ""
     
-    resultEnumString = String(describing: resultEnum)
     
-    if let hyperKycData = hyperKycResult.hyperKYCData {
-      if let country = hyperKycData.selectedCountry {
-        kycData["selectedCountryId"] = country
-      }
+    func processHyperKycResult(hyperKycResult: HyperKycResult) -> [String : Any]  {
       
+      let resultEnum = hyperKycResult.status!
+      var resultEnumString = ""
+      var kycData = [:] as [String: Any]
+      var errorMessage = ""
       
-      var docResultList : [[String: Any]] = []
-      for docResult in hyperKycData.docResultList{
-        
-        var docDataList: [[String: Any]] = []
+      resultEnumString = String(describing: resultEnum)
+      
+      if let hyperKycData = hyperKycResult.hyperKYCData {
         
-        for docData in docResult.docDataList {
-          var docDataDictionary = [
-            "side" : docData.side,
-            "docImagePath" : docData.docImagePath,
-            "action" : docData.action,
-          
+        //Process country data
+        if let countryResult = hyperKycData.countryResult{
+          var countryDataDictionary = [
+            "id": countryResult.id,
+            "name": countryResult.name,
+            "region": countryResult.region,
+            "moduleId": countryResult.moduleId,
+            "baseUrl": countryResult.baseUrl
+            
           ] as [String: Any]
-          if let responseHeaders = docData.responseHeaders  {
-            docDataDictionary["responseHeaders"] = responseHeaders
-          }
-          if let responseResult = docData.responseResult {
-            docDataDictionary["responseResult"] = getResponseResultJsonString(docDataResponseResult: responseResult, faceDataResponseResult: nil, faceMatchDataResponseResult: nil )
+          
+          kycData["countryResult"] = countryDataDictionary
+        }
+        
+        //Process doc data
+        var docResultList : [[String: Any]] = []
+        for docResult in hyperKycData.docResultList{
+          var docDataList: [[String: Any]] = []
+          for docData in docResult.docDataList {
+            docDataList.append(processDictionary(inputDictionary: docData.asDictionary))
           }
-          docDataList.append(docDataDictionary as [String : Any])
+          var docResultDictionary = [
+            "documentId": docResult.documentId,
+            "moduleId":docResult.moduleId,
+            "docDataList": docDataList
+          ] as [String : Any]
+          
+          docResultList.append(docResultDictionary as [String: Any])
         }
-        var docResultDictionary = [
-          "tag" : docResult.tag,
-          "documentId": docResult.documentId,
-          "docDataList": docDataList
-        ] as [String : Any]
         
-        docResultList.append(docResultDictionary as [String: Any])
-      }
-      
-      kycData["docResultList"] = docResultList
-      
-      // Process face data
-      if let faceData = hyperKycData.faceData {
-        var faceDataDictionary = [
-          "croppedFaceImagePath" : faceData.croppedFaceImagePath,
-          "fullFaceImagePath" : faceData.fullFaceImagePath,
-          "videoPath" : faceData.videoPath,
-          "action" : faceData.action,
-        ] as [String:Any]
-        if let responseHeaders = faceData.responseHeaders  {
-          faceDataDictionary["responseHeaders"] = responseHeaders
+        kycData["docResultList"] = docResultList
+        
+        //
+        // Process face data
+        if let faceResult = hyperKycData.faceResult {
+          var faceResultDictionary = ["moduleId": faceResult.moduleId] as [String:Any]
+          faceResultDictionary["faceData"] = processDictionary(inputDictionary: faceResult.faceData.asDictionary)
+          kycData["faceResult"] = faceResultDictionary
         }
-        if let responseResult = faceData.responseResult {
-          faceDataDictionary["responseResult"] = getResponseResultJsonString(docDataResponseResult: nil, faceDataResponseResult: responseResult, faceMatchDataResponseResult: nil )
+        
+        
+        
+        // Process api data
+        var apiResultList : [[String: Any]] = []
+        for apiResult in hyperKycData.apiResultList{
+          var apiResultDictionary = [
+            "moduleId" : apiResult.moduleId
+          ] as [String : Any]
+          apiResultDictionary["apiData"] = processDictionary(inputDictionary: apiResult.apiData.asDictionary)
+          apiResultList.append(apiResultDictionary)
         }
         
         
-        kycData["faceData"] = faceDataDictionary
+        kycData["apiResultList"] = apiResultList
         
-      }
         
-      //Process face match data
-        var faceMatchDataResultList : [[String: Any]] = []
-        for faceMatchDataResult in hyperKycData.faceMatchDataResultList{
-    
-          var faceMatchDataDictionary = [
-            "action" : faceMatchDataResult.facematchData.action,
-          ] as [String:Any]
-          if let responseHeaders = faceMatchDataResult.facematchData.responseHeaders  {
-            faceMatchDataDictionary["responseHeaders"] = responseHeaders
-          }
-          if let responseResult = faceMatchDataResult.facematchData.responseResult {
-            faceMatchDataDictionary["responseResult"] = getResponseResultJsonString(docDataResponseResult: nil, faceDataResponseResult: nil, faceMatchDataResponseResult: responseResult)
-          }
-          var faceMatchResultDictionary = [
-            "tag": faceMatchDataResult.tag,
-            "documentId":faceMatchDataResult.documentId,
-            "faceMatchData":faceMatchDataDictionary
-          ] as [String: Any]
-          faceMatchDataResultList.append(faceMatchResultDictionary)
+        
+        //Process formview data
+        var formViewResultList : [[String: Any]] = []
+        
+        for formViewResult in hyperKycData.formResultList{
+          var formViewResultDictionary = [
+            "moduleId" : formViewResult.moduleId
+          ] as [String : Any]
+          formViewResultList.append(formViewResultDictionary)
         }
-       
-      kycData["faceMatchDataResultList"] = faceMatchDataResultList
         
-                  if let errorMsg = hyperKycResult.errorMessage {
-                    errorMessage = errorMsg
-                  }
+        kycData["formViewResultList"] = formViewResultList
         
-                  let resultMap = [
-                    "result" : resultEnumString,
-                    "hyperKycData" : kycData,
-                    "errorMessage" : errorMessage,
-                  ] as [String : Any]
-                  return resultMap
+        //Process webview data
+        var webViewResultList : [[String: Any]] = []
+        for webViewResult in hyperKycData.webviewResultList{
+          var webViewResultDictionary = [
+            "moduleId" : webViewResult.moduleId
+          ] as [String : Any]
+          
+          webViewResultDictionary["webViewData"] = processDictionary(inputDictionary: webViewResult.webviewData.asDictionary)
+          webViewResultList.append(webViewResultDictionary)
+        }
         
-    
-    
-    }
-    return [:]
-  }
+        kycData["webViewResultList"] = webViewResultList
+        
+        
+        
+        
+        if let errorMsg = hyperKycResult.reason {
+          errorMessage = errorMsg
+        }
+        
+        let resultMap = [
+          "status" : resultEnumString,
+          "reason" : errorMessage,
+          "hyperKycData" : kycData
+         
+        ] as [String : Any]
+        return resultMap
+        
+      }
+      
       
-
-//
-  func getResponseResultJsonString(docDataResponseResult: DocCaptureApiDetail?, faceDataResponseResult: FaceCaptureApiDetail?, faceMatchDataResponseResult: FaceMatchApiDetail?) -> [String:Any] {
-  let encoder = JSONEncoder()
-  
-  do {
-    if let responseResult = docDataResponseResult {
-      let responseResultData = try encoder.encode(responseResult)
-      return try JSONSerialization.jsonObject(with: responseResultData, options: []) as? [String:Any] ?? [:]
-    } else if let responseResult = faceDataResponseResult {
-      let responseResultData = try encoder.encode(responseResult)
-      return try JSONSerialization.jsonObject(with: responseResultData, options: []) as? [String:Any] ?? [:]
-    } else if let responseResult = faceMatchDataResponseResult {
-      let responseResultData = try encoder.encode(responseResult)
-      return try JSONSerialization.jsonObject(with: responseResultData, options: []) as? [String:Any] ?? [:]
-    } else {
       return [:]
     }
-  } catch let parseError {
-    print("JSON Error DocData ResponseResult : \(parseError.localizedDescription)")
-    return [:]
-  }
-    return [:]
-}
-
-
-
-func processKYCFlowStates(flows : String) -> [HyperKycFlow] {
-  var hyperKycFlows = [HyperKycFlow]()
-  let workflows = convertToDictionary(json: flows)
-  
-  workflows?.forEach({ (value: Any) in
-    let valueObj = (value as! [String:Any])
-    switch(valueObj["type"] as! String){
-    case "document":
-      let useForFaceMatch = valueObj["useForFaceMatch"] as? Bool ?? false
-      let countryId = valueObj["countryId"] as? String ?? nil
-      let documentId = valueObj["documentId"] as? String ?? nil
-      hyperKycFlows.append(HyperKycFlow.document(config: DocFlowConfig(useForFaceMatch: useForFaceMatch, countryId: countryId, documentId: documentId)))
-    case "face":
-      hyperKycFlows.append(HyperKycFlow.face())
-    default:
-      print("Case not handled")
-    }
-  })
-  
-  return hyperKycFlows
-  
-}
+    
+    
 
-func convertToDictionary(json: String) -> [Any]? {
-  if let data = json.data(using: .utf8) {
-    do {
-      return try JSONSerialization.jsonObject(with: data, options: []) as? [Any]
-    } catch {
-      print(error.localizedDescription)
+    func processDictionary(inputDictionary : [String : Any]) -> [String : Any]{
+      var resultDictionary = [:] as [String: Any]
+      for (key,value ) in inputDictionary{
+        
+        if(!skipKeysArray.contains(key) ){
+          var keyName = key
+          if(key == "responseResultRaw"){
+            keyName = "responseResult"
+          }
+          resultDictionary[keyName] = value
+        }
+        
+      }
+      return resultDictionary
+      
     }
-  }
-  return nil
-}
+    
+    
+    
     
   }
-      
+
 
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-hyperkyc-sdk",
-  "version": "0.2.0-alpha2",
+  "version": "0.3.0",
   "description": "React Native wrapper for HyperKYC SDK",
   "main": "lib/commonjs/index",
   "module": "lib/module/index",