@regulaforensics/cordova-plugin-document-reader-api 9.4.489-nightly → 9.4.491-rc

package/example/package.json

@@ -13,8 +13,8 @@
   "author": "Regula Forensics Inc.",
   "license": "commercial",
   "dependencies": {
-    "@regulaforensics/cordova-plugin-document-reader-api": "9.4.489-nightly",
-    "@regulaforensics/cordova-plugin-document-reader-core-fullauthrfid": "9.4.2256-nightly",
+    "@regulaforensics/cordova-plugin-document-reader-api": "9.4.491-rc",
+    "@regulaforensics/cordova-plugin-document-reader-core-fullauthrfid": "9.4.2271-rc",
     "cordova-android": "13.0.0",
     "cordova-ios": "7.1.1",
     "cordova-plugin-add-swift-support": "2.0.2",

package/example/www/js/index.js

@@ -166,12 +166,12 @@ var app = {
 
         function customRFID() {
             showRfidUI()
-            DocumentReader.readRFID(null, function (m) { handleRfidCompletion(m) }, function (e) { })
+            DocumentReader.readRFID(false, false, false, function (m) { handleRfidCompletion(m) }, function (e) { })
         }
 
         function usualRFID() {
             isReadingRfid = true
-            DocumentReader.startRFIDReader(null, function (m) { handleRfidCompletion(m) }, function (e) { })
+            DocumentReader.startRFIDReader(false, false, false, function (m) { handleRfidCompletion(m) }, function (e) { })
         }
 
         function handleRfidCompletion(raw) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@regulaforensics/cordova-plugin-document-reader-api",
-  "version": "9.4.489-nightly",
+  "version": "9.4.491-rc",
   "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="@regulaforensics/cordova-plugin-document-reader-api" version="9.4.489-nightly" xmlns="http://apache.org/cordova/ns/plugins/1.0">
+<plugin id="@regulaforensics/cordova-plugin-document-reader-api" version="9.4.491-rc" xmlns="http://apache.org/cordova/ns/plugins/1.0">
   <name>DocumentReaderApi</name>
   <description>Cordova plugin Document reader api</description>
   <license>commercial</license>
@@ -29,7 +29,7 @@
         <source url="https://github.com/CocoaPods/Specs.git"/>
       </config>
       <pods>
-        <pod name="DocumentReaderNightly" spec="9.4.6185" />
+        <pod name="DocumentReaderStage" spec="9.4.6188" />
       </pods>
     </podspec>
   </platform>

package/src/android/JSONConstructor.kt

@@ -47,9 +47,7 @@ import com.regula.documentreader.api.params.mdl.DeviceRetrievalMethod
 import com.regula.documentreader.api.params.mdl.DocumentRequest18013MDL
 import com.regula.documentreader.api.params.mdl.DocumentRequestMDL
 import com.regula.documentreader.api.params.mdl.NameSpaceMDL
-import com.regula.documentreader.api.params.rfid.CaProtocol
 import com.regula.documentreader.api.params.rfid.PKDCertificate
-import com.regula.documentreader.api.params.rfid.PaceProtocol
 import com.regula.documentreader.api.params.rfid.RFIDParams
 import com.regula.documentreader.api.params.rfid.TccParams
 import com.regula.documentreader.api.params.rfid.authorization.PAAttribute
@@ -2140,37 +2138,3 @@ fun generateFinalizeConfig(input: FinalizeConfig?) = input?.let {
         "mdlSession" to it.getPrivateProperty("mdlSession"),
     ).toJson()
 }
-
-fun paceProtocolFromJSON(input: JSONObject?) = input?.let {
-    PaceProtocol(
-        it.getString("version"),
-        it.getString("stdDomainParams"),
-        it.getString("keyAlgorithm"),
-    )
-}
-
-fun generatePaceProtocol(input: PaceProtocol?) = input?.let {
-    mapOf(
-        "version" to it.version,
-        "stdDomainParams" to it.stdDomainParams,
-        "keyAlgorithm" to it.keyAlgorithm,
-    ).toJson()
-}
-
-fun caProtocolFromJSON(input: JSONObject?) = input?.let {
-    CaProtocol(
-        it.getString("version"),
-        it.getString("scheme"),
-        it.getString("keyAlgorithm"),
-        it.getBoolean("chipIndividual"),
-    )
-}
-
-fun generateCaProtocol(input: CaProtocol?) = input?.let {
-    mapOf(
-        "version" to it.version,
-        "scheme" to it.scheme,
-        "keyAlgorithm" to it.keyAlgorithm,
-        "chipIndividual" to it.isChipIndividual,
-    ).toJson()
-}

package/src/android/Main.kt

@@ -19,13 +19,13 @@ import com.regula.documentreader.api.completions.IDocumentReaderInitCompletion
 import com.regula.documentreader.api.completions.IDocumentReaderPrepareDbCompletion
 import com.regula.documentreader.api.completions.IVideoEncoderCompletion
 import com.regula.documentreader.api.completions.model.PrepareProgress
-import com.regula.documentreader.api.completions.rfid.ICaProtocolCompletion
-import com.regula.documentreader.api.completions.rfid.IPaceProtocolCompletion
 import com.regula.documentreader.api.completions.rfid.IRfidPKDCertificateCompletion
 import com.regula.documentreader.api.completions.rfid.IRfidReaderCompletion
 import com.regula.documentreader.api.completions.rfid.IRfidReaderRequest
 import com.regula.documentreader.api.completions.rfid.IRfidTASignatureCompletion
-import com.regula.documentreader.api.completions.rfid.certificates.IRfidAccessControl
+import com.regula.documentreader.api.completions.rfid.certificates.IRfidPACertificates
+import com.regula.documentreader.api.completions.rfid.certificates.IRfidTACertificates
+import com.regula.documentreader.api.completions.rfid.certificates.IRfidTASignature
 import com.regula.documentreader.api.enums.DocReaderAction
 import com.regula.documentreader.api.enums.LCID
 import com.regula.documentreader.api.enums.eImageQualityCheckType
@@ -39,8 +39,6 @@ import com.regula.documentreader.api.errors.DocReaderRfidException
 import com.regula.documentreader.api.errors.DocumentReaderException
 import com.regula.documentreader.api.internal.core.CoreScenarioUtil
 import com.regula.documentreader.api.params.mdl.DataRetrieval
-import com.regula.documentreader.api.params.rfid.CaProtocol
-import com.regula.documentreader.api.params.rfid.PaceProtocol
 import com.regula.documentreader.api.results.DocumentReaderNotification
 import com.regula.documentreader.api.results.DocumentReaderResults
 import com.regula.documentreader.api.results.DocumentReaderResults.fromRawResults
@@ -86,14 +84,12 @@ fun methodCall(method: String, callback: (Any?) -> Unit): Any = when (method) {
     "recognize" -> recognize(args(0))
     "startNewPage" -> startNewPage()
     "stopScanner" -> stopScanner()
-    "startRFIDReader" -> startRFIDReader(argsNullable(0))
-    "readRFID" -> readRFID(argsNullable(0))
+    "startRFIDReader" -> startRFIDReader(args(0), args(1), args(2))
+    "readRFID" -> readRFID(args(0), args(1), args(2))
     "stopRFIDReader" -> stopRFIDReader()
     "providePACertificates" -> providePACertificates(argsNullable(0))
     "provideTACertificates" -> provideTACertificates(argsNullable(0))
     "provideTASignature" -> provideTASignature(args(0))
-    "selectPACEProtocol" -> selectPACEProtocol(args(0))
-    "selectCAProtocol" -> selectCAProtocol(args(0))
     "setTCCParams" -> setTCCParams(callback, args(0))
     "addPKDCertificates" -> addPKDCertificates(args(0))
     "clearPKDCertificates" -> clearPKDCertificates()
@@ -154,8 +150,6 @@ const val rfidOnRetryReadChipEvent = "rfidOnRetryReadChipEvent"
 const val paCertificateCompletionEvent = "pa_certificate_completion"
 const val taCertificateCompletionEvent = "ta_certificate_completion"
 const val taSignatureCompletionEvent = "ta_signature_completion"
-const val paceProtocolCompletionEvent = "paceProtocolCompletionEvent"
-const val caProtocolCompletionEvent = "caProtocolCompletionEvent"
 
 const val videoEncoderCompletionEvent = "video_encoder_completion"
 const val onCustomButtonTappedEvent = "onCustomButtonTappedEvent"
@@ -254,13 +248,22 @@ fun startNewPage() = Instance().startNewPage()
 
 fun stopScanner() = Instance().stopScanner(context)
 
-fun startRFIDReader(config: JSONObject?) {
+fun startRFIDReader(onRequestPACertificates: Boolean, onRequestTACertificates: Boolean, onRequestTASignature: Boolean) {
     stopBackgroundRFID()
-    Instance().startRFIDReader(activity, rfidReaderCompletion, getRfidReaderRequest(config))
+    requestType = RfidReaderRequestType(
+        onRequestPACertificates,
+        onRequestTACertificates,
+        onRequestTASignature
+    )
+    Instance().startRFIDReader(activity, rfidReaderCompletion, requestType.getRfidReaderRequest())
 }
 
-fun readRFID(config: JSONObject?) {
-    rfidReaderRequest = getRfidReaderRequest(config)
+fun readRFID(onRequestPACertificates: Boolean, onRequestTACertificates: Boolean, onRequestTASignature: Boolean) {
+    requestType = RfidReaderRequestType(
+        onRequestPACertificates,
+        onRequestTACertificates,
+        onRequestTASignature
+    )
     startForegroundDispatch("readRFID")
 }
 
@@ -281,14 +284,6 @@ fun provideTASignature(signature: String?) = taSignatureCompletion.onSignatureRe
     signature.toByteArray()
 )
 
-fun selectPACEProtocol(protocol: JSONObject) = paceProtocolCompletion.onPaceProtocolSelected(
-    paceProtocolFromJSON(protocol)!!
-)
-
-fun selectCAProtocol(protocol: JSONObject) = caProtocolCompletion.onCaProtocolSelected(
-    caProtocolFromJSON(protocol)!!
-)
-
 fun setTCCParams(callback: Callback, params: JSONObject) {
     Instance().setTccParams(tccParamsFromJSON(params)) { success, error ->
         callback(generateSuccessCompletion(success, error))
@@ -550,47 +545,49 @@ fun initCompletion(callback: Callback) = IDocumentReaderInitCompletion { success
 lateinit var paCertificateCompletion: IRfidPKDCertificateCompletion
 lateinit var taCertificateCompletion: IRfidPKDCertificateCompletion
 lateinit var taSignatureCompletion: IRfidTASignatureCompletion
-lateinit var paceProtocolCompletion: IPaceProtocolCompletion
-lateinit var caProtocolCompletion: ICaProtocolCompletion
-
-var rfidReaderRequest = getRfidReaderRequest()
-
-fun getRfidReaderRequest(config: JSONObject? = null): IRfidReaderRequest {
-    val result = IRfidReaderRequest()
-    if (config == null) return result
 
-    if (config.getBoolean("paCertificates")) result.setPACertificates { serialNumber, issuer, completion ->
+class RfidReaderRequestType(
+    val doPACertificates: Boolean,
+    val doTACertificates: Boolean,
+    val doTASignature: Boolean
+) {
+    private val onRequestPACertificates = IRfidPACertificates { serialNumber, issuer, completion ->
         paCertificateCompletion = completion
         sendEvent(paCertificateCompletionEvent, generatePACertificateCompletion(serialNumber, issuer))
     }
-    if (config.getBoolean("taCertificates")) result.setTACertificates { keyCAR, completion ->
+    private val onRequestTACertificates = IRfidTACertificates { keyCAR, completion ->
         taCertificateCompletion = completion
         sendEvent(taCertificateCompletionEvent, keyCAR)
     }
-    if (config.getBoolean("taSignature")) result.setTASignature { challenge, completion ->
+    private val onRequestTASignature = IRfidTASignature { challenge, completion ->
         taSignatureCompletion = completion
         sendEvent(taSignatureCompletionEvent, generateTAChallenge(challenge))
     }
-    if (config.getBoolean("paceProtocol") || config.getBoolean("caProtocol")) result.setRfidAccessControl(object : IRfidAccessControl {
-        override fun onRequestPaceProtocol(list: List<PaceProtocol?>, completion: IPaceProtocolCompletion) {
-            paceProtocolCompletion = completion
-            sendEvent(paceProtocolCompletionEvent, list.toJson(::generatePaceProtocol))
-        }
-        override fun onRequestCaProtocol(list: List<CaProtocol?>, completion: ICaProtocolCompletion) {
-            caProtocolCompletion = completion
-            sendEvent(caProtocolCompletionEvent, list.toJson(::generateCaProtocol))
-        }
-    })
 
-    return result
+    fun getRfidReaderRequest(): IRfidReaderRequest? = when {
+        !doPACertificates && !doTACertificates && doTASignature -> IRfidReaderRequest(onRequestTASignature)
+        !doPACertificates && doTACertificates && !doTASignature -> IRfidReaderRequest(onRequestTACertificates)
+        !doPACertificates && doTACertificates && doTASignature -> IRfidReaderRequest(onRequestTACertificates, onRequestTASignature)
+        doPACertificates && !doTACertificates && !doTASignature -> IRfidReaderRequest(onRequestPACertificates)
+        doPACertificates && !doTACertificates && doTASignature -> IRfidReaderRequest(onRequestPACertificates, onRequestTASignature)
+        doPACertificates && doTACertificates && !doTASignature -> IRfidReaderRequest(onRequestPACertificates, onRequestTACertificates)
+        doPACertificates && doTACertificates && doTASignature -> IRfidReaderRequest(onRequestPACertificates, onRequestTACertificates, onRequestTASignature)
+        else -> null
+    }
 }
 
+var requestType = RfidReaderRequestType(
+    doPACertificates = false,
+    doTACertificates = false,
+    doTASignature = false
+)
+
 @Suppress("DEPRECATION", "MissingPermission")
 fun newIntent(intent: Intent): Boolean {
     if (intent.action != NfcAdapter.ACTION_TECH_DISCOVERED) return false
     val isoDep = IsoDep.get(intent.getParcelableExtra(NfcAdapter.EXTRA_TAG))
     when (nfcFunction) {
-        "readRFID" -> Instance().readRFID(isoDep, rfidReaderCompletion, rfidReaderRequest)
+        "readRFID" -> Instance().readRFID(isoDep, rfidReaderCompletion, requestType.getRfidReaderRequest())
         "engageDeviceNFC" -> Instance().engageDeviceNFC(isoDep) { v1, v2 -> engageDeviceNFCCallback(generateDeviceEngagementCompletion(v1, v2)) }
         "retrieveDataNFC" -> Instance().retrieveDataNFC(isoDep, retrieveDataNFCProp) { v1, v2, v3 -> retrieveDataNFCCallback(generateCompletion(v1, v2, v3)) }
     }

package/src/android/build.gradle

@@ -1,12 +1,12 @@
 repositories {
     maven {
-        url "https://maven.regulaforensics.com/RegulaDocumentReader/Nightly"
+        url "https://maven.regulaforensics.com/RegulaDocumentReader/Stage"
     }
 }
 
 dependencies {
     //noinspection GradleDependency
-	implementation ('com.regula.documentreader:api:9.4.12714'){
+	implementation ('com.regula.documentreader:api:9.3.12716'){
         transitive = true
     }
 }

package/src/ios/RGLWJSONConstructor.h

@@ -198,10 +198,6 @@
 +(NSDictionary* _Nullable)generateDocumentRequestMDL:(RGLDocumentRequestMDL* _Nullable)input;
 +(RGLFinalizeConfig* _Nullable)finalizeConfigFromJson:(NSDictionary* _Nullable)input;
 +(NSDictionary* _Nullable)generateFinalizeConfig:(RGLFinalizeConfig* _Nullable)input;
-+(RGLRFIDAccessControlPACE* _Nullable)paceProtocolFromJson:(NSDictionary* _Nullable)input;
-+(NSDictionary* _Nullable)generatePaceProtocol:(RGLRFIDAccessControlPACE* _Nullable)input;
-+(RGLRFIDAccessControlCA* _Nullable)caProtocolFromJson:(NSDictionary* _Nullable)input;
-+(NSDictionary* _Nullable)generateCaProtocol:(RGLRFIDAccessControlCA* _Nullable)input;
 
 @end
 

package/src/ios/RGLWJSONConstructor.m

@@ -61,22 +61,22 @@ static NSMutableArray* weakReferencesHolder;
 +(NSDictionary*)generateError:(NSError*)input {
     if(input == nil) return nil;
     NSMutableDictionary *result = [NSMutableDictionary new];
-    
+
     result[@"code"] = [NSNumber numberWithInteger:input.code];
     result[@"message"] = input.localizedDescription;
-    
+
     return result;
 }
 
 +(NSString*)generateCompletion:(NSNumber*)action :(RGLDocumentReaderResults*)results :(NSError*)error {
     NSMutableDictionary *result = [NSMutableDictionary new];
     int actionInt = [action intValue];
-    
+
     if(actionInt == 0 || actionInt == 2 || actionInt == 3 || actionInt == 4 || actionInt == 6)
         result[@"results"] = [self generateDocumentReaderResults:results];
     result[@"action"] = action;
     result[@"error"] = [self generateError:error];
-    
+
     return [RGLWJSONConstructor dictToString: result];
 }
 
@@ -100,11 +100,11 @@ static NSMutableArray* weakReferencesHolder;
 
 +(NSString*)generateFinalizePackageCompletion:(NSNumber*)action :(RGLTransactionInfo*)info :(NSError*)error {
     NSMutableDictionary *result = [NSMutableDictionary new];
-    
+
     result[@"action"] = action;
     result[@"info"] = [self generateTransactionInfo:info];
     result[@"error"] = [self generateError:error];
-    
+
     return [RGLWJSONConstructor dictToString: result];
 }
 
@@ -158,12 +158,12 @@ static NSMutableArray* weakReferencesHolder;
     if (!input) return nil;
     if (!input[@"license"]) return nil;
     RGLConfig *config = [[RGLConfig alloc] initWithLicenseData:[self base64Decode: input[@"license"]]];
-    
+
     if (input[@"databasePath"]) config.databasePath = input[@"databasePath"];
     if (input[@"licenseUpdateTimeout"]) config.licenseUpdateTimeout = input[@"licenseUpdateTimeout"];
     if (input[@"licenseUpdate"]) config.licenseUpdateCheck = [input[@"licenseUpdate"] boolValue];
     if (input[@"delayedNNLoad"]) config.delayedNNLoadEnabled = [input[@"delayedNNLoad"] boolValue];
-    
+
     return config;
 }
 
@@ -176,19 +176,19 @@ static NSMutableArray* weakReferencesHolder;
     result[@"licenseUpdateTimeout"] = input.licenseUpdateTimeout;
     result[@"licenseUpdate"] = @(input.licenseUpdateCheck);
     result[@"delayedNNLoad"] = @(input.delayedNNLoadEnabled);
-    
+
     return result;
 }
 
 +(RGLBleConfig*)bleDeviceConfigFromJson:(NSDictionary*)input :(RGLBluetooth*)bluetooth {
     if (!input) return nil;
     RGLBleConfig *config = [[RGLBleConfig alloc] initWithBluetooth:bluetooth];
-    
+
     if (input[@"databasePath"]) config.databasePath = input[@"databasePath"];
     if (input[@"licenseUpdateTimeout"]) config.licenseUpdateTimeout = input[@"licenseUpdateTimeout"];
     if (input[@"licenseUpdate"]) config.licenseUpdateCheck = [input[@"licenseUpdate"] boolValue];
     if (input[@"delayedNNLoad"]) config.delayedNNLoadEnabled = [input[@"delayedNNLoad"] boolValue];
-    
+
     return config;
 }
 
@@ -223,7 +223,7 @@ static NSMutableArray* weakReferencesHolder;
     RGLRecognizeConfig *config = [RGLRecognizeConfig alloc];
     if (input[@"scenario"]) config = [config initWithScenario:input[@"scenario"]];
     else config = [config initWithOnlineProcessingConfig:[self onlineProcessingConfigFromJson:input[@"onlineProcessingConfig"]]];
-    
+
     if (input[@"image"]) config.image = [RGLWJSONConstructor imageWithBase64:input[@"image"]];
     if (input[@"data"]) config.imageData = [RGLWJSONConstructor base64Decode:input[@"data"]];
     if (input[@"images"]) {
@@ -238,13 +238,13 @@ static NSMutableArray* weakReferencesHolder;
             [imageInputs addObject:[RGLWJSONConstructor imageInputFromJson: imageInput]];
         config.imageInputs = imageInputs;
     }
-    
+
     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[@"dtc"]) config.dtc = [RGLWJSONConstructor base64Decode:input[@"dtc"]];
-    
+
     return config;
 }
 
@@ -533,10 +533,10 @@ static NSMutableArray* weakReferencesHolder;
 
 +(RGLRFIDParams*)rfidParamsFromJson:(NSDictionary*)input {
     RGLRFIDParams* result = [RGLRFIDParams new];
-    
+
     if([input valueForKey:@"paIgnoreNotificationCodes"] != nil)
         result.paIgnoreNotificationCodes = [input valueForKey:@"paIgnoreNotificationCodes"];
-    
+
     return result;
 }
 
@@ -561,7 +561,7 @@ static NSMutableArray* weakReferencesHolder;
 
 +(RGLFaceAPIParams*)faceAPIParamsFromJson:(NSDictionary*)input {
     RGLFaceAPIParams* result = [RGLFaceAPIParams defaultParams];
-    
+
     if([input valueForKey:@"url"] != nil)
         result.url = [input valueForKey:@"url"];
     if([input valueForKey:@"mode"] != nil)
@@ -578,7 +578,7 @@ static NSMutableArray* weakReferencesHolder;
         result.proxyPassword = [input valueForKey:@"proxyPassword"];
     if([input valueForKey:@"proxyType"] != nil)
         result.proxyType = [input valueForKey:@"proxyType"];
-    
+
     return result;
 }
 
@@ -600,14 +600,14 @@ static NSMutableArray* weakReferencesHolder;
 
 +(RGLFaceAPISearchParams*)faceAPISearchParamsFromJson:(NSDictionary*)input {
     RGLFaceAPISearchParams* result = [RGLFaceAPISearchParams new];
-    
+
     if([input valueForKey:@"limit"] != nil)
         result.limit = [input valueForKey:@"limit"];
     if([input valueForKey:@"threshold"] != nil)
         result.threshold = [input valueForKey:@"threshold"];
     if([input valueForKey:@"groupIds"] != nil)
         result.groupIDs = [input valueForKey:@"groupIds"];
-    
+
     return result;
 }
 
@@ -1055,7 +1055,7 @@ static NSMutableArray* weakReferencesHolder;
     result[@"notificationCode"] = @(input.code & -0x10000);
     result[@"dataFileType"] = @((int)input.attachment);
     result[@"progress"] = @((int)input.value);
-    
+
     return [RGLWJSONConstructor dictToString: result];
 }
 
@@ -1714,10 +1714,10 @@ static NSMutableArray* weakReferencesHolder;
 +(NSDictionary*)generateDataField:(RGLDataField*)input {
     NSMutableDictionary *result = [NSMutableDictionary new];
     if(input == nil) return nil;
-    
+
     result[@"data"] = input.data;
     result[@"fieldType"] = @(input.fieldType);
-    
+
     return result;
 }
 
@@ -1835,7 +1835,7 @@ static NSMutableArray* weakReferencesHolder;
     for(NSDictionary* item in [input valueForKey:@"checks"])
         [array addObject:[self authenticityCheckFromJson:item]];
     RGLDocumentReaderAuthenticityResult* result = [[RGLDocumentReaderAuthenticityResult alloc]
-                                                   initWithAuthenticityChecks:array];
+     initWithAuthenticityChecks:array];
     if (input[@"status"]) [result setValue:input[@"status"] forKey:@"_security"];
     return result;
 }
@@ -2434,7 +2434,7 @@ static NSMutableArray* weakReferencesHolder;
     for (NSString* key in map) {
         [result addField:key intentToRetain:[map[key] integerValue]];
     }
-    
+
     return result;
     
 }
@@ -2459,7 +2459,7 @@ static NSMutableArray* weakReferencesHolder;
         [nameSpaces addObject:[self nameSpaceMDLFromJson: item]];
     }
     [result setValue:nameSpaces forKey:@"nameSpaces"];
-    
+
     return result;
     
 }
@@ -2632,7 +2632,7 @@ static NSMutableArray* weakReferencesHolder;
     if (input[@"video"]) result.video = [input[@"video"] boolValue];
     if (input[@"rfidSession"]) result.rfidSession = [input[@"rfidSession"] boolValue];
     if (input[@"mdlSession"]) result.mdlSession = [input[@"mdlSession"] boolValue];
-    
+
     return result;
 }
 
@@ -2648,52 +2648,6 @@ static NSMutableArray* weakReferencesHolder;
     return result;
 }
 
