@regulaforensics/document-reader 9.4.713-rc → 9.4.715-nightly

package/RNDocumentReader.podspec

@@ -5,7 +5,7 @@ source = File.join(__dir__, 'ios')
 
 Pod::Spec.new do |s|
   s.name         = 'RNDocumentReader'
-  s.version      = '9.4.713-rc'
+  s.version      = '9.4.715-nightly'
   s.summary      = package['description']
   s.license      = package['license']
 
@@ -16,6 +16,6 @@ Pod::Spec.new do |s|
   s.ios.deployment_target = '13.0'
   s.source_files = 'ios/**/*.{h,m}'
   s.exclude_files = [ 'ios/CVDDocumentReader.h', 'ios/CVDDocumentReader.m' ]
-  s.dependency 'DocumentReaderStage', '9.4.6173'
+  s.dependency 'DocumentReaderNightly', '9.4.6185'
   s.dependency 'React'
 end

package/android/build.gradle

@@ -20,7 +20,7 @@ android {
 rootProject.allprojects {
     repositories {
         maven {
-            url "https://maven.regulaforensics.com/RegulaDocumentReader/Stage"
+            url "https://maven.regulaforensics.com/RegulaDocumentReader/Nightly"
         }
     }
 }
@@ -29,7 +29,7 @@ dependencies {
     //noinspection GradleDynamicVersion
     implementation 'com.facebook.react:react-native:+'
     //noinspection GradleDependency
-    implementation('com.regula.documentreader:api:9.4.12704'){
+    implementation('com.regula.documentreader:api:9.4.12714'){
         transitive = true
     }
 }

package/android/cordova.gradle

@@ -1,12 +1,12 @@
 repositories {
     maven {
-        url "https://maven.regulaforensics.com/RegulaDocumentReader/Stage"
+        url "https://maven.regulaforensics.com/RegulaDocumentReader/Nightly"
     }
 }
 
 dependencies {
     //noinspection GradleDependency
-    implementation('com.regula.documentreader:api:9.4.12704'){
+    implementation('com.regula.documentreader:api:9.4.12714'){
         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/examples/capacitor/package-lock.json

@@ -1613,9 +1613,9 @@
       }
     },
     "node_modules/@xmldom/xmldom": {
-      "version": "0.8.11",
-      "resolved": "https://registry.npmjs.org/@xmldom/xmldom/-/xmldom-0.8.11.tgz",
-      "integrity": "sha512-cQzWCtO6C8TQiYl1ruKNn2U6Ao4o4WBBcbL61yJl84x+j5sOWWFU9X7DpND8XZG3daDppSsigMdfAIl2upQBRw==",
+      "version": "0.8.12",
+      "resolved": "https://registry.npmjs.org/@xmldom/xmldom/-/xmldom-0.8.12.tgz",
+      "integrity": "sha512-9k/gHF6n/pAi/9tqr3m3aqkuiNosYTurLLUtc7xQ9sxB/wm7WPygCv8GYa6mS0fLJEHhqMC1ATYhz++U/lRHqg==",
       "license": "MIT",
       "engines": {
         "node": ">=10.0.0"
@@ -1659,9 +1659,9 @@
       }
     },
     "node_modules/anymatch/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"
@@ -1760,9 +1760,9 @@
       }
     },
     "node_modules/brace-expansion": {
-      "version": "5.0.4",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-5.0.4.tgz",
-      "integrity": "sha512-h+DEnpVvxmfVefa4jFbCf5HdH5YMDXRsmKflpf1pILZWRFlTbJpxeU55nJl4Smt5HQaGzg1o6RHFPJaOqnmBDg==",
+      "version": "5.0.5",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-5.0.5.tgz",
+      "integrity": "sha512-VZznLgtwhn+Mact9tfiwx64fA9erHH/MCXEUfB/0bX/6Fz6ny5EGTXYltMocqg4xFAQZtnO3DHWWXi8RiuN7cQ==",
       "license": "MIT",
       "dependencies": {
         "balanced-match": "^4.0.2"
@@ -2569,9 +2569,9 @@
       "license": "ISC"
     },
     "node_modules/picomatch": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.3.tgz",
-      "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==",
+      "version": "4.0.4",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.4.tgz",
+      "integrity": "sha512-QP88BAKvMam/3NxH6vj2o21R6MjxZUAd6nlwAS/pnGvN9IVLocLHxGYIzFhg6fUQ+5th6P4dv4eW9jX3DSIj7A==",
       "license": "MIT",
       "engines": {
         "node": ">=12"
@@ -2704,9 +2704,9 @@
       }
     },
     "node_modules/readdirp/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"

package/examples/capacitor/package.json

@@ -6,7 +6,7 @@
     "android": "scripts/android.sh"
   },
   "dependencies": {
-    "@regulaforensics/document-reader": "9.4.713-rc",
+    "@regulaforensics/document-reader": "9.4.715-nightly",
     "@regulaforensics/document-reader-core-fullauthrfid": "9.3.1817",
     "@regulaforensics/document-reader-btdevice": "9.1.35",
     "@awesome-cordova-plugins/file": "^8.1.0",