react-native-rdservice-fingerprintscanner 1.0.7 → 1.1.1

package/README.md

@@ -37,7 +37,7 @@ import { getDeviceInfo, captureFinger } from "react-native-rdservice-fingerprint
 
 getDeviceInfo()
       .then((response) => {
-        console.log(response, 'DEVICE DRIVER FOUND'); // Either The Device connected or not connected response here
+        console.log(response, 'DEVICE DRIVER FOUND'); // Response about Device Driver
       })
       .catch((error) => {
         console.log(error, 'DEVICE DRIVER NOT FOUND'); //Failed to get device information
@@ -45,15 +45,45 @@ getDeviceInfo()
       
     captureFinger(pidOptions)
       .then((response) => {
-        console.log(response, 'FINGER CAPTURE'); // Either The Device Connected or Not Connected Response here
+        console.log(response, 'FINGER CAPTURE'); // FingerPrint Response
       })
       .catch((e) => {
         console.log(e, 'ERROR_FINGER_CAPTURE'); // Failed to capture the Fingerprint
       });
 ```
 
+
 ```pidOptions``` is an XML String that you have to pass to ```captureFinger``` method. Refer [UIDAI Document](https://uidai.gov.in/images/resource/Aadhaar_Registered_Devices_2_0_4.pdf)
 
+```Note``` : Call ```captureFinger()``` Method after getting response from getDeviceInfo() method. Calling of ```captureFinger()``` method before ```getDeviceInfo()``` method, only returns Error in ```catch``` block. Refer [Example Code](https://github.com/senthalan2/react-native-rdservice-fingerprintscanner/blob/main/example/src/App.js) 
+
+
+## Response JSON Object
+
+```getDeviceInfo()``` Method Reponse
+
+Key | Value | Description  
+--- | --- | ---
+status | -1 or 1 or 0 | ```-1``` - Device Driver not Found, ```1``` - READY, ```0``` - NOTREADY
+isWhitelisted | true or false | iT is about the Device is Approved or not. ```true``` - Approved, ```false``` - Not Approved  
+rdServiceInfoJson |JSON DATA | The device returns XML DATA of Device Information. this parameter contains converted JSON DATA of XML DATA
+rdServiceInfoXML | XML DATA | Device Information
+rdServicePackage | Device Package
+
+
+
+```captureFinger()``` Method Reponse
+
+Key | Value | Description  
+--- | --- | ---
+status | 1 or 0 | ```1``` - Fingerprint Captured Successfully, ```0``` - FingerPrint not Captured (Check Connection of Device and OTG Connection Settings in Mobile)
+errorCode | ERROR CODE from RD Service | Refer [UIDAI Document](https://uidai.gov.in/images/resource/Aadhaar_Registered_Devices_2_0_4.pdf) and [RDService Error Details](https://github.com/senthalan2/react-native-rdservice-fingerprintscanner/blob/main/Assets/RDService_Error_Details.pdf)
+errInfo | Error Message according to the ERROR CODE | Refer [UIDAI Document](https://uidai.gov.in/images/resource/Aadhaar_Registered_Devices_2_0_4.pdf) and [RDService Error Details](https://github.com/senthalan2/react-native-rdservice-fingerprintscanner/blob/main/Assets/RDService_Error_Details.pdf)
+pidDataJson |JSON DATA | The device returns PID DATA of Captured Fingerprint. this parameter contains converted JSON pidData of XML pidData
+pidDataXML | XML DATA | pidData Captured Fingerprint
+rdServicePackage | Device Package
+
+
 ## Contributing
 
 See the [contributing guide](CONTRIBUTING.md) to learn how to contribute to the repository and the development workflow.

package/android/build.gradle

@@ -56,4 +56,5 @@ repositories {
 dependencies {
     //noinspection GradleDynamicVersion
     implementation "com.facebook.react:react-native:+"  // From node_modules
+    implementation 'com.github.smart-fun:XmlToJson:1.5.1'
 }

package/android/src/main/java/com/reactnativerdservicefingerprintscanner/RdserviceFingerprintscannerModule.java

@@ -2,6 +2,7 @@ package com.reactnativerdservicefingerprintscanner;
 
 import android.app.Activity;
 import android.content.Intent;
+import android.util.Log;
 import android.widget.Toast;
 
 import androidx.annotation.NonNull;
@@ -15,6 +16,11 @@ import com.facebook.react.bridge.ReactMethod;
 import com.facebook.react.bridge.WritableMap;
 import com.facebook.react.module.annotations.ReactModule;
 
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import fr.arnaudguyon.xmltojsonlib.XmlToJson;
+
 @ReactModule(name = RdserviceFingerprintscannerModule.NAME)
 public class RdserviceFingerprintscannerModule extends ReactContextBaseJavaModule implements RDServiceEvents {
     public static final String NAME = "RdserviceFingerprintscanner";
@@ -40,41 +46,78 @@ public class RdserviceFingerprintscannerModule extends ReactContextBaseJavaModul
     this.promise = promise;
     final Activity activity = getCurrentActivity();
     rdServiceManager.discoverRdService(activity);
-
-
   }
 
   @ReactMethod
   public void captureFinger(String pidOptions, Promise promise) {
     this.promise = promise;
     final Activity activity = getCurrentActivity();
-
     rdServiceManager.captureRdService(servicePackage,pidOptions,activity);
-
-
   }
 
   @Override
   public void onRDServiceDriverDiscovery(String rdServiceInfo, String rdServicePackage, Boolean isWhitelisted) {
     // Called when an installed driver is discovered
     servicePackage = rdServicePackage;
+    XmlToJson xmlToJson = new XmlToJson.Builder(rdServiceInfo).build();
+    String jsonString = xmlToJson.toString();
+    try{
+      JSONObject obj = new JSONObject(jsonString);
+      String statusMsg = obj.getJSONObject("RDService").getString("status");
+      WritableMap responseData = Arguments.createMap();
+      if(statusMsg.equals("READY")){
+        responseData.putInt("status",1);
+        responseData.putString("message","Device is Ready");
+      }
+      else {
+        responseData.putInt("status",0);
+        responseData.putString("message","Make Sure the Device is Connected and OTG Connection is Enabled in your Mobile");
+      }
+      responseData.putString("rdServiceInfoJsonString", jsonString);
+      responseData.putString("rdServiceInfoXML", rdServiceInfo);
+      responseData.putString("rdServicePackage", rdServicePackage);
+      responseData.putBoolean("isWhitelisted",isWhitelisted);
+      promise.resolve(responseData);
+    }
+    catch(JSONException e){
+      promise.reject("DRIVER_DISCOVERY_FAILED","Driver Discovery Failed");
+    }
+
 
-    WritableMap responseData = Arguments.createMap();
-    responseData.putInt("status",1);
-    responseData.putString("rdServiceInfo", rdServiceInfo);
-    responseData.putString("rdServicePackage", rdServicePackage);
-    responseData.putBoolean("isWhitelisted",isWhitelisted);
-    promise.resolve(responseData);
   }
 
   @Override
   public void onRDServiceCaptureResponse(String pidData, String rdServicePackage) {
-    // Called when fingerprint is successfully captured
-    WritableMap responseData = Arguments.createMap();
-    responseData.putInt("status",1);
-    responseData.putString("pidData", pidData);
-    responseData.putString("rdServicePackage", rdServicePackage);
-    promise.resolve(responseData);
+
+    XmlToJson xmlToJson = new XmlToJson.Builder(pidData).build();
+    String jsonString = xmlToJson.toString();
+
+    try{
+      JSONObject obj = new JSONObject(jsonString);
+      JSONObject response =  obj.getJSONObject("PidData").getJSONObject("Resp");
+      String errorCode = response.getString("errCode");
+      String errInfo = response.getString("errInfo");
+      WritableMap responseData = Arguments.createMap();
+      if(Integer.parseInt(errorCode) == 0 ){
+        responseData.putInt("status",1);
+        responseData.putString("message","FingerPrint Scanned Successfully");
+      }
+      else {
+        responseData.putInt("status",0);
+        responseData.putString("message","Make Sure the Device is Connected and OTG Connection is Enabled in your Mobile");
+      }
+
+      responseData.putString("errorCode",errorCode);
+      responseData.putString("errInfo",errInfo);
+      responseData.putString("pidDataJsonString", jsonString);
+      responseData.putString("pidDataXML", pidData);
+      responseData.putString("rdServicePackage", rdServicePackage);
+      promise.resolve(responseData);
+    }
+    catch (JSONException e){
+      promise.reject("FINGERPRINT_CAPTURE__FAILED","FingerPrint Capture Failed");
+    }
+
 
   }
 
@@ -82,7 +125,7 @@ public class RdserviceFingerprintscannerModule extends ReactContextBaseJavaModul
   public void onRDServiceDriverNotFound() {
     // Called when no installed driver is found
     WritableMap responseData = Arguments.createMap();
-    responseData.putInt("status",0);
+    responseData.putInt("status",-1);
     responseData.putString("message","Driver Not Found");
     promise.resolve(responseData);
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-rdservice-fingerprintscanner",
-  "version": "1.0.7",
+  "version": "1.1.1",
   "description": "FingerPrint Scanner RD Service",
   "main": "lib/commonjs/index",
   "module": "lib/module/index",

package/src/index.js

@@ -18,24 +18,48 @@ const RdserviceFingerprintscanner = NativeModules.RdserviceFingerprintscanner
     );
 
 export function getDeviceInfo() {
- return new Promise((resolve,reject)=>{
-  RdserviceFingerprintscanner.getDeviceInfo().then(res=>{
-    resolve(res)
-  }).catch(err=>{
-    reject(err)
-  })
- })
-
+  return new Promise((resolve, reject) => {
+    RdserviceFingerprintscanner.getDeviceInfo()
+      .then((res) => {
+        if (res.status === -1) {
+          const resObj = {
+            status: res.status,
+            message: res.message,
+          };
+          resolve(resObj);
+        } else {
+          const resObj = {
+            isWhitelisted: res.isWhitelisted,
+            rdServiceInfoJson: JSON.parse(res.rdServiceInfoJsonString),
+            rdServiceInfoXML: res.rdServiceInfoXML,
+            rdServicePackage: res.rdServicePackage,
+            status: res.status,
+          };
+          resolve(resObj);
+        }
+      })
+      .catch((err) => {
+        reject(err);
+      });
+  });
 }
 
 export function captureFinger(pidOptions) {
-  return new Promise((resolve,reject)=>{
-    RdserviceFingerprintscanner.captureFinger(pidOptions).then(res => {
-      resolve(res)
-    }).catch( err => {
-      reject(err)
-    })
-
-  }) 
-  
+  return new Promise((resolve, reject) => {
+    RdserviceFingerprintscanner.captureFinger(pidOptions)
+      .then((res) => {
+        const resObj = {
+          pidDataJson: JSON.parse(res.pidDataJsonString),
+          pidDataXML: res.pidDataXML,
+          rdServicePackage: res.rdServicePackage,
+          status: res.status,
+          errInfo: res.errInfo,
+          errorCode: parseInt(res.errorCode),
+        };
+        resolve(resObj);
+      })
+      .catch((err) => {
+        reject(err);
+      });
+  });
 }

package/lib/commonjs/index.js

@@ -1,44 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.captureFinger = captureFinger;
-exports.getDeviceInfo = getDeviceInfo;
-
-var _reactNative = require("react-native");
-
-const LINKING_ERROR = `The package 'react-native-rdservice-fingerprintscanner' doesn't seem to be linked. Make sure: \n\n` + _reactNative.Platform.select({
-  ios: "- You have run 'pod install'\n",
-  default: ''
-}) + '- You rebuilt the app after installing the package\n' + '- You are not using Expo managed workflow\n';
-const RdserviceFingerprintscanner = _reactNative.NativeModules.RdserviceFingerprintscanner ? _reactNative.NativeModules.RdserviceFingerprintscanner : new Proxy({}, {
-  get() {
-    throw new Error(LINKING_ERROR);
-  }
-
-});
-
-function getDeviceInfo() {
-  return new Promise((resolve,reject)=>{
-   RdserviceFingerprintscanner.getDeviceInfo().then(res=>{
-     resolve(res)
-   }).catch(err=>{
-     reject(err)
-   })
-  })
- 
- }
- 
- function captureFinger(pidOptions) {
-   return new Promise((resolve,reject)=>{
-     RdserviceFingerprintscanner.captureFinger(pidOptions).then(res => {
-       resolve(res)
-     }).catch( err => {
-       reject(err)
-     })
- 
-   }) 
-   
- }
-//# sourceMappingURL=index.js.map

