@regulaforensics/cordova-plugin-document-reader-api 6.4.0 → 6.5.0

package/src/android/RegulaConfig.java

@@ -6,9 +6,11 @@ import org.json.JSONException;
 
 import com.regula.documentreader.api.DocumentReader;
 import com.regula.documentreader.api.params.ImageQA;
+import com.regula.documentreader.api.params.OnlineProcessingConfig;
 import com.regula.documentreader.api.params.ParamsCustomization;
 import com.regula.documentreader.api.params.Functionality;
 import com.regula.documentreader.api.params.ProcessParam;
+import com.regula.documentreader.api.params.rfid.ReprocParams;
 import com.regula.documentreader.api.params.rfid.dg.DataGroups;
 
 import android.content.Context;
@@ -59,8 +61,6 @@ class RegulaConfig {
             editor.setShowCaptureButtonDelayFromDetect(opts.getInt("showCaptureButtonDelayFromDetect"));
         if (opts.has("showCaptureButtonDelayFromStart"))
             editor.setShowCaptureButtonDelayFromStart(opts.getInt("showCaptureButtonDelayFromStart"));
-        if (opts.has("isOnlineMode"))
-            editor.setOnlineMode(opts.getBoolean("isOnlineMode"));
         if (opts.has("databaseAutoupdate"))
             editor.setDatabaseAutoupdate(opts.getBoolean("databaseAutoupdate"));
         if (opts.has("showSkipNextPageButton"))
@@ -73,8 +73,6 @@ class RegulaConfig {
             editor.setShowCameraSwitchButton(opts.getBoolean("showCameraSwitchButton"));
         if (opts.has("cameraFrame"))
             editor.setCameraFrame(opts.getString("cameraFrame"));
-        if (opts.has("serviceURL"))
-            editor.setServiceURL(opts.getString("serviceURL"));
         if (opts.has("btDeviceName"))
             editor.setBtDeviceName(opts.getString("btDeviceName"));
         if (opts.has("orientation"))
@@ -105,6 +103,8 @@ class RegulaConfig {
             editor.setExposure(BigDecimal.valueOf(opts.getDouble("exposure")).floatValue());
         if (opts.has("rfidTimeout"))
             editor.setRfidTimeout(opts.getInt("rfidTimeout"));
+        if (opts.has("onlineProcessingConfiguration"))
+            editor.setOnlineProcessingConfiguration(OnlineProcessingConfigFromJSON(opts.getJSONObject("onlineProcessingConfiguration")));
 
         editor.apply();
     }
@@ -349,14 +349,12 @@ class RegulaConfig {
         object.put("showChangeFrameButton", functionality.isShowChangeFrameButton());
         object.put("showCaptureButtonDelayFromDetect", functionality.getShowCaptureButtonDelayFromDetect());
         object.put("showCaptureButtonDelayFromStart", functionality.getShowCaptureButtonDelayFromStart());
-        object.put("isOnlineMode", functionality.isOnlineMode());
         object.put("databaseAutoupdate", functionality.isDatabaseAutoupdate());
         object.put("showSkipNextPageButton", functionality.isShowSkipNextPageButton());
         object.put("useAuthenticator", functionality.isUseAuthenticator());
         object.put("skipFocusingFrames", functionality.isSkipFocusingFrames());
         object.put("showCameraSwitchButton", functionality.isShowCameraSwitchButton());
         object.put("cameraFrame", functionality.getCameraFrame());
-        object.put("serviceURL", functionality.getServiceURL());
         object.put("btDeviceName", functionality.getBtDeviceName());
         object.put("orientation", functionality.getOrientation());
         object.put("BTDeviceApiPresent", functionality.isBTDeviceApiPresent());
@@ -603,6 +601,10 @@ class RegulaConfig {
             setDataGroups(DocumentReader.Instance().rfidScenario().eIDDataGroups(), opts.getJSONObject("eIDDataGroups"));
         if (opts.has("eDLDataGroups"))
             setDataGroups(DocumentReader.Instance().rfidScenario().eDLDataGroups(), opts.getJSONObject("eDLDataGroups"));
+        if (opts.has("reprocessParams"))
+            DocumentReader.Instance().rfidScenario().setReprocessParams(ReprocParamsFromJSON(opts.getJSONObject("reprocessParams")));
+        if (opts.has("defaultReadingBufferSize"))
+            DocumentReader.Instance().rfidScenario().setDefaultReadingBufferSize(opts.getInt("defaultReadingBufferSize"));
     }
 
     private static void setDataGroups(DataGroups dataGroup, JSONObject opts) throws JSONException {
@@ -649,4 +651,42 @@ class RegulaConfig {
         if (opts.has("DG21"))
             dataGroup.setDG14(opts.getBoolean("DG21"));
     }
+
+    private static ReprocParams ReprocParamsFromJSON(JSONObject input) {
+        try {
+            ReprocParams result;
+            if (input.has("serviceUrl"))
+                result = new ReprocParams(input.getString("serviceUrl"));
+            else return null;
+            if (input.has("failIfNoService"))
+                result.setFailIfNoService(input.getBoolean("failIfNoService"));
+            return result;
+        } catch (JSONException e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
+
+    private static OnlineProcessingConfig OnlineProcessingConfigFromJSON(JSONObject input) {
+        try {
+            OnlineProcessingConfig.Builder builder;
+            if (input.has("mode"))
+                builder = new OnlineProcessingConfig.Builder(input.getInt("mode"));
+            else return null;
+            if (input.has("imageFormat"))
+                builder.setImageFormat(input.getInt("imageFormat"));
+            if (input.has("url"))
+                builder.setUrl(input.getString("url"));
+            if (input.has("imageCompressionQuality"))
+                builder.setImageCompressionQuality((float) input.getDouble("imageCompressionQuality"));
+            if (input.has("processParams")) {
+                ProcessParam params = new ProcessParam();
+                setProcessParams(params, input.getJSONObject("processParams"));
+                builder.setProcessParams(params);
+            }
+        } catch (JSONException e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
 }

package/src/android/build.gradle

@@ -12,7 +12,7 @@ repositories {
 }
 
 dependencies {
-	implementation ('com.regula.documentreader:api:6.4.7224'){
+	implementation ('com.regula.documentreader:api:6.5.7488'){
         transitive = true
     }
 }

package/src/ios/RGLDocumentReader.m

@@ -236,6 +236,8 @@ typedef void (^Callback)(NSString* response);
         [self prepareDatabase :[args objectAtIndex:0] :successCallback :errorCallback];
     else if([action isEqualToString:@"recognizeImage"])
         [self recognizeImage :[args objectAtIndex:0] :successCallback :errorCallback];
+    else if([action isEqualToString:@"recognizeData"])
+        [self recognizeData :[args objectAtIndex:0] :successCallback :errorCallback];
     else if([action isEqualToString:@"setRfidSessionStatus"])
         [self setRfidSessionStatus :[args objectAtIndex:0] :successCallback :errorCallback];
     else if([action isEqualToString:@"providePACertificates"])
@@ -248,8 +250,6 @@ typedef void (^Callback)(NSString* response);
         [self parseCoreResults :[args objectAtIndex:0] :successCallback :errorCallback];
     else if([action isEqualToString:@"setTCCParams"])
         [self setTCCParams :[args objectAtIndex:0] :successCallback :errorCallback];
-    else if([action isEqualToString:@"initializeReaderWithDatabase"])
-        [self initializeReaderWithDatabase :[args objectAtIndex:0] :[args objectAtIndex:1] :successCallback :errorCallback];
     else if([action isEqualToString:@"recognizeImageWithOpts"])
         [self recognizeImageWithOpts :[args objectAtIndex:0] :[args objectAtIndex:1] :successCallback :errorCallback];
     else if([action isEqualToString:@"recognizeVideoFrame"])
@@ -304,12 +304,8 @@ typedef void (^Callback)(NSString* response);
     [self result:@"getLicenseMessage() is an android-only method" :successCallback];
 }
 
-- (void) initializeReaderWithDatabase:(NSString*)licenseString :(NSString*)databaseString :(Callback)successCallback :(Callback)errorCallback{
-    [self result:@"initializeReaderWithDatabase() is an android-only method" :successCallback];
-}
-
-- (void) initializeReader:(NSString*)licenseString :(Callback)successCallback :(Callback)errorCallback{
-    [RGLDocReader.shared initializeReaderWithConfig:[RGLConfig configWithLicenseData:[[NSData alloc] initWithBase64EncodedString:licenseString options:0]] completion:[self getInitCompletion :successCallback :errorCallback]];
+- (void) initializeReader:(NSDictionary*)config :(Callback)successCallback :(Callback)errorCallback{
+    [RGLDocReader.shared initializeReaderWithConfig:[RGLWJSONConstructor RGLConfigFromJson:config] completion:[self getInitCompletion :successCallback :errorCallback]];
 }
 
 - (void) parseCoreResults:(NSString*)json :(Callback)successCallback :(Callback)errorCallback{
@@ -356,6 +352,10 @@ typedef void (^Callback)(NSString* response);
     [self recognizeImageWith :base64 :false :successCallback :errorCallback];
 }
 
+- (void) recognizeData:(NSString*)data :(Callback)successCallback :(Callback)errorCallback{
+    [RGLDocReader.shared recognizeData :[[NSData alloc] initWithBase64EncodedString:data options:0] completion:[self getCompletion]];
+}
+
 - (void) recognizeImages:(NSArray*)input :(Callback)successCallback :(Callback)errorCallback{
         NSMutableArray<UIImage*>* images = [[NSMutableArray alloc] init];
         for(__strong NSMutableString* base64 in input)

package/src/ios/RGLWJSONConstructor.h

@@ -12,6 +12,7 @@
 +(NSMutableDictionary* _Nonnull)generateNSDictionary:(NSDictionary<NSNumber*, NSNumber*>* _Nullable)input;
 +(RGLPKDCertificate* _Nullable)RGLPKDCertificateFromJson:(NSDictionary* _Nullable) dict;
 +(RGLTCCParams* _Nonnull)RGLTCCParamsFromJson:(NSDictionary* _Nonnull)input;
++(RGLConfig* _Nullable)RGLConfigFromJson:(NSDictionary* _Nonnull)input;
 +(RGLImageInput* _Nonnull)RGLImageInputFromJson:(NSDictionary* _Nonnull)input;
 +(NSInteger)generateDocReaderAction:(RGLDocReaderAction)action;
 +(NSInteger)generateRFIDCompleteAction:(RGLRFIDCompleteAction)action;

package/src/ios/RGLWJSONConstructor.m

@@ -35,6 +35,28 @@
     return [[RGLTCCParams alloc] initWithServiceTAURLString:serviceTAURLString servicePAURLString:servicePAURLString pfxCertURLString:pfxCertURLString pfxCertData: pfxCertData pfxPassPhrase:pfxPassPhrase];
 }
 
++(RGLConfig*)RGLConfigFromJson:(NSDictionary*)input {
+    NSData* license;
+    if([input valueForKey:@"license"] != nil)
+        license = [[NSData alloc] initWithBase64EncodedString:[input valueForKey:@"license"] options:0];
+    else return nil;
+
+    RGLConfig *config = [[RGLConfig alloc] initWithLicenseData:license];
+
+    if([input valueForKey:@"databasePath"] != nil){
+        config.databasePath = [[input valueForKey:@"databasePath"] stringValue];
+    }
+    if([input valueForKey:@"licenseUpdate"] != nil){
+        config.licenseUpdateCheck = [[input valueForKey:@"licenseUpdate"] boolValue];
+    }
+    if([input valueForKey:@"delayedNNLoad"] != nil){
+        config.delayedNNLoadEnabled = [[input valueForKey:@"delayedNNLoad"] boolValue];
+    }
+
+    return config;
+}
+
+
 +(RGLImageInput*)RGLImageInputFromJson:(NSDictionary*)input {
     NSInteger pageIndex = 0;
     if([input valueForKey:@"pageIndex"] != nil)
@@ -294,11 +316,9 @@
                 [array addObject:[self generateRGLImageQualityGroup:item]];
         result[@"imageQuality"] = array;
     }
-    result[@"overallResult"] = @(input.overallResult);
     result[@"authenticityResult"] = [self generateRGLDocumentReaderAuthenticityResult:input.authenticityResults];
     result[@"rfidSessionData"] = [self generateRGLRFIDSessionData:input.rfidSessionData];
     result[@"chipPage"] = @(input.chipPage);
-    result[@"resolutionType"] = @(input.resolutionType);
     result[@"barcodeResult"] = [self generateRGLDocumentReaderBarcodeResult:input.barcodeResult];
     result[@"processingFinishedStatus"] = @(input.processingFinishedStatus);
     result[@"morePagesAvailable"] = @(input.morePagesAvailable);
@@ -614,7 +634,6 @@
     result[@"status"] = @(input.status);
     result[@"extLeSupport"] = @(input.extLeSupport);
     result[@"processTime"] = @(input.processTime);
-    result[@"sessionDataStatus"] = [self generateRGLRFIDSessionDataStatus:input.sessionDataStatus];
 
     return result;
 }

package/src/ios/RegulaConfig.m

@@ -447,6 +447,37 @@
     return group;
 }
 
++(RGLOnlineProcessingConfig*)RGLOnlineProcessingConfigFromJSON:(NSDictionary*)dict {
+    if([dict valueForKey:@"mode"] == nil) return nil;
+
+    RGLOnlineProcessingConfig *result = [[RGLOnlineProcessingConfig alloc] initWithMode:[[dict valueForKey:@"mode"] integerValue]];
+
+    if([dict valueForKey:@"imageFormat"] != nil)
+        result.imageFormat = [[dict valueForKey:@"imageFormat"] integerValue];
+    if([dict valueForKey:@"url"] != nil)
+        result.serviceURL = [dict valueForKey:@"url"];
+    if([dict valueForKey:@"imageCompressionQuality"] != nil)
+        result.imageCompressionQuality = [[dict valueForKey:@"imageCompressionQuality"] floatValue];
+    if([dict valueForKey:@"processParams"] != nil) {
+        RGLProcessParams *params = [RGLProcessParams new];
+        [self setProcessParams:[dict valueForKey:@"processParams"] :params];
+        result.processParams = params;
+    }
+
+    return result;
+}
+
++(RGLReprocParams*)RGLReprocParamsFromJSON:(NSDictionary*)dict {
+    RGLReprocParams *result = [RGLReprocParams new];
+
+    if([dict valueForKey:@"serviceUrl"] != nil)
+        result.serviceURL = [dict valueForKey:@"serviceUrl"];
+    if([dict valueForKey:@"failIfNoService"] != nil)
+        result.failIfNoService = [dict valueForKey:@"failIfNoService"];
+
+    return result;
+}
+
 +(void)setCustomization:(NSDictionary*)options :(RGLCustomization*)customization {
     if([options valueForKey:@"cameraFrameBorderWidth"] != nil)
         customization.cameraFrameBorderWidth = [[options valueForKey:@"cameraFrameBorderWidth"] floatValue];
@@ -590,10 +621,6 @@
         functionality.singleResult = [[options valueForKey:@"singleResult"] boolValue];
     if([options valueForKey:@"cameraPosition"] != nil)
         functionality.cameraPosition = [self AVCaptureDevicePositionWithNSInteger:[[options valueForKey:@"cameraPosition"] integerValue]];
-    if([options valueForKey:@"onlineMode"] != nil)
-        functionality.onlineMode = [[options valueForKey:@"onlineMode"] boolValue];
-    if([options valueForKey:@"serviceURL"] != nil)
-        functionality.serviceURL = [[options valueForKey:@"serviceURL"] stringValue];
     if([options valueForKey:@"btDeviceName"] != nil)
         functionality.btDeviceName = [[options valueForKey:@"btDeviceName"] stringValue];
     if([options valueForKey:@"useAuthenticator"] != nil)
@@ -614,6 +641,8 @@
         functionality.recordScanningProcess = [[options valueForKey:@"recordScanningProcess"] boolValue];
     if([options valueForKey:@"manualMultipageMode"] != nil)
         functionality.manualMultipageMode = [[options valueForKey:@"manualMultipageMode"] boolValue];
+    if([options valueForKey:@"onlineProcessingConfiguration"] != nil)
+        functionality.onlineProcessingConfig = [self RGLOnlineProcessingConfigFromJSON:[options valueForKey:@"onlineProcessingConfiguration"]];;
 }
 
 +(void)setProcessParams:(NSDictionary*)options :(RGLProcessParams*)processParams {
@@ -797,8 +826,6 @@
     result[@"videoSessionPreset"] = [NSNumber numberWithInteger:[self NSIntegerWithAVCaptureSessionPreset:functionality.videoSessionPreset]];
     result[@"videoCaptureMotionControl"] = [NSNumber numberWithBool:functionality.videoCaptureMotionControl];
     result[@"orientation"] = [NSNumber numberWithInteger:[self NSIntegerWithUIInterfaceOrientationMask:functionality.orientation]];
-    result[@"onlineMode"] = [NSNumber numberWithBool:functionality.onlineMode];
-    result[@"serviceURL"] = functionality.serviceURL;
     result[@"cameraPosition"] = [NSNumber numberWithInteger:[self NSIntegerWithAVCaptureDevicePosition:functionality.cameraPosition]];
     result[@"btDeviceName"] = functionality.btDeviceName;
     result[@"useAuthenticator"] = [NSNumber numberWithBool:functionality.isUseAuthenticator];
@@ -969,6 +996,10 @@
         rfidScenario.authorizedInstallCert = [[options valueForKey:@"authorizedInstallCert"] boolValue];
     if([options valueForKey:@"authorizedInstallQCert"] != nil)
         rfidScenario.authorizedInstallQCert = [[options valueForKey:@"authorizedInstallQCert"] boolValue];
+    if([options valueForKey:@"reprocessParams"] != nil)
+        rfidScenario.reprocParams = [self RGLReprocParamsFromJSON: [options valueForKey:@"reprocessParams"]];
+    if([options valueForKey:@"defaultReadingBufferSize"] != nil)
+        rfidScenario.defaultReadingBufferSize = [[options valueForKey:@"defaultReadingBufferSize"] intValue];
 }
 
 @end

package/tmp.64209.json

@@ -0,0 +1,30 @@
+{
+  "name": "@regulaforensics/cordova-plugin-document-reader-api-beta",
+  "version": "0.0.136",
+  "description": "Cordova plugin for reading and validation of identification documents (API framework)",
+  "cordova": {
+    "id": "@regulaforensics/cordova-plugin-document-reader-api-beta",
+    "platforms": [
+      "ios",
+      "android"
+    ]
+  },
+  "max_body_size": "1000mb",
+  "keywords": [
+    "cordova",
+    "documentreader",
+    "reader",
+    "scanner",
+    "regula"
+  ],
+  "author": "RegulaForensics",
+  "license": "commercial",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/regulaforensics/DocumentReader-Cordova-Plugin.git"
+  },
+  "homepage": "https://mobile.regulaforensics.com",
+  "publishConfig": {
+    "access": "public"
+  }
+}