@regulaforensics/react-native-document-reader-api 6.8.1 → 6.9.1

package/ios/RGLWJSONConstructor.h

@@ -2,27 +2,29 @@
 #define RGLWJSONConstructor_h
 
 #import <DocumentReader/DocumentReader.h>
+#import "RGLWRegulaConfig.h"
 @import CoreGraphics;
 @import UIKit;
 
 @interface RGLWJSONConstructor : NSObject
 +(NSString* _Nonnull)dictToString:(NSMutableDictionary* _Nonnull)input;
 +(NSString* _Nonnull)arrayToString:(NSMutableArray* _Nonnull)input;
-+(NSMutableDictionary* _Nonnull)generateRfidNotificationCompletion:(NSInteger)notification;
-+(NSMutableDictionary* _Nonnull)generateRfidNotificationCompletionWithError:(NSInteger)notification : (NSInteger)value;
 +(NSMutableDictionary* _Nonnull)generateNSDictionary:(NSDictionary<NSNumber*, NSNumber*>* _Nullable)input;
++(UIImage* _Nullable)imageWithBase64:(NSString* _Nullable)input;
++(NSString* _Nullable)base64WithImage:(UIImage* _Nullable)input;
 +(RGLPKDCertificate* _Nullable)RGLPKDCertificateFromJson:(NSDictionary* _Nullable) dict;
 +(RGLTCCParams* _Nonnull)RGLTCCParamsFromJson:(NSDictionary* _Nonnull)input;
 +(RGLConfig* _Nullable)RGLConfigFromJson:(NSDictionary* _Nonnull)input;
++(RGLScannerConfig* _Nullable)RGLScannerConfigFromJson:(NSDictionary* _Nonnull)input;
++(RGLRecognizeConfig* _Nullable)RGLRecognizeConfigFromJson:(NSDictionary* _Nonnull)input;
 +(RGLImageInput* _Nonnull)RGLImageInputFromJson:(NSDictionary* _Nonnull)input;
 +(NSInteger)generateDocReaderAction:(RGLDocReaderAction)action;
 +(NSInteger)generateRFIDCompleteAction:(RGLRFIDCompleteAction)action;
-+(NSInteger)generateRFIDNotificationAction:(RGLRFIDNotificationAction)action;
-+(NSMutableDictionary* _Nullable)generateCompletion:(NSInteger)action :(RGLDocumentReaderResults*_Nullable)results :(NSError*_Nullable)error :(RGLRFIDNotify*_Nullable)notify;
++(NSMutableDictionary* _Nullable)generateCompletion:(NSInteger)action :(RGLDocumentReaderResults*_Nullable)results :(NSError*_Nullable)error;
 +(NSMutableDictionary* _Nonnull)generateVideoEncoderCompletion:(NSURL* _Nullable)input :(NSError* _Nullable)error;
 +(NSString*_Nonnull)generateNSData:(NSData *_Nullable)input;
 +(NSMutableDictionary* _Nonnull)generatePACertificateCompletion:(NSData *_Nullable)serialNumber :(RGLPAResourcesIssuer *_Nullable)issuer;
-+(NSMutableDictionary* _Nonnull)generateRGLRFIDNotify:(RGLRFIDNotify* _Nullable)input;
++(NSMutableDictionary* _Nonnull)generateDocumentReaderNotification:(RGLRFIDNotify* _Nullable)input;
 +(NSMutableDictionary* _Nonnull)generateRGLDocumentReaderResults:(RGLDocumentReaderResults* _Nullable)input;
 +(NSMutableDictionary* _Nonnull)generateRGLPosition:(RGLPosition* _Nullable)input;
 +(NSMutableDictionary* _Nonnull)generateRGLDocumentReaderBarcodeResult:(RGLDocumentReaderBarcodeResult* _Nullable)input;
@@ -41,6 +43,7 @@
 +(NSMutableDictionary* _Nonnull)generateRGLDocumentReaderDocumentType:(RGLDocumentReaderDocumentType* _Nullable)input;
 +(NSMutableDictionary* _Nonnull)generateRGLScenario:(RGLScenario* _Nullable)input;
 +(NSMutableDictionary* _Nonnull)generateRGLRFIDSessionData:(RGLRFIDSessionData* _Nullable)input;
