@regulaforensics/cordova-plugin-document-reader-api 7.4.620 → 7.5.78-rc

package/src/ios/RGLWDocumentReader.m

@@ -39,10 +39,6 @@ static RGLWEventSender sendEvent = ^(NSString* event, id data) {
         [self getDocumentReaderIsReady :successCallback :errorCallback];
     else if([action isEqualToString:@"getDocumentReaderStatus"])
         [self getDocumentReaderStatus :successCallback :errorCallback];
-    else if([action isEqualToString:@"isAuthenticatorAvailableForUse"])
-        [self isAuthenticatorAvailableForUse :successCallback :errorCallback];
-    else if([action isEqualToString:@"isBlePermissionsGranted"])
-        [self isBlePermissionsGranted :successCallback :errorCallback];
     else if([action isEqualToString:@"getRfidSessionStatus"])
         [self getRfidSessionStatus :successCallback :errorCallback];
     else if([action isEqualToString:@"setRfidSessionStatus"])
@@ -121,8 +117,8 @@ static RGLWEventSender sendEvent = ^(NSString* event, id data) {
         [self clearPKDCertificates :successCallback :errorCallback];
     else if([action isEqualToString:@"startNewSession"])
         [self startNewSession :successCallback :errorCallback];
-    else if([action isEqualToString:@"startBluetoothService"])
-        [self startBluetoothService :successCallback :errorCallback];
+    else if([action isEqualToString:@"connectBluetoothDevice"])
+        [self connectBluetoothDevice :[args objectAtIndex:0] :successCallback :errorCallback];
     else if([action isEqualToString:@"setLocalizationDictionary"])
         [self setLocalizationDictionary :[args objectAtIndex:0] :successCallback :errorCallback];
     else if([action isEqualToString:@"getLicense"])
@@ -131,6 +127,10 @@ static RGLWEventSender sendEvent = ^(NSString* event, id data) {
         [self getAvailableScenarios :successCallback :errorCallback];
     else if([action isEqualToString:@"getIsRFIDAvailableForUse"])
         [self getIsRFIDAvailableForUse :successCallback :errorCallback];
+    else if([action isEqualToString:@"isAuthenticatorRFIDAvailableForUse"])
+        [self isAuthenticatorRFIDAvailableForUse :successCallback :errorCallback];
+    else if([action isEqualToString:@"isAuthenticatorAvailableForUse"])
+        [self isAuthenticatorAvailableForUse :successCallback :errorCallback];
     else if([action isEqualToString:@"getDocReaderVersion"])
         [self getDocReaderVersion :successCallback :errorCallback];
     else if([action isEqualToString:@"getDocReaderDocumentsDatabase"])
@@ -171,6 +171,8 @@ static RGLWEventSender sendEvent = ^(NSString* event, id data) {
         [self encryptedContainers :[args objectAtIndex:0] :successCallback :errorCallback];
     else if([action isEqualToString:@"finalizePackage"])
         [self finalizePackage :successCallback :errorCallback];
+    else if([action isEqualToString:@"endBackendTransaction"])
+        [self endBackendTransaction :successCallback :errorCallback];
     else if([action isEqualToString:@"getTranslation"])
         [self getTranslation :[args objectAtIndex:0] :[args objectAtIndex:1] :successCallback :errorCallback];
     else
@@ -188,10 +190,6 @@ NSString* RGLWPaCertificateCompletionEvent = @"pa_certificate_completion";
 NSString* RGLWTaCertificateCompletionEvent = @"ta_certificate_completion";
 NSString* RGLWTaSignatureCompletionEvent = @"ta_signature_completion";
 
-NSString* RGLWBleOnServiceConnectedEvent = @"bleOnServiceConnectedEvent";
-NSString* RGLWBleOnServiceDisconnectedEvent = @"bleOnServiceDisconnectedEvent";
-NSString* RGLWBleOnDeviceReadyEvent = @"bleOnDeviceReadyEvent";
-
 NSString* RGLWVideoEncoderCompletionEvent = @"video_encoder_completion";
 NSString* RGLWOnCustomButtonTappedEvent = @"onCustomButtonTappedEvent";
 
@@ -203,14 +201,6 @@ NSString* RGLWOnCustomButtonTappedEvent = @"onCustomButtonTappedEvent";
     successCallback(RGLDocReader.shared.documentReaderStatus);
 }
 
-- (void) isAuthenticatorAvailableForUse:(RGLWCallback)successCallback :(RGLWCallback)errorCallback{
-    successCallback(RGLDocReader.shared.isAuthenticatorAvailableForUse ? @YES : @NO);
-}
-
-- (void) isBlePermissionsGranted:(RGLWCallback)successCallback :(RGLWCallback)errorCallback {
-    errorCallback(@"isBlePermissionsGranted() is an android-only method");
-}
-
 - (void) getRfidSessionStatus:(RGLWCallback)successCallback :(RGLWCallback)errorCallback{
     successCallback(RGLDocReader.shared.rfidSessionStatus);
 }
@@ -290,7 +280,7 @@ NSString* RGLWOnCustomButtonTappedEvent = @"onCustomButtonTappedEvent";
 }
 
 - (void) initializeReaderWithBleDeviceConfig:(NSDictionary*)config :(RGLWCallback)successCallback :(RGLWCallback)errorCallback{
-    errorCallback(@"initializeReaderWithBleDeviceConfig() is an android-only method");
+    [RGLDocReader.shared initializeReaderWithConfig:[RGLWJSONConstructor bleDeviceConfigFromJson:config :bluetooth] completion:[self getInitCompletion :successCallback :errorCallback]];
 }
 
 - (void) deinitializeReader:(RGLWCallback)successCallback :(RGLWCallback)errorCallback{
@@ -434,8 +424,55 @@ NSString* RGLWOnCustomButtonTappedEvent = @"onCustomButtonTappedEvent";
     successCallback(@"");
 }
 
-- (void) startBluetoothService:(RGLWCallback)successCallback :(RGLWCallback)errorCallback {
-    errorCallback(@"startBluetoothService() is an android-only method");
+RGLBluetooth* bluetooth;
+CBCentralManager* centralManager;
+RGLWCallback savedCallbackForBluetoothResult;
+
+- (void) connectBluetoothDevice:(NSString*)deviceName :(RGLWCallback)successCallback :(RGLWCallback)errorCallback {
+    // register callback for user's answer to bluetooth permission
+    centralManager = [[CBCentralManager alloc] initWithDelegate:self queue:nil];
+
+    // return if already connected
+    if (bluetooth && bluetooth.state == RGLBluetoothConnectionStateConnected) return;
+
+    // start searching devices
+    if (!bluetooth) {
+        bluetooth = [RGLBluetooth new];
+        bluetooth.delegate = self;
+    }
+    savedCallbackForBluetoothResult = successCallback;
+    [bluetooth connectWithDeviceName:deviceName];
+}
+
+// CBCentralManagerDelegate
+- (void)centralManagerDidUpdateState:(CBCentralManager *)central {
+    if (central.state != CBManagerStatePoweredOn && savedCallbackForBluetoothResult)
+        [self bluetoothDeviceConnectionFailed];
+}
+
+// RGLBluetoothDelegate
+- (void)didChangeConnectionState:(RGLBluetooth *)bluetooth state:(RGLBluetoothConnectionState)state {
+    if (state == RGLBluetoothConnectionStateNone && savedCallbackForBluetoothResult)
+        [self bluetoothDeviceConnectionFailed];
+
+    // set searching timeout
+    if (state == RGLBluetoothConnectionStateSearching)
+        [self performSelector:NSSelectorFromString(@"bluetoothDeviceConnectionFailed") withObject:nil afterDelay:7.0];
+
+    if (state == RGLBluetoothConnectionStateConnected) {
+        savedCallbackForBluetoothResult(@YES);
+        savedCallbackForBluetoothResult = nil;
+        [NSObject cancelPreviousPerformRequestsWithTarget:self selector:NSSelectorFromString(@"bluetoothDeviceConnectionFailed") object:nil];
+    }
+}
+
+- (void) bluetoothDeviceConnectionFailed {
+    if (savedCallbackForBluetoothResult) {
+        savedCallbackForBluetoothResult(@NO);
+        savedCallbackForBluetoothResult = nil;
+    }
+    [bluetooth stopSearchDevices];
+    [bluetooth disconnect];
 }
 
 - (void) setLocalizationDictionary:(NSDictionary*)dictionary :(RGLWCallback)successCallback :(RGLWCallback)errorCallback{
@@ -466,6 +503,14 @@ NSString* RGLWOnCustomButtonTappedEvent = @"onCustomButtonTappedEvent";
     successCallback([RGLWJSONConstructor generateDocReaderVersion:RGLDocReader.shared.version]);
 }
 
+- (void) isAuthenticatorRFIDAvailableForUse:(RGLWCallback)successCallback :(RGLWCallback)errorCallback{
+    successCallback(RGLDocReader.shared.isAuthenticatorRFIDAvailableForUse ? @YES : @NO);
+}
+
+- (void) isAuthenticatorAvailableForUse:(RGLWCallback)successCallback :(RGLWCallback)errorCallback{
+    successCallback(RGLDocReader.shared.isAuthenticatorAvailableForUse ? @YES : @NO);
+}
+
 - (void) getDocReaderDocumentsDatabase:(RGLWCallback)successCallback :(RGLWCallback)errorCallback {
     if(RGLDocReader.shared.version != nil)
         successCallback([RGLWJSONConstructor dictToString:[RGLWJSONConstructor generateDocReaderDocumentsDatabase:RGLDocReader.shared.version.database]]);
@@ -579,6 +624,11 @@ NSString* RGLWOnCustomButtonTappedEvent = @"onCustomButtonTappedEvent";
     }];
 }
 
+- (void) endBackendTransaction:(RGLWCallback)successCallback :(RGLWCallback)errorCallback{
+    [RGLDocReader.shared endBackendTransaction];
+    successCallback(@"");
+}
+
 - (void) getTranslation:(NSString*)className :(NSNumber*)value :(RGLWCallback)successCallback :(RGLWCallback)errorCallback{
     if([className isEqualToString:@"RFIDErrorCodes"])
         successCallback(RGLRFIDErrorCodesGetStringValue([value intValue]));

package/src/ios/RGLWJSONConstructor.h

@@ -30,6 +30,7 @@
 
 +(RGLConfig* _Nullable)configFromJson:(NSDictionary* _Nullable)input;
 +(NSDictionary* _Nullable)generateConfig:(RGLConfig* _Nullable)input;
++(RGLBleConfig* _Nullable)bleDeviceConfigFromJson:(NSDictionary* _Nullable)input :(RGLBluetooth* _Nonnull)bluetooth;
 +(RGLOnlineProcessingConfig* _Nullable)onlineProcessingConfigFromJson:(NSDictionary* _Nullable)input;
 +(NSDictionary* _Nullable)generateOnlineProcessingConfig:(RGLOnlineProcessingConfig* _Nullable)input;
 +(RGLImageInput* _Nullable)imageInputFromJson:(NSDictionary* _Nullable)input;
@@ -62,6 +63,8 @@
 +(NSDictionary* _Nullable)generateEPassportDataGroups:(RGLePassportDataGroup* _Nullable)input;
 +(RGLeIDDataGroup* _Nullable)eIDDataGroupsFromJson:(NSDictionary* _Nullable)input;
 +(NSDictionary* _Nullable)generateEIDDataGroups:(RGLeIDDataGroup* _Nullable)input;
++(RGLeIDDataGroup* _Nullable)dtcDataGroupFromJson:(NSDictionary* _Nullable)input;
++(NSDictionary* _Nullable)generateRGLDTCDataGroup:(RGLeIDDataGroup* _Nullable)input;
 +(RGLRFIDScenario* _Nullable)rfidScenarioFromJson:(NSDictionary* _Nullable)input;
 +(NSDictionary* _Nullable)generateRFIDScenario:(RGLRFIDScenario* _Nullable)input;
 +(RGLCustomization* _Nullable)customizationFromJson:(NSDictionary* _Nullable)input;
@@ -181,4 +184,9 @@
 +(NSDictionary* _Nullable)generateTransactionInfo:(RGLTransactionInfo* _Nullable)input;
 
 @end
+
+@interface RGLWRequestInterceptorProxy : NSObject <RGLURLRequestInterceptingDelegate>
+- (instancetype _Nonnull)initWithHeaders:(NSDictionary*_Nonnull)headers;
+@end
+
 #endif

package/src/ios/RGLWJSONConstructor.m

@@ -11,6 +11,13 @@
 
 @implementation RGLWJSONConstructor
 
+static NSMutableArray* weakReferencesHolder;
++(void) holdWeakReference:(id)reference {
+    if(!weakReferencesHolder)
+        weakReferencesHolder = [NSMutableArray new];
+    [weakReferencesHolder addObject:reference];
+}
+
 +(NSString*)dictToString:(NSDictionary*)input {
     if(input == nil) return nil;
     return [[NSString alloc] initWithData:[NSJSONSerialization dataWithJSONObject:input options:NSJSONWritingPrettyPrinted error:nil] encoding:NSUTF8StringEncoding];
@@ -23,6 +30,7 @@
 
 +(NSData*)base64Decode:(NSString*)input {
     if(input == nil) return nil;
+    if ([input hasPrefix:@"data"]) input = [input substringFromIndex:[input rangeOfString:@","].location + 1];
     return [[NSData alloc] initWithBase64EncodedString:input options:0];
 }
 
@@ -103,8 +111,9 @@
     
     NSString* transactionId = [input valueForKey:@"transactionId"];
     NSString* tag = [input valueForKey:@"tag"];
+    NSString* sessionLogFolder = input[@"sessionLogFolder"];
     
-    return [[RGLTransactionInfo alloc] initWithTag:tag transactionId:transactionId];
+    return [[RGLTransactionInfo alloc] initWithTag:tag transactionId:transactionId sessionLogFolder:sessionLogFolder];
 }
 
 +(NSDictionary*)generateTransactionInfo:(RGLTransactionInfo*)input {
@@ -113,6 +122,7 @@
     
     result[@"transactionId"] = input.transactionId;
     result[@"tag"] = input.tag;
+    result[@"sessionLogFolder"] = input.sessionLogFolder;
     
     return result;
 }
@@ -166,6 +176,17 @@
     return result;
 }
 
++(RGLBleConfig*)bleDeviceConfigFromJson:(NSDictionary*)input :(RGLBluetooth*)bluetooth {
+    if (!input) return nil;
+    RGLBleConfig *config = [[RGLBleConfig alloc] initWithBluetooth:bluetooth];
+
+    if (input[@"databasePath"]) config.databasePath = [[NSBundle mainBundle] pathForResource:input[@"databasePath"] ofType:nil];
+    if (input[@"licenseUpdate"]) config.licenseUpdateCheck = [input[@"licenseUpdate"] boolValue];
+    if (input[@"delayedNNLoad"]) config.delayedNNLoadEnabled = [input[@"delayedNNLoad"] boolValue];
+
+    return config;
+}
+
 +(RGLScannerConfig*)scannerConfigFromJson:(NSDictionary*)input {
     RGLScannerConfig *config = [RGLScannerConfig alloc];
     if (input[@"scenario"]) config = [config initWithScenario:input[@"scenario"]];
@@ -216,7 +237,8 @@
     if (input[@"scenario"]) config.scenario = input[@"scenario"];
     if (input[@"livePortrait"]) config.livePortrait = [self imageWithBase64:input[@"livePortrait"]];
     if (input[@"extPortrait"]) config.extPortrait = [self imageWithBase64:input[@"extPortrait"]];
-    if (input[@"oneShotIdentification"])  config.oneShotIdentification = input[@"oneShotIdentification"];
+    if (input[@"oneShotIdentification"]) config.oneShotIdentification = input[@"oneShotIdentification"];
+    if (input[@"dtc"]) config.dtc = [RGLWJSONConstructor base64Decode:input[@"dtc"]];
 
     return config;
 }
@@ -230,6 +252,7 @@
     result[@"livePortrait"] = [self base64WithImage: input.livePortrait];
     result[@"extPortrait"] = [self base64WithImage: input.extPortrait];
     result[@"oneShotIdentification"] = @(input.oneShotIdentification);
+    result[@"dtc"] = [self base64Encode: input.dtc];
     result[@"image"] = [self base64WithImage: input.image];
     result[@"data"] = [self base64Encode: input.imageData];
     if(input.images != nil) {
@@ -258,6 +281,7 @@
         result.httpHeaders = [input valueForKey:@"httpHeaders"];
     if([input valueForKey:@"rfidServerSideChipVerification"] != nil)
         result.rfidServerSideChipVerification = [input valueForKey:@"rfidServerSideChipVerification"];
+    if (input[@"timeoutConnection"]) result.timeoutConnection = input[@"timeoutConnection"];
     
     return result;
 }
@@ -269,6 +293,7 @@
     result[@"url"] = input.url;
     result[@"httpHeaders"] = input.httpHeaders;
     result[@"rfidServerSideChipVerification"] = input.rfidServerSideChipVerification;
+    result[@"timeoutConnection"] = input.timeoutConnection;
     
     return result;
 }