package/lib/commonjs/index.js.map

@@ -1 +0,0 @@
-{"version":3,"sources":["index.js"],"names":["LINKING_ERROR","Platform","select","ios","default","RdserviceFingerprintscanner","NativeModules","Proxy","get","Error","getDeviceInfo","captureFinger","pidOptions"],"mappings":";;;;;;;;AAAA;;AAEA,MAAMA,aAAa,GAChB,oGAAD,GACAC,sBAASC,MAAT,CAAgB;AAAEC,EAAAA,GAAG,EAAE,gCAAP;AAAyCC,EAAAA,OAAO,EAAE;AAAlD,CAAhB,CADA,GAEA,sDAFA,GAGA,6CAJF;AAMA,MAAMC,2BAA2B,GAAGC,2BAAcD,2BAAd,GAChCC,2BAAcD,2BADkB,GAEhC,IAAIE,KAAJ,CACE,EADF,EAEE;AACEC,EAAAA,GAAG,GAAG;AACJ,UAAM,IAAIC,KAAJ,CAAUT,aAAV,CAAN;AACD;;AAHH,CAFF,CAFJ;;AAWO,SAASU,aAAT,GAAyB;AAC9B,SAAOL,2BAA2B,CAACK,aAA5B,EAAP;AACD;;AAEM,SAASC,aAAT,CAAuBC,UAAvB,EAAmC;AACxC,SAAOP,2BAA2B,CAACM,aAA5B,CAA0CC,UAA1C,CAAP;AACD","sourcesContent":["import { NativeModules, Platform } from 'react-native';\n\nconst LINKING_ERROR =\n  `The package 'react-native-rdservice-fingerprintscanner' doesn't seem to be linked. Make sure: \\n\\n` +\n  Platform.select({ ios: \"- You have run 'pod install'\\n\", default: '' }) +\n  '- You rebuilt the app after installing the package\\n' +\n  '- You are not using Expo managed workflow\\n';\n\nconst RdserviceFingerprintscanner = NativeModules.RdserviceFingerprintscanner\n  ? NativeModules.RdserviceFingerprintscanner\n  : new Proxy(\n      {},\n      {\n        get() {\n          throw new Error(LINKING_ERROR);\n        },\n      }\n    );\n\nexport function getDeviceInfo() {\n  return RdserviceFingerprintscanner.getDeviceInfo();\n}\n\nexport function captureFinger(pidOptions) {\n  return RdserviceFingerprintscanner.captureFinger(pidOptions);\n}\n"]}

