@regulaforensics/react-native-document-reader-api 9.4.547-rc → 9.4.549-rc

package/android/build.gradle

@@ -29,7 +29,7 @@ dependencies {
     //noinspection GradleDynamicVersion
     implementation 'com.facebook.react:react-native:+'
     //noinspection GradleDependency
-    implementation('com.regula.documentreader:api:9.4.12783') {
+    implementation('com.regula.documentreader:api:9.3.12784') {
         transitive = true
     }
 }

package/android/src/main/java/com/regula/plugin/documentreader/JSONConstructor.kt

@@ -47,7 +47,9 @@ 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
@@ -2138,3 +2140,37 @@ 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/android/src/main/java/com/regula/plugin/documentreader/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.IRfidPACertificates
-import com.regula.documentreader.api.completions.rfid.certificates.IRfidTACertificates
-import com.regula.documentreader.api.completions.rfid.certificates.IRfidTASignature
+import com.regula.documentreader.api.completions.rfid.certificates.IRfidAccessControl
 import com.regula.documentreader.api.enums.DocReaderAction
 import com.regula.documentreader.api.enums.LCID
 import com.regula.documentreader.api.enums.eImageQualityCheckType
@@ -39,6 +39,8 @@ 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
@@ -84,12 +86,14 @@ fun methodCall(method: String, callback: (Any?) -> Unit): Any = when (method) {
     "recognize" -> recognize(args(0))
     "startNewPage" -> startNewPage()
     "stopScanner" -> stopScanner()
-    "startRFIDReader" -> startRFIDReader(args(0), args(1), args(2))
-    "readRFID" -> readRFID(args(0), args(1), args(2))
+    "startRFIDReader" -> startRFIDReader(argsNullable(0))
+    "readRFID" -> readRFID(argsNullable(0))
     "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()
@@ -150,6 +154,8 @@ 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"
@@ -248,22 +254,13 @@ fun startNewPage() = Instance().startNewPage()
 
 fun stopScanner() = Instance().stopScanner(context)
 
-fun startRFIDReader(onRequestPACertificates: Boolean, onRequestTACertificates: Boolean, onRequestTASignature: Boolean) {
+fun startRFIDReader(config: JSONObject?) {
     stopBackgroundRFID()
-    requestType = RfidReaderRequestType(
-        onRequestPACertificates,
-        onRequestTACertificates,
-        onRequestTASignature
-    )
-    Instance().startRFIDReader(activity, rfidReaderCompletion, requestType.getRfidReaderRequest())
+    Instance().startRFIDReader(activity, rfidReaderCompletion, getRfidReaderRequest(config))
 }
 
-fun readRFID(onRequestPACertificates: Boolean, onRequestTACertificates: Boolean, onRequestTASignature: Boolean) {
-    requestType = RfidReaderRequestType(
-        onRequestPACertificates,
-        onRequestTACertificates,
-        onRequestTASignature
-    )
+fun readRFID(config: JSONObject?) {
+    rfidReaderRequest = getRfidReaderRequest(config)
     startForegroundDispatch("readRFID")
 }
 
@@ -284,6 +281,14 @@ 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))
@@ -545,49 +550,47 @@ 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
 
-class RfidReaderRequestType(
-    val doPACertificates: Boolean,
-    val doTACertificates: Boolean,
-    val doTASignature: Boolean
-) {
-    private val onRequestPACertificates = IRfidPACertificates { serialNumber, issuer, completion ->
+    if (config.getBoolean("paCertificates")) result.setPACertificates { serialNumber, issuer, completion ->
         paCertificateCompletion = completion
         sendEvent(paCertificateCompletionEvent, generatePACertificateCompletion(serialNumber, issuer))
     }
-    private val onRequestTACertificates = IRfidTACertificates { keyCAR, completion ->
+    if (config.getBoolean("taCertificates")) result.setTACertificates { keyCAR, completion ->
         taCertificateCompletion = completion
         sendEvent(taCertificateCompletionEvent, keyCAR)
     }
-    private val onRequestTASignature = IRfidTASignature { challenge, completion ->
+    if (config.getBoolean("taSignature")) result.setTASignature { 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))
+        }
+    })
 
-    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
-    }
+    return result
 }
 
