react-native-kalapa-ekyc 1.1.2 → 1.2.0

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.4'
+    implementation 'vn.kalapa:ekyc:2.10.9'
 }

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

@@ -44,73 +44,85 @@ 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 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)
+        .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

@@ -26,7 +26,9 @@ RCT_EXPORT_METHOD(start:(NSString *)session
             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]
@@ -39,18 +41,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 +91,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/package.json

@@ -1,12 +1,12 @@
 {
   "name": "react-native-kalapa-ekyc",
-  "version": "1.1.2",
+  "version": "1.2.0",
   "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"

package/src/KalapaResult.ts

@@ -0,0 +1,326 @@
+/**
+ * KalapaResult - Simplified and standardized result parser for NFC-only mode
+ * Handles both Android and iOS response formats
+ */
+
+export interface SelfieData {
+  is_matched: boolean;
+  matching_score: number;
+}
+
+export interface NfcData {
+  // Personal Information
+  name: string;
+  id_number: string;
+  old_id_number: string;
+  date_of_birth: string;
+  date_of_expiry: string;
+  date_of_issuance: string;
+  gender: string;
+  nationality: string;
+  nation: string;
+  
+  // Address Information
+  address: string;
+  hometown: string;
+  
+  // Family Information
+  father_name: string;
+  mother_name: string;
+  spouse_name: string;
+  
+  // Additional Information
+  religion: string;
+  personal_identification: string;
+  
+  // Technical Data
+  face_image: string; // Base64 image from NFC chip
+  mrz: string;
+}
+
+export interface AddressEntities {
+  district: string;
+  ward: string;
+  province: string;
+  unknown: string;
+}
+
+export interface MrzDataFields {
+  birthday?: string;
+  doe?: string;
+  gender?: string;
+  id_number?: string;
+  name?: string;
+}
+
+export interface MrzDataError {
+  code: number;
+  message: string;
+}
+
+export interface MrzData {
+  data?: {
+    fields?: MrzDataFields;
+    raw_mrz?: string;
+  };
+  error?: MrzDataError;
+}
+
+export interface QrCodeData {
+  decoded_text?: string;
+  stage?: number;
+}
+
+export interface QrCode {
+  data?: QrCodeData;
+  error?: {
+    code: number;
+    message: string;
+  };
+}
+
+export type DecisionType = 'APPROVED' | 'MANUAL' | 'REJECTED' | 'UNKNOWN';
+
+export class KalapaResult {
+  // Root level common fields
+  public birthday!: string;
+  public country!: string;
+  public decision!: DecisionType;
+  public doe!: string; // Date of expiry
+  public doi!: string; // Date of issuance
+  public ethnicity!: string;
+  public features!: string;
+  public gender!: string;
+  public home!: string;
+  public home_entities!: AddressEntities;
+  public id_number!: string;
+  public mrz_data!: MrzData | null;
+  public name!: string;
+  public national!: string;
+  public nfc_data!: NfcData;
+  public poi!: string;
+  public qr_code!: QrCode | null;
+  public religion!: string;
+  public resident!: string;
+  public resident_entities!: AddressEntities;
+  public selfie_data!: SelfieData;
+  public session!: string;
+  public type!: string;
+  public rawResult: any;
+
+  constructor(rawResult: any) {
+    this.rawResult = rawResult;
+    this._parseResult();
+  }
+
+  private _parseResult(): void {
+    // Handle both wrapped (kalapa_result) and unwrapped responses
+    const kalapaData = this.rawResult?.kalapa_result || this.rawResult || {};
+    
+    // Parse root level common fields
+    this.birthday = kalapaData.birthday || '';
+    this.country = kalapaData.country || '';
+    this.decision = (kalapaData.decision || 'UNKNOWN') as DecisionType;
+    this.doe = kalapaData.doe || '';
+    this.doi = kalapaData.doi || '';
+    this.ethnicity = kalapaData.ethnicity || '';
+    this.features = kalapaData.features || '';
+    this.gender = kalapaData.gender || '';
+    this.home = kalapaData.home || '';
+    this.home_entities = {
+      district: kalapaData.home_entities?.district || '',
+      ward: kalapaData.home_entities?.ward || '',
+      province: kalapaData.home_entities?.province || '',
+      unknown: kalapaData.home_entities?.unknown || ''
+    };
+    // Handle both idNumber (Android) and id_number (iOS)
+    this.id_number = kalapaData.id_number || kalapaData.idNumber || '';
+    this.name = kalapaData.name || '';
+    this.national = kalapaData.national || '';
+    this.poi = kalapaData.poi || '';
+    this.religion = kalapaData.religion || '';
+    this.resident = kalapaData.resident || '';
+    this.resident_entities = {
+      district: kalapaData.resident_entities?.district || '',
+      ward: kalapaData.resident_entities?.ward || '',
+      province: kalapaData.resident_entities?.province || '',
+      unknown: kalapaData.resident_entities?.unknown || ''
+    };
+    this.session = kalapaData.session || '';
+    this.type = kalapaData.type || '';
+    
+    // Parse MRZ data (available on both platforms)
+    const mrzRaw = kalapaData.mrz_data;
+    if (mrzRaw && typeof mrzRaw === 'object' && mrzRaw !== null) {
+      this.mrz_data = {
+        data: mrzRaw.data ? {
+          fields: mrzRaw.data.fields || {},
+          raw_mrz: mrzRaw.data.raw_mrz || ''
+        } : undefined,
+        error: mrzRaw.error ? {
+          code: mrzRaw.error.code || 0,
+          message: mrzRaw.error.message || ''
+        } : undefined
+      };
+    } else {
+      this.mrz_data = null;
+    }
+    
+    // Parse QR code data (available on both platforms)
+    const qrRaw = kalapaData.qr_code;
+    if (qrRaw && typeof qrRaw === 'object' && qrRaw !== null) {
+      this.qr_code = {
+        data: qrRaw.data ? {
+          decoded_text: qrRaw.data.decoded_text || '',
+          stage: qrRaw.data.stage || undefined
+        } : undefined,
+        error: qrRaw.error ? {
+          code: qrRaw.error.code || 0,
+          message: qrRaw.error.message || ''
+        } : undefined
+      };
+    } else {
+      this.qr_code = null;
+    }
+    
+    // Parse selfie data (identical structure on both platforms)
+    const selfieRaw = kalapaData.selfie_data || {};
+    this.selfie_data = {
+      is_matched: selfieRaw.is_matched || false,
+      matching_score: selfieRaw.matching_score || 0
+    };
+    
+    // Parse NFC data (core fields available on both platforms)
+    const nfcRaw = kalapaData.nfc_data || {};
+    this.nfc_data = {
+      // Personal Information
+      name: nfcRaw.name || '',
+      id_number: nfcRaw.id_number || '',
+      old_id_number: nfcRaw.old_id_number || '',
+      date_of_birth: nfcRaw.date_of_birth || '',
+      date_of_expiry: nfcRaw.date_of_expiry || '',
+      date_of_issuance: nfcRaw.date_of_issuance || '',
+      gender: nfcRaw.gender || '',
+      nationality: nfcRaw.nationality || '',
+      nation: nfcRaw.nation || '',
+      
+      // Address Information
+      address: nfcRaw.address || '',
+      hometown: nfcRaw.hometown || '',
+      
+      // Family Information
+      father_name: nfcRaw.father_name || '',
+      mother_name: nfcRaw.mother_name || '',
+      spouse_name: nfcRaw.spouse_name || '',
+      
+      // Additional Information
+      religion: nfcRaw.religion || '',
+      personal_identification: nfcRaw.personal_identification || '',
+      
+      // Technical Data
+      face_image: nfcRaw.face_image || '', // Base64 image from NFC chip
+      mrz: nfcRaw.mrz || '',
+    };
+  }
+
+  // Convenience methods
+  public isApproved(): boolean {
+    return this.decision === 'APPROVED';
+  }
+
+  public isManualReview(): boolean {
+    return this.decision === 'MANUAL';
+  }
+
+  public isRejected(): boolean {
+    return this.decision === 'REJECTED';
+  }
+
+  public isFaceMatched(): boolean {
+    return this.selfie_data.is_matched === true;
+  }
+
+  public getFaceMatchingScore(): number {
+    return this.selfie_data.matching_score;
+  }
+
+  // Get formatted display name
+  public getDisplayName(): string {
+    return this.nfc_data.name || 'N/A';
+  }
+
+  // Get formatted ID number
+  public getIdNumber(): string {
+    return this.nfc_data.id_number || 'N/A';
+  }
+
+  // Get formatted date of birth
+  public getDateOfBirth(): string {
+    return this.nfc_data.date_of_birth || 'N/A';
+  }
+
+  // Get face image (Base64)
+  public getFaceImage(): string {
+    return this.nfc_data.face_image;
+  }
+
+  // Export essential data as plain object
+  public toJSON(): {
+    birthday: string;
+    country: string;
+    decision: DecisionType;
+    doe: string;
+    doi: string;
+    ethnicity: string;
+    features: string;
+    gender: string;
+    home: string;
+    home_entities: AddressEntities;
+    id_number: string;
+    mrz_data: MrzData | null;
+    name: string;
+    national: string;
+    nfc_data: NfcData;
+    poi: string;
+    qr_code: QrCode | null;
+    religion: string;
+    resident: string;
+    resident_entities: AddressEntities;
+    selfie_data: SelfieData;
+    session: string;
+    type: string;
+  } {
+    return {
+      birthday: this.birthday,
+      country: this.country,
+      decision: this.decision,
+      doe: this.doe,
+      doi: this.doi,
+      ethnicity: this.ethnicity,
+      features: this.features,
+      gender: this.gender,
+      home: this.home,
+      home_entities: this.home_entities,
+      id_number: this.id_number,
+      mrz_data: this.mrz_data,
+      name: this.name,
+      national: this.national,
+      nfc_data: this.nfc_data,
+      poi: this.poi,
+      qr_code: this.qr_code,
+      religion: this.religion,
+      resident: this.resident,
+      resident_entities: this.resident_entities,
+      selfie_data: this.selfie_data,
+      session: this.session,
+      type: this.type
+    };
+  }
+
+  // Static factory method to create from raw result
+  public static fromRawResult(rawResult: any): KalapaResult {
+    return new KalapaResult(rawResult);
+  }
+}
+
+export default KalapaResult;