@@ -333,6 +358,16 @@
     return [RGLWConfig getDataGroups:input];
 }
 
++(RGLDTCDataGroup*)dtcDataGroupFromJson:(NSDictionary*)input {
+    RGLDTCDataGroup *result = [RGLDTCDataGroup new];
+    [RGLWConfig setDTCDataGroup:result dict:input];
+    return result;
+}
+
++(NSDictionary*)generateRGLDTCDataGroup:(RGLDTCDataGroup*)input {
+    return [RGLWConfig getDTCDataGroup:input];
+}
+
 +(RGLRFIDScenario*)rfidScenarioFromJson:(NSDictionary*)input {
     RGLRFIDScenario *result = [RGLRFIDScenario new];
     [RGLWConfig setRfidScenario:input :result];
@@ -380,6 +415,11 @@
         [RGLWConfig setProcessParams:[input valueForKey:@"processParams"] :params];
         result.processParams = params;
     }
+    if([input valueForKey:@"requestHeaders"] != nil) {
+        RGLWRequestInterceptorProxy* proxy = [[RGLWRequestInterceptorProxy alloc] initWithHeaders:[input valueForKey:@"requestHeaders"]];
+        [self holdWeakReference: proxy];
+        result.requestInterceptingDelegate = proxy;
+    }
     
     return result;
 }