++(NSMutableDictionary* _Nonnull)generateRGLDataField:(RGLDataField* _Nullable)input;
 +(NSMutableDictionary* _Nonnull)generateRGLCardProperties:(RGLCardProperties* _Nullable)input;
 +(NSMutableDictionary* _Nonnull)generateRGLRFIDSessionDataStatus:(RGLRFIDSessionDataStatus* _Nullable)input;
 +(NSMutableDictionary* _Nonnull)generateRGLAccessControlProcedureType:(RGLAccessControlProcedureType* _Nullable)input;
@@ -57,7 +60,6 @@
 +(NSMutableDictionary* _Nonnull)generateRGLExtension:(RGLExtension* _Nullable)input;
 +(NSMutableDictionary* _Nonnull)generateRGLCertificateChain:(RGLCertificateChain* _Nullable)input;
 +(NSMutableDictionary* _Nonnull)generateRGLValidity:(RGLValidity* _Nullable)input;
-+(NSMutableDictionary* _Nonnull)generateNSError:(NSError* _Nullable)input;
 +(NSMutableDictionary* _Nonnull)generateRGLPAResourcesIssuer:(RGLPAResourcesIssuer* _Nullable)input;
 +(NSMutableDictionary* _Nonnull)generateRGLPAAttribute:(RGLPAAttribute* _Nullable)input;
 +(NSMutableDictionary* _Nonnull)generateRGLTAChallenge:(RGLTAChallenge* _Nullable)input;

package/ios/RGLWJSONConstructor.m

@@ -12,6 +12,16 @@
     return [[NSString alloc] initWithData:[NSJSONSerialization dataWithJSONObject:input options:NSJSONWritingPrettyPrinted error:nil] encoding:NSUTF8StringEncoding];
 }
 
++(NSMutableDictionary* _Nonnull)generateNSError:(NSError* _Nullable)input {
+    NSMutableDictionary *result = [NSMutableDictionary new];
+    if(input == nil) return result;
+
+    result[@"errorCode"] = [NSNumber numberWithInteger:input.code];
+    result[@"message"] = input.localizedDescription;
+
+    return result;
+}
+
 +(NSMutableDictionary* _Nonnull)generateNSDictionary:(NSDictionary<NSNumber*, NSNumber*>* _Nullable)input {
     NSMutableDictionary *result = [NSMutableDictionary new];
     if(input == nil) return result;
@@ -22,6 +32,16 @@
     return result;
 }
 
++(UIImage*)imageWithBase64:(NSString*)input {
+    if(input == nil) return nil;
+    return [UIImage imageWithData:[[NSData alloc]initWithBase64EncodedString:input options:NSDataBase64DecodingIgnoreUnknownCharacters]];
+}
+
++(NSString*)base64WithImage:(UIImage*)input {
+    if(input == nil) return nil;
+    return [UIImageJPEGRepresentation(input, 1.0) base64EncodedStringWithOptions:0];
+}
+
 +(RGLPKDCertificate*)RGLPKDCertificateFromJson:(NSDictionary*)input {
     NSInteger type = [[input valueForKey:@"resourceType"] integerValue];
     NSData* binaryData = [[NSData alloc] initWithBase64EncodedString:[input objectForKey:@"binaryData"] options:0];
@@ -41,26 +61,67 @@
 }
 
 +(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:@"license"] == nil) return nil;
+    RGLConfig *config = [[RGLConfig alloc] initWithLicenseData:[[NSData alloc] initWithBase64EncodedString:[input valueForKey:@"license"] options:0]];
 
-    if([input valueForKey:@"databasePath"] != nil){
+    if([input valueForKey:@"databasePath"] != nil)
         config.databasePath = [[input valueForKey:@"databasePath"] stringValue];
-    }
-    if([input valueForKey:@"licenseUpdate"] != nil){
+    if([input valueForKey:@"licenseUpdate"] != nil)
         config.licenseUpdateCheck = [[input valueForKey:@"licenseUpdate"] boolValue];
-    }
-    if([input valueForKey:@"delayedNNLoad"] != nil){
+    if([input valueForKey:@"delayedNNLoad"] != nil)
         config.delayedNNLoadEnabled = [[input valueForKey:@"delayedNNLoad"] boolValue];
-    }
 
     return config;
 }
 
