@pagopa/io-react-native-iso18013 0.8.3 → 0.8.4

package/IoReactNativeIso18013.podspec

@@ -17,7 +17,7 @@ Pod::Spec.new do |s|
 
   # Module dependencies
   s.dependency "IOWalletCBOR", "0.2.1"
-  s.dependency "IOWalletProximity", "1.4.2"
+  s.dependency "IOWalletProximity", "1.5.0"
 
   # Use install_modules_dependencies helper to install the dependencies if React Native version >=0.71.0.
   # See https://github.com/facebook/react-native/blob/febf6b7f33fdb4904669f99d795eba4c0f95d7bf/scripts/cocoapods/new_architecture.rb#L79.

package/android/build.gradle

@@ -83,8 +83,8 @@ def kotlin_version = getExtOrDefault("kotlinVersion")
 dependencies {
   implementation "com.facebook.react:react-android"
   implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
-  implementation "it.pagopa.io.wallet.proximity:proximity:2.4.1"
-  implementation "it.pagopa.io.wallet.cbor:cbor:1.4.1"
+  implementation "it.pagopa.io.wallet.proximity:proximity:2.5.0"
+  implementation "it.pagopa.io.wallet.cbor:cbor:1.4.2"
   implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.3"
   testImplementation('junit:junit:4.13.2')
 }

package/android/src/main/AndroidManifest.xml

@@ -7,6 +7,7 @@
         <service
             android:name="com.ioreactnativeiso18013.IoNfcEngagementService"
             android:exported="true"
+            android:enabled="false"
             android:permission="android.permission.BIND_NFC_SERVICE">
             <intent-filter>
                 <action android:name="android.nfc.cardemulation.action.HOST_APDU_SERVICE" />

package/android/src/main/AndroidManifestNew.xml

@@ -6,6 +6,7 @@
     <service
         android:name="com.ioreactnativeiso18013.IoNfcEngagementService"
         android:exported="true"
+        android:enabled="false"
         android:permission="android.permission.BIND_NFC_SERVICE">
       <intent-filter>
         <action android:name="android.nfc.action.NDEF_DISCOVERED" />

package/android/src/main/java/com/ioreactnativeiso18013/IoReactNativeIso18013Module.kt

@@ -52,11 +52,8 @@ class IoReactNativeIso18013Module(reactContext: ReactApplicationContext) :
   }
 
   override fun invalidate() {
+    this.dispose()
     super.invalidate()
-    nfcEventJob?.cancel()
-    nfcEventJob = null
-    nfcScope.coroutineContext[Job]?.cancel()
-    reactApplicationContext.currentActivity?.let { NfcEngagementService.disable(it) }
   }
 
   /**
@@ -106,8 +103,7 @@ class IoReactNativeIso18013Module(reactContext: ReactApplicationContext) :
       // NFC engagement
 
       if (parsedEngagementModes.any { it == EngagementMode.NFC }) {
-        val readerTrustStore = certificatesList.takeIf { it.isNotEmpty() }
-          ?.map { chain -> chain.map<ByteArray, Any> { it } }
+        val readerTrustStore = certificatesList.map { chain -> chain.map<ByteArray, Any> { it } }
 
         check(
           NfcEngagementEventBus.setupNfcService(
@@ -127,9 +123,7 @@ class IoReactNativeIso18013Module(reactContext: ReactApplicationContext) :
 
       if (parsedEngagementModes.any { it == EngagementMode.QR_CODE }) {
         qrEngagement = QrEngagement.build(reactApplicationContext, methods).apply {
-          if (certificatesList.isNotEmpty()) {
-            withReaderTrustStore(certificatesList)
-          }
+          withReaderTrustStore(certificatesList)
         }
         qrEngagement?.configure()
         setupProximityHandler()
@@ -164,15 +158,7 @@ class IoReactNativeIso18013Module(reactContext: ReactApplicationContext) :
   @ReactMethod
   fun close(promise: Promise) {
     try {
-      qrEngagement?.close()
-      qrEngagement = null
-      deviceRetrievalHelper?.disconnect()
-      deviceRetrievalHelper = null
-      sessionRetrievalMethod = null
-      sessionTranscript = null
-      nfcEventJob?.cancel()
-      nfcEventJob = null
-      reactApplicationContext.currentActivity?.let { NfcEngagementService.disable(it) }
+      this.dispose()
       promise.resolve(true)
     } catch (e: Exception) {
       promise.reject(ModuleErrorCodes.CLOSE_ERROR, message = e.message, e)
@@ -529,6 +515,21 @@ class IoReactNativeIso18013Module(reactContext: ReactApplicationContext) :
       .emit(eventName, data)
   }
 
+  /**
+   * Disposes the resources
+   */
+  private fun dispose() {
+    qrEngagement?.close()
+    qrEngagement = null
+    deviceRetrievalHelper?.disconnect()
+    deviceRetrievalHelper = null
+    sessionRetrievalMethod = null
+    sessionTranscript = null
+    nfcEventJob?.cancel()
+    nfcEventJob = null
+    reactApplicationContext.currentActivity?.let { NfcEngagementService.disable(it) }
+  }
+
   /**
    * Keep: Required for RN built in Event Emitter Calls.
    * This fixes the warning: `new NativeEventEmitter()` was called with a non-null argument without the required `removeListeners` method

package/android/src/main/res/values/strings.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="nfc_engagement_service_desc">NFC Engagement Service</string>
+    <string name="nfc_engagement_service_desc">IT-Wallet Proximity</string>
     <string name="nfc_engagement_aid_group_desc">ISO 18013-5 NFC Engagement</string>
 </resources>

package/ios/IoReactNativeIso18013.swift

@@ -398,10 +398,10 @@ class IoReactNativeIso18013: RCTEventEmitter, ISO18013Delegate {
   /**
    Converts a device requested from the `onDocumentRequestReceived` callback into a serializable JSON.
    - Parameters:
-   - request: The request returned from `onDocumentRequestReceived` which contains an array of tuples consists of a doctype, namespaces and the requested claims with a boolean value indicating wether or not the device which is making the request has an intent to retain the data.
+   - request: The request returned from `onDocumentRequestReceived` which contains an array of tuples consists of a doctype, namespaces, the requested claims with a boolean value indicating wether or not the device which is making the request has an intent to retain the data, and optional certificate data from the verifier X.509 certificate.
    - Returns: A JSON string representing the device request or nil if an error occurs.
    */