-+(RGLRFIDAccessControlPACE*)paceProtocolFromJson:(NSDictionary*)input {
-    NSMutableDictionary* json = input.mutableCopy;
-    
-    json[@"Version"] = input[@"version"];
-    json[@"StdDomainParams"] = input[@"stdDomainParams"];
-    json[@"KeyAlgorithm"] = input[@"keyAlgorithm"];
-#pragma clang diagnostic ignored "-Warc-performSelector-leaks"
-    return [[RGLRFIDAccessControlPACE alloc] performSelector:NSSelectorFromString(@"initWithJSON:") withObject:json];
-#pragma clang diagnostic pop
-}
-
-+(NSDictionary*)generatePaceProtocol:(RGLRFIDAccessControlPACE*)input {
-    if(input == nil) return nil;
-    NSMutableDictionary* result = [NSMutableDictionary new];
-    
-    result[@"version"] = [NSString stringWithFormat:@"%ld", (long)input.version];
-    result[@"stdDomainParams"] = input.stdDomainParams;
-    result[@"keyAlgorithm"] = input.keyAlgorithm;
-    
-    return result;
-}
-
-+(RGLRFIDAccessControlCA*)caProtocolFromJson:(NSDictionary*)input {
-    NSMutableDictionary* json = input.mutableCopy;
-    
-    json[@"Version"] = input[@"version"];
-    json[@"Scheme"] = input[@"scheme"];
-    json[@"KeyAlgorithm"] = input[@"keyAlgorithm"];
-    json[@"ChipIndividual"] = input[@"chipIndividual"];
-#pragma clang diagnostic ignored "-Warc-performSelector-leaks"
-    return [[RGLRFIDAccessControlCA alloc] performSelector:NSSelectorFromString(@"initWithJSON:") withObject:json];
-#pragma clang diagnostic pop
-}
-
-+(NSDictionary*)generateCaProtocol:(RGLRFIDAccessControlCA*)input {
-    if(input == nil) return nil;
-    NSMutableDictionary* result = [NSMutableDictionary new];
-    
-    result[@"version"] = [NSString stringWithFormat:@"%ld", (long)input.version];
-    result[@"scheme"] = input.scheme;
-    result[@"keyAlgorithm"] = input.keyAlgorithm;
-    result[@"chipIndividual"] = [NSNumber numberWithBool: input.chipIndividual];
-    
-    return result;
-}
-
 +(RGLDocumentReaderResults*)documentReaderResultsFromJson:(NSDictionary*)input {
     NSMutableArray<RGLDocumentReaderDocumentType*>* documentType = [NSMutableArray new];
     for(NSDictionary* item in [input valueForKey:@"documentType"]){
@@ -2717,26 +2671,26 @@ static NSMutableArray* weakReferencesHolder;
     }
     
     RGLDocumentReaderResults* result = [[RGLDocumentReaderResults alloc]
-                                        initWithDocumentTypes:documentType
-                                        textResult:[self documentReaderTextResultFromJson: [input valueForKey:@"textResult"]]
-                                        graphicResult:[self documentReaderGraphicResultFromJson: [input valueForKey:@"graphicResult"]]
-                                        rawResult:[input valueForKey:@"rawResult"]
-                                        documentPosition:documentPosition
-                                        barcodePosition:barcodePosition
-                                        mrzPosition:mrzPosition
-                                        imageQualityGroup:imageQuality
-                                        authenticityResults:[self documentReaderAuthenticityResultFromJson: [input valueForKey:@"authenticityResult"]]
-                                        rfidSessionData:[self rfidSessionDataFromJson: [input valueForKey:@"rfidSessionData"]]
-                                        chipPage:[[input valueForKey:@"chipPage"] integerValue]
-                                        barcodeResult:[self documentReaderBarcodeResultFromJson: [input valueForKey:@"barcodeResult"]]
-                                        vdsncData:[self vdsncDataFromJson: [input valueForKey:@"vdsncData"]]
-                                        vdsData:[self vdsDataFromJson: [input valueForKey:@"vdsData"]]
-                                        status:[self documentReaderResultsStatusFromJson: [input valueForKey:@"status"]]
-                                        processingFinished:[[input valueForKey:@"processingFinishedStatus"] integerValue]
-                                        morePagesAvailable:[[input valueForKey:@"morePagesAvailable"] integerValue]
-                                        elapsedTime:[[input valueForKey:@"elapsedTime"] integerValue]
-                                        elapsedTimeRFID:[[input valueForKey:@"elapsedTimeRFID"] integerValue]
-                                        transactionInfo:[self transactionInfoFromJson:[input valueForKey:@"transactionInfo"]]];
+            initWithDocumentTypes:documentType
+            textResult:[self documentReaderTextResultFromJson: [input valueForKey:@"textResult"]]
+            graphicResult:[self documentReaderGraphicResultFromJson: [input valueForKey:@"graphicResult"]]
+            rawResult:[input valueForKey:@"rawResult"]
+            documentPosition:documentPosition
+            barcodePosition:barcodePosition
+            mrzPosition:mrzPosition
+            imageQualityGroup:imageQuality
+            authenticityResults:[self documentReaderAuthenticityResultFromJson: [input valueForKey:@"authenticityResult"]]
+            rfidSessionData:[self rfidSessionDataFromJson: [input valueForKey:@"rfidSessionData"]]
+            chipPage:[[input valueForKey:@"chipPage"] integerValue]
+            barcodeResult:[self documentReaderBarcodeResultFromJson: [input valueForKey:@"barcodeResult"]]
+            vdsncData:[self vdsncDataFromJson: [input valueForKey:@"vdsncData"]]
+            vdsData:[self vdsDataFromJson: [input valueForKey:@"vdsData"]]
+            status:[self documentReaderResultsStatusFromJson: [input valueForKey:@"status"]]
+            processingFinished:[[input valueForKey:@"processingFinishedStatus"] integerValue]
+            morePagesAvailable:[[input valueForKey:@"morePagesAvailable"] integerValue]
+            elapsedTime:[[input valueForKey:@"elapsedTime"] integerValue]
+            elapsedTimeRFID:[[input valueForKey:@"elapsedTimeRFID"] integerValue]
+            transactionInfo:[self transactionInfoFromJson:[input valueForKey:@"transactionInfo"]]];
     
     [result setValue:[RGLWJSONConstructor base64Decode:input[@"dtcData"]] forKey:@"dtcData"];
     [result setValue:input[@"bsiTr03135Results"] forKey:@"bsiTr03135Results"];