++(RGLScannerConfig*)RGLScannerConfigFromJson:(NSDictionary*)input {
+    if([input valueForKey:@"scenario"] == nil && [input valueForKey:@"onlineProcessingConfig"] == nil) return nil;
+    RGLScannerConfig *config = [RGLScannerConfig new];
+
+    if([input valueForKey:@"scenario"] != nil)
+        config.scenario = [input valueForKey:@"scenario"];
+    if([input valueForKey:@"onlineProcessingConfig"] != nil)
+        config.onlineProcessingConfig = [RGLWRegulaConfig RGLOnlineProcessingConfigFromJSON:[input valueForKey:@"onlineProcessingConfig"]];
+    if([input valueForKey:@"livePortrait"] != nil)
+        config.livePortrait = [self imageWithBase64:[input valueForKey:@"livePortrait"]];
+    if([input valueForKey:@"extPortrait"] != nil)
+        config.extPortrait = [self imageWithBase64:[input valueForKey:@"extPortrait"]];
+
+    return config;
+}
+
++(RGLRecognizeConfig*)RGLRecognizeConfigFromJson:(NSDictionary*)input {
+    if([input valueForKey:@"scenario"] == nil && [input valueForKey:@"onlineProcessingConfig"] == nil) return nil;
+    if([input valueForKey:@"image"] == nil && [input valueForKey:@"images"] == nil && [input valueForKey:@"imageInputs"] == nil) return nil;
+    RGLRecognizeConfig *config = [RGLRecognizeConfig alloc];
+
+    if([input valueForKey:@"image"] != nil)
+        config = [config initWithImage:[RGLWJSONConstructor imageWithBase64:[input valueForKey:@"image"]]];
+    else if([input valueForKey:@"images"] != nil){
+        NSMutableArray<UIImage*>* images = [[NSMutableArray alloc] init];
+        for(NSMutableString* base64 in [input valueForKey:@"images"])
+            [images addObject:[RGLWJSONConstructor imageWithBase64:base64]];
+        config = [config initWithImages:images];
+    } else if([input valueForKey:@"imageInputs"] != nil){
+        NSMutableArray<RGLImageInput*>* images = [[NSMutableArray alloc] init];
+        for(NSDictionary* image in [input valueForKey:@"imageInputs"])
+            [images addObject:[RGLWJSONConstructor RGLImageInputFromJson: image]];
+        config = [config initWithImageInputs:images];
+    }
+
+    if([input valueForKey:@"scenario"] != nil)
+        config.scenario = [input valueForKey:@"scenario"];
+    if([input valueForKey:@"onlineProcessingConfig"] != nil)
+        config.onlineProcessingConfig = [RGLWRegulaConfig RGLOnlineProcessingConfigFromJSON:[input valueForKey:@"onlineProcessingConfig"]];
+    if([input valueForKey:@"livePortrait"] != nil)
+        config.livePortrait = [self imageWithBase64:[input valueForKey:@"livePortrait"]];
+    if([input valueForKey:@"extPortrait"] != nil)
+        config.extPortrait = [self imageWithBase64:[input valueForKey:@"extPortrait"]];
+    if([input valueForKey:@"oneShotIdentification"] != nil)
+        config.oneShotIdentification = [input valueForKey:@"oneShotIdentification"];
+
+    return config;
+}
 
 +(RGLImageInput*)RGLImageInputFromJson:(NSDictionary*)input {
     NSInteger pageIndex = 0;
@@ -68,11 +129,9 @@
         pageIndex = [[input valueForKey:@"pageIndex"] integerValue];
     NSInteger light = 6;
     if([input valueForKey:@"light"] != nil)
-        pageIndex = [[input valueForKey:@"light"] integerValue];
-    if([input valueForKey:@"bitmap"] != nil){
-        UIImage* image = [UIImage imageWithData:[[NSData alloc]initWithBase64EncodedString:[input valueForKey:@"bitmap"] options:NSDataBase64DecodingIgnoreUnknownCharacters]];
-        return [[RGLImageInput alloc] initWithImage:image light:light pageIndex:pageIndex];
-    }
+        light = [[input valueForKey:@"light"] integerValue];
+    if([input valueForKey:@"image"] != nil)
+        return [[RGLImageInput alloc] initWithImage:[self imageWithBase64:[input valueForKey:@"image"]] light:light pageIndex:pageIndex];
     return nil;
 }
 