-  private func deviceRequestToJson(request: [(docType: String, nameSpaces: [String: [String: Bool]], isAuthenticated: Bool)]?) -> String? {
+  private func deviceRequestToJson(request: [(docType: String, nameSpaces: [String: [String: Bool]], isAuthenticated: Bool, certificateData: [String: String]?)]?) -> String? {
     var jsonRequest : [String: AnyHashable] = [:]
     request?.forEach({
       item in
@@ -412,6 +412,9 @@ class IoReactNativeIso18013: RCTEventEmitter, ISO18013Delegate {
       })
       
       subReq["isAuthenticated"] = item.isAuthenticated
+      if let certData = item.certificateData {
+        subReq["certificateData"] = certData
+      }
       
       jsonRequest[item.docType] = subReq
     })

package/lib/module/iso18013/iso18013-5/proximity.js

@@ -51,8 +51,8 @@ export let ErrorCode = /*#__PURE__*/function (ErrorCode) {
  * @param config.centralClientMode (Android only) - Whether the device is in central client mode. Defaults to false
  * @param config.clearBleCache (Android only) - Whether the BLE cache should be cleared. Defaults to true
  * @param config.certificates - Two-dimensional array of base64 strings representing DER encoded X.509 certificate which are used to authenticate the verifier app
- * @param config.engagementMethods - Array of engagements methods initiated. Defaults to ['qr', 'nfc']
- * @param config.retrievalMethods - Array of supported retrieval methods. Defaults to ['ble', 'nfc']
+ * @param config.engagementMethods - Array of engagements methods initiated. Defaults to ['qr']
+ * @param config.retrievalMethods - Array of supported retrieval methods. Defaults to ['ble']
  * @throws {ModuleError} in case of error which can be parsed with {@link ModuleErrorSchema}
  */
 export function startEngagement(config = {}) {
@@ -61,8 +61,8 @@ export function startEngagement(config = {}) {
     centralClientMode = false,
     clearBleCache = true,
     certificates = [],
-    engagementModes = ['qrcode', 'nfc'],
-    retrievalMethods = ['ble', 'nfc']
+    engagementModes = ['qrcode'],
+    retrievalMethods = ['ble']
   } = config;
   if (Platform.OS === 'ios') {
     return IoReactNativeIso18013.startEngagement(certificates, engagementModes, retrievalMethods);

package/lib/module/iso18013/iso18013-5/proximity.js.map

@@ -1 +1 @@
-{"version":3,"names":["NativeEventEmitter","Platform","IoReactNativeIso18013","eventEmitter","ErrorCode","startEngagement","config","peripheralMode","centralClientMode","clearBleCache","certificates","engagementModes","retrievalMethods","OS","close","sendErrorResponse","code","generateResponse","documents","acceptedFields","sendResponse","response","addListener","event","callback","setHceModalMessage","message"],"sourceRoot":"../../../../src","sources":["iso18013/iso18013-5/proximity.ts"],"mappings":";;AAAA,SAASA,kBAAkB,EAAEC,QAAQ,QAAQ,cAAc;AAC3D,SAASC,qBAAqB,QAAQ,aAAI;AAG1C,MAAMC,YAAY,GAAG,IAAIH,kBAAkB,CAACE,qBAAqB,CAAC;;AAElE;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAcA;AACA;AACA;;AAGA;AACA;AACA;AACA;AACA;AACA,WAAYE,SAAS,0BAATA,SAAS;EAATA,SAAS,CAATA,SAAS;EAATA,SAAS,CAATA,SAAS;EAATA,SAAS,CAATA,SAAS;EAAA,OAATA,SAAS;AAAA;;AAMrB;AACA;AACA;AACA;AACA;;AAGA;AACA;AACA;AACA;AACA;;AAGA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,SAASC,eAAeA,CAC7BC,MAOC,GAAG,CAAC,CAAC,EACY;EAClB,MAAM;IACJC,cAAc,GAAG,IAAI;IACrBC,iBAAiB,GAAG,KAAK;IACzBC,aAAa,GAAG,IAAI;IACpBC,YAAY,GAAG,EAAE;IACjBC,eAAe,GAAG,CAAC,QAAQ,EAAE,KAAK,CAAC;IACnCC,gBAAgB,GAAG,CAAC,KAAK,EAAE,KAAK;EAClC,CAAC,GAAGN,MAAM;EAEV,IAAIL,QAAQ,CAACY,EAAE,KAAK,KAAK,EAAE;IACzB,OAAOX,qBAAqB,CAACG,eAAe,CAC1CK,YAAY,EACZC,eAAe,EACfC,gBACF,CAAC;EACH,CAAC,MAAM;IACL,OAAOV,qBAAqB,CAACG,eAAe,CAC1CE,cAAc,EACdC,iBAAiB,EACjBC,aAAa,EACbC,YAAY,EACZC,eAAe,EACfC,gBACF,CAAC;EACH;AACF;;AAEA;AACA;AACA;AACA;AACA;AACA,OAAO,SAASE,KAAKA,CAAA,EAAqB;EACxC,OAAOZ,qBAAqB,CAACY,KAAK,CAAC,CAAC;AACtC;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,SAASC,iBAAiBA,CAACC,IAAe,EAAoB;EACnE,OAAOd,qBAAqB,CAACa,iBAAiB,CAACC,IAAI,CAAC;AACtD;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,SAASC,gBAAgBA,CAC9BC,SAAmC,EACnCC,cAA8B,EACb;EACjB,OAAOjB,qBAAqB,CAACe,gBAAgB,CAACC,SAAS,EAAEC,cAAc,CAAC;AAC1E;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,SAASC,YAAYA,CAACC,QAAgB,EAAoB;EAC/D,OAAOnB,qBAAqB,CAACkB,YAAY,CAACC,QAAQ,CAAC;AACrD;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,SAASC,WAAWA,CACzBC,KAAQ,EACRC,QAA0C,EAC1C;EACA,OAAOrB,YAAY,CAACmB,WAAW,CAACC,KAAK,EAAEC,QAAQ,CAAC;AAClD;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,SAASC,kBAAkBA,CAACC,OAAe,EAAQ;EACxDxB,qBAAqB,CAACuB,kBAAkB,CAACC,OAAO,CAAC;AACnD","ignoreList":[]}
+{"version":3,"names":["NativeEventEmitter","Platform","IoReactNativeIso18013","eventEmitter","ErrorCode","startEngagement","config","peripheralMode","centralClientMode","clearBleCache","certificates","engagementModes","retrievalMethods","OS","close","sendErrorResponse","code","generateResponse","documents","acceptedFields","sendResponse","response","addListener","event","callback","setHceModalMessage","message"],"sourceRoot":"../../../../src","sources":["iso18013/iso18013-5/proximity.ts"],"mappings":";;AAAA,SAASA,kBAAkB,EAAEC,QAAQ,QAAQ,cAAc;AAC3D,SAASC,qBAAqB,QAAQ,aAAI;AAG1C,MAAMC,YAAY,GAAG,IAAIH,kBAAkB,CAACE,qBAAqB,CAAC;;AAElE;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAcA;AACA;AACA;;AAGA;AACA;AACA;AACA;AACA;AACA,WAAYE,SAAS,0BAATA,SAAS;EAATA,SAAS,CAATA,SAAS;EAATA,SAAS,CAATA,SAAS;EAATA,SAAS,CAATA,SAAS;EAAA,OAATA,SAAS;AAAA;;AAMrB;AACA;AACA;AACA;AACA;;AAGA;AACA;AACA;AACA;AACA;;AAGA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,SAASC,eAAeA,CAC7BC,MAOC,GAAG,CAAC,CAAC,EACY;EAClB,MAAM;IACJC,cAAc,GAAG,IAAI;IACrBC,iBAAiB,GAAG,KAAK;IACzBC,aAAa,GAAG,IAAI;IACpBC,YAAY,GAAG,EAAE;IACjBC,eAAe,GAAG,CAAC,QAAQ,CAAC;IAC5BC,gBAAgB,GAAG,CAAC,KAAK;EAC3B,CAAC,GAAGN,MAAM;EAEV,IAAIL,QAAQ,CAACY,EAAE,KAAK,KAAK,EAAE;IACzB,OAAOX,qBAAqB,CAACG,eAAe,CAC1CK,YAAY,EACZC,eAAe,EACfC,gBACF,CAAC;EACH,CAAC,MAAM;IACL,OAAOV,qBAAqB,CAACG,eAAe,CAC1CE,cAAc,EACdC,iBAAiB,EACjBC,aAAa,EACbC,YAAY,EACZC,eAAe,EACfC,gBACF,CAAC;EACH;AACF;;AAEA;AACA;AACA;AACA;AACA;AACA,OAAO,SAASE,KAAKA,CAAA,EAAqB;EACxC,OAAOZ,qBAAqB,CAACY,KAAK,CAAC,CAAC;AACtC;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,SAASC,iBAAiBA,CAACC,IAAe,EAAoB;EACnE,OAAOd,qBAAqB,CAACa,iBAAiB,CAACC,IAAI,CAAC;AACtD;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,SAASC,gBAAgBA,CAC9BC,SAAmC,EACnCC,cAA8B,EACb;EACjB,OAAOjB,qBAAqB,CAACe,gBAAgB,CAACC,SAAS,EAAEC,cAAc,CAAC;AAC1E;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,SAASC,YAAYA,CAACC,QAAgB,EAAoB;EAC/D,OAAOnB,qBAAqB,CAACkB,YAAY,CAACC,QAAQ,CAAC;AACrD;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,SAASC,WAAWA,CACzBC,KAAQ,EACRC,QAA0C,EAC1C;EACA,OAAOrB,YAAY,CAACmB,WAAW,CAACC,KAAK,EAAEC,QAAQ,CAAC;AAClD;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,SAASC,kBAAkBA,CAACC,OAAe,EAAQ;EACxDxB,qBAAqB,CAACuB,kBAAkB,CAACC,OAAO,CAAC;AACnD","ignoreList":[]}

package/lib/module/iso18013/iso18013-5/request.js

@@ -4,8 +4,23 @@ import { z } from 'zod';
 
 // Inner data: a record of booleans with the attributes and the intent to retain flag
 const booleanFieldGroup = z.record(z.string(), z.boolean());
+
+// Parses raw X.509 subject fields from the verifier certificate
+// and maps them to readable internal names.
+const certificateDataSchema = z.object({
+  C: z.string().optional(),
+  O: z.string().optional(),
+  SERIALNUMBER: z.string().optional(),
+  CN: z.string().optional()
+}).transform(certificate => ({
+  country: certificate.C,
+  organization: certificate.O,
+  serialNumber: certificate.SERIALNUMBER,
+  commonName: certificate.CN
+}));
 const credentialEntrySchema = z.object({
-  isAuthenticated: z.boolean()
+  isAuthenticated: z.boolean(),
+  certificateData: certificateDataSchema.optional()
 }).catchall(booleanFieldGroup);
 const VerifierRequest = z.object({
   request: z.record(z.string(), credentialEntrySchema)
@@ -18,12 +33,18 @@ const VerifierRequest = z.object({
  * Example:
  *  `{
  *    "org.iso.18013.5.1.mDL": {
- *      "isAuthenticated": true,
  *      "org.iso.18013.5.1": {
  *        "hair_colour": true,
  *        "given_name_national_character": true,
  *        "family_name_national_character": true,
  *        "given_name": true,
+ *      },
+ *      "isAuthenticated": true,
+ *      "certificateData": {
+ *        "country": "UT",
+ *        "organization": "EUDI Wallet Reference Implementation",
+ *        "serialNumber": "001",
+ *        "commonName": "EUDI Proximity Verifier"
  *      }
  *    }
  *  }`

package/lib/module/iso18013/iso18013-5/request.js.map

@@ -1 +1 @@
-{"version":3,"names":["z","booleanFieldGroup","record","string","boolean","credentialEntrySchema","object","isAuthenticated","catchall","VerifierRequest","request","parseVerifierRequest","input","parse"],"sourceRoot":"../../../../src","sources":["iso18013/iso18013-5/request.ts"],"mappings":";;AAAA,SAASA,CAAC,QAAQ,KAAK;;AAEvB;AACA,MAAMC,iBAAiB,GAAGD,CAAC,CAACE,MAAM,CAACF,CAAC,CAACG,MAAM,CAAC,CAAC,EAAEH,CAAC,CAACI,OAAO,CAAC,CAAC,CAAC;AAE3D,MAAMC,qBAAqB,GAAGL,CAAC,CAC5BM,MAAM,CAAC;EACNC,eAAe,EAAEP,CAAC,CAACI,OAAO,CAAC;AAC7B,CAAC,CAAC,CACDI,QAAQ,CAACP,iBAAiB,CAAC;AAE9B,MAAMQ,eAAe,GAAGT,CAAC,CAACM,MAAM,CAAC;EAC/BI,OAAO,EAAEV,CAAC,CAACE,MAAM,CAACF,CAAC,CAACG,MAAM,CAAC,CAAC,EAAEE,qBAAqB;AACrD,CAAC,CAAC;;AAEF;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAGA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,MAAMM,oBAAoB,GAAIC,KAAc,IAAsB;EACvE,OAAOH,eAAe,CAACI,KAAK,CAACD,KAAK,CAAC;AACrC,CAAC","ignoreList":[]}
+{"version":3,"names":["z","booleanFieldGroup","record","string","boolean","certificateDataSchema","object","C","optional","O","SERIALNUMBER","CN","transform","certificate","country","organization","serialNumber","commonName","credentialEntrySchema","isAuthenticated","certificateData","catchall","VerifierRequest","request","parseVerifierRequest","input","parse"],"sourceRoot":"../../../../src","sources":["iso18013/iso18013-5/request.ts"],"mappings":";;AAAA,SAASA,CAAC,QAAQ,KAAK;;AAEvB;AACA,MAAMC,iBAAiB,GAAGD,CAAC,CAACE,MAAM,CAACF,CAAC,CAACG,MAAM,CAAC,CAAC,EAAEH,CAAC,CAACI,OAAO,CAAC,CAAC,CAAC;;AAE3D;AACA;AACA,MAAMC,qBAAqB,GAAGL,CAAC,CAC5BM,MAAM,CAAC;EACNC,CAAC,EAAEP,CAAC,CAACG,MAAM,CAAC,CAAC,CAACK,QAAQ,CAAC,CAAC;EACxBC,CAAC,EAAET,CAAC,CAACG,MAAM,CAAC,CAAC,CAACK,QAAQ,CAAC,CAAC;EACxBE,YAAY,EAAEV,CAAC,CAACG,MAAM,CAAC,CAAC,CAACK,QAAQ,CAAC,CAAC;EACnCG,EAAE,EAAEX,CAAC,CAACG,MAAM,CAAC,CAAC,CAACK,QAAQ,CAAC;AAC1B,CAAC,CAAC,CACDI,SAAS,CAAEC,WAAW,KAAM;EAC3BC,OAAO,EAAED,WAAW,CAACN,CAAC;EACtBQ,YAAY,EAAEF,WAAW,CAACJ,CAAC;EAC3BO,YAAY,EAAEH,WAAW,CAACH,YAAY;EACtCO,UAAU,EAAEJ,WAAW,CAACF;AAC1B,CAAC,CAAC,CAAC;AAEL,MAAMO,qBAAqB,GAAGlB,CAAC,CAC5BM,MAAM,CAAC;EACNa,eAAe,EAAEnB,CAAC,CAACI,OAAO,CAAC,CAAC;EAC5BgB,eAAe,EAAEf,qBAAqB,CAACG,QAAQ,CAAC;AAClD,CAAC,CAAC,CACDa,QAAQ,CAACpB,iBAAiB,CAAC;AAE9B,MAAMqB,eAAe,GAAGtB,CAAC,CAACM,MAAM,CAAC;EAC/BiB,OAAO,EAAEvB,CAAC,CAACE,MAAM,CAACF,CAAC,CAACG,MAAM,CAAC,CAAC,EAAEe,qBAAqB;AACrD,CAAC,CAAC;;AAEF;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAGA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,MAAMM,oBAAoB,GAAIC,KAAc,IAAsB;EACvE,OAAOH,eAAe,CAACI,KAAK,CAACD,KAAK,CAAC;AACrC,CAAC","ignoreList":[]}

package/lib/typescript/src/iso18013/iso18013-5/proximity.d.ts

@@ -60,8 +60,8 @@ export type RetrievalMethod = 'ble' | 'nfc';
  * @param config.centralClientMode (Android only) - Whether the device is in central client mode. Defaults to false
  * @param config.clearBleCache (Android only) - Whether the BLE cache should be cleared. Defaults to true
  * @param config.certificates - Two-dimensional array of base64 strings representing DER encoded X.509 certificate which are used to authenticate the verifier app
- * @param config.engagementMethods - Array of engagements methods initiated. Defaults to ['qr', 'nfc']
- * @param config.retrievalMethods - Array of supported retrieval methods. Defaults to ['ble', 'nfc']
+ * @param config.engagementMethods - Array of engagements methods initiated. Defaults to ['qr']
+ * @param config.retrievalMethods - Array of supported retrieval methods. Defaults to ['ble']
  * @throws {ModuleError} in case of error which can be parsed with {@link ModuleErrorSchema}
  */
 export declare function startEngagement(config?: {

package/lib/typescript/src/iso18013/iso18013-5/request.d.ts

@@ -2,6 +2,22 @@ import { z } from 'zod';
 declare const VerifierRequest: z.ZodObject<{
     request: z.ZodRecord<z.ZodString, z.ZodObject<{
         isAuthenticated: z.ZodBoolean;
+        certificateData: z.ZodOptional<z.ZodPipe<z.ZodObject<{
+            C: z.ZodOptional<z.ZodString>;
+            O: z.ZodOptional<z.ZodString>;
+            SERIALNUMBER: z.ZodOptional<z.ZodString>;
+            CN: z.ZodOptional<z.ZodString>;
+        }, z.core.$strip>, z.ZodTransform<{
+            country: string | undefined;
+            organization: string | undefined;
+            serialNumber: string | undefined;
+            commonName: string | undefined;
+        }, {
+            C?: string | undefined;
+            O?: string | undefined;
+            SERIALNUMBER?: string | undefined;
+            CN?: string | undefined;
+        }>>>;
     }, z.core.$catchall<z.ZodRecord<z.ZodString, z.ZodBoolean>>>>;
 }, z.core.$strip>;
 /**
@@ -11,12 +27,18 @@ declare const VerifierRequest: z.ZodObject<{
  * Example:
  *  `{
  *    "org.iso.18013.5.1.mDL": {
- *      "isAuthenticated": true,
  *      "org.iso.18013.5.1": {
  *        "hair_colour": true,
  *        "given_name_national_character": true,
  *        "family_name_national_character": true,
  *        "given_name": true,
+ *      },
+ *      "isAuthenticated": true,
+ *      "certificateData": {
+ *        "country": "UT",
+ *        "organization": "EUDI Wallet Reference Implementation",
+ *        "serialNumber": "001",
+ *        "commonName": "EUDI Proximity Verifier"
  *      }
  *    }
  *  }`

package/lib/typescript/src/iso18013/iso18013-5/request.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"request.d.ts","sourceRoot":"","sources":["../../../../../src/iso18013/iso18013-5/request.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAWxB,QAAA,MAAM,eAAe;;;;iBAEnB,CAAC;AAEH;;;;;;;;;;;;;;;;;;GAkBG;AACH,MAAM,MAAM,eAAe,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,eAAe,CAAC,CAAC;AAE9D;;;;;GAKG;AACH,eAAO,MAAM,oBAAoB,GAAI,OAAO,OAAO,KAAG,eAErD,CAAC"}
+{"version":3,"file":"request.d.ts","sourceRoot":"","sources":["../../../../../src/iso18013/iso18013-5/request.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AA4BxB,QAAA,MAAM,eAAe;;;;;;;;;;;;;;;;;;;;iBAEnB,CAAC;AAEH;;;;;;;;;;;;;;;;;;;;;;;;GAwBG;AACH,MAAM,MAAM,eAAe,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,eAAe,CAAC,CAAC;AAE9D;;;;;GAKG;AACH,eAAO,MAAM,oBAAoB,GAAI,OAAO,OAAO,KAAG,eAErD,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pagopa/io-react-native-iso18013",
-  "version": "0.8.3",
+  "version": "0.8.4",
   "description": "React Native bridge for iso18013 methods",
   "source": "./src/index.tsx",
   "main": "./lib/module/index.js",

package/src/iso18013/iso18013-5/proximity.ts

@@ -65,8 +65,8 @@ export type RetrievalMethod = 'ble' | 'nfc';
  * @param config.centralClientMode (Android only) - Whether the device is in central client mode. Defaults to false
  * @param config.clearBleCache (Android only) - Whether the BLE cache should be cleared. Defaults to true
  * @param config.certificates - Two-dimensional array of base64 strings representing DER encoded X.509 certificate which are used to authenticate the verifier app
- * @param config.engagementMethods - Array of engagements methods initiated. Defaults to ['qr', 'nfc']
- * @param config.retrievalMethods - Array of supported retrieval methods. Defaults to ['ble', 'nfc']
+ * @param config.engagementMethods - Array of engagements methods initiated. Defaults to ['qr']
+ * @param config.retrievalMethods - Array of supported retrieval methods. Defaults to ['ble']
  * @throws {ModuleError} in case of error which can be parsed with {@link ModuleErrorSchema}
  */
 export function startEngagement(
@@ -84,8 +84,8 @@ export function startEngagement(
     centralClientMode = false,
     clearBleCache = true,
     certificates = [],
-    engagementModes = ['qrcode', 'nfc'],
-    retrievalMethods = ['ble', 'nfc'],
+    engagementModes = ['qrcode'],
+    retrievalMethods = ['ble'],
   } = config;
 
   if (Platform.OS === 'ios') {

package/src/iso18013/iso18013-5/request.ts

@@ -3,9 +3,26 @@ import { z } from 'zod';
 // Inner data: a record of booleans with the attributes and the intent to retain flag
 const booleanFieldGroup = z.record(z.string(), z.boolean());
 
+// Parses raw X.509 subject fields from the verifier certificate
+// and maps them to readable internal names.
+const certificateDataSchema = z
+  .object({
+    C: z.string().optional(),
+    O: z.string().optional(),
+    SERIALNUMBER: z.string().optional(),
+    CN: z.string().optional(),
+  })
+  .transform((certificate) => ({
+    country: certificate.C,
+    organization: certificate.O,
+    serialNumber: certificate.SERIALNUMBER,
+    commonName: certificate.CN,
+  }));
+
 const credentialEntrySchema = z
   .object({
     isAuthenticated: z.boolean(),
+    certificateData: certificateDataSchema.optional(),
   })
   .catchall(booleanFieldGroup);
 
@@ -20,12 +37,18 @@ const VerifierRequest = z.object({
  * Example:
  *  `{
  *    "org.iso.18013.5.1.mDL": {
- *      "isAuthenticated": true,
  *      "org.iso.18013.5.1": {
  *        "hair_colour": true,
  *        "given_name_national_character": true,
  *        "family_name_national_character": true,
  *        "given_name": true,
+ *      },
+ *      "isAuthenticated": true,
+ *      "certificateData": {
+ *        "country": "UT",
+ *        "organization": "EUDI Wallet Reference Implementation",
+ *        "serialNumber": "001",
+ *        "commonName": "EUDI Proximity Verifier"
  *      }
  *    }
  *  }`