@regulaforensics/cordova-plugin-document-reader-api 6.2.1 → 6.3.1

package/README.md

@@ -12,17 +12,17 @@ This repository contains the source code of the Document Reader API, and the sam
 * [Additional information](#additional-information)
 
 ## How to build the demo application
-1. Visit [licensing.regulaforensics.com](https://licensing.regulaforensics.com) to get a trial license (`regula.license` file). The license creation wizard will guide you through the necessary steps.
+1. Visit [client.regulaforensics.com](https://client.regulaforensics.com) to get a trial license (`regula.license` file). The license creation wizard will guide you through the necessary steps.
 2. Download or clone current repository using the command `git clone https://github.com/regulaforensics/DocumentReader-Cordova-Plugin.git`.
 3. Run the following commands in Terminal:
 ```bash
 $ cd example
 $ npm install
+$ npx jetify
 $ cordova prepare
 ```
 
 4. Copy the `regula.license` file to the `example/www` folder.
-5. Change the application ID to the one you have specified during the registration at [licensing.regulaforensics.com](https://licensing.regulaforensics.com).
 6. Android:
   * Run `cordova run android` inside `example` folder - this is just one way to run the app. You can also run it directly from within Android Studio.
 
@@ -35,7 +35,6 @@ $ cordova prepare
 ### Troubleshooting license issues
 If you have issues with license verification when running the application, please verify that next is true:
 1. The OS, which you use, is specified in the license (e.g., Android and/or iOS).
-2. The application (Bundle) ID, which you use, is specified in the license.
 3. The license is valid (not expired).
 4. The date and time on the device, where you run the application, are valid.
 5. You use the latest release version of the Document Reader SDK.

package/example/config.xml

@@ -17,6 +17,7 @@
     <allow-intent href="mailto:*" />
     <allow-intent href="geo:*" />
     <platform name="android">
+        <preference name="AndroidXEnabled" value="true" />
         <allow-intent href="market:*" />
         <config-file parent="/*" target="AndroidManifest.xml">
             <uses-permission android:name="android.permission.NFC" />

package/example/package.json

@@ -16,12 +16,13 @@
     "cordova-android": "^9.0.0",
     "cordova-ios": "^6.1.1",
     "cordova-plugin-add-swift-support": "^2.0.2",
-    "@regulaforensics/cordova-plugin-document-reader-api": "^6.2.1",
-    "@regulaforensics/cordova-plugin-document-reader-core-fullrfid": "^6.2.1",
+    "@regulaforensics/cordova-plugin-document-reader-api": "^6.3.1",
+    "@regulaforensics/cordova-plugin-document-reader-core-fullrfid": "^6.3.0",
     "cordova-plugin-file": "^6.0.2",
     "cordova-plugin-image-picker": "^1.1.3",
     "cordova-plugin-android-permissions": "1.1.0",
-    "cordova-plugin-advanced-http": "3.2.1"
+    "cordova-plugin-advanced-http": "3.2.1",
+    "jetifier": "^2.0.0"
   },
   "cordova": {
     "plugins": {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@regulaforensics/cordova-plugin-document-reader-api",
-  "version": "6.2.1",
+  "version": "6.3.1",
   "description": "Cordova plugin for reading and validation of identification documents (API framework)",
   "cordova": {
     "id": "@regulaforensics/cordova-plugin-document-reader-api",

package/plugin.xml

@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<plugin id="cordova-plugin-document-reader-api" version="6.2.1"
+<plugin id="cordova-plugin-document-reader-api" version="6.3.1"
   xmlns="http://apache.org/cordova/ns/plugins/1.0">
   <name>DocumentReaderApi</name>
   <description>Cordova plugin Document reader api</description>
@@ -25,7 +25,7 @@
     <podspec>
       <config/>
       <pods>
-        <pod name="DocumentReader" spec="~> 6.2.2441" />
+        <pod name="DocumentReader" spec="~> 6.3.2494" />
       </pods>
     </podspec>
   </platform>

package/src/android/DocumentReader.java

@@ -19,6 +19,7 @@ import com.regula.documentreader.api.completions.IDocumentReaderPrepareCompletio
 import com.regula.documentreader.api.completions.IRfidPKDCertificateCompletion;
 import com.regula.documentreader.api.completions.IRfidReaderRequest;
 import com.regula.documentreader.api.completions.IRfidTASignatureCompletion;
+import com.regula.documentreader.api.completions.ITccParamsCompletion;
 import com.regula.documentreader.api.enums.DocReaderAction;
 import com.regula.documentreader.api.errors.DocumentReaderException;
 import com.regula.documentreader.api.internal.core.CoreScenarioUtil;
@@ -325,8 +326,8 @@ public class DocumentReader extends CordovaPlugin {
                 case "parseCoreResults":
                     parseCoreResults(callback, args(0));
                     break;
-                case "initializeReaderWithDatabasePath":
-                    initializeReaderWithDatabasePath(callback, args(0), args(1));
+                case "setTCCParams":
+                    setTCCParams(callback, args(0));
                     break;
                 case "initializeReaderWithDatabase":
                     initializeReaderWithDatabase(callback, args(0), args(1));
@@ -439,6 +440,10 @@ public class DocumentReader extends CordovaPlugin {
         callback.success(Instance().version.database.documentsNumber);
     }
 
+    private void setTCCParams(Callback callback, final JSONObject params) {
+        Instance().setTccParams(JSONConstructor.TCCParamsFromJSON(params), getTCCParamsCompletion(callback));
+    }
+
     private void deinitializeReader(Callback callback) {
         Instance().deinitializeReader();
         callback.success();
@@ -700,11 +705,6 @@ public class DocumentReader extends CordovaPlugin {
         callback.error("recognizeImageWithCameraMode() is an ios-only method");
     }
 
-    @SuppressWarnings("unused")
-    private void initializeReaderWithDatabasePath(Callback callback, Object license, String path) {
-        callback.error("initializeReaderWithDatabasePath() is an ios-only method");
-    }
-
     @SuppressWarnings("unused")
     private void setRfidSessionStatus(Callback callback, String s) {
         callback.error("setRfidSessionStatus() is an ios-only method");
@@ -752,6 +752,15 @@ public class DocumentReader extends CordovaPlugin {
         };
     }
 
+    private ITccParamsCompletion getTCCParamsCompletion(Callback callback) {
+        return (success, error) -> {
+            if (success)
+                callback.success("success");
+            else
+                callback.error("failed: " + error.getMessage());
+        };
+    }
+
     private IRfidReaderRequest getIRfidReaderRequest() {
         return new IRfidReaderRequest() {
             @Override

package/src/android/JSONConstructor.java

@@ -16,6 +16,7 @@ import com.regula.documentreader.api.enums.eRPRM_Lights;
 import com.regula.documentreader.api.errors.DocumentReaderException;
 import com.regula.documentreader.api.internal.core.CoreDetailedScenario;
 import com.regula.documentreader.api.params.FaceMetaData;
+import com.regula.documentreader.api.params.rfid.TccParams;
 import com.regula.documentreader.api.params.rfid.authorization.PAAttribute;
 import com.regula.documentreader.api.params.rfid.authorization.PAResourcesIssuer;
 import com.regula.documentreader.api.params.rfid.authorization.TAChallenge;
@@ -340,6 +341,25 @@ class JSONConstructor {
         return result;
     }
 
+    static TccParams TCCParamsFromJSON(JSONObject input) {
+        TccParams result = new TccParams();
+        try {
+            if (input.has("serviceUrlTA"))
+                result.setServiceUrlTA(input.getString("serviceUrlTA"));
+            if (input.has("serviceUrlPA"))
+                result.setServiceUrlPA(input.getString("serviceUrlPA"));
+            if (input.has("pfxCertUrl"))
+                result.setPfxCertUrl(input.getString("pfxCertUrl"));
+            if (input.has("pfxPassPhrase"))
+                result.setPfxPassPhrase(input.getString("pfxPassPhrase"));
+            if (input.has("pfxCert"))
+                result.setPfxCert(Base64.decode(input.getString("pfxCert"), Base64.DEFAULT));
+        } catch (JSONException e) {
+            e.printStackTrace();
+        }
+        return result;
+    }
+
     static Throwable ThrowableFromJSON(JSONObject jsonObject) {
         return new Throwable();
     }

package/src/android/RegulaConfig.java

@@ -323,6 +323,14 @@ class RegulaConfig {
             editor.setToolbarSize(BigDecimal.valueOf(opts.getDouble("toolbarSize")).floatValue());
         if (opts.has("statusBackgroundColor"))
             editor.setStatusBackgroundColor(opts.getString("statusBackgroundColor"));
+        if (opts.has("hologramAnimationImage"))
+            editor.setHologramAnimationImage(drawableFromBase64(opts.getString("hologramAnimationImage"), context));
+        if (opts.has("hologramAnimationPositionMultiplier"))
+            editor.setHologramAnimationPositionMultiplier((float) opts.getDouble("hologramAnimationPositionMultiplier"));
+        if (opts.has("hologramAnimationImageMatrix"))
+            editor.setHologramAnimationImageMatrix(matrixFromFloatArray(floatArrayFromJson(opts.getJSONArray("hologramAnimationImageMatrix"))));
+        if (opts.has("hologramAnimationImageScaleType"))
+            editor.setHologramAnimationImageScaleType(ScaleType.valueOf(opts.getString("hologramAnimationImageScaleType")));
 
         editor.applyImmediately(context);
     }
@@ -423,6 +431,10 @@ class RegulaConfig {
         object.put("changeFrameButtonCollapseImage", bitmapToBase64String(bitmapFromDrawable(customization.getChangeFrameCollapseButtonDrawable())));
         object.put("toolbarSize", customization.getToolbarSize());
         object.put("statusBackgroundColor", customization.getStatusBackgroundColor());
+        object.put("hologramAnimationImage", bitmapToBase64String(bitmapFromDrawable(customization.getHologramAnimationImage())));
+        object.put("hologramAnimationPositionMultiplier", customization.getHologramAnimationPositionMultiplier());
+        object.put("hologramAnimationImageMatrix", customization.getHologramAnimationImageMatrix());
+        object.put("hologramAnimationImageScaleType", customization.getHologramAnimationImageScaleType());
 
         return object;
     }

package/src/android/build.gradle

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

package/src/ios/RGLDocumentReader.m

@@ -244,8 +244,8 @@ typedef void (^Callback)(NSString* response);
         [self provideTASignature :[args objectAtIndex:0] :successCallback :errorCallback];
     else if([action isEqualToString:@"parseCoreResults"])
         [self parseCoreResults :[args objectAtIndex:0] :successCallback :errorCallback];
-    else if([action isEqualToString:@"initializeReaderWithDatabasePath"])
-        [self initializeReaderWithDatabasePath :[args objectAtIndex:0] :[args objectAtIndex:1] :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:@"recognizeImageFrame"])
@@ -324,10 +324,6 @@ typedef void (^Callback)(NSString* response);
     });
 }
 
-- (void) initializeReaderWithDatabasePath:(NSString*)licenseString :(NSString*)databasePath :(Callback)successCallback :(Callback)errorCallback{
-    [RGLDocReader.shared initializeReaderWithConfig:[RGLConfig configWithLicenseData:[[NSData alloc] initWithBase64EncodedString:licenseString options:0] licenseUpdateCheck:true databasePath:databasePath delayedNNLoadEnabled:false] completion:[self getInitCompletion :successCallback :errorCallback]];
-}
-
 - (void) prepareDatabase:(NSString*)dbID :(Callback)successCallback :(Callback)errorCallback{
     [RGLDocReader.shared prepareDatabase:dbID progressHandler:[self getProgressHandler :successCallback :errorCallback] completion:[self getPrepareCompletion :successCallback :errorCallback]];
 }
@@ -510,6 +506,10 @@ typedef void (^Callback)(NSString* response);
     [self result:RGLDocReader.shared.documentReaderStatus :successCallback];
 }
 
+- (void) setTCCParams:(NSDictionary*)params :(Callback)successCallback :(Callback)errorCallback{
+    [RGLDocReader.shared setTCCParams:[RGLWJSONConstructor RGLTCCParamsFromJson:params] completion:[self getTCCParamsCompletion:successCallback :errorCallback]];
+}
+
 - (void) getRfidSessionStatus:(Callback)successCallback :(Callback)errorCallback{
     [self result:RGLDocReader.shared.rfidSessionStatus :successCallback];
 }
@@ -636,4 +636,13 @@ typedef void (^Callback)(NSString* response);
     };
 }
 
+-(void (^_Nullable)(BOOL success, NSError * _Nullable error))getTCCParamsCompletion:(Callback)successCallback :(Callback)errorCallback{
+    return  ^(BOOL success, NSError * _Nullable error) {
+        if (success)
+            [self result:@"success" :successCallback];
+        else
+            [self result:[NSString stringWithFormat:@"%@/%@", @"failed: ", error.description] :errorCallback];
+    };
+}
+
 @end

package/src/ios/RGLWJSONConstructor.h

@@ -11,6 +11,7 @@
 +(NSMutableDictionary* _Nonnull)generateRfidNotificationCompletionWithError:(NSInteger)notification : (NSInteger)value;
 +(NSMutableDictionary* _Nonnull)generateNSDictionary:(NSDictionary<NSNumber*, NSNumber*>* _Nullable)input;
 +(RGLPKDCertificate* _Nullable)RGLPKDCertificateFromJson:(NSDictionary* _Nullable) dict;
++(RGLTCCParams* _Nonnull)RGLTCCParamsFromJson:(NSDictionary* _Nonnull)input;
 +(NSInteger)generateDocReaderAction:(RGLDocReaderAction)action;
 +(NSInteger)generateRFIDCompleteAction:(RGLRFIDCompleteAction)action;
 +(NSInteger)generateRFIDNotificationAction:(RGLRFIDNotificationAction)action;

package/src/ios/RGLWJSONConstructor.m

@@ -25,6 +25,16 @@
     return [[RGLPKDCertificate alloc] initWithBinaryData:binaryData resourceType:type privateKey:privateKey];
 }
 
++(RGLTCCParams*)RGLTCCParamsFromJson:(NSDictionary*)input {
+    NSString* serviceTAURLString = [input valueForKey:@"serviceUrlTA"];
+    NSString* servicePAURLString = [input valueForKey:@"serviceUrlPA"];
+    NSString* pfxCertURLString = [input valueForKey:@"pfxCertUrl"];
+    NSString* pfxPassPhrase = [input valueForKey:@"pfxPassPhrase"];
+    NSData* pfxCertData = [input objectForKey:@"pfxCert"] != nil ? [[NSData alloc] initWithBase64EncodedString:[input objectForKey:@"pfxCert"] options:0] : nil;
+
+    return [[RGLTCCParams alloc] initWithServiceTAURLString:serviceTAURLString servicePAURLString:servicePAURLString pfxCertURLString:pfxCertURLString pfxCertData: pfxCertData pfxPassPhrase:pfxPassPhrase];
+}
+
 +(NSMutableDictionary*)generateCGPoint:(CGPoint)input {
     NSMutableDictionary *result = [NSMutableDictionary new];
 
@@ -390,7 +400,7 @@
     NSMutableDictionary *result = [NSMutableDictionary new];
     if(input == nil) return result;
 
-    result[@"type"] = @(input.type);
+    result[@"type"] = input.type;
     result[@"result"] = @(input.result);
     result[@"featureType"] = @(input.featureType);
     result[@"boundRects"] = [self generateNSArrayCGRect:input.boundRects];

package/src/ios/RegulaConfig.m

@@ -299,6 +299,12 @@
         image.colornessCheck = [dict valueForKey:@"colornessCheck"];
     if([dict valueForKey:@"moireCheck"] != nil)
         image.moireCheck = [dict valueForKey:@"moireCheck"];
+    if([dict valueForKey:@"expectedPass"] != nil){
+        NSMutableArray<RGLImageQualityCheckType> *expectedPass = [NSMutableArray new];
+        for(NSString* str in [dict valueForKey:@"expectedPass"])
+            [expectedPass addObject:str];
+        image.expectedPass = expectedPass;
+    }
 
     return image;
 }
@@ -313,6 +319,7 @@
     result[@"glaresCheck"] = input.glaresCheck;
     result[@"colornessCheck"] = input.colornessCheck;
     result[@"moireCheck"] = input.moireCheck;
+    result[@"expectedPass"] = input.expectedPass;
 
     return result;
 }
@@ -537,6 +544,12 @@
         customization.toolbarSize = [[options valueForKey:@"toolbarSize"] floatValue];
     if([options valueForKey:@"statusBackgroundColor"] != nil)
         customization.statusBackgroundColor = [self getUIColorObjectFromHexString:[options valueForKey:@"statusBackgroundColor"] alpha:1];
+    if([options valueForKey:@"hologramAnimationImageContentMode"] != nil)
+        customization.hologramAnimationImageContentMode = [self UIViewContentModeWithNSInteger:[[options valueForKey:@"hologramAnimationImageContentMode"] integerValue]];
+    if([options valueForKey:@"hologramAnimationPositionMultiplier"] != nil)
+        customization.hologramAnimationPositionMultiplier = [[options valueForKey:@"hologramAnimationPositionMultiplier"] floatValue];
+    if([options valueForKey:@"hologramAnimationImage"] != nil)
+        customization.hologramAnimationImage = [self imageFromBase64:[options valueForKey:@"hologramAnimationImage"]];
 }
 
 +(void)setFunctionality:(NSDictionary*)options :(RGLFunctionality*)functionality {
@@ -740,6 +753,9 @@
     result[@"cameraFramePortraitAspectRatio"] = [NSNumber numberWithFloat:customization.cameraFramePortraitAspectRatio];
     result[@"cameraFrameLandscapeAspectRatio"] = [NSNumber numberWithFloat:customization.cameraFrameLandscapeAspectRatio];
     result[@"toolbarSize"] = [NSNumber numberWithFloat:customization.toolbarSize];
+    result[@"hologramAnimationImageContentMode"] = [NSNumber numberWithInteger:[self NSIntegerWithUIViewContentMode:customization.hologramAnimationImageContentMode]];
+    result[@"hologramAnimationPositionMultiplier"] = [NSNumber numberWithFloat:customization.hologramAnimationPositionMultiplier];
+    result[@"hologramAnimationImage"] = [UIImageJPEGRepresentation(customization.hologramAnimationImage, 1.0) base64EncodedStringWithOptions:0];
     if(customization.customLabelStatus != nil)
         result[@"customLabelStatus"] = customization.customLabelStatus.string;
     if(customization.activityIndicatorColor != nil)

package/www/DocumentReader.js

@@ -1682,6 +1682,7 @@ const eImageQualityCheckType = {
     IQC_BOUNDS: 5,
     IQC_SCREEN_CAPTURE: 6,
     IQC_PORTRAIT: 7,
+    IQC_HANDWRITTEN: 8,
 }
 
 const eLDS_ParsingErrorCodes = {
@@ -6081,7 +6082,7 @@ DocumentReader.providePACertificates = (certificates, successCallback, errorCall
 DocumentReader.provideTACertificates = (certificates, successCallback, errorCallback) => cordova.exec(successCallback, errorCallback, "DocumentReader", "exec", ["provideTACertificates", certificates])
 DocumentReader.provideTASignature = (certificates, successCallback, errorCallback) => cordova.exec(successCallback, errorCallback, "DocumentReader", "exec", ["provideTASignature", certificates])
 DocumentReader.parseCoreResults = (json, successCallback, errorCallback) => cordova.exec(successCallback, errorCallback, "DocumentReader", "exec", ["parseCoreResults", json])
-DocumentReader.initializeReaderWithDatabasePath = (license, path, successCallback, errorCallback) => cordova.exec(successCallback, errorCallback, "DocumentReader", "exec", ["initializeReaderWithDatabasePath", license, path])
+DocumentReader.setTCCParams = (params, successCallback, errorCallback) => cordova.exec(successCallback, errorCallback, "DocumentReader", "exec", ["setTCCParams", params])
 DocumentReader.initializeReaderWithDatabase = (license, db, successCallback, errorCallback) => cordova.exec(successCallback, errorCallback, "DocumentReader", "exec", ["initializeReaderWithDatabase", license, db])
 DocumentReader.recognizeImageFrame = (image, params, successCallback, errorCallback) => cordova.exec(successCallback, errorCallback, "DocumentReader", "exec", ["recognizeImageFrame", image, params])
 DocumentReader.recognizeImageWithOpts = (image, options, successCallback, errorCallback) => cordova.exec(successCallback, errorCallback, "DocumentReader", "exec", ["recognizeImageWithOpts", image, options])