react-native-kalapa-ekyc 1.1.3 → 1.2.1

package/android/build.gradle

@@ -6,9 +6,8 @@ buildscript {
         }
 
         dependencies {
-            classpath "com.android.tools.build:gradle:8.7.2"
-            // noinspection DifferentKotlinGradleVersion
-            classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.0}"
+            classpath("com.android.tools.build:gradle:4.2.2")
+            // classpath 'com.android.tools.build:gradle:3.5.3'
         }
     }
 }
@@ -20,11 +19,10 @@ def safeExtGet(prop, fallback) {
 }
 
 android {
-    namespace "com.reactnativekalapaekyc"
-    compileSdkVersion safeExtGet('KalapaEkyc_compileSdkVersion', 35)
+    compileSdkVersion safeExtGet('KalapaEkyc_compileSdkVersion', 33)
     defaultConfig {
-        minSdkVersion safeExtGet('KalapaEkyc_minSdkVersion', 26)
-        targetSdkVersion safeExtGet('KalapaEkyc_targetSdkVersion', 35)
+        minSdkVersion safeExtGet('KalapaEkyc_minSdkVersion', 24)
+        targetSdkVersion safeExtGet('KalapaEkyc_targetSdkVersion', 33)
         versionCode 1
         versionName "1.8"
 
@@ -38,6 +36,10 @@ android {
     lintOptions {
         disable 'GradleCompatible'
     }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
 }
 
 repositories {
@@ -54,5 +56,5 @@ dependencies {
     //noinspection GradleDynamicVersion
     implementation "com.facebook.react:react-native:+"  // From node_modules
     //kalapasdk
-    implementation 'vn.kalapa.payme:ekyc:2.10.9.5'
+    implementation 'vn.kalapa:ekyc:2.11.0'
 }

package/android/src/main/java/com/reactnativekalapaekyc/KalapaEkycModule.java

@@ -44,73 +44,89 @@ public class KalapaEkycModule extends ReactContextBaseJavaModule {
   public void multiply(int a, int b, Promise promise) {
     promise.resolve(a * b);
   }
-  
+
 
   @ReactMethod
   public void start(String session, String flow, ReadableMap data, Promise promise) {
 
-      String domain = data.getString("domain");
-      String mainColor = data.getString("main_color") != null ? data.getString("main_color") : "#1F69E6";
-      String background = data.getString("background_color") != null ? data.getString("background_color") : "#FFFFFF";
-      String mainTextColor = data.getString("main_text_color") != null ? data.getString("main_text_color") : "#000000";
-      String btnTextColor = data.getString("btn_text_color") != null ? data.getString("btn_text_color") : "#FFFFFF";
-      String language = data.getString("language") != null ? data.getString("language") : "en";
-      int livenessVersion = data.getInt("liveness_version");
-      
-
-      String faceData = data.getString("face_data") != null ? data.getString("face_data") : "";
-      String mrzData = data.getString("mrz") != null ? data.getString("mrz") : "";
-      String sessionId = data.getString("session_id") != null ? data.getString("session_id") : "";
-
-      Context context = getReactApplicationContext();
-      if (getCurrentActivity() != null) {
+    String domain = data.getString("domain");
+    String mainColor = data.getString("main_color") != null ? data.getString("main_color") : "#1F69E6";
+    String successColor = data.getString("success_color") != null ? data.getString("success_color") : "#388E3C";
+    String failureColor = data.getString("failure_color") != null ? data.getString("failure_color") : "#F44336";
+    String background = data.getString("background_color") != null ? data.getString("background_color") : "#FFFFFF";
+    String mainTextColor = data.getString("main_text_color") != null ? data.getString("main_text_color") : "#000000";
+    String btnTextColor = data.getString("btn_text_color") != null ? data.getString("btn_text_color") : "#FFFFFF";
+    String language = data.getString("language") != null ? data.getString("language") : "en";
+    int livenessVersion = data.getInt("liveness_version");
+
+    String faceData = data.getString("face_data") != null ? data.getString("face_data") : "";
+    String mrzData = data.getString("mrz") != null ? data.getString("mrz") : "";
+    String qrCode = data.getString("qr_code") != null ? data.getString("qr_code") : "";
+    String sessionId = data.getString("session_id") != null ? data.getString("session_id") : "";
+    boolean allowMrzRescanOnNfcMismatch = data.getBoolean("allow_mrz_rescan_on_nfc_mismatch");
+    Context context = getReactApplicationContext();
+    if (getCurrentActivity() != null) {
       KalapaSDKConfig klpConfig = new KalapaSDKConfig.KalapaSDKConfigBuilder(getCurrentActivity())
-              .withBaseURL(domain)
-              .withMainColor(mainColor)
-              .withBackgroundColor(background)
-              .withMainTextColor(mainTextColor)
-              .withBtnTextColor(btnTextColor)
-              .withLanguage(language)
-              .withLivenessVersion(livenessVersion).build();
-          System.out.println("KLP KalapaSDKConfig: " + klpConfig.getLivenessVersion());
-          KalapaSDK.KalapaSDKBuilder builder = new KalapaSDK.KalapaSDKBuilder(getCurrentActivity(), klpConfig);
-          if (faceData != null && !faceData.isEmpty()) builder.withFaceData(faceData);
-          if (mrzData != null && !mrzData.isEmpty()) builder.withMrz(mrzData);
-          if (sessionId != null && !sessionId.isEmpty()) builder.withLeftoverSession(sessionId);
-
-          builder.build().start(session, flow, new KalapaHandler() {
-              @Override
-              public void onExpired() {
-                  promise.reject("EXPIRED", "Session expired");
+        .withBaseURL(domain)
+        .withMainColor(mainColor)
+        .withBackgroundColor(background)
+        .withSuccessColor(successColor)
+        .withFailureColor(failureColor)
+        .withMainTextColor(mainTextColor)
+        .withBtnTextColor(btnTextColor)
+        .withLanguage(language)
+        .withLivenessVersion(livenessVersion)
+        .withAllowMRZRescanOnNFCMismatch(allowMrzRescanOnNfcMismatch)
+        .build();
+
+      KalapaSDK.KalapaSDKBuilder builder = new KalapaSDK.KalapaSDKBuilder(getCurrentActivity(), klpConfig);
+      if (qrCode != null && !qrCode.isEmpty()) builder.withRawQRCode(qrCode);
+      if (faceData != null && !faceData.isEmpty()) builder.withFaceData(faceData);
+      if (mrzData != null && !mrzData.isEmpty()) builder.withMrz(mrzData);
+      if (sessionId != null && !sessionId.isEmpty()) builder.withLeftoverSession(sessionId);
+
+      builder.build().start(session, flow, new KalapaHandler() {
+        @Override
+        public void onExpired() {
+          promise.reject("EXPIRED", "Session expired");
 //                    promise.reject("401", "EXPIRED");
-              }
-
-              @Override
-              public void onComplete(@NonNull KalapaResult kalapaResult) {
-                  super.onComplete(kalapaResult);
-                  String resultMap = kalapaResult.toJson();
-                  WritableMap res = new WritableNativeMap();
-                  res.putString("kalapa_result", resultMap);
+        }
+
+        @Override
+        public void onComplete(@NonNull KalapaResult kalapaResult) {
+          String resultMap = kalapaResult.toJson();
+          WritableMap res = new WritableNativeMap();
+          res.putString("kalapa_result", resultMap);
 //                    callback.invoke(res);
-                  promise.resolve(res);
-              }
-
-              @Override
-              public void onError(@NonNull KalapaSDKResultCode kalapaSDKResultCode) {
-                  super.onError(kalapaSDKResultCode);
-                  switch (kalapaSDKResultCode) {
-                      case USER_LEAVE:
-                          promise.reject("CANCELED", kalapaSDKResultCode.getEn());
-                      case DEVICE_NOT_SUPPORTED:
-                          promise.reject("UNSUPPORTED", kalapaSDKResultCode.getEn());
-                      case CONFIGURATION_NOT_ACCEPTABLE:
-                          promise.reject("CONFIG_ERROR", kalapaSDKResultCode.getEn());
-                      default:
-                          promise.reject("OTHER", kalapaSDKResultCode.getEn());
-                  }
-              }
-          });
-      } else Toast.makeText(getReactApplicationContext(), "Activity is null", Toast.LENGTH_LONG).show();
+          promise.resolve(res);
+        }
+
+        @Override
+        public void onError(@NonNull KalapaSDKResultCode kalapaSDKResultCode, @NonNull String message) {
+          switch (kalapaSDKResultCode) {
+            case USER_LEAVE:
+              promise.reject("CANCELED", message);
+            case DEVICE_NOT_SUPPORTED:
+              promise.reject("UNSUPPORTED", message);
+            case CONFIGURATION_NOT_ACCEPTABLE:
+              promise.reject("CONFIG_ERROR", message);
+            case INVALID_NFC:
+              promise.reject("MRZ_INVALID", message);
+            case WRONG_CCCDID:
+              promise.reject("NFC_NOT_MATCH", message);
+            case PERMISSION_DENIED:
+              promise.reject("PERMISSION_DENIED", message);
+            case VIRTUAL_CAMERA_DETECTED:
+            case ROOTED_DEVICE_DETECTED:
+            case EMULATOR_DETECTED:
+              promise.reject("DEVICE_NOT_ACCEPTABLE", message);
+            default:
+              promise.reject("OTHER", message);
+          }
+        }
+      });
+    } else
+      Toast.makeText(getReactApplicationContext(), "Activity is null", Toast.LENGTH_LONG).show();
   }
 
   public static native int nativeMultiply(int a, int b);

package/ios/KalapaEkyc.m

@@ -14,7 +14,7 @@ RCT_EXPORT_METHOD(start:(NSString *)session
 {
     dispatch_async(dispatch_get_main_queue(), ^{
         if (@available(iOS 13, *)) {
-            NSString *domain = data[@"domain"] ?: @"https://ekyc-api.kalapa.vn";
+            NSString *domain = data[@"domain"] ?: @"https://ekyc-sdk.kalapa.vn";
             NSString *language = data[@"language"] ?: @"vi";
             
             NSString *mainColor = data[@"main_color"] ?: @"3270EA";
@@ -22,16 +22,28 @@ RCT_EXPORT_METHOD(start:(NSString *)session
             NSString *mainTextColor = data[@"main_text_color"] ?: @"000000";
             NSString *btnTextColor = data[@"btn_text_color"] ?: @"ffffff";
             NSInteger livenessVersion = [data[@"liveness_version"] integerValue] ?: 0;
+            NSString *successColor =  data[@"success_color"] ?: @"6200EA";
+            NSString *failureColor =  data[@"failure_color"]  ?: @"00BCD4";
             
             NSString *faceData = data[@"face_data"];
             NSString *mrz = data[@"mrz"];
             NSString *sessionID = data[@"session_id"];
+            id val = data[@"allow_mrz_rescan_on_nfc_mismatch"];
+            BOOL allowMRZRescanOnNfcMismatch = [val isKindOfClass:NSNumber.class] ? [val boolValue] : NO;
             
-            KLPAppearance *klpAppearance = [[[[[[KLPAppearance Builder]
-                                                withLanguage:language]
-                                               withMainColor:mainColor]
-                                              withBackgroundColor:backgroundColor]
-                                             withMainTextColor:mainTextColor]
+            KLPThemeColor *themeColor = [[[KLPThemeColor Builder]
+                                          withSuccessColor:successColor]
+                                         withFailureColor:failureColor];
+            
+            KLPTheme *theme = [[KLPTheme Builder]
+                                withColor:themeColor];
+
+            KLPAppearance *klpAppearance = [[[[[[[KLPAppearance Builder]
+                                                 withLanguage:language]
+                                                withMainColor:mainColor]
+                                               withBackgroundColor:backgroundColor]
+                                              withMainTextColor:mainTextColor]
+                                             withTheme:theme]
                                             withBtnTextColor:btnTextColor];
             
             KLPConfig *klpConfig = [self configureKLPWithSession:session
@@ -39,18 +51,26 @@ RCT_EXPORT_METHOD(start:(NSString *)session
                                                  livenessVersion:livenessVersion
                                                       appearance:klpAppearance
                                                              mrz:mrz
-                                                        faceData:faceData];
+                                                        faceData:faceData
+                                                        allowMRZRescanOnNfcMismatch:allowMRZRescanOnNfcMismatch];
             
             if (sessionID != nil) {
                 [klpConfig withSession:sessionID];
             }
             
-            [klpConfig withExpiredHandler:^{
-                reject(@"EXPIRED", @"Session expired", nil);
-            }];
-            
-            [klpConfig withCancelSessionHandler:^{
-                reject(@"CANCELED", @"Session was canceled by the user", nil);
+            [klpConfig withEventHandler:^(enum Event event) {
+              switch (event) {
+                case EventSessionTerminated:
+                  reject(@"CANCELED", @"Người dùng hủy bỏ xác thực", nil);
+                  break;
+                case EventSessionExpired:
+                  reject(@"UNAUTHORIZED", @"Quá trình xác thực thất bại, vui lòng kiểm tra lại", nil);
+                  break;
+                default:
+                  reject(@"OTHER", @"Đã có lỗi xảy ra", nil);
+                  break;
+              }
+
             }];
             
             [klpConfig withResultHandler:^(KalapaResult * _Nullable result) {
@@ -81,7 +101,8 @@ RCT_EXPORT_METHOD(start:(NSString *)session
                         livenessVersion:(NSInteger)livenessVersion
                              appearance:(KLPAppearance *)appearance
                                     mrz:(NSString *)mrz
-                               faceData:(NSString *)faceData {
+                               faceData:(NSString *)faceData
+           allowMRZRescanOnNfcMismatch:(BOOL)allowMRZRescanOnNfcMismatch {
   KLPConfig *config = [[[[[[KLPConfig BuilderWithSession:session]
                            withBaseUrl:domain]
                           withLivenessVersion:livenessVersion]

package/lib/commonjs/index.js

@@ -0,0 +1,38 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+var _reactNative = require("react-native");
+const {
+  KalapaEkyc
+} = _reactNative.NativeModules;
+
+// export default KalapaEkyc;
+
+// Define types for better TypeScript support
+
+// Extend the native module
+const ExtendedKalapaEkyc = {
+  ...KalapaEkyc,
+  start: async (session, flow, config) => {
+    try {
+      // Call original native method
+      const result = await KalapaEkyc.start(session, flow, config);
+
+      // Parse the result
+      const parsedResult = JSON.parse(result.kalapa_result);
+
+      // Return enhanced result with WebView capability
+      return {
+        ...result,
+        kalapa_result: parsedResult
+      };
+    } catch (error) {
+      throw error;
+    }
+  }
+};
+var _default = exports.default = ExtendedKalapaEkyc;
+//# sourceMappingURL=index.js.map

package/lib/commonjs/index.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["_reactNative","require","KalapaEkyc","NativeModules","ExtendedKalapaEkyc","start","session","flow","config","result","parsedResult","JSON","parse","kalapa_result","error","_default","exports","default"],"sources":["index.tsx"],"sourcesContent":["import { NativeModules } from 'react-native';\n\nconst { KalapaEkyc } = NativeModules;\n\n// export default KalapaEkyc;\n\n// Define types for better TypeScript support\ninterface KalapaResult {\n    kalapa_result: string;\n    session?: string;\n    [key: string]: any;\n  }\n  \n  // Extend the native module\n  const ExtendedKalapaEkyc = {\n    ...KalapaEkyc,\n  \n    start: async (session: string, flow: string, config: any): Promise<KalapaResult & { showWebView: () => Promise<void> }> => {\n      try {\n        // Call original native method\n        const result = await KalapaEkyc.start(session, flow, config);\n        \n        // Parse the result\n        const parsedResult = JSON.parse(result.kalapa_result);\n  \n        // Return enhanced result with WebView capability\n        return {\n          ...result,\n          kalapa_result: parsedResult,\n        };\n      } catch (error) {\n        throw error;\n      }\n    }\n  };\n\nexport default ExtendedKalapaEkyc;\n"],"mappings":";;;;;;AAAA,IAAAA,YAAA,GAAAC,OAAA;AAEA,MAAM;EAAEC;AAAW,CAAC,GAAGC,0BAAa;;AAEpC;;AAEA;;AAOE;AACA,MAAMC,kBAAkB,GAAG;EACzB,GAAGF,UAAU;EAEbG,KAAK,EAAE,MAAAA,CAAOC,OAAe,EAAEC,IAAY,EAAEC,MAAW,KAAmE;IACzH,IAAI;MACF;MACA,MAAMC,MAAM,GAAG,MAAMP,UAAU,CAACG,KAAK,CAACC,OAAO,EAAEC,IAAI,EAAEC,MAAM,CAAC;;MAE5D;MACA,MAAME,YAAY,GAAGC,IAAI,CAACC,KAAK,CAACH,MAAM,CAACI,aAAa,CAAC;;MAErD;MACA,OAAO;QACL,GAAGJ,MAAM;QACTI,aAAa,EAAEH;MACjB,CAAC;IACH,CAAC,CAAC,OAAOI,KAAK,EAAE;MACd,MAAMA,KAAK;IACb;EACF;AACF,CAAC;AAAC,IAAAC,QAAA,GAAAC,OAAA,CAAAC,OAAA,GAEWb,kBAAkB","ignoreList":[]}

package/lib/module/index.js

@@ -0,0 +1,32 @@
+import { NativeModules } from 'react-native';
+const {
+  KalapaEkyc
+} = NativeModules;
+
+// export default KalapaEkyc;
+
+// Define types for better TypeScript support
+
+// Extend the native module
+const ExtendedKalapaEkyc = {
+  ...KalapaEkyc,
+  start: async (session, flow, config) => {
+    try {
+      // Call original native method
+      const result = await KalapaEkyc.start(session, flow, config);
+
+      // Parse the result
+      const parsedResult = JSON.parse(result.kalapa_result);
+
+      // Return enhanced result with WebView capability
+      return {
+        ...result,
+        kalapa_result: parsedResult
+      };
+    } catch (error) {
+      throw error;
+    }
+  }
+};
+export default ExtendedKalapaEkyc;
+//# sourceMappingURL=index.js.map

package/lib/module/index.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["NativeModules","KalapaEkyc","ExtendedKalapaEkyc","start","session","flow","config","result","parsedResult","JSON","parse","kalapa_result","error"],"sources":["index.tsx"],"sourcesContent":["import { NativeModules } from 'react-native';\n\nconst { KalapaEkyc } = NativeModules;\n\n// export default KalapaEkyc;\n\n// Define types for better TypeScript support\ninterface KalapaResult {\n    kalapa_result: string;\n    session?: string;\n    [key: string]: any;\n  }\n  \n  // Extend the native module\n  const ExtendedKalapaEkyc = {\n    ...KalapaEkyc,\n  \n    start: async (session: string, flow: string, config: any): Promise<KalapaResult & { showWebView: () => Promise<void> }> => {\n      try {\n        // Call original native method\n        const result = await KalapaEkyc.start(session, flow, config);\n        \n        // Parse the result\n        const parsedResult = JSON.parse(result.kalapa_result);\n  \n        // Return enhanced result with WebView capability\n        return {\n          ...result,\n          kalapa_result: parsedResult,\n        };\n      } catch (error) {\n        throw error;\n      }\n    }\n  };\n\nexport default ExtendedKalapaEkyc;\n"],"mappings":"AAAA,SAASA,aAAa,QAAQ,cAAc;AAE5C,MAAM;EAAEC;AAAW,CAAC,GAAGD,aAAa;;AAEpC;;AAEA;;AAOE;AACA,MAAME,kBAAkB,GAAG;EACzB,GAAGD,UAAU;EAEbE,KAAK,EAAE,MAAAA,CAAOC,OAAe,EAAEC,IAAY,EAAEC,MAAW,KAAmE;IACzH,IAAI;MACF;MACA,MAAMC,MAAM,GAAG,MAAMN,UAAU,CAACE,KAAK,CAACC,OAAO,EAAEC,IAAI,EAAEC,MAAM,CAAC;;MAE5D;MACA,MAAME,YAAY,GAAGC,IAAI,CAACC,KAAK,CAACH,MAAM,CAACI,aAAa,CAAC;;MAErD;MACA,OAAO;QACL,GAAGJ,MAAM;QACTI,aAAa,EAAEH;MACjB,CAAC;IACH,CAAC,CAAC,OAAOI,KAAK,EAAE;MACd,MAAMA,KAAK;IACb;EACF;AACF,CAAC;AAEH,eAAeV,kBAAkB","ignoreList":[]}

package/lib/typescript/index.d.ts

@@ -0,0 +1,2 @@
+declare const ExtendedKalapaEkyc: any;
+export default ExtendedKalapaEkyc;

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "react-native-kalapa-ekyc",
-  "version": "1.1.3",
+  "version": "1.2.1",
   "description": "React Native SDK for Kalapa eKYC integration",
- "main": "lib/commonjs/index.js",
+  "main": "lib/commonjs/index.js",
   "module": "lib/module/index.js",
   "types": "lib/typescript/src/index.d.ts",
   "react-native": "src/index.tsx",
-  "source": "src/index.tsx",
+  "source": "src/index",
   "files": [
     "src",
     "lib",
@@ -16,17 +16,15 @@
     "android",
     "ios",
     "cpp",
-    "Frameworks",
     "react-native-kalapa-ekyc.podspec",
+    "!lib/typescript/example",
     "!android/build",
     "!ios/build"
   ],
   "scripts": {
     "test": "jest",
     "typescript": "tsc --noEmit",
-    "lint": "eslint \"**/*.{js,ts,tsx}\"",
-    "prepare": "npm run build",
-    "build": "echo 'Build completed'"
+    "lint": "eslint \"**/*.{js,ts,tsx}\""
   },
   "keywords": [
     "react-native",
@@ -49,8 +47,8 @@
     "@react-native-community/eslint-config": "^2.0.0",
     "@release-it/conventional-changelog": "^2.0.0",
     "@types/jest": "^26.0.0",
-    "@types/react": "17.0.2",
-    "@types/react-native": "0.63.4",
+    "@types/react": "^16.9.19",
+    "@types/react-native": "0.62.13",
     "commitlint": "^11.0.0",
     "eslint": "^7.2.0",
     "eslint-config-prettier": "^7.0.0",
@@ -59,14 +57,15 @@
     "jest": "^26.0.1",
     "pod-install": "^0.1.0",
     "prettier": "^2.0.5",
+    "react": "16.13.1",
+    "react-native": "0.63.4",
     "react-native-builder-bob": "^0.18.0",
     "release-it": "^14.2.2",
     "typescript": "^4.1.3"
   },
   "peerDependencies": {
-    "react": "^17.0.2",
-    "react-native": "^0.66.4",
-    "react-native-reanimated": ">1.9.0"
+    "react": "*",
+    "react-native": "*"
   },
   "jest": {
     "preset": "react-native",

package/react-native-kalapa-ekyc.podspec

@@ -14,6 +14,7 @@ Pod::Spec.new do |s|
   s.source       = { :git => "https://gitlab.com/littlepjg/klp-ekyc-react-native.git", :tag => "#{s.version}" }
 
   s.source_files = "ios/**/*.{h,m,mm}"
+  #s.ios.vendored_frameworks = "Frameworks/KalapaSDK.xcframework"
 
   s.dependency "React-Core"
   s.dependency "KalapaEkycSDK"