package/src/ios/RGLWMain.h

@@ -18,6 +18,10 @@ extern UIViewController*_Nonnull(^ _Nonnull RGLWRootViewController)(void);
                  :(RGLWCallback _Nonnull)callback
                  :(RGLWEventSender _Nonnull)eventSender;
 
+@property NSNumber* _Nonnull doRequestPACertificates;
+@property NSNumber* _Nonnull doRequestTACertificates;
+@property NSNumber* _Nonnull doRequestTASignature;
+
 @end
 
 static NSString* _Nonnull completionEvent = @"completion";
@@ -28,7 +32,5 @@ static NSString* _Nonnull rfidOnRetryReadChipEvent = @"rfidOnRetryReadChipEvent"
 static NSString* _Nonnull paCertificateCompletionEvent = @"pa_certificate_completion";
 static NSString* _Nonnull taCertificateCompletionEvent = @"ta_certificate_completion";
 static NSString* _Nonnull taSignatureCompletionEvent = @"ta_signature_completion";
-static NSString* _Nonnull paceProtocolCompletionEvent = @"paceProtocolCompletionEvent";
-static NSString* _Nonnull caProtocolCompletionEvent = @"caProtocolCompletionEvent";
 static NSString* _Nonnull drVideoEncoderCompletionEvent = @"video_encoder_completion";
 static NSString* _Nonnull drOnCustomButtonTappedEvent = @"onCustomButtonTappedEvent";