@@ -113,23 +172,6 @@
     return result;
 }
 
-+(NSMutableDictionary*)generateRfidNotificationCompletion:(NSInteger)notification {
-    NSMutableDictionary *result = [NSMutableDictionary new];
-
-    result[@"notification"] = [NSNumber numberWithInteger:notification];
-
-    return result;
-}
-
-+(NSMutableDictionary*)generateRfidNotificationCompletionWithError:(NSInteger)notification :(NSInteger)value {
-    NSMutableDictionary *result = [NSMutableDictionary new];
-
-    result[@"notification"] = [NSNumber numberWithInteger:notification];
-    result[@"value"] = [NSNumber numberWithInteger:value];
-
-    return result;
-}
-
 +(NSInteger)generateDocReaderAction:(RGLDocReaderAction)input {
     NSInteger result = -1;
     switch (input) {
@@ -168,7 +210,7 @@
     NSInteger result = 0;
     switch (input) {
         case RGLRFIDCompleteActionComplete:
-            result = 999;
+            result = 0;
             break;
         case RGLRFIDCompleteActionError:
             result = 4;
@@ -186,51 +228,13 @@
     return result;
 }
 
-+(NSInteger)generateRFIDNotificationAction:(RGLRFIDNotificationAction)input {
-    return 101;
-}
-
-+(NSMutableDictionary*)generateCompletion:(NSInteger)action :(RGLDocumentReaderResults*)results :(NSError*)error :(RGLRFIDNotify*)notify {
++(NSMutableDictionary*)generateCompletion:(NSInteger)action :(RGLDocumentReaderResults*)results :(NSError*)error {
     NSMutableDictionary *result = [NSMutableDictionary new];
 
-    switch (action) {
-        case 0:
-        case 2:
-        case 3:
-        case 4:
-        case 6:
-            result[@"results"] = [self generateRGLDocumentReaderResults:results];
-            break;
-        case 101:
-            result[@"results"] = [self generateResultsWithNotification:[self generateRGLRFIDNotify:notify]];
-            break;
-        case 999:
-            result[@"results"] = [self generateResultsWithRFID :results :1];
-            action = 0;
-            break;
-        default:
-            break;
-    }
-
+    if(action == 0 || action == 2 || action == 3 || action == 4 || action == 6)
+        result[@"results"] = [self generateRGLDocumentReaderResults:results];
     result[@"action"] = [NSNumber numberWithInteger:action];
-    if(error != nil)
-        result[@"error"] = [self generateNSError:error];
-
-    return result;
-}
-
-+(NSMutableDictionary*)generateResultsWithNotification:(NSMutableDictionary*)input {
-    NSMutableDictionary *result = [NSMutableDictionary new];
-
-    result[@"documentReaderNotification"] = input;
-
-    return result;
-}
-
-+(NSMutableDictionary*)generateResultsWithRFID:(RGLDocumentReaderResults*)results :(NSInteger)input {
-    NSMutableDictionary *result = [self generateRGLDocumentReaderResults:results];
-
-    result[@"rfidResult"] = [NSNumber numberWithInteger:input];
+    result[@"error"] = [self generateNSError:error];
 
     return result;
 }
@@ -271,15 +275,13 @@
     return result;
 }
 
-+(NSMutableDictionary* _Nonnull)generateRGLRFIDNotify:(RGLRFIDNotify* _Nullable)input {
++(NSMutableDictionary* _Nonnull)generateDocumentReaderNotification:(RGLRFIDNotify* _Nullable)input{
     NSMutableDictionary *result = [NSMutableDictionary new];
     if(input == nil) return result;
 
-    result[@"code"] = @(input.code);
-    result[@"value"] = @(input.value);
     result[@"notificationCode"] = @(input.code & 0xFFFF0000);
     result[@"dataFileType"] = @(input.code & 0x0000FFFF);
-//    result[@"progress"] = @(input.value & 0xFFFFFFF0);
+    result[@"progress"] = @((int)input.value & 0xFFFFFFF0);
 
     return result;
 }
@@ -506,7 +508,7 @@
     result[@"fieldName"] = input.fieldName;
     result[@"fieldRect"] = [self generateCGRect:input.boundRect];
     result[@"value"] = [UIImageJPEGRepresentation(input.value, 1.0) base64EncodedStringWithOptions:0];
-    result[@"lightType"] = @(input.lightType);
+    result[@"light"] = @(input.lightType);
     result[@"lightName"] = input.lightName;
     result[@"pageIndex"] = @(input.pageIndex);
     result[@"originalPageIndex"] = @(input.originalPageIndex);
@@ -679,6 +681,30 @@
     result[@"status"] = @(input.status);
     result[@"extLeSupport"] = @(input.extLeSupport);
     result[@"processTime"] = @(input.processTime);
+    if(input.dataGroups != nil){
+        NSMutableArray *array = [NSMutableArray new];
+        for(NSNumber* item in input.dataGroups)
+            if(item != nil)
+                [array addObject:item];
+        result[@"dataGroups"] = array;
+    }
+    if(input.dataFields != nil){
+        NSMutableArray *array = [NSMutableArray new];
+        for(RGLDataField* item in input.dataFields)
+            if(item != nil)
+                [array addObject:[self generateRGLDataField:item]];
+        result[@"dataFields"] = array;
+    }
+
+    return result;
+}
+
++(NSMutableDictionary* _Nonnull)generateRGLDataField:(RGLDataField* _Nullable)input {
+    NSMutableDictionary *result = [NSMutableDictionary new];
+    if(input == nil) return result;
+
+    result[@"data"] = input.data;
+    result[@"fieldType"] = @(input.fieldType);
 
     return result;
 }
@@ -990,16 +1016,6 @@
     return result;
 }
 
-+(NSMutableDictionary* _Nonnull)generateNSError:(NSError* _Nullable)input {
-    NSMutableDictionary *result = [NSMutableDictionary new];
-    if(input == nil) return result;
-
-    result[@"code"] = @(input.code);
-    result[@"localizedDescription"] = input.localizedDescription;
-
-    return result;
-}
-
 +(NSMutableDictionary* _Nonnull)generateRGLPAResourcesIssuer:(RGLPAResourcesIssuer* _Nullable)input {
     NSMutableDictionary *result = [NSMutableDictionary new];
     if(input == nil) return result;
@@ -1173,6 +1189,7 @@
     result[@"databaseDescription"] = input.databaseDescription;
     result[@"countriesNumber"] = @(input.countriesNumber);
     result[@"documentsNumber"] = @(input.documentsNumber);
+    result[@"size"] = input.size;
 
     return result;
 }

package/ios/RGLWRegulaConfig.h

@@ -1,6 +1,7 @@
 #ifndef RGLWRegulaConfig_h
 #define RGLWRegulaConfig_h
 #import <DocumentReader/DocumentReader.h>
+#import "RGLWJSONConstructor.h"
 @import CoreGraphics;
 @import UIKit;
 @import AVFoundation;
@@ -15,11 +16,11 @@
 +(void)setProcessParams:(NSDictionary*) options : (RGLProcessParams*) processParams;
 +(UIColor *)getUIColorObjectFromHexString:(NSString *)hexStr alpha:(CGFloat)alpha;
 +(unsigned int)intFromHexString:(NSString *)hexStr;
-+(UIImage*)imageFromBase64:(NSString *)base64image;
 +(RGLePassportDataGroup*)RGLePassportDataGroupFromJson:(NSDictionary *) dict;
 +(RGLeIDDataGroup*)RGLeIDDataGroupFromJson:(NSDictionary*) dict;
 +(RGLeDLDataGroup*)RGLeDLDataGroupFromJson:(NSDictionary*) dict;
 +(RGLImageQA*)ImageQAFromJson:(NSDictionary*) dict;
 +(NSDictionary*)ImageQAToJson:(RGLImageQA*) input;
++(RGLOnlineProcessingConfig*)RGLOnlineProcessingConfigFromJSON:(NSDictionary*) dict;
 @end
 #endif