6.3.0

Jenkins · Jenkins · commit 3ef03f93f4cb · 2022-04-18T23:53:38.000+03:00
diff --git a/RNDocumentReaderApi.podspec b/RNDocumentReaderApi.podspec
@@ -14,6 +14,6 @@ Pod::Spec.new do |s|
   s.source       = { :http => 'file:' + __dir__ }
   s.ios.deployment_target = '11.0'
   s.source_files  = "ios/*.{h,m}"
-  s.dependency 'DocumentReader', '6.2.2441'
+  s.dependency 'DocumentReader', '6.3.2494'
   s.dependency 'React'
 end
diff --git a/android/build.gradle b/android/build.gradle
@@ -49,7 +49,7 @@ dependencies {
     //noinspection GradleDynamicVersion
     implementation 'com.facebook.react:react-native:+'
     //noinspection GradleDependency
-    implementation('com.regula.documentreader:api:6.2.6779') {
+    implementation('com.regula.documentreader:api:6.3.6939') {
         transitive = true
     }
 }
diff --git a/android/src/main/java/com/regula/documentreader/JSONConstructor.java b/android/src/main/java/com/regula/documentreader/JSONConstructor.java
@@ -16,6 +16,7 @@
 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 @@ static DocumentReaderNotification DocumentReaderNotificationFromJSON(JSONObject
         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();
     }
diff --git a/android/src/main/java/com/regula/documentreader/RNRegulaDocumentReaderModule.java b/android/src/main/java/com/regula/documentreader/RNRegulaDocumentReaderModule.java
@@ -28,6 +28,7 @@
 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;
@@ -351,8 +352,8 @@ public void error(String s) {
                 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));