@@ -1658,10 +1698,12 @@
     NSMutableArray<RGLAuthenticityElement*> *array = [NSMutableArray new];
     for(NSDictionary* item in [input valueForKey:@"elements"])
         [array addObject:[self authenticityElementFromJson:item]];
-    return [[RGLAuthenticityCheck alloc]
-            initWithAuthenticity:[[input valueForKey:@"type"] integerValue]
-            elements:array
-            pageIndex:[[input valueForKey:@"pageIndex"] integerValue]];
+    RGLAuthenticityCheck* result = [[RGLAuthenticityCheck alloc]
+                                    initWithAuthenticity:[[input valueForKey:@"type"] integerValue]
+                                    elements:array
+                                    pageIndex:[[input valueForKey:@"pageIndex"] integerValue]];
+    if (input[@"status"]) [result setValue:input[@"status"] forKey:@"status"];
+    return result;;
 }
 
 +(NSDictionary*)generateAuthenticityCheck:(RGLAuthenticityCheck*)input {
@@ -1764,8 +1806,10 @@
     NSMutableArray<RGLAuthenticityCheck*> *array = [NSMutableArray new];
     for(NSDictionary* item in [input valueForKey:@"checks"])
         [array addObject:[self authenticityCheckFromJson:item]];
-    return [[RGLDocumentReaderAuthenticityResult alloc]
-            initWithAuthenticityChecks:array];
+    RGLDocumentReaderAuthenticityResult* result = [[RGLDocumentReaderAuthenticityResult alloc]
+     initWithAuthenticityChecks:array];
+    if (input[@"status"]) [result setValue:input[@"status"] forKey:@"_security"];
+    return result;
 }
 
 +(NSDictionary*)generateDocumentReaderAuthenticityResult:(RGLDocumentReaderAuthenticityResult*)input {
@@ -2220,7 +2264,7 @@
         [imageQuality addObject:[self imageQualityGroupFromJson:item]];
     }
     