-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, requestType.getRfidReaderRequest())
+        "readRFID" -> Instance().readRFID(isoDep, rfidReaderCompletion, rfidReaderRequest)
         "engageDeviceNFC" -> Instance().engageDeviceNFC(isoDep) { v1, v2 -> engageDeviceNFCCallback(generateDeviceEngagementCompletion(v1, v2)) }
         "retrieveDataNFC" -> Instance().retrieveDataNFC(isoDep, retrieveDataNFCProp) { v1, v2, v3 -> retrieveDataNFCCallback(generateCompletion(v1, v2, v3)) }
     }

package/example/App.tsx

@@ -210,12 +210,12 @@ export default class App extends React.Component<IProps, IState> {
 
   customRFID() {
     this.showRfidUI()
-    DocumentReader.readRFID(false, false, false, _ => { }, _ => { })
+    DocumentReader.readRFID(null, _ => { }, _ => { })
   }
 
   usualRFID() {
     isReadingRfid = true
-    DocumentReader.startRFIDReader(false, false, false, _ => { }, _ => { })
+    DocumentReader.startRFIDReader(null, _ => { }, _ => { })
   }
 
   handleResults(results: DocumentReaderResults) {

package/example/package-lock.json

@@ -2078,9 +2078,9 @@
       "license": "Python-2.0"
     },
     "node_modules/@eslint/eslintrc/node_modules/brace-expansion": {
-      "version": "1.1.12",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.12.tgz",
-      "integrity": "sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==",
+      "version": "1.1.13",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.13.tgz",
+      "integrity": "sha512-9ZLprWS6EENmhEOpjCYW2c8VkmOvckIJZfkr7rBW6dObmfgJ/L1GpSYW5Hpo9lDz4D1+n0Ckz8rU7FwHDQiG/w==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -2158,9 +2158,9 @@
       }
     },
     "node_modules/@humanwhocodes/config-array/node_modules/brace-expansion": {
-      "version": "1.1.12",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.12.tgz",
-      "integrity": "sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==",
+      "version": "1.1.13",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.13.tgz",
+      "integrity": "sha512-9ZLprWS6EENmhEOpjCYW2c8VkmOvckIJZfkr7rBW6dObmfgJ/L1GpSYW5Hpo9lDz4D1+n0Ckz8rU7FwHDQiG/w==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -2718,6 +2718,19 @@
         "eslint-scope": "5.1.1"
       }
     },
+    "node_modules/@nodable/entities": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/@nodable/entities/-/entities-2.1.0.tgz",
+      "integrity": "sha512-nyT7T3nbMyBI/lvr6L5TyWbFJAI9FTgVRakNoBqCD+PmID8DzFrrNdLLtHMwMszOtqZa8PAOV24ZqDnQrhQINA==",
+      "devOptional": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/nodable"
+        }
+      ],
+      "license": "MIT"
+    },
     "node_modules/@nodelib/fs.scandir": {
       "version": "2.1.5",
       "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
@@ -4468,9 +4481,9 @@
       "peer": true
     },
     "node_modules/brace-expansion": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.2.tgz",
-      "integrity": "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==",
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.3.tgz",
+      "integrity": "sha512-MCV/fYJEbqx68aE58kv2cA/kiky1G8vux3OR6/jbS+jIMe/6fJWa0DTzJU7dqijOWYwHi1t29FlfYI9uytqlpA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -6158,9 +6171,9 @@
       "license": "MIT"
     },
     "node_modules/eslint-plugin-react/node_modules/brace-expansion": {
-      "version": "1.1.12",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.12.tgz",
-      "integrity": "sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==",
+      "version": "1.1.13",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.13.tgz",
+      "integrity": "sha512-9ZLprWS6EENmhEOpjCYW2c8VkmOvckIJZfkr7rBW6dObmfgJ/L1GpSYW5Hpo9lDz4D1+n0Ckz8rU7FwHDQiG/w==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -6260,9 +6273,9 @@
       "license": "Python-2.0"
     },
     "node_modules/eslint/node_modules/brace-expansion": {
-      "version": "1.1.12",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.12.tgz",
-      "integrity": "sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==",
+      "version": "1.1.13",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.13.tgz",
+      "integrity": "sha512-9ZLprWS6EENmhEOpjCYW2c8VkmOvckIJZfkr7rBW6dObmfgJ/L1GpSYW5Hpo9lDz4D1+n0Ckz8rU7FwHDQiG/w==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -6541,9 +6554,9 @@
       "license": "MIT"
     },
     "node_modules/fast-xml-builder": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/fast-xml-builder/-/fast-xml-builder-1.1.4.tgz",
