react-native-hyperkyc-sdk 0.16.0 → 0.17.0

package/android/build.gradle

@@ -56,7 +56,7 @@ repositories {
 dependencies {
     //noinspection GradleDynamicVersion
     implementation "com.facebook.react:react-native:+"  // From node_modules
-    implementation('co.hyperverge:hyperkyc:0.16.0@aar', {
+    implementation('co.hyperverge:hyperkyc:0.17.2@aar', {
         transitive = true
     })
 

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

@@ -1,62 +1,41 @@
 package com.reactnativehyperkycsdk;
 
-
 import android.app.Activity;
 import android.content.Intent;
 import android.util.Log;
 
-
-
 import com.facebook.react.ReactActivity;
 import com.facebook.react.bridge.ActivityEventListener;
-
 import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.bridge.ReactContextBaseJavaModule;
 import com.facebook.react.bridge.ReactMethod;
 import com.facebook.react.bridge.Callback;
-import com.facebook.react.bridge.ReadableArray;
 import com.facebook.react.bridge.ReadableMap;
 import com.facebook.react.bridge.ReadableMapKeySetIterator;
+import com.facebook.react.bridge.ReadableNativeMap;
 import com.facebook.react.bridge.WritableMap;
 import com.facebook.react.bridge.WritableNativeMap;
 import com.google.gson.Gson;
 
-
-
-import java.util.ArrayList;
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
 
-import org.json.JSONArray;
-import org.json.JSONException;
 import org.json.JSONObject;
 
 import co.hyperverge.hyperkyc.HyperKyc;
-
 import co.hyperverge.hyperkyc.data.models.HyperKycConfig;
-
-import co.hyperverge.hyperkyc.data.models.result.HyperKycData;
 import co.hyperverge.hyperkyc.data.models.result.HyperKycResult;
-import androidx.annotation.NonNull;
 
+import androidx.annotation.NonNull;
 
-public class HyperkycSdkModule extends ReactContextBaseJavaModule implements ActivityEventListener {
+public class HyperkycSdkModule extends ReactContextBaseJavaModule {
   public static final String NAME = "Hyperkyc";
-
   private final ReactApplicationContext reactContext;
-
   private final int HYPERKYC_REQUEST_CODE = 56455;
-  Callback callback;
-  HyperKyc.Contract contract;
-  Gson gson;
-  WritableMap result;
-
 
   public HyperkycSdkModule(ReactApplicationContext reactContext) {
     super(reactContext);
     this.reactContext = reactContext;
-    this.reactContext.addActivityEventListener(this);
   }
 
   @Override
@@ -65,94 +44,118 @@ public class HyperkycSdkModule extends ReactContextBaseJavaModule implements Act
     return NAME;
   }
 
-
   @ReactMethod
-  public void launch(ReadableMap kycConfig, Callback resultCallback ){
-    callback = resultCallback;
-
-
-
-
-    ReactActivity currentActivity = (ReactActivity)getCurrentActivity();
-    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 accessToken = kycConfig.hasKey("accessToken")? kycConfig.getString("accessToken") : null;
-    String defaultLangCode = kycConfig.hasKey("defaultLangCode")? kycConfig.getString("defaultLangCode") : null;
-    Boolean useLocation = kycConfig.hasKey("useLocation")? kycConfig.getBoolean("useLocation") : false;
-    ReadableMap inputsMap = kycConfig.hasKey("inputs")?kycConfig.getMap("inputs"): null;
-
-    HyperKycConfig config = null;
-    if(accessToken != null){
-      config = new HyperKycConfig(accessToken, workflowId, transactionId);
-    }else if(appId != null && appKey != null) {
-
-      config = new HyperKycConfig(appId, appKey, workflowId, transactionId);
-    }
-    if(inputsMap != null){
-      config.setInputs(processInputsArray(inputsMap));
-    }
-    if(defaultLangCode != null ){
-      config.setDefaultLangCode(defaultLangCode);
-    }
-
-    config.setUseLocation(useLocation);
-    contract = new HyperKyc.Contract();
-    Intent newIntent = contract.createIntent(currentActivity, config);
-    if(currentActivity != null)
+  public void launch(ReadableMap kycConfig, Callback resultCallback) {
+    ReactActivity currentActivity = (ReactActivity) getCurrentActivity();
+    assert kycConfig != null;
+    HyperKycConfig config = getHyperKycConfigFromMap(kycConfig);
+    HyperKyc.Contract contract = new HyperKyc.Contract();
+
+    reactContext.addActivityEventListener(new ActivityEventListener() {
+      @Override
+      public void onActivityResult(Activity activity, int requestCode, int resultCode, Intent data) {
+        if (requestCode == HYPERKYC_REQUEST_CODE) {
+          HyperKycResult hyperKycResult = contract.parseResult(resultCode, data);
+          parseKYCResult(hyperKycResult, resultCallback);
+        } else {
+          resultCallback.invoke(getDummyResultMap());
+        }
+        reactContext.removeActivityEventListener(this);
+      }
+
+      @Override
+      public void onNewIntent(Intent intent) {
+      }
+    });
+
+    if (currentActivity != null) {
+      Intent newIntent = contract.createIntent(currentActivity, config);
       currentActivity.startActivityIfNeeded(newIntent, HYPERKYC_REQUEST_CODE);
-
-  }
-
-  @Override
-  public void onActivityResult(Activity activity, int requestCode, int resultCode, Intent data) {
-    if(requestCode == HYPERKYC_REQUEST_CODE){
-
-      HyperKycResult hyperKycResult = contract.parseResult(resultCode, data);
-      result = new WritableNativeMap();
-      parseKYCResult(hyperKycResult);
+    } else {
+      resultCallback.invoke(getDummyResultMap());
     }
-
-
   }
 
-  private void parseKYCResult(HyperKycResult hyperKycResult){
-
-    WritableMap resultMap = new WritableNativeMap();
-
+  private void parseKYCResult(HyperKycResult hyperKycResult, Callback callback) {
     try {
-
-
-      gson = new Gson();
+      Gson gson = new Gson();
       String resultJSON = gson.toJson(hyperKycResult);
       JSONObject result = new JSONObject(resultJSON);
-      resultMap = HyperkycSdkUtils.convertJsonToMap(result);
+      WritableMap resultMap = HyperkycSdkUtils.convertJsonToMap(result);
       callback.invoke(resultMap);
-    }catch (Exception e){
-
+    } catch (Exception e) {
+      if (e.getLocalizedMessage() != null) {
+        Log.e(NAME, e.getLocalizedMessage());
+      } else {
+        Log.e(NAME, "error parsing hyperKycResult");
+      }
+      callback.invoke(getDummyResultMap());
     }
-
   }
 
-
-
-  private Map<String, String> processInputsArray(ReadableMap inputs){
+  private Map<String, String> processInputsArray(ReadableMap inputs) {
     Map<String, String> inputsMap = new HashMap<>();
-
     ReadableMapKeySetIterator iterator = inputs.keySetIterator();
-    while(iterator.hasNextKey()){
+    while (iterator.hasNextKey()) {
       String key = iterator.nextKey();
       String value = inputs.getString(key);
       inputsMap.put(key, value);
     }
-
     return inputsMap;
-
   }
 
-  @Override
-  public void onNewIntent(Intent intent) {
+  private HyperKycConfig getHyperKycConfigFromMap(ReadableMap kycConfig) {
+
+    String appId = kycConfig.hasKey("appId") ? kycConfig.getString("appId") : null;
+    String appKey = kycConfig.hasKey("appKey") ? kycConfig.getString("appKey") : null;
+    String accessToken = kycConfig.hasKey("accessToken") ? kycConfig.getString("accessToken") : null;
+    String workflowId = kycConfig.hasKey("workflowId") ? kycConfig.getString("workflowId") : null;
+    String transactionId = kycConfig.hasKey("transactionId") ? kycConfig.getString("transactionId") : null;
+    ReadableMap inputs = kycConfig.hasKey("inputs") ? kycConfig.getMap("inputs") : null;
+    String defaultLangCode = kycConfig.hasKey("defaultLangCode") ? kycConfig.getString("defaultLangCode") : null;
+    Boolean useLocation = kycConfig.hasKey("useLocation") ? kycConfig.getBoolean("useLocation") : null;
+
+    if (accessToken == null) {
+      assert appId != null;
+      assert appKey != null;
+      assert workflowId != null;
+      assert transactionId != null;
+      HyperKycConfig hyperKycConfig = new HyperKycConfig(appId, appKey, workflowId, transactionId);
+      if (inputs != null) {
+        hyperKycConfig.setInputs(processInputsArray(inputs));
+      }
+      if (defaultLangCode != null) {
+        hyperKycConfig.setDefaultLangCode(defaultLangCode);
+      }
+      if (useLocation != null) {
+        hyperKycConfig.setUseLocation(useLocation);
+      }
+      return hyperKycConfig;
+    } else {
+      assert workflowId != null;
+      assert transactionId != null;
+      HyperKycConfig hyperKycConfig = new HyperKycConfig(accessToken, workflowId, transactionId);
+      if (inputs != null) {
+        hyperKycConfig.setInputs(processInputsArray(inputs));
+      }
+      if (defaultLangCode != null) {
+        hyperKycConfig.setDefaultLangCode(defaultLangCode);
+      }
+      if (useLocation != null) {
+        hyperKycConfig.setUseLocation(useLocation);
+      }
+      return hyperKycConfig;
+    }
+  }
 
+  private WritableMap getDummyResultMap() {
+    WritableMap dummyResult = new WritableNativeMap();
+    dummyResult.putString("status", "");
+    dummyResult.putString("transactionId", "");
+    dummyResult.putInt("errorCode", 0);
+    dummyResult.putString("errorMessage", "");
+    dummyResult.putString("latestModule", "");
+    dummyResult.putMap("details", new WritableNativeMap());
+    return dummyResult;
   }
 }

package/ios/HyperkycSdk.swift

@@ -6,7 +6,7 @@ import HyperKYC
 @objc(Hyperkyc)
 class Hyperkyc: NSObject  {
     @objc  static func requiresMainQueueSetup() -> Bool {return true}
-    
+
     internal var skipKeysArray : [String] = ["responseResult", "variables", "moduleId"]
     @objc(launch:callback:)
     func launch(_config: NSDictionary, callback: @escaping RCTResponseSenderBlock) {
@@ -18,53 +18,43 @@ class Hyperkyc: NSObject  {
         let defaultLangCode = _config["defaultLangCode"] as? String
         let inputs = _config["inputs"] as? [String: String]
         let useLocation = _config["useLocation"] as? Bool
-        
-        
-        
+
         DispatchQueue.main.async {
             let controller = RCTPresentedViewController()
-           
-            var hyperKYCConfig: HyperKycConfig?
-           
 
-            // Launch HyperKyc if accessTokenConfig is available
+            var hyperKYCConfig: HyperKycConfig
+
             if let accessToken = accessToken {
                 hyperKYCConfig = HyperKycConfig(accessToken: accessToken, workflowId: workflowId!, transactionId: transactionId!)
             }
+            else {
+                hyperKYCConfig = HyperKycConfig(appId: appId!, appKey: appKey!, workflowId: workflowId!, transactionId: transactionId!)
+            }
 
-            // Launch HyperKyc if appKey and appId are available
-            if let appKey = appKey, let appId = appId {
-                hyperKYCConfig = HyperKycConfig(appId: appId, appKey: appKey, workflowId: workflowId!, transactionId: transactionId!)
+            if let inputs = inputs {
+                hyperKYCConfig.setInputs(inputs: inputs)
+            }
+            if let defaultLangCode = defaultLangCode {
+                hyperKYCConfig.setDefaultLangCode(language: defaultLangCode)
+            }
+            if let useLocation = useLocation {
+                hyperKYCConfig.setUseLocation(shouldUse: useLocation)
             }
 
-            // Launch HyperKyc with hyperKYCConfig if available
-            if let hyperKYCConfig = hyperKYCConfig {
-                if let inputs = inputs {
-                    hyperKYCConfig.setInputs(inputs: inputs)
-                }
-                if let defaultLangCode = defaultLangCode {
-                    hyperKYCConfig.setDefaultLangCode(language: defaultLangCode)
-                }
-                if let useLocation = useLocation {
-                    hyperKYCConfig.setUseLocation(shouldUse: useLocation)
-                }
-                HyperKyc.launch(controller!, hyperKycConfig: hyperKYCConfig) { hyperKycResult in
-                    let result = self.processHyperKycResponse(hyperKycResult: hyperKycResult)
-                    callback([result])
-                }
+            //launch HyperKyc
+            HyperKyc.launch(controller!, hyperKycConfig: hyperKYCConfig) { hyperKycResult in
+                let result = self.processHyperKycResponse(hyperKycResult: hyperKycResult)
+                callback([result])
             }
-            
-      
-            
         }
     }
-    
+
     func processHyperKycResponse(hyperKycResult: HyperKycResult) -> [String : Any]  {
         var kycData = [:] as [String: Any]
-        
+
         kycData["status"] = hyperKycResult.status
         kycData["transactionId"] = hyperKycResult.transactionId
-        
+
         kycData["details"] = hyperKycResult.details
         if let errorCode = hyperKycResult.errorCode{
             kycData["errorCode"] = errorCode
@@ -72,22 +62,11 @@ class Hyperkyc: NSObject  {
         if let errorMessage = hyperKycResult.errorMessage{
             kycData["errorMessage"] = errorMessage
         }
-        
+
         if let moduleId = hyperKycResult.latestModule {
             kycData["latestModule"] = moduleId
         }
-        
+
         return kycData
     }
-    
-    
-    
-    
-    
 }
-
-
-
-
-
-

package/package.json

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

package/react-native-hyperkyc-sdk.podspec

@@ -16,7 +16,7 @@ Pod::Spec.new do |s|
   s.source_files = "ios/**/*.{h,m,mm,swift}"
   s.static_framework = true
   s.dependency "React-Core"
-  s.dependency "HyperKYC", "0.16.0"
+  s.dependency "HyperKYC", "0.17.0"
   # Need these lines to support HyperKYC framework
   s.preserve_paths = 'HyperKYC.framework'
   s.xcconfig = { 'OTHER_LDFLAGS' => '-framework HyperKYC' }