-    return [[RGLDocumentReaderResults alloc]
+    RGLDocumentReaderResults* result = [[RGLDocumentReaderResults alloc]
             initWithDocumentTypes:documentType
             textResult:[self documentReaderTextResultFromJson: [input valueForKey:@"textResult"]]
             graphicResult:[self documentReaderGraphicResultFromJson: [input valueForKey:@"graphicResult"]]
@@ -2240,6 +2284,10 @@
             elapsedTime:[[input valueForKey:@"elapsedTime"] integerValue]
             elapsedTimeRFID:[[input valueForKey:@"elapsedTimeRFID"] integerValue]
             transactionInfo:[self transactionInfoFromJson:[input valueForKey:@"transactionInfo"]]];
+    
+    [result setValue:[RGLWJSONConstructor base64Decode:input[@"dtcData"]] forKey:@"dtcData"];
+    
+    return result;
 }
 
 +(NSDictionary*)generateDocumentReaderResults:(RGLDocumentReaderResults*)input {
@@ -2289,6 +2337,7 @@
     result[@"rawResult"] = input.rawResult;
     result[@"status"] = [self generateDocumentReaderResultsStatus:input.status];
     result[@"vdsncData"] = [self generateVDSNCData:input.vdsncData];
+    result[@"dtcData"] = [self base64Encode: input.dtcData];
     result[@"transactionInfo"] = [self generateTransactionInfo:input.transactionInfo];
     
     return result;
@@ -2305,3 +2354,22 @@
 }
 
 @end
+
+@implementation RGLWRequestInterceptorProxy {
+    NSDictionary* _headers;
+}
+
+- (instancetype)initWithHeaders:(NSDictionary*)headers {
+    self = [super init];
+    _headers = [headers copy];
+    return self;
+}
+
+-(NSURLRequest*)interceptorPrepareRequest:(NSURLRequest*)request {
+    NSMutableURLRequest *interceptedRequest = [request mutableCopy];
+    for (NSString* key in _headers.allKeys)
+        [interceptedRequest addValue:[_headers valueForKey:key] forHTTPHeaderField:key];
+    return interceptedRequest;
+}
+
+@end