-      "integrity": "sha512-f2jhpN4Eccy0/Uz9csxh3Nu6q4ErKxf0XIsasomfOihuSUa3/xw6w8dnOtCDgEItQFJG8KyXPzQXzcODDrrbOg==",
+      "version": "1.1.5",
+      "resolved": "https://registry.npmjs.org/fast-xml-builder/-/fast-xml-builder-1.1.5.tgz",
+      "integrity": "sha512-4TJn/8FKLeslLAH3dnohXqE3QSoxkhvaMzepOIZytwJXZO69Bfz0HBdDHzOTOon6G59Zrk6VQ2bEiv1t61rfkA==",
       "devOptional": true,
       "funding": [
         {
@@ -6557,9 +6570,9 @@
       }
     },
     "node_modules/fast-xml-parser": {
-      "version": "5.5.8",
-      "resolved": "https://registry.npmjs.org/fast-xml-parser/-/fast-xml-parser-5.5.8.tgz",
-      "integrity": "sha512-Z7Fh2nVQSb2d+poDViM063ix2ZGt9jmY1nWhPfHBOK2Hgnb/OW3P4Et3P/81SEej0J7QbWtJqxO05h8QYfK7LQ==",
+      "version": "5.7.2",
+      "resolved": "https://registry.npmjs.org/fast-xml-parser/-/fast-xml-parser-5.7.2.tgz",
+      "integrity": "sha512-P7oW7tLbYnhOLQk/Gv7cZgzgMPP/XN03K02/Jy6Y/NHzyIAIpxuZIM/YqAkfiXFPxA2CTm7NtCijK9EDu09u2w==",
       "devOptional": true,
       "funding": [
         {
@@ -6569,9 +6582,10 @@
       ],
       "license": "MIT",
       "dependencies": {
-        "fast-xml-builder": "^1.1.4",
-        "path-expression-matcher": "^1.2.0",
-        "strnum": "^2.2.0"
+        "@nodable/entities": "^2.1.0",
+        "fast-xml-builder": "^1.1.5",
+        "path-expression-matcher": "^1.5.0",
+        "strnum": "^2.2.3"
       },
       "bin": {
         "fxparser": "src/cli/cli.js"
@@ -6954,9 +6968,9 @@
       }
     },
     "node_modules/glob/node_modules/brace-expansion": {
-      "version": "1.1.12",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.12.tgz",
-      "integrity": "sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==",
+      "version": "1.1.13",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.13.tgz",
+      "integrity": "sha512-9ZLprWS6EENmhEOpjCYW2c8VkmOvckIJZfkr7rBW6dObmfgJ/L1GpSYW5Hpo9lDz4D1+n0Ckz8rU7FwHDQiG/w==",
       "license": "MIT",
       "dependencies": {
         "balanced-match": "^1.0.0",
@@ -9105,9 +9119,9 @@
       }
     },
     "node_modules/lodash": {
-      "version": "4.17.23",
-      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.23.tgz",
-      "integrity": "sha512-LgVTMpQtIopCi79SJeDiP0TfWi5CNEc/L/aRdTh3yIvmZXTnheWpKjSZhnvMl8iXbC1tFg9gdHHDMLoV7CnG+w==",
+      "version": "4.18.1",
+      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.18.1.tgz",
+      "integrity": "sha512-dMInicTPVE8d1e5otfwmmjlxkZoUpiVLwyeTdUsi/Caj/gfzzblBcCE5sRHV/AsjuCmxWrte2TNGSYuCeCq+0Q==",
       "license": "MIT"
     },
     "node_modules/lodash.debounce": {
@@ -10351,9 +10365,9 @@
       }
     },
     "node_modules/path-expression-matcher": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/path-expression-matcher/-/path-expression-matcher-1.2.0.tgz",