package/lib/module/index.js

@@ -1,33 +0,0 @@
-import { NativeModules, Platform } from 'react-native';
-const LINKING_ERROR = `The package 'react-native-rdservice-fingerprintscanner' doesn't seem to be linked. Make sure: \n\n` + Platform.select({
-  ios: "- You have run 'pod install'\n",
-  default: ''
-}) + '- You rebuilt the app after installing the package\n' + '- You are not using Expo managed workflow\n';
-const RdserviceFingerprintscanner = NativeModules.RdserviceFingerprintscanner ? NativeModules.RdserviceFingerprintscanner : new Proxy({}, {
-  get() {
-    throw new Error(LINKING_ERROR);
-  }
-
-});
-export function getDeviceInfo() {
-  return new Promise((resolve,reject)=>{
-   RdserviceFingerprintscanner.getDeviceInfo().then(res=>{
-     resolve(res)
-   }).catch(err=>{
-     reject(err)
-   })
-  })
- 
- }
- export function captureFinger(pidOptions) {
-  return new Promise((resolve,reject)=>{
-    RdserviceFingerprintscanner.captureFinger(pidOptions).then(res => {
-      resolve(res)
-    }).catch( err => {
-      reject(err)
-    })
-
-  }) 
-  
-}
-//# sourceMappingURL=index.js.map