package/src/ios/RGLWMain.m

@@ -41,14 +41,12 @@
         @"recognize": ^{ [self recognize :args[0]]; },
         @"startNewPage": ^{ [self startNewPage]; },
         @"stopScanner": ^{ [self stopScanner]; },
-        @"startRFIDReader": ^{ [self startRFIDReader :args[0]]; },
-        @"readRFID": ^{ [self readRFID :args[0]]; },
+        @"startRFIDReader": ^{ [self startRFIDReader :args[0] :args[1] :args[2]]; },
+        @"readRFID": ^{ [self readRFID :args[0] :args[1] :args[2]]; },
         @"stopRFIDReader": ^{ [self stopRFIDReader]; },
         @"providePACertificates": ^{ [self providePACertificates :args[0]]; },
         @"provideTACertificates": ^{ [self provideTACertificates :args[0]]; },
         @"provideTASignature": ^{ [self provideTASignature :args[0]]; },
-        @"selectPACEProtocol": ^{ [self selectPACEProtocol :args[0]]; },
-        @"selectCAProtocol": ^{ [self selectCAProtocol :args[0]]; },
         @"setTCCParams": ^{ [self setTCCParams :args[0] :callback]; },
         @"addPKDCertificates": ^{ [self addPKDCertificates :args[0]]; },
         @"clearPKDCertificates": ^{ [self clearPKDCertificates]; },