@@ -464,6 +465,10 @@ private void getDatabaseDocumentsNumber(Callback callback) {
         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();
@@ -725,11 +730,6 @@ private void recognizeImageWithCameraMode(Callback callback, String base64, bool
         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");
@@ -777,6 +777,15 @@ private IDocumentReaderInitCompletion getInitCompletion(Callback callback) {
         };
     }
 
+    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
diff --git a/android/src/main/java/com/regula/documentreader/RegulaConfig.java b/android/src/main/java/com/regula/documentreader/RegulaConfig.java
@@ -323,6 +323,14 @@ private static void setCustomization(ParamsCustomization customization, JSONObje
             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 @@ private static JSONObject getCustomization(ParamsCustomization customization) th
         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;
     }
diff --git a/example/package.json b/example/package.json
@@ -10,8 +10,8 @@
     "lint": "eslint ."
   },
   "dependencies": {
-    "@regulaforensics/react-native-document-reader-api": "^6.2.2",
-    "@regulaforensics/react-native-document-reader-core-fullrfid": "^6.2.1",
+    "@regulaforensics/react-native-document-reader-api": "^6.3.0",
+    "@regulaforensics/react-native-document-reader-core-fullrfid": "^6.3.0",
     "react": "17.0.2",
     "react-native": "^0.67.0",
     "react-native-check-box": "^2.1.7",
diff --git a/index.d.ts b/index.d.ts
@@ -2157,6 +2157,7 @@ export const eImageQualityCheckType = {
     IQC_BOUNDS: 5,
     IQC_SCREEN_CAPTURE: 6,
     IQC_PORTRAIT: 7,
+    IQC_HANDWRITTEN: 8,
 }
 
 export const eLDS_ParsingErrorCodes = {
@@ -6555,7 +6556,7 @@ export default class DocumentReader {
     static provideTACertificates(certificates: PKDCertificate[], successCallback: (response: string) => void, errorCallback?: (error: string) => void): void
     static provideTASignature(certificates: byte[], successCallback: (response: string) => void, errorCallback?: (error: string) => void): void
     static parseCoreResults(json: string, successCallback: (response: string) => void, errorCallback?: (error: string) => void): void
-    static initializeReaderWithDatabasePath(license: string, path: string, successCallback: (response: string) => void, errorCallback?: (error: string) => void): void
+    static setTCCParams(params: object, successCallback: (response: string) => void, errorCallback?: (error: string) => void): void
     static initializeReaderWithDatabase(license: string, db: string, successCallback: (response: string) => void, errorCallback?: (error: string) => void): void
     static recognizeImageFrame(image: string, params: ImageInputParam, successCallback: (response: string) => void, errorCallback?: (error: string) => void): void
     static recognizeImageWithOpts(image: string, options: object, successCallback: (response: string) => void, errorCallback?: (error: string) => void): void
diff --git a/index.js b/index.js
@@ -1684,6 +1684,7 @@ export const eImageQualityCheckType = {
     IQC_BOUNDS: 5,
     IQC_SCREEN_CAPTURE: 6,
     IQC_PORTRAIT: 7,
+    IQC_HANDWRITTEN: 8,
 }
 
 export const eLDS_ParsingErrorCodes = {
@@ -6083,7 +6084,7 @@ DocumentReader.providePACertificates = (certificates, successCallback, errorCall
 DocumentReader.provideTACertificates = (certificates, successCallback, errorCallback) => RNRegulaDocumentReader.exec("DocumentReader", "provideTACertificates", [certificates], successCallback, errorCallback)
 DocumentReader.provideTASignature = (certificates, successCallback, errorCallback) => RNRegulaDocumentReader.exec("DocumentReader", "provideTASignature", [certificates], successCallback, errorCallback)
 DocumentReader.parseCoreResults = (json, successCallback, errorCallback) => RNRegulaDocumentReader.exec("DocumentReader", "parseCoreResults", [json], successCallback, errorCallback)
-DocumentReader.initializeReaderWithDatabasePath = (license, path, successCallback, errorCallback) => RNRegulaDocumentReader.exec("DocumentReader", "initializeReaderWithDatabasePath", [license, path], successCallback, errorCallback)
+DocumentReader.setTCCParams = (params, successCallback, errorCallback) => RNRegulaDocumentReader.exec("DocumentReader", "setTCCParams", [params], successCallback, errorCallback)
 DocumentReader.initializeReaderWithDatabase = (license, db, successCallback, errorCallback) => RNRegulaDocumentReader.exec("DocumentReader", "initializeReaderWithDatabase", [license, db], successCallback, errorCallback)
 DocumentReader.recognizeImageFrame = (image, params, successCallback, errorCallback) => RNRegulaDocumentReader.exec("DocumentReader", "recognizeImageFrame", [image, params], successCallback, errorCallback)
 DocumentReader.recognizeImageWithOpts = (image, options, successCallback, errorCallback) => RNRegulaDocumentReader.exec("DocumentReader", "recognizeImageWithOpts", [image, options], successCallback, errorCallback)
diff --git a/ios/RGLWJSONConstructor.h b/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;
diff --git a/ios/RGLWJSONConstructor.m b/ios/RGLWJSONConstructor.m
@@ -25,6 +25,16 @@ +(RGLPKDCertificate*)RGLPKDCertificateFromJson:(NSDictionary*)input {
     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* _Nonnull)generateRGLImageQuality:(RGLImageQuality* _Nulla
     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];
diff --git a/ios/RNRegulaDocumentReader.m b/ios/RNRegulaDocumentReader.m
@@ -236,8 +236,8 @@ - (void)didReceivedError:(RGLRFIDErrorCodes)errorCode {
         [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"])
@@ -316,10 +316,6 @@ - (void) startRFIDReader:(Callback)successCallback :(Callback)errorCallback{
     });
 }
 
-- (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]];
 }
@@ -502,6 +498,10 @@ - (void) getDocumentReaderStatus:(Callback)successCallback :(Callback)errorCallb
     [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];
 }
@@ -628,4 +628,13 @@ -(RGLDocumentReaderPrepareCompletion _Nonnull)getPrepareCompletion:(Callback)suc
     };
 }
 
+-(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
diff --git a/ios/RegulaConfig.m b/ios/RegulaConfig.m
@@ -299,6 +299,12 @@ +(RGLImageQA*)ImageQAFromJson:(NSDictionary*)dict {
         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 @@ +(NSDictionary*)ImageQAToJson:(RGLImageQA*)input {
     result[@"glaresCheck"] = input.glaresCheck;
     result[@"colornessCheck"] = input.colornessCheck;
     result[@"moireCheck"] = input.moireCheck;
+    result[@"expectedPass"] = input.expectedPass;
 
     return result;
 }
@@ -537,6 +544,12 @@ +(void)setCustomization:(NSDictionary*)options :(RGLCustomization*)customization
         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 @@ +(NSMutableDictionary *)getCustomization:(RGLCustomization*)customization {
     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)
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@regulaforensics/react-native-document-reader-api",
-  "version": "6.2.2",
+  "version": "6.3.0",
   "description": "React Native module for reading and validation of identification documents (API framework)",
   "main": "index.js",
   "scripts": {

Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ dependencies {`
`49`	`49`	`//noinspection GradleDynamicVersion`
`50`	`50`	`implementation 'com.facebook.react:react-native:+'`
`51`	`51`	`//noinspection GradleDependency`
`52`		`- implementation('com.regula.documentreader:api:6.2.6779') {`
	`52`	`+ implementation('com.regula.documentreader:api:6.3.6939') {`
`53`	`53`	`transitive = true`
`54`	`54`	`}`
`55`	`55`	`}`