package/lib/module/index.js.map

@@ -1 +0,0 @@
-{"version":3,"sources":["index.js"],"names":["NativeModules","Platform","LINKING_ERROR","select","ios","default","RdserviceFingerprintscanner","Proxy","get","Error","getDeviceInfo","captureFinger","pidOptions"],"mappings":"AAAA,SAASA,aAAT,EAAwBC,QAAxB,QAAwC,cAAxC;AAEA,MAAMC,aAAa,GAChB,oGAAD,GACAD,QAAQ,CAACE,MAAT,CAAgB;AAAEC,EAAAA,GAAG,EAAE,gCAAP;AAAyCC,EAAAA,OAAO,EAAE;AAAlD,CAAhB,CADA,GAEA,sDAFA,GAGA,6CAJF;AAMA,MAAMC,2BAA2B,GAAGN,aAAa,CAACM,2BAAd,GAChCN,aAAa,CAACM,2BADkB,GAEhC,IAAIC,KAAJ,CACE,EADF,EAEE;AACEC,EAAAA,GAAG,GAAG;AACJ,UAAM,IAAIC,KAAJ,CAAUP,aAAV,CAAN;AACD;;AAHH,CAFF,CAFJ;AAWA,OAAO,SAASQ,aAAT,GAAyB;AAC9B,SAAOJ,2BAA2B,CAACI,aAA5B,EAAP;AACD;AAED,OAAO,SAASC,aAAT,CAAuBC,UAAvB,EAAmC;AACxC,SAAON,2BAA2B,CAACK,aAA5B,CAA0CC,UAA1C,CAAP;AACD","sourcesContent":["import { NativeModules, Platform } from 'react-native';\n\nconst LINKING_ERROR =\n  `The package 'react-native-rdservice-fingerprintscanner' doesn't seem to be linked. Make sure: \\n\\n` +\n  Platform.select({ ios: \"- You have run 'pod install'\\n\", default: '' }) +\n  '- You rebuilt the app after installing the package\\n' +\n  '- You are not using Expo managed workflow\\n';\n\nconst RdserviceFingerprintscanner = NativeModules.RdserviceFingerprintscanner\n  ? NativeModules.RdserviceFingerprintscanner\n  : new Proxy(\n      {},\n      {\n        get() {\n          throw new Error(LINKING_ERROR);\n        },\n      }\n    );\n\nexport function getDeviceInfo() {\n  return RdserviceFingerprintscanner.getDeviceInfo();\n}\n\nexport function captureFinger(pidOptions) {\n  return RdserviceFingerprintscanner.captureFinger(pidOptions);\n}\n"]}