-      "integrity": "sha512-DwmPWeFn+tq7TiyJ2CxezCAirXjFxvaiD03npak3cRjlP9+OjTmSy1EpIrEbh+l6JgUundniloMLDQ/6VTdhLQ==",
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/path-expression-matcher/-/path-expression-matcher-1.5.0.tgz",
+      "integrity": "sha512-cbrerZV+6rvdQrrD+iGMcZFEiiSrbv9Tfdkvnusy6y0x0GKBXREFg/Y65GhIfm0tnLntThhzCnfKwp1WRjeCyQ==",
       "devOptional": true,
       "funding": [
         {
@@ -10409,9 +10423,9 @@
       "license": "ISC"
     },
     "node_modules/picomatch": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
-      "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.2.tgz",
+      "integrity": "sha512-V7+vQEJ06Z+c5tSye8S+nHUfI51xoXIXjHQ99cQtKUkQqqO1kO/KCJUfZXuB47h/YBlDhah2H3hdUGXn8ie0oA==",
       "license": "MIT",
       "engines": {
         "node": ">=8.6"
@@ -12085,9 +12099,9 @@
       }
     },
     "node_modules/strnum": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/strnum/-/strnum-2.2.1.tgz",
-      "integrity": "sha512-BwRvNd5/QoAtyW1na1y1LsJGQNvRlkde6Q/ipqqEaivoMdV+B1OMOTVdwR+N/cwVUcIt9PYyHmV8HyexCZSupg==",
+      "version": "2.2.3",
+      "resolved": "https://registry.npmjs.org/strnum/-/strnum-2.2.3.tgz",
+      "integrity": "sha512-oKx6RUCuHfT3oyVjtnrmn19H1SiCqgJSg+54XqURKp5aCMbrXrhLjRN9TjuwMjiYstZ0MzDrHqkGZ5dFTKd+zg==",
       "devOptional": true,
       "funding": [
         {
@@ -12171,9 +12185,9 @@
       }
     },
     "node_modules/test-exclude/node_modules/brace-expansion": {
-      "version": "1.1.12",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.12.tgz",
-      "integrity": "sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==",
+      "version": "1.1.13",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.13.tgz",
+      "integrity": "sha512-9ZLprWS6EENmhEOpjCYW2c8VkmOvckIJZfkr7rBW6dObmfgJ/L1GpSYW5Hpo9lDz4D1+n0Ckz8rU7FwHDQiG/w==",
       "license": "MIT",
       "dependencies": {
         "balanced-match": "^1.0.0",
@@ -12399,7 +12413,7 @@
       "version": "5.7.3",
       "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.7.3.tgz",
       "integrity": "sha512-84MVSjMEHP+FQRPy3pX9sTVV/INIex71s9TL2Gm5FG/WG1SqXeKyZ0k7/blY/4FdOzI12CBy1vGc4og/eus0fw==",
-      "devOptional": true,
+      "dev": true,
       "license": "Apache-2.0",
       "bin": {
         "tsc": "bin/tsc",
@@ -12805,9 +12819,9 @@
       "license": "ISC"
     },
     "node_modules/yaml": {
-      "version": "2.8.2",
-      "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.8.2.tgz",
-      "integrity": "sha512-mplynKqc1C2hTVYxd0PU2xQAc22TI1vShAYGksCCfxbn/dFwnHTNi1bvYsBTkhdUNtGIf5xNOg938rrSSYvS9A==",
+      "version": "2.8.3",
+      "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.8.3.tgz",
+      "integrity": "sha512-AvbaCLOO2Otw/lW5bmh9d/WEdcDFdQp2Z2ZUH3pX9U2ihyUY0nvLv7J6TrWowklRGPYbB/IuIMfYgxaCPg5Bpg==",
       "devOptional": true,
       "license": "ISC",
       "bin": {

package/example/package.json

@@ -10,8 +10,8 @@
     "test": "jest"
   },
   "dependencies": {
-    "@regulaforensics/react-native-document-reader-api": "9.4.547-rc",
-    "@regulaforensics/react-native-document-reader-core-fullauthrfid": "9.4.2320-rc",
+    "@regulaforensics/react-native-document-reader-api": "9.4.549-rc",
+    "@regulaforensics/react-native-document-reader-core-fullauthrfid": "9.4.2334-rc",
     "@rneui/base": "4.0.0-rc.7",
     "@rneui/themed": "4.0.0-rc.7",
     "react": "19.0.0",

package/index.d.ts

@@ -3398,6 +3398,63 @@ export class FinalizeCompletion {
     }
 }
 
+export class PACEProtocol {
+    version?: string
+    stdDomainParams?: string
+    keyAlgorithm?: string
+
+    static fromJson(jsonObject?: any): PACEProtocol | undefined {
+        if (jsonObject == null || jsonObject == undefined) return undefined
+        const result = new PACEProtocol
+
+        result.version = jsonObject["version"]
+        result.stdDomainParams = jsonObject["stdDomainParams"]
+        result.keyAlgorithm = jsonObject["keyAlgorithm"]
+
+        return result
+    }
+}
+
+export class CAProtocol {
+    version?: string
+    scheme?: string
+    keyAlgorithm?: string
+    chipIndividual?: boolean
+
+    static fromJson(jsonObject?: any): CAProtocol | undefined {
+        if (jsonObject == null || jsonObject == undefined) return undefined
+        const result = new CAProtocol
+
+        result.version = jsonObject["version"]
+        result.scheme = jsonObject["scheme"]
+        result.keyAlgorithm = jsonObject["keyAlgorithm"]
+        result.chipIndividual = jsonObject["chipIndividual"]
+
+        return result
+    }
+}
+
+export class RFIDConfig {
+    onRequestPACertificates?: boolean
+    onRequestTACertificates?: boolean
+    onRequestTASignature?: boolean
+    onRequestPACEProtocol?: boolean
+    onRequestCAProtocol?: boolean
+
+    static fromJson(jsonObject?: any): RFIDConfig | undefined {
+        if (jsonObject == null || jsonObject == undefined) return undefined
+        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
+    }
+}
+
 export const FontStyle = {
     NORMAL: 0,
     BOLD: 1,
@@ -4003,9 +4060,9 @@ export const eRFID_NotificationCodes = {
     RFID_NOTIFICATION_AUXILIARY_DATA_VALIDATION: 0x000D0000,
     RFID_NOTIFICATION_RI_SECTOR_ID: 0x000E0000,
     RFID_NOTIFICATION_BIOMETRICS_EMPTY_PLACEHOLDER: 0x000F0000,
-    RFID_NOTIFICATION_SESSION_FILE_DATA_UPDATED: 1048576,
-    RFID_NOTIFICATION_TCC_TA_RESOURCES: 1114112,
-    RFID_NOTIFICATION_TCC_TA_SIGNATURE: 1114113,
+    RFID_NOTIFICATION_SESSION_FILE_DATA_UPDATED: 0x00100000,
+    RFID_NOTIFICATION_TCC_TA_RESOURCES: 0x00110000,
+    RFID_NOTIFICATION_TCC_TA_SIGNATURE: 0x00110001,
 }
 
 export const CameraPosition = {
@@ -4535,6 +4592,8 @@ export const eLDS_ParsingNotificationCodes = {
     NTF_LDS_ICAO_CERTIFICATE_MRZ_COUNTRY_NON_MATCHING: 0x90000252,
     NTF_LDS_ICAO_CERTIFICATE_ISSUER_COUNTRY_NON_UPPER_CASE: 0x90000253,
     NTF_LDS_ICAO_CERTIFICATE_SUBJECT_COUNTRY_NON_UPPER_CASE: 0x90000254,
+    NTFLDS_SI_STORAGE_CS_NONCONSISTANT: 0x91000111,
+    NTFLDS_SI_STORAGE_CS_PACE_CAM_KEY_MISSING: 0x9100011,
 }
 
 export const eImageQualityCheckType = {
@@ -5101,6 +5160,13 @@ export const eRFID_DataFile_Type = {
     DFT_VDS: 900,
     DFT_VDSNC: 901,
     DFT_USERDEFINED: 1000,
+    DFT_POST_CA_RESPONSE: 710,
+    DFT_POST_CA_PUBLIC_KEY: 711,
+    DFT_POST_CA_INFO: 712,
+    DFT_POST_CA_DPARAMS: 713,
+    DFT_POST_CA_CHECK_PK: 714,
+    DFT_POST_CA_CHECK_SK: 715,
+    DFT_ID_DG22: 122,
 }
 
 export const eVisualFieldType = {
@@ -5761,6 +5827,7 @@ export const eVisualFieldType = {
     FT_NON_DOMICILED_INDICATOR: 702,
     FT_JURISDICTION_SPECIFIC_DATA: 703,
     FT_DATA_DATE_OF_EXPIRY: 704,
+    FT_CONSUL: 705,
 }
 
 export const DocReaderOrientation = {
@@ -6114,12 +6181,14 @@ export default class DocumentReader {
     static recognize(config: RecognizeConfig, successCallback: (response: string) => void, errorCallback?: (error: string) => void): void
     static startNewPage(successCallback: (response: string) => void, errorCallback?: (error: string) => void): void
     static stopScanner(successCallback: (response: string) => void, errorCallback?: (error: string) => void): void
-    static startRFIDReader(requestPACertificates: boolean, requestTACertificates: boolean, requestTASignature: boolean, successCallback: (response: string) => void, errorCallback?: (error: string) => void): void
-    static readRFID(requestPACertificates: boolean, requestTACertificates: boolean, requestTASignature: boolean, successCallback: (response: string) => void, errorCallback?: (error: string) => void): void
+    static startRFIDReader(config: RFIDConfig | null, successCallback: (response: string) => void, errorCallback?: (error: string) => void): void
+    static readRFID(config: RFIDConfig | null, successCallback: (response: string) => void, errorCallback?: (error: string) => void): void
     static stopRFIDReader(successCallback: (response: string) => void, errorCallback?: (error: string) => void): void
     static providePACertificates(certificates: PKDCertificate[] | null, successCallback: (response: string) => void, errorCallback?: (error: string) => void): void
     static provideTACertificates(certificates: PKDCertificate[] | null, successCallback: (response: string) => void, errorCallback?: (error: string) => void): void
     static provideTASignature(signature: string, successCallback: (response: string) => void, errorCallback?: (error: string) => void): void
+    static selectPACEProtocol(protocol: PACEProtocol, successCallback: (response: string) => void, errorCallback?: (error: string) => void): void
+    static selectCAProtocol(protocol: CAProtocol, successCallback: (response: string) => void, errorCallback?: (error: string) => void): void
     static setTCCParams(params: TccParams, successCallback: (response: string) => void, errorCallback?: (error: string) => void): void
     static addPKDCertificates(certificates: PKDCertificate[], successCallback: (response: string) => void, errorCallback?: (error: string) => void): void
     static clearPKDCertificates(successCallback: (response: string) => void, errorCallback?: (error: string) => void): void

package/index.js

@@ -2205,6 +2205,48 @@ export class FinalizeCompletion {
     }
 }
 
+export 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
+    }
+}
+
+export 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
+    }
+}
+
+export 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
 
 export const FontStyle = {
@@ -2812,9 +2854,9 @@ export const eRFID_NotificationCodes = {
     RFID_NOTIFICATION_AUXILIARY_DATA_VALIDATION: 0x000D0000,
     RFID_NOTIFICATION_RI_SECTOR_ID: 0x000E0000,
     RFID_NOTIFICATION_BIOMETRICS_EMPTY_PLACEHOLDER: 0x000F0000,
-    RFID_NOTIFICATION_SESSION_FILE_DATA_UPDATED: 1048576,
-    RFID_NOTIFICATION_TCC_TA_RESOURCES: 1114112,
-    RFID_NOTIFICATION_TCC_TA_SIGNATURE: 1114113,
+    RFID_NOTIFICATION_SESSION_FILE_DATA_UPDATED: 0x00100000,
+    RFID_NOTIFICATION_TCC_TA_RESOURCES: 0x00110000,
+    RFID_NOTIFICATION_TCC_TA_SIGNATURE: 0x00110001,
 }
 
 export const CameraPosition = {
@@ -3344,6 +3386,8 @@ export const eLDS_ParsingNotificationCodes = {
     NTF_LDS_ICAO_CERTIFICATE_MRZ_COUNTRY_NON_MATCHING: 0x90000252,
     NTF_LDS_ICAO_CERTIFICATE_ISSUER_COUNTRY_NON_UPPER_CASE: 0x90000253,
     NTF_LDS_ICAO_CERTIFICATE_SUBJECT_COUNTRY_NON_UPPER_CASE: 0x90000254,
+    NTFLDS_SI_STORAGE_CS_NONCONSISTANT: 0x91000111,
+    NTFLDS_SI_STORAGE_CS_PACE_CAM_KEY_MISSING: 0x9100011,
 }
 
 export const eImageQualityCheckType = {
@@ -3910,6 +3954,13 @@ export const eRFID_DataFile_Type = {
     DFT_VDS: 900,
     DFT_VDSNC: 901,
     DFT_USERDEFINED: 1000,
+    DFT_POST_CA_RESPONSE: 710,
+    DFT_POST_CA_PUBLIC_KEY: 711,
+    DFT_POST_CA_INFO: 712,
+    DFT_POST_CA_DPARAMS: 713,
+    DFT_POST_CA_CHECK_PK: 714,
+    DFT_POST_CA_CHECK_SK: 715,
+    DFT_ID_DG22: 122,
 }
 
 export const eVisualFieldType = {
@@ -4570,6 +4621,7 @@ export const eVisualFieldType = {
     FT_NON_DOMICILED_INDICATOR: 702,
     FT_JURISDICTION_SPECIFIC_DATA: 703,
     FT_DATA_DATE_OF_EXPIRY: 704,
+    FT_CONSUL: 705,
 }
 
 export const DocReaderOrientation = {
@@ -4924,12 +4976,14 @@ DocumentReader.startScanner = (config, successCallback, errorCallback) => RNRegu
 DocumentReader.recognize = (config, successCallback, errorCallback) => RNRegulaDocumentReader.exec("DocumentReader", "recognize", [config], successCallback, errorCallback)
 DocumentReader.startNewPage = (successCallback, errorCallback) => RNRegulaDocumentReader.exec("DocumentReader", "startNewPage", [], successCallback, errorCallback)
 DocumentReader.stopScanner = (successCallback, errorCallback) => RNRegulaDocumentReader.exec("DocumentReader", "stopScanner", [], successCallback, errorCallback)
-DocumentReader.startRFIDReader = (requestPACertificates, requestTACertificates, requestTASignature, successCallback, errorCallback) => RNRegulaDocumentReader.exec("DocumentReader", "startRFIDReader", [requestPACertificates, requestTACertificates, requestTASignature], successCallback, errorCallback)
-DocumentReader.readRFID = (requestPACertificates, requestTACertificates, requestTASignature, successCallback, errorCallback) => RNRegulaDocumentReader.exec("DocumentReader", "readRFID", [requestPACertificates, requestTACertificates, requestTASignature], successCallback, errorCallback)
+DocumentReader.startRFIDReader = (config, successCallback, errorCallback) => RNRegulaDocumentReader.exec("DocumentReader", "startRFIDReader", [config], successCallback, errorCallback)
+DocumentReader.readRFID = (config, successCallback, errorCallback) => RNRegulaDocumentReader.exec("DocumentReader", "readRFID", [config], successCallback, errorCallback)
 DocumentReader.stopRFIDReader = (successCallback, errorCallback) => RNRegulaDocumentReader.exec("DocumentReader", "stopRFIDReader", [], successCallback, errorCallback)
 DocumentReader.providePACertificates = (certificates, successCallback, errorCallback) => RNRegulaDocumentReader.exec("DocumentReader", "providePACertificates", [certificates], successCallback, errorCallback)
 DocumentReader.provideTACertificates = (certificates, successCallback, errorCallback) => RNRegulaDocumentReader.exec("DocumentReader", "provideTACertificates", [certificates], successCallback, errorCallback)
 DocumentReader.provideTASignature = (signature, successCallback, errorCallback) => RNRegulaDocumentReader.exec("DocumentReader", "provideTASignature", [signature], successCallback, errorCallback)
+DocumentReader.selectPACEProtocol = (protocol, successCallback, errorCallback) => RNRegulaDocumentReader.exec("DocumentReader", "selectPACEProtocol", [protocol], successCallback, errorCallback)
+DocumentReader.selectCAProtocol = (protocol, successCallback, errorCallback) => RNRegulaDocumentReader.exec("DocumentReader", "selectCAProtocol", [protocol], successCallback, errorCallback)
 DocumentReader.setTCCParams = (params, successCallback, errorCallback) => RNRegulaDocumentReader.exec("DocumentReader", "setTCCParams", [params], successCallback, errorCallback)
 DocumentReader.addPKDCertificates = (certificates, successCallback, errorCallback) => RNRegulaDocumentReader.exec("DocumentReader", "addPKDCertificates", [certificates], successCallback, errorCallback)
 DocumentReader.clearPKDCertificates = (successCallback, errorCallback) => RNRegulaDocumentReader.exec("DocumentReader", "clearPKDCertificates", [], successCallback, errorCallback)

package/ios/RGLWJSONConstructor.h

@@ -198,6 +198,10 @@
 +(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/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,6 +2648,52 @@ 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"]){
@@ -2671,26 +2717,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/ios/RGLWMain.h

@@ -18,10 +18,6 @@ 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";
@@ -32,5 +28,7 @@ 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/ios/RGLWMain.m

@@ -41,12 +41,14 @@
         @"recognize": ^{ [self recognize :args[0]]; },
         @"startNewPage": ^{ [self startNewPage]; },
         @"stopScanner": ^{ [self stopScanner]; },
-        @"startRFIDReader": ^{ [self startRFIDReader :args[0] :args[1] :args[2]]; },
-        @"readRFID": ^{ [self readRFID :args[0] :args[1] :args[2]]; },
+        @"startRFIDReader": ^{ [self startRFIDReader :args[0]]; },
+        @"readRFID": ^{ [self readRFID :args[0]]; },
         @"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]; },
@@ -249,19 +251,15 @@ static NSDictionary* headers;
     });
 }
 
-+(void)startRFIDReader:(NSNumber*)paCert :(NSNumber*)taCert :(NSNumber*)taSig {
-    this.doRequestPACertificates = paCert;
-    this.doRequestTACertificates = taCert;
-    this.doRequestTASignature = taSig;
++(void)startRFIDReader:(NSDictionary*)config {
+    rfidReaderRequest = config;
     dispatch_async(dispatch_get_main_queue(), ^{
         [RGLDocReader.shared startRFIDReaderFromPresenter:RGLWRootViewController() completion:[self completion]];
     });
 }
 
-+(void)readRFID:(NSNumber*)paCert :(NSNumber*)taCert :(NSNumber*)taSig {
-    this.doRequestPACertificates = paCert;
-    this.doRequestTACertificates = taCert;
-    this.doRequestTASignature = taSig;
++(void)readRFID:(NSDictionary*)config {
+    rfidReaderRequest = config;
     [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) {
@@ -291,6 +289,14 @@ 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]);
@@ -626,9 +632,13 @@ 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([self.doRequestPACertificates boolValue]) {
+    if (rfidReaderRequest && [rfidReaderRequest[@"paCertificates"] boolValue]) {
         paCertificateCompletion = callback;
         sendEvent(paCertificateCompletionEvent, [RGLWJSONConstructor generatePACertificateCompletion:serialNumber :issuer]);
     } else {
@@ -638,7 +648,7 @@ RGLWRFIDSignatureCallback taSignatureCompletion;
 }
 
 - (void)onRequestTACertificatesWithKey:(NSString *)keyCAR callback:(RGLRFIDCertificatesCallback)callback {
-    if([self.doRequestTACertificates boolValue]) {
+    if (rfidReaderRequest && [rfidReaderRequest[@"taCertificates"] boolValue]) {
         taCertificateCompletion = callback;
         sendEvent(taCertificateCompletionEvent, keyCAR);
     } else {
@@ -648,7 +658,7 @@ RGLWRFIDSignatureCallback taSignatureCompletion;
 }
 
 - (void)onRequestTASignatureWithChallenge:(RGLTAChallenge *)challenge callback:(void(^)(NSData *signature))callback {
-    if([self.doRequestTASignature boolValue]) {
+    if (rfidReaderRequest && [rfidReaderRequest[@"taSignature"] boolValue]) {
         taSignatureCompletion = callback;
         sendEvent(taSignatureCompletionEvent, [RGLWJSONConstructor dictToString: [RGLWJSONConstructor generateTAChallenge:challenge]]);
     } else {
@@ -657,6 +667,32 @@ RGLWRFIDSignatureCallback taSignatureCompletion;
     }
 }
 
+- (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/ios/RNRegulaDocumentReader.m

@@ -15,6 +15,8 @@ RCT_EXPORT_MODULE();
              paCertificateCompletionEvent,
              taCertificateCompletionEvent,
              taSignatureCompletionEvent,
+             paceProtocolCompletionEvent,
+             caProtocolCompletionEvent,
              drVideoEncoderCompletionEvent,
              drOnCustomButtonTappedEvent];
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@regulaforensics/react-native-document-reader-api",
-  "version": "9.4.547-rc",
+  "version": "9.4.549-rc",
   "description": "React Native module for reading and validation of identification documents (API framework)",
   "main": "index.js",
   "scripts": {