@@ -251,15 +249,19 @@ static NSDictionary* headers;
     });
 }
 
-+(void)startRFIDReader:(NSDictionary*)config {
-    rfidReaderRequest = config;
++(void)startRFIDReader:(NSNumber*)paCert :(NSNumber*)taCert :(NSNumber*)taSig {
+    this.doRequestPACertificates = paCert;
+    this.doRequestTACertificates = taCert;
+    this.doRequestTASignature = taSig;
     dispatch_async(dispatch_get_main_queue(), ^{
         [RGLDocReader.shared startRFIDReaderFromPresenter:RGLWRootViewController() completion:[self completion]];
     });
 }
 
-+(void)readRFID:(NSDictionary*)config {
-    rfidReaderRequest = config;
++(void)readRFID:(NSNumber*)paCert :(NSNumber*)taCert :(NSNumber*)taSig {
+    this.doRequestPACertificates = paCert;
+    this.doRequestTACertificates = taCert;
+    this.doRequestTASignature = taSig;
     [RGLDocReader.shared readRFID:^(RGLRFIDNotificationAction notificationAction, RGLRFIDNotify* _Nullable notification) {
         if (notification != nil) sendEvent(rfidOnProgressEvent, [RGLWJSONConstructor generateDocumentReaderNotification:notification]);
     } completion :^(RGLRFIDCompleteAction action, RGLDocumentReaderResults * _Nullable results, NSError * _Nullable error, RGLRFIDErrorCodes errorCode) {
@@ -289,14 +291,6 @@ static NSDictionary* headers;
     taSignatureCompletion([RGLWJSONConstructor base64Decode:signature]);
 }
 
-+(void)selectPACEProtocol:(NSDictionary*)protocol {
-    paceProtocolCompletion([RGLWJSONConstructor paceProtocolFromJson:protocol]);
-}
-
-+(void)selectCAProtocol:(NSDictionary*)protocol {
-    caProtocolCompletion([RGLWJSONConstructor caProtocolFromJson:protocol]);
-}
-
 +(void)setTCCParams:(NSDictionary*)params :(RGLWCallback)callback {
     [RGLDocReader.shared setTCCParams:[RGLWJSONConstructor tccParamsFromJson:params] completion:^(BOOL success, NSError * _Nullable error) {
         callback([RGLWJSONConstructor generateSuccessCompletion:success :error]);
@@ -632,13 +626,9 @@ RGLWCallback savedCallbackForBluetoothResult;
 RGLRFIDCertificatesCallback paCertificateCompletion;
 RGLRFIDCertificatesCallback taCertificateCompletion;
 RGLWRFIDSignatureCallback taSignatureCompletion;
-RGLRFIDAccessControlPACECallback paceProtocolCompletion;
-RGLRFIDAccessControlCACallback caProtocolCompletion;
-
-NSDictionary* rfidReaderRequest;
 
 - (void)onRequestPACertificatesWithSerial:(NSData *)serialNumber issuer:(RGLPAResourcesIssuer *)issuer callback:(RGLRFIDCertificatesCallback)callback {
-    if (rfidReaderRequest && [rfidReaderRequest[@"paCertificates"] boolValue]) {
+    if([self.doRequestPACertificates boolValue]) {
         paCertificateCompletion = callback;
         sendEvent(paCertificateCompletionEvent, [RGLWJSONConstructor generatePACertificateCompletion:serialNumber :issuer]);
     } else {
@@ -648,7 +638,7 @@ NSDictionary* rfidReaderRequest;
 }
 
 - (void)onRequestTACertificatesWithKey:(NSString *)keyCAR callback:(RGLRFIDCertificatesCallback)callback {
-    if (rfidReaderRequest && [rfidReaderRequest[@"taCertificates"] boolValue]) {
+    if([self.doRequestTACertificates boolValue]) {
         taCertificateCompletion = callback;
         sendEvent(taCertificateCompletionEvent, keyCAR);
     } else {
@@ -658,7 +648,7 @@ NSDictionary* rfidReaderRequest;
 }
 
 - (void)onRequestTASignatureWithChallenge:(RGLTAChallenge *)challenge callback:(void(^)(NSData *signature))callback {
-    if (rfidReaderRequest && [rfidReaderRequest[@"taSignature"] boolValue]) {
+    if([self.doRequestTASignature boolValue]) {
         taSignatureCompletion = callback;
         sendEvent(taSignatureCompletionEvent, [RGLWJSONConstructor dictToString: [RGLWJSONConstructor generateTAChallenge:challenge]]);
     } else {
@@ -667,32 +657,6 @@ NSDictionary* rfidReaderRequest;
     }
 }
 
-- (void)onRequestPACEProtocolWithOptions:(NSArray<RGLRFIDAccessControlPACE*>*)protocols callback:(RGLRFIDAccessControlPACECallback)callback {
-    if (rfidReaderRequest && [rfidReaderRequest[@"paceProtocol"] boolValue]) {
-        paceProtocolCompletion = callback;
-        NSMutableArray *array = [NSMutableArray new];
-        for(RGLRFIDAccessControlPACE* item in protocols)
-            [array addObject:[RGLWJSONConstructor generatePaceProtocol:item]];
-        sendEvent(paceProtocolCompletionEvent, [RGLWJSONConstructor arrayToString: array]);
-    } else {
-        paceProtocolCompletion = nil;
-        callback(nil);
-    }
-}
-
-- (void)onRequestCAProtocolWithOptions:(NSArray<RGLRFIDAccessControlCA*>*)protocols callback:(RGLRFIDAccessControlCACallback)callback {
-    if (rfidReaderRequest && [rfidReaderRequest[@"caProtocol"] boolValue]) {
-        caProtocolCompletion = callback;
-        NSMutableArray *array = [NSMutableArray new];
-        for(RGLRFIDAccessControlCA* item in protocols)
-            [array addObject:[RGLWJSONConstructor generateCaProtocol:item]];
-        sendEvent(caProtocolCompletionEvent, [RGLWJSONConstructor arrayToString: array]);
-    } else {
-        caProtocolCompletionEvent = nil;
-        callback(nil);
-    }
-}
-
 - (void)didChipConnected {
     sendEvent(rfidOnChipDetectedEvent, @"");
 }

package/www/DocumentReader.js

@@ -2130,48 +2130,6 @@ class FinalizeCompletion {
     }
 }
 
-class PACEProtocol {
-    static fromJson(jsonObject) {
-        if (jsonObject == null) return null
-        const result = new PACEProtocol()
-
-        result.version = jsonObject["version"]
-        result.stdDomainParams = jsonObject["stdDomainParams"]
-        result.keyAlgorithm = jsonObject["keyAlgorithm"]
-
-        return result
-    }
-}
-
-class CAProtocol {
-    static fromJson(jsonObject) {
-        if (jsonObject == null) return null
-        const result = new CAProtocol()
-
-        result.version = jsonObject["version"]
-        result.scheme = jsonObject["scheme"]
-        result.keyAlgorithm = jsonObject["keyAlgorithm"]
-        result.chipIndividual = jsonObject["chipIndividual"]
-
-        return result
-    }
-}
-
-class RFIDConfig {
-    static fromJson(jsonObject) {
-        if (jsonObject == null) return null
-        const result = new RFIDConfig()
-
-        result.onRequestPACertificates = jsonObject["onRequestPACertificates"]
-        result.onRequestTACertificates = jsonObject["onRequestTACertificates"]
-        result.onRequestTASignature = jsonObject["onRequestTASignature"]
-        result.onRequestPACEProtocol = jsonObject["onRequestPACEProtocol"]
-        result.onRequestCAProtocol = jsonObject["onRequestCAProtocol"]
-
-        return result
-    }
-}
-
 // Enum
 
 const FontStyle = {
@@ -4891,14 +4849,12 @@ DocumentReader.startScanner = (config, successCallback, errorCallback) => cordov
 DocumentReader.recognize = (config, successCallback, errorCallback) => cordova.exec(successCallback, errorCallback, "DocumentReader", "exec", ["recognize", config])
 DocumentReader.startNewPage = (successCallback, errorCallback) => cordova.exec(successCallback, errorCallback, "DocumentReader", "exec", ["startNewPage"])
 DocumentReader.stopScanner = (successCallback, errorCallback) => cordova.exec(successCallback, errorCallback, "DocumentReader", "exec", ["stopScanner"])
-DocumentReader.startRFIDReader = (config, successCallback, errorCallback) => cordova.exec(successCallback, errorCallback, "DocumentReader", "exec", ["startRFIDReader", config])
-DocumentReader.readRFID = (config, successCallback, errorCallback) => cordova.exec(successCallback, errorCallback, "DocumentReader", "exec", ["readRFID", config])
+DocumentReader.startRFIDReader = (requestPACertificates, requestTACertificates, requestTASignature, successCallback, errorCallback) => cordova.exec(successCallback, errorCallback, "DocumentReader", "exec", ["startRFIDReader", requestPACertificates, requestTACertificates, requestTASignature])
+DocumentReader.readRFID = (requestPACertificates, requestTACertificates, requestTASignature, successCallback, errorCallback) => cordova.exec(successCallback, errorCallback, "DocumentReader", "exec", ["readRFID", requestPACertificates, requestTACertificates, requestTASignature])
 DocumentReader.stopRFIDReader = (successCallback, errorCallback) => cordova.exec(successCallback, errorCallback, "DocumentReader", "exec", ["stopRFIDReader"])
 DocumentReader.providePACertificates = (certificates, successCallback, errorCallback) => cordova.exec(successCallback, errorCallback, "DocumentReader", "exec", ["providePACertificates", certificates])
 DocumentReader.provideTACertificates = (certificates, successCallback, errorCallback) => cordova.exec(successCallback, errorCallback, "DocumentReader", "exec", ["provideTACertificates", certificates])
 DocumentReader.provideTASignature = (signature, successCallback, errorCallback) => cordova.exec(successCallback, errorCallback, "DocumentReader", "exec", ["provideTASignature", signature])
-DocumentReader.selectPACEProtocol = (protocol, successCallback, errorCallback) => cordova.exec(successCallback, errorCallback, "DocumentReader", "exec", ["selectPACEProtocol", protocol])
-DocumentReader.selectCAProtocol = (protocol, successCallback, errorCallback) => cordova.exec(successCallback, errorCallback, "DocumentReader", "exec", ["selectCAProtocol", protocol])
 DocumentReader.setTCCParams = (params, successCallback, errorCallback) => cordova.exec(successCallback, errorCallback, "DocumentReader", "exec", ["setTCCParams", params])
 DocumentReader.addPKDCertificates = (certificates, successCallback, errorCallback) => cordova.exec(successCallback, errorCallback, "DocumentReader", "exec", ["addPKDCertificates", certificates])
 DocumentReader.clearPKDCertificates = (successCallback, errorCallback) => cordova.exec(successCallback, errorCallback, "DocumentReader", "exec", ["clearPKDCertificates"])
@@ -5053,8 +5009,5 @@ DocumentReaderPlugin.NameSpaceMDL = NameSpaceMDL
 DocumentReaderPlugin.DocumentRequest18013MDL = DocumentRequest18013MDL
 DocumentReaderPlugin.FinalizeConfig = FinalizeConfig
 DocumentReaderPlugin.FinalizeCompletion = FinalizeCompletion
-DocumentReaderPlugin.PACEProtocol = PACEProtocol
-DocumentReaderPlugin.CAProtocol = CAProtocol
-DocumentReaderPlugin.RFIDConfig = RFIDConfig
 
 module.exports = DocumentReaderPlugin