@animo-id/expo-mdoc-data-transfer 0.1.3 → 0.1.5

package/MdocDataTransfer.podspec

@@ -10,7 +10,7 @@ Pod::Spec.new do |s|
   s.license        = package['license']
   s.author         = package['author']
   s.homepage       = package['homepage']
-  s.platforms      = { :ios => '14.0'}
+  s.platforms      = { :ios => '15.0'}
   s.swift_version  = '5.4'
   s.source         = { :git => "https://github.com/animo/mdoc-data-transfer.git", :tag => "#{s.version}" }
 
@@ -24,13 +24,19 @@ Pod::Spec.new do |s|
   install_modules_dependencies(s)
 
   if defined?(:spm_dependency)
-    spm_dependency(s,  
+    spm_dependency(s,
       # Currently we use this fork because it adds a manual `sendDeviceResponse` method
       # Which we use as we generate this outside of the library
-      url: 'https://github.com/berendsliedrecht/eudi-lib-ios-iso18013-data-transfer.git', 
-      requirement: {kind: 'upToNextMinorVersion', minimumVersion: '0.3.12'}, 
-      products: ['MdocDataTransfer18013'] 
-    ) 
+      url: 'https://github.com/animo/eudi-lib-ios-iso18013-data-transfer.git',
+      requirement: {kind: 'upToNextMinorVersion', minimumVersion: '0.6.3'},
+      products: ['MdocDataTransfer18013']
+    )
+
+    spm_dependency(s,
+      url: 'https://github.com/eu-digital-identity-wallet/eudi-lib-ios-wallet-storage.git',
+      requirement: {kind: 'upToNextMinorVersion', minimumVersion: '0.4.8'},
+      products: ['WalletStorage']
+    )
   else 
     raise "Please upgrade React Native to >=0.75.0 to use SPM dependencies." 
   end 

package/android/build.gradle

@@ -42,16 +42,27 @@ android {
     }
 }
 
-
 dependencies {
-    implementation("eu.europa.ec.eudi:eudi-lib-android-iso18013-data-transfer:0.3.0-SNAPSHOT") {
+    implementation("eu.europa.ec.eudi:eudi-lib-android-wallet-document-manager:0.9.0") {
+        exclude group: 'org.bouncycastle'
+        exclude module: 'bcprov-jdk18on'
+    }
+
+    implementation("com.android.identity:identity-android:202408.1") {
         exclude group: 'org.bouncycastle'
         exclude module: 'bcprov-jdk18on'
     }
+
+    implementation("eu.europa.ec.eudi:eudi-lib-android-iso18013-data-transfer:0.6.0") {
+        exclude group: 'org.bouncycastle'
+        exclude module: 'bcprov-jdk18on'
+    }
+
     implementation("org.bouncycastle:bcprov-jdk18on") {
         version {
             strictly '1.72'
         }
     }
+
     implementation "androidx.biometric:biometric-ktx:1.2.0-alpha05"
 }

package/android/src/main/java/id/animo/mdocdatatransfer/MdocDataTransfer.kt

@@ -6,7 +6,8 @@ import android.util.Log
 import androidx.activity.ComponentActivity
 import eu.europa.ec.eudi.iso18013.transfer.TransferEvent
 import eu.europa.ec.eudi.iso18013.transfer.engagement.NfcEngagementService
-import eu.europa.ec.eudi.iso18013.transfer.response.DeviceRequest
+import eu.europa.ec.eudi.iso18013.transfer.response.device.DeviceRequest
+import eu.europa.ec.eudi.iso18013.transfer.response.device.DeviceResponse
 
 class MdocDataTransfer(
     context: Context,
@@ -49,24 +50,19 @@ class MdocDataTransfer(
 
                 is TransferEvent.RequestReceived -> {
                     Log.d(TAG, ":::mdoc-data-transfer::: TransferEvent.RequestReceived")
-                    when (val request = event.request) {
-                        is DeviceRequest -> {
-                            sendEvent(
-                                MdocDataTransferEvent.ON_REQUEST_RECEIVED,
-                                mapOf(
-                                    ("deviceRequest" to request.deviceRequestBytes.asList()),
-                                    ("sessionTranscript" to request.sessionTranscriptBytes.asList())
-                                )
-                            )
-                        }
-                    }
+                    val request = event.request as DeviceRequest
+                    sendEvent(
+                        MdocDataTransferEvent.ON_REQUEST_RECEIVED, mapOf(
+                            "deviceRequest" to request.deviceRequestBytes.asList(),
+                            "sessionTranscript" to request.sessionTranscriptBytes.asList()
+                        )
+                    )
                 }
 
                 is TransferEvent.ResponseSent -> {
                     Log.d(TAG, ":::mdoc-data-transfer::: TransferEvent.ResponseSent")
                     sendEvent(
-                        MdocDataTransferEvent.ON_RESPONSE_SENT,
-                        null
+                        MdocDataTransferEvent.ON_RESPONSE_SENT, null
                     )
                 }
             }
@@ -82,7 +78,7 @@ class MdocDataTransfer(
     }
 
     fun respond(deviceResponse: ByteArray) {
-        MdocDataTransferManager.transferManager.value.sendResponse(deviceResponse)
+        MdocDataTransferManager.transferManager.value.sendResponse(DeviceResponse(deviceResponse))
     }
 
     fun enableNfc() {

package/android/src/main/java/id/animo/mdocdatatransfer/MdocDataTransferManager.kt

@@ -2,10 +2,11 @@ package id.animo.mdocdatatransfer
 
 import android.annotation.SuppressLint
 import android.content.Context
-import eu.europa.ec.eudi.iso18013.transfer.DocumentsResolver
+import com.android.identity.securearea.software.SoftwareSecureArea
+import com.android.identity.storage.EphemeralStorageEngine
 import eu.europa.ec.eudi.iso18013.transfer.TransferManager
-import eu.europa.ec.eudi.iso18013.transfer.response.ResponseGenerator
-import eu.europa.ec.eudi.iso18013.transfer.retrieval.BleRetrievalMethod
+import eu.europa.ec.eudi.iso18013.transfer.engagement.BleRetrievalMethod
+import eu.europa.ec.eudi.wallet.document.DocumentManager
 
 @SuppressLint("StaticFieldLeak")
 object MdocDataTransferManager {
@@ -16,20 +17,28 @@ object MdocDataTransferManager {
         this.context = context
     }
 
+    private val storageEngine = EphemeralStorageEngine()
+    private val secureArea = SoftwareSecureArea(storageEngine)
+
+    private val documentManager = DocumentManager
+        .Builder()
+        .setIdentifier("eudi_wallet_document_manager")
+        .setStorageEngine(storageEngine)
+        .addSecureArea(secureArea)
+        .build()
+
     val transferManager = lazy {
-        TransferManager.Builder(context).apply {
-            retrievalMethods = listOf(
+        TransferManager.getDefault(
+            context,
+            documentManager,
+            null,
+            listOf(
                 BleRetrievalMethod(
                     peripheralServerMode = true,
                     centralClientMode = true,
                     clearBleCache = true
                 )
             )
-            responseGenerator = ResponseGenerator.Builder(context)
-                .apply {
-                    documentsResolver = DocumentsResolver { listOf() }
-                }.build()
-
-        }.build()
+        )
     }
 }

package/android/src/main/java/id/animo/mdocdatatransfer/MdocDataTransferModule.kt

@@ -18,7 +18,7 @@ class MdocDataTransferModule : Module() {
             MdocDataTransferEvent.ON_RESPONSE_SENT
         )
 
-        Function("initialize") {
+        Function("initialize") { serviceName: String ->
             // We have to re-set the Bouncy Castle provider, otherwise the EUDI library cannot find it correctly
             Security.removeProvider("BC")
             Security.addProvider(BouncyCastleProvider())
@@ -32,8 +32,6 @@ class MdocDataTransferModule : Module() {
                     body ?: mapOf()
                 )
             }
-
-            return@Function null
         }
 
 

package/build/MdocDataTransfer.d.ts

@@ -1,11 +1,11 @@
 import { type OnRequestReceivedEventPayload } from './MdocDataTransferEvent';
 export declare let instance: MdocDataTransfer | undefined;
 export declare const mdocDataTransfer: {
-    instance: () => MdocDataTransfer;
+    instance: (serviceName: string) => MdocDataTransfer;
 };
 declare class MdocDataTransfer {
     isNfcEnabled: boolean;
-    static initialize(): MdocDataTransfer;
+    static initialize(serviceName: string): MdocDataTransfer;
     startQrEngagement(): Promise<string>;
     waitForDeviceRequest(): Promise<OnRequestReceivedEventPayload<Uint8Array>>;
     sendDeviceResponse(deviceResponse: Uint8Array): Promise<void>;

package/build/MdocDataTransfer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"MdocDataTransfer.d.ts","sourceRoot":"","sources":["../src/MdocDataTransfer.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,KAAK,6BAA6B,EAEnC,MAAM,yBAAyB,CAAA;AAGhC,eAAO,IAAI,QAAQ,EAAE,gBAAgB,GAAG,SAAqB,CAAA;AAC7D,eAAO,MAAM,gBAAgB;;CAK5B,CAAA;AAED,cAAM,gBAAgB;IACb,YAAY,UAAQ;WAEb,UAAU;IAWX,iBAAiB;IAIjB,oBAAoB;IAcpB,kBAAkB,CAAC,cAAc,EAAE,UAAU;IAUnD,QAAQ;IAWR,SAAS;CAKjB"}
+{"version":3,"file":"MdocDataTransfer.d.ts","sourceRoot":"","sources":["../src/MdocDataTransfer.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,KAAK,6BAA6B,EAEnC,MAAM,yBAAyB,CAAA;AAGhC,eAAO,IAAI,QAAQ,EAAE,gBAAgB,GAAG,SAAqB,CAAA;AAC7D,eAAO,MAAM,gBAAgB;4BACH,MAAM;CAI/B,CAAA;AAED,cAAM,gBAAgB;IACb,YAAY,UAAQ;WAEb,UAAU,CAAC,WAAW,EAAE,MAAM;IAW/B,iBAAiB;IAIjB,oBAAoB;IAcpB,kBAAkB,CAAC,cAAc,EAAE,UAAU;IAUnD,QAAQ;IAWR,SAAS;CAKjB"}

package/build/MdocDataTransfer.js

@@ -2,16 +2,16 @@ import { MdocDataTransferEvent, } from './MdocDataTransferEvent';
 import { mDocNativeModule, mDocNativeModuleEventEmitter } from './MdocDataTransferModule';
 export let instance = undefined;
 export const mdocDataTransfer = {
-    instance: () => {
+    instance: (serviceName) => {
         if (instance)
             return instance;
-        return MdocDataTransfer.initialize();
+        return MdocDataTransfer.initialize(serviceName);
     },
 };
 class MdocDataTransfer {
     isNfcEnabled = false;
-    static initialize() {
-        const error = mDocNativeModule.initialize();
+    static initialize(serviceName) {
+        const error = mDocNativeModule.initialize(serviceName);
         if (typeof error === 'string' && error.length > 0) {
             throw new Error(error);
         }

package/build/MdocDataTransfer.js.map

@@ -1 +1 @@
-{"version":3,"file":"MdocDataTransfer.js","sourceRoot":"","sources":["../src/MdocDataTransfer.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,qBAAqB,GAGtB,MAAM,yBAAyB,CAAA;AAChC,OAAO,EAAE,gBAAgB,EAAE,4BAA4B,EAAE,MAAM,0BAA0B,CAAA;AAEzF,MAAM,CAAC,IAAI,QAAQ,GAAiC,SAAS,CAAA;AAC7D,MAAM,CAAC,MAAM,gBAAgB,GAAG;IAC9B,QAAQ,EAAE,GAAG,EAAE;QACb,IAAI,QAAQ;YAAE,OAAO,QAAQ,CAAA;QAC7B,OAAO,gBAAgB,CAAC,UAAU,EAAE,CAAA;IACtC,CAAC;CACF,CAAA;AAED,MAAM,gBAAgB;IACb,YAAY,GAAG,KAAK,CAAA;IAEpB,MAAM,CAAC,UAAU;QACtB,MAAM,KAAK,GAAG,gBAAgB,CAAC,UAAU,EAAE,CAAA;QAE3C,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAClD,MAAM,IAAI,KAAK,CAAC,KAAK,CAAC,CAAA;QACxB,CAAC;QAED,QAAQ,GAAG,IAAI,gBAAgB,EAAE,CAAA;QACjC,OAAO,QAAQ,CAAA;IACjB,CAAC;IAEM,KAAK,CAAC,iBAAiB;QAC5B,OAAO,MAAM,gBAAgB,CAAC,iBAAiB,EAAE,CAAA;IACnD,CAAC;IAEM,KAAK,CAAC,oBAAoB;QAC/B,OAAO,MAAM,IAAI,OAAO,CAA4C,CAAC,OAAO,EAAE,EAAE,CAC9E,4BAA4B,CAAC,WAAW,CACtC,qBAAqB,CAAC,iBAAiB,EACvC,CAAC,OAAsC,EAAE,EAAE;YACzC,OAAO,CAAC;gBACN,aAAa,EAAE,IAAI,UAAU,CAAC,OAAO,CAAC,aAAa,CAAC;gBACpD,iBAAiB,EAAE,IAAI,UAAU,CAAC,OAAO,CAAC,iBAAiB,CAAC;aAC7D,CAAC,CAAA;QACJ,CAAC,CACF,CACF,CAAA;IACH,CAAC;IAEM,KAAK,CAAC,kBAAkB,CAAC,cAA0B;QACxD,MAAM,CAAC,GAAG,IAAI,OAAO,CAAwB,CAAC,OAAO,EAAE,EAAE,CACvD,4BAA4B,CAAC,WAAW,CAAC,qBAAqB,CAAC,cAAc,EAAE,OAAO,CAAC,CACxF,CAAA;QAED,gBAAgB,CAAC,kBAAkB,CAAC,cAAc,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAA;QAE7D,MAAM,CAAC,CAAA;IACT,CAAC;IAEM,QAAQ;QACb,IAAI,CAAC,YAAY,GAAG,KAAK,CAAA;QACzB,MAAM,KAAK,GAAG,gBAAgB,CAAC,QAAQ,EAAE,CAAA;QAEzC,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAClD,MAAM,IAAI,KAAK,CAAC,KAAK,CAAC,CAAA;QACxB,CAAC;QAED,QAAQ,GAAG,SAAS,CAAA;IACtB,CAAC;IAEM,SAAS;QACd,IAAI,IAAI,CAAC,YAAY;YAAE,OAAM;QAC7B,gBAAgB,CAAC,SAAS,EAAE,CAAA;QAC5B,IAAI,CAAC,YAAY,GAAG,IAAI,CAAA;IAC1B,CAAC;CACF","sourcesContent":["import {\n  MdocDataTransferEvent,\n  type OnRequestReceivedEventPayload,\n  type OnResponseSendPayload,\n} from './MdocDataTransferEvent'\nimport { mDocNativeModule, mDocNativeModuleEventEmitter } from './MdocDataTransferModule'\n\nexport let instance: MdocDataTransfer | undefined = undefined\nexport const mdocDataTransfer = {\n  instance: () => {\n    if (instance) return instance\n    return MdocDataTransfer.initialize()\n  },\n}\n\nclass MdocDataTransfer {\n  public isNfcEnabled = false\n\n  public static initialize() {\n    const error = mDocNativeModule.initialize()\n\n    if (typeof error === 'string' && error.length > 0) {\n      throw new Error(error)\n    }\n\n    instance = new MdocDataTransfer()\n    return instance\n  }\n\n  public async startQrEngagement() {\n    return await mDocNativeModule.startQrEngagement()\n  }\n\n  public async waitForDeviceRequest() {\n    return await new Promise<OnRequestReceivedEventPayload<Uint8Array>>((resolve) =>\n      mDocNativeModuleEventEmitter.addListener(\n        MdocDataTransferEvent.OnRequestReceived,\n        (payload: OnRequestReceivedEventPayload) => {\n          resolve({\n            deviceRequest: new Uint8Array(payload.deviceRequest),\n            sessionTranscript: new Uint8Array(payload.sessionTranscript),\n          })\n        }\n      )\n    )\n  }\n\n  public async sendDeviceResponse(deviceResponse: Uint8Array) {\n    const p = new Promise<OnResponseSendPayload>((resolve) =>\n      mDocNativeModuleEventEmitter.addListener(MdocDataTransferEvent.OnResponseSent, resolve)\n    )\n\n    mDocNativeModule.sendDeviceResponse(deviceResponse.join(':'))\n\n    await p\n  }\n\n  public shutdown() {\n    this.isNfcEnabled = false\n    const error = mDocNativeModule.shutdown()\n\n    if (typeof error === 'string' && error.length > 0) {\n      throw new Error(error)\n    }\n\n    instance = undefined\n  }\n\n  public enableNfc() {\n    if (this.isNfcEnabled) return\n    mDocNativeModule.enableNfc()\n    this.isNfcEnabled = true\n  }\n}\n"]}
+{"version":3,"file":"MdocDataTransfer.js","sourceRoot":"","sources":["../src/MdocDataTransfer.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,qBAAqB,GAGtB,MAAM,yBAAyB,CAAA;AAChC,OAAO,EAAE,gBAAgB,EAAE,4BAA4B,EAAE,MAAM,0BAA0B,CAAA;AAEzF,MAAM,CAAC,IAAI,QAAQ,GAAiC,SAAS,CAAA;AAC7D,MAAM,CAAC,MAAM,gBAAgB,GAAG;IAC9B,QAAQ,EAAE,CAAC,WAAmB,EAAE,EAAE;QAChC,IAAI,QAAQ;YAAE,OAAO,QAAQ,CAAA;QAC7B,OAAO,gBAAgB,CAAC,UAAU,CAAC,WAAW,CAAC,CAAA;IACjD,CAAC;CACF,CAAA;AAED,MAAM,gBAAgB;IACb,YAAY,GAAG,KAAK,CAAA;IAEpB,MAAM,CAAC,UAAU,CAAC,WAAmB;QAC1C,MAAM,KAAK,GAAG,gBAAgB,CAAC,UAAU,CAAC,WAAW,CAAC,CAAA;QAEtD,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAClD,MAAM,IAAI,KAAK,CAAC,KAAK,CAAC,CAAA;QACxB,CAAC;QAED,QAAQ,GAAG,IAAI,gBAAgB,EAAE,CAAA;QACjC,OAAO,QAAQ,CAAA;IACjB,CAAC;IAEM,KAAK,CAAC,iBAAiB;QAC5B,OAAO,MAAM,gBAAgB,CAAC,iBAAiB,EAAE,CAAA;IACnD,CAAC;IAEM,KAAK,CAAC,oBAAoB;QAC/B,OAAO,MAAM,IAAI,OAAO,CAA4C,CAAC,OAAO,EAAE,EAAE,CAC9E,4BAA4B,CAAC,WAAW,CACtC,qBAAqB,CAAC,iBAAiB,EACvC,CAAC,OAAsC,EAAE,EAAE;YACzC,OAAO,CAAC;gBACN,aAAa,EAAE,IAAI,UAAU,CAAC,OAAO,CAAC,aAAa,CAAC;gBACpD,iBAAiB,EAAE,IAAI,UAAU,CAAC,OAAO,CAAC,iBAAiB,CAAC;aAC7D,CAAC,CAAA;QACJ,CAAC,CACF,CACF,CAAA;IACH,CAAC;IAEM,KAAK,CAAC,kBAAkB,CAAC,cAA0B;QACxD,MAAM,CAAC,GAAG,IAAI,OAAO,CAAwB,CAAC,OAAO,EAAE,EAAE,CACvD,4BAA4B,CAAC,WAAW,CAAC,qBAAqB,CAAC,cAAc,EAAE,OAAO,CAAC,CACxF,CAAA;QAED,gBAAgB,CAAC,kBAAkB,CAAC,cAAc,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAA;QAE7D,MAAM,CAAC,CAAA;IACT,CAAC;IAEM,QAAQ;QACb,IAAI,CAAC,YAAY,GAAG,KAAK,CAAA;QACzB,MAAM,KAAK,GAAG,gBAAgB,CAAC,QAAQ,EAAE,CAAA;QAEzC,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAClD,MAAM,IAAI,KAAK,CAAC,KAAK,CAAC,CAAA;QACxB,CAAC;QAED,QAAQ,GAAG,SAAS,CAAA;IACtB,CAAC;IAEM,SAAS;QACd,IAAI,IAAI,CAAC,YAAY;YAAE,OAAM;QAC7B,gBAAgB,CAAC,SAAS,EAAE,CAAA;QAC5B,IAAI,CAAC,YAAY,GAAG,IAAI,CAAA;IAC1B,CAAC;CACF","sourcesContent":["import {\n  MdocDataTransferEvent,\n  type OnRequestReceivedEventPayload,\n  type OnResponseSendPayload,\n} from './MdocDataTransferEvent'\nimport { mDocNativeModule, mDocNativeModuleEventEmitter } from './MdocDataTransferModule'\n\nexport let instance: MdocDataTransfer | undefined = undefined\nexport const mdocDataTransfer = {\n  instance: (serviceName: string) => {\n    if (instance) return instance\n    return MdocDataTransfer.initialize(serviceName)\n  },\n}\n\nclass MdocDataTransfer {\n  public isNfcEnabled = false\n\n  public static initialize(serviceName: string) {\n    const error = mDocNativeModule.initialize(serviceName)\n\n    if (typeof error === 'string' && error.length > 0) {\n      throw new Error(error)\n    }\n\n    instance = new MdocDataTransfer()\n    return instance\n  }\n\n  public async startQrEngagement() {\n    return await mDocNativeModule.startQrEngagement()\n  }\n\n  public async waitForDeviceRequest() {\n    return await new Promise<OnRequestReceivedEventPayload<Uint8Array>>((resolve) =>\n      mDocNativeModuleEventEmitter.addListener(\n        MdocDataTransferEvent.OnRequestReceived,\n        (payload: OnRequestReceivedEventPayload) => {\n          resolve({\n            deviceRequest: new Uint8Array(payload.deviceRequest),\n            sessionTranscript: new Uint8Array(payload.sessionTranscript),\n          })\n        }\n      )\n    )\n  }\n\n  public async sendDeviceResponse(deviceResponse: Uint8Array) {\n    const p = new Promise<OnResponseSendPayload>((resolve) =>\n      mDocNativeModuleEventEmitter.addListener(MdocDataTransferEvent.OnResponseSent, resolve)\n    )\n\n    mDocNativeModule.sendDeviceResponse(deviceResponse.join(':'))\n\n    await p\n  }\n\n  public shutdown() {\n    this.isNfcEnabled = false\n    const error = mDocNativeModule.shutdown()\n\n    if (typeof error === 'string' && error.length > 0) {\n      throw new Error(error)\n    }\n\n    instance = undefined\n  }\n\n  public enableNfc() {\n    if (this.isNfcEnabled) return\n    mDocNativeModule.enableNfc()\n    this.isNfcEnabled = true\n  }\n}\n"]}

package/build/specs/NativeMdocDataTransfer.d.ts

@@ -1,10 +1,8 @@
-import { type TurboModule } from 'react-native';
-export interface Spec extends TurboModule {
+export interface Spec {
     enableNfc: () => void;
-    initialize: () => undefined | string;
+    initialize: (serviceName: string) => undefined | string;
     startQrEngagement: () => Promise<string>;
-    sendDeviceResponse: (devceResponse: string) => void;
+    sendDeviceResponse: (devceResponse: string) => Promise<void>;
     shutdown: () => undefined | string;
 }
-export declare const turboModuleMdocDataTransfer: () => Spec;
 //# sourceMappingURL=NativeMdocDataTransfer.d.ts.map

package/build/specs/NativeMdocDataTransfer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"NativeMdocDataTransfer.d.ts","sourceRoot":"","sources":["../../src/specs/NativeMdocDataTransfer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,WAAW,EAAuB,MAAM,cAAc,CAAA;AAEpE,MAAM,WAAW,IAAK,SAAQ,WAAW;IACvC,SAAS,EAAE,MAAM,IAAI,CAAA;IAGrB,UAAU,EAAE,MAAM,SAAS,GAAG,MAAM,CAAA;IAEpC,iBAAiB,EAAE,MAAM,OAAO,CAAC,MAAM,CAAC,CAAA;IAExC,kBAAkB,EAAE,CAAC,aAAa,EAAE,MAAM,KAAK,IAAI,CAAA;IAGnD,QAAQ,EAAE,MAAM,SAAS,GAAG,MAAM,CAAA;CACnC;AAED,eAAO,MAAM,2BAA2B,YAAmE,CAAA"}
+{"version":3,"file":"NativeMdocDataTransfer.d.ts","sourceRoot":"","sources":["../../src/specs/NativeMdocDataTransfer.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,IAAI;IACnB,SAAS,EAAE,MAAM,IAAI,CAAA;IAGrB,UAAU,EAAE,CAAC,WAAW,EAAE,MAAM,KAAK,SAAS,GAAG,MAAM,CAAA;IAEvD,iBAAiB,EAAE,MAAM,OAAO,CAAC,MAAM,CAAC,CAAA;IAExC,kBAAkB,EAAE,CAAC,aAAa,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAA;IAG5D,QAAQ,EAAE,MAAM,SAAS,GAAG,MAAM,CAAA;CACnC"}

package/build/specs/NativeMdocDataTransfer.js

@@ -1,3 +1,2 @@
-import { TurboModuleRegistry } from 'react-native';
-export const turboModuleMdocDataTransfer = () => TurboModuleRegistry.getEnforcing('MdocDataTransfer');
+export {};
 //# sourceMappingURL=NativeMdocDataTransfer.js.map

package/build/specs/NativeMdocDataTransfer.js.map

@@ -1 +1 @@
-{"version":3,"file":"NativeMdocDataTransfer.js","sourceRoot":"","sources":["../../src/specs/NativeMdocDataTransfer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAoB,mBAAmB,EAAE,MAAM,cAAc,CAAA;AAgBpE,MAAM,CAAC,MAAM,2BAA2B,GAAG,GAAG,EAAE,CAAC,mBAAmB,CAAC,YAAY,CAAO,kBAAkB,CAAC,CAAA","sourcesContent":["import { type TurboModule, TurboModuleRegistry } from 'react-native'\n\nexport interface Spec extends TurboModule {\n  enableNfc: () => void\n\n  // String indicates an error on iOS legacy architecture\n  initialize: () => undefined | string\n\n  startQrEngagement: () => Promise<string>\n\n  sendDeviceResponse: (devceResponse: string) => void\n\n  // String indicates an error on iOS legacy architecture\n  shutdown: () => undefined | string\n}\n\nexport const turboModuleMdocDataTransfer = () => TurboModuleRegistry.getEnforcing<Spec>('MdocDataTransfer')\n"]}
+{"version":3,"file":"NativeMdocDataTransfer.js","sourceRoot":"","sources":["../../src/specs/NativeMdocDataTransfer.ts"],"names":[],"mappings":"","sourcesContent":["export interface Spec {\n  enableNfc: () => void\n\n  // String indicates an error on iOS legacy architecture\n  initialize: (serviceName: string) => undefined | string\n\n  startQrEngagement: () => Promise<string>\n\n  sendDeviceResponse: (devceResponse: string) => Promise<void>\n\n  // String indicates an error on iOS legacy architecture\n  shutdown: () => undefined | string\n}\n"]}

package/ios/MdocDataTransfer.mm

@@ -9,13 +9,14 @@
 
 RCT_EXTERN_METHOD(enableNfc)
 
-RCT_EXTERN_METHOD(initialize)
+RCT_EXTERN_METHOD(initialize:(NSString *)serviceName)
 
-RCT_EXTERN_METHOD(startQrEngagement
-                  : (RCTPromiseResolveBlock)resolve _
-                  : (RCTPromiseRejectBlock)reject)
+RCT_EXTERN_METHOD(startQrEngagement:(RCTPromiseResolveBlock)resolve
+                  reject:(RCTPromiseRejectBlock)reject)
 
-RCT_EXTERN_METHOD(sendDeviceResponse : (NSString)deviceResponse)
+RCT_EXTERN_METHOD(sendDeviceResponse:(NSString)deviceResponse
+                  resolve:(RCTPromiseResolveBlock)resolve
+                  reject:(RCTPromiseRejectBlock)reject)
 
 RCT_EXTERN_METHOD(shutdown)
 

package/ios/MdocDataTransfer.swift

@@ -3,193 +3,219 @@ import MdocDataTransfer18013
 import MdocSecurity18013
 import React
 import SwiftCBOR
+import WalletStorage
 
 @objc(MdocDataTransfer)
 class MdocDataTransfer: RCTEventEmitter {
-    let ON_RESPONSE_SENT_EVENT: String = "onResponseSent"
-    let ON_REQUEST_RECEIVED_EVENT: String = "onRequestReceived"
+  let crv: CoseEcCurve = CoseEcCurve.P256
 
-    var bleServerTransfer: MdocGattServer?
-    var resolver: RCTPromiseResolveBlock?
-    var rejector: RCTPromiseRejectBlock?
+  let ON_RESPONSE_SENT_EVENT: String = "onResponseSent"
+  let ON_REQUEST_RECEIVED_EVENT: String = "onRequestReceived"
 
-    override func supportedEvents() -> [String]! {
-        return ["onResponseSent", "onRequestReceived"]
-    }
+  var secureArea: SecureArea?
+  var bleServerTransfer: MdocGattServer?
+  var resolver: RCTPromiseResolveBlock?
+  var rejector: RCTPromiseRejectBlock?
 
-    // NFC is not enabled on iOS
-    @objc
-    func enableNfc() {
-        return
-    }
+  override func supportedEvents() -> [String]! {
+    return ["onResponseSent", "onRequestReceived"]
+  }
 
-    @objc
-    func initialize() -> String? {
-        guard bleServerTransfer == nil else {
-            return MdocDataTransferError.BleGattServerAlreadyInitialized.localizedDescription
-        }
+  // NFC is not enabled on iOS
+  @objc func enableNfc() {
+    return
+  }
 
-        do {
-            bleServerTransfer = try MdocGattServer(parameters: [
-                InitializeKeys.document_json_data.rawValue: [],
-                InitializeKeys.trusted_certificates.rawValue: [],
-                InitializeKeys.send_response_manually.rawValue: true,
-            ])
-            bleServerTransfer?.delegate = self
-        } catch {
-            return error.localizedDescription
-        }
+  @objc func initialize(_ serviceName: String) -> String? {
+    guard bleServerTransfer == nil else {
+      return MdocDataTransferError.BleGattServerAlreadyInitialized.localizedDescription
+    }
 
-        return nil
+    secureArea = SoftwareSecureArea.create(
+      storage: KeyChainSecureKeyStorage(serviceName: serviceName, accessGroup: nil))
+
+    do {
+      bleServerTransfer = try MdocGattServer(
+        parameters: InitializeTransferData(
+          dataFormats: [:],
+          documentData: [:],
+          docDisplayNames: [:],
+          privateKeyData: [:],
+          trustedCertificates: [],
+          deviceAuthMethod: DeviceAuthMethod.deviceSignature.rawValue,
+          idsToDocTypes: [:],
+          hashingAlgs: [:],
+          sendDeviceResponseManually: true)
+      )
+      bleServerTransfer?.delegate = self
+    } catch {
+      return error.localizedDescription
     }
 
-    @objc(startQrEngagement:_:)
-    func startQrEngagement(
-        resolve: @escaping RCTPromiseResolveBlock,
-        reject: @escaping RCTPromiseRejectBlock
-    ) {
-        resolver = resolve
-        rejector = reject
-
-        guard let bleServerTransfer = bleServerTransfer else {
-            self.reject(
-                MdocDataTransferError.BleGattServerNotInitialized
-                    .localizedDescription)
-            return
-        }
+    return nil
+  }
+
+  @objc func startQrEngagement(
+    _ resolve: @escaping RCTPromiseResolveBlock,
+    reject: @escaping RCTPromiseRejectBlock
+  ) {
+    Task {
+      resolver = resolve
+      rejector = reject
+
+      guard let bleServerTransfer = bleServerTransfer, let secureArea = secureArea else {
+        self.reject(
+          MdocDataTransferError.BleGattServerNotInitialized
+            .localizedDescription)
+        return
+      }
 
-        bleServerTransfer.performDeviceEngagement()
+      do {
+        try await bleServerTransfer.performDeviceEngagement(secureArea: secureArea, crv: crv)
+      } catch {
+        self.reject(error.localizedDescription)
+      }
     }
+  }
+
+  @objc func sendDeviceResponse(
+    _ deviceResponse: String,
+    resolve: @escaping RCTPromiseResolveBlock,
+    reject: @escaping RCTPromiseRejectBlock
+  ) {
+    Task {
+      resolver = resolve
+      rejector = reject
+
+      guard let bleServerTransfer = bleServerTransfer,
+        var sessionEncryption = bleServerTransfer.sessionEncryption
+      else {
+        self.reject(
+          MdocDataTransferError.BleGattServerNotInitialized
+            .localizedDescription)
+        return
+      }
 
-    @objc(sendDeviceResponse:)
-    func sendDeviceResponse(deviceResponse: String) -> String? {
-        guard let bleServerTransfer = bleServerTransfer,
-            var sessionEncryption = bleServerTransfer.sessionEncryption
-        else {
-            return MdocDataTransferError.BleGattServerNotInitialized
-                .localizedDescription
+      do {
+        let byteArray = deviceResponse.split(separator: ":").compactMap {
+          UInt8($0)
         }
-
+        let cipherData = try await sessionEncryption.encrypt(byteArray)
+        let sd = SessionData(cipher_data: cipherData, status: 20)
+        try bleServerTransfer.sendDeviceResponse(
+          Data(sd.encode(options: CBOROptions())))
+      } catch {
+        let sd = SessionData(cipher_data: nil, status: 11)
         do {
-            let byteArray = deviceResponse.split(separator: ":").compactMap {
-                UInt8($0)
-            }
-            let cipherData = try sessionEncryption.encrypt(byteArray)
-            let sd = SessionData(cipher_data: cipherData, status: 20)
-            try bleServerTransfer.sendResponse(
-                Data(sd.encode(options: CBOROptions())))
+          try bleServerTransfer.sendDeviceResponse(
+            Data(sd.encode(options: CBOROptions())))
         } catch {
-            let sd = SessionData(cipher_data: nil, status: 11)
-            do {
-                try bleServerTransfer.sendResponse(
-                    Data(sd.encode(options: CBOROptions())))
-            } catch {
-                return error.localizedDescription
-            }
-            return error.localizedDescription
+          self.reject(error.localizedDescription)
+          return
         }
-
-        return nil
+        self.reject(error.localizedDescription)
+        return
+      }
+      resolve(nil)
     }
+  }
 
-    @objc
-    func shutdown() -> String? {
-        guard let bleServerTransfer = bleServerTransfer else {
-            return MdocDataTransferError.BleGattServerNotInitialized
-                .localizedDescription
-
-        }
+  @objc func shutdown() -> String? {
+    guard let bleServerTransfer = bleServerTransfer else {
+      return MdocDataTransferError.BleGattServerNotInitialized
+        .localizedDescription
 
-        bleServerTransfer.stop()
+    }
 
-        self.bleServerTransfer = nil
-        rejector = nil
-        resolver = nil
+    bleServerTransfer.stop()
 
-        return nil
-    }
+    self.bleServerTransfer = nil
+    rejector = nil
+    resolver = nil
 
-    private func reject(_ message: String) {
-        guard let rejector = rejector else {
-            fatalError(
-                MdocDataTransferError.RejectorNotInitialized
-                    .localizedDescription)
-        }
-        rejector("ERROR", message, nil)
+    return nil
+  }
 
-        resolver = nil
-        self.rejector = nil
+  private func reject(_ message: String) {
+    guard let rejector = rejector else {
+      fatalError(
+        MdocDataTransferError.RejectorNotInitialized
+          .localizedDescription)
     }
+    rejector("ERROR", message, nil)
 
-    private func resolve(_ result: Any) {
-        guard let resolver = resolver else {
-            fatalError(
-                MdocDataTransferError.ResolverNotInitialized
-                    .localizedDescription)
-        }
-        resolver(result)
+    resolver = nil
+    self.rejector = nil
+  }
 
-        self.resolver = nil
-        rejector = nil
+  private func resolve(_ result: Any?) {
+    guard let resolver = resolver else {
+      fatalError(
+        MdocDataTransferError.ResolverNotInitialized
+          .localizedDescription)
     }
+    resolver(result)
+
+    self.resolver = nil
+    rejector = nil
+  }
 }
 
 extension MdocDataTransfer: MdocOfflineDelegate {
-    public func didChangeStatus(
-        _ newStatus: MdocDataTransfer18013.TransferStatus
-    ) {
-        guard let bleServerTransfer = bleServerTransfer else {
-            reject(
-                MdocDataTransferError.BleGattServerNotInitialized
-                    .localizedDescription)
-            return
-        }
-
-        switch newStatus {
-        case .qrEngagementReady:
-            guard let qrCode = bleServerTransfer.qrCodePayload else {
-                reject(MdocDataTransferError.QrCodeNotSet.localizedDescription)
-                return
-            }
-            resolve(qrCode)
-        case .error:
-            guard let error = bleServerTransfer.error else {
-                reject(MdocDataTransferError.ErrorNotSet.localizedDescription)
-                return
-            }
-            reject(error.localizedDescription)
-            return
-        case .responseSent:
-            sendEvent(withName: ON_RESPONSE_SENT_EVENT, body: nil)
-        default:
-            os_log("data transfer status change: %@", newStatus.rawValue)
-        }
-
+  public func didChangeStatus(
+    _ newStatus: MdocDataTransfer18013.TransferStatus
+  ) {
+    guard let bleServerTransfer = bleServerTransfer else {
+      reject(
+        MdocDataTransferError.BleGattServerNotInitialized
+          .localizedDescription)
+      return
     }
 
-    public func didFinishedWithError(_ error: any Error) {
-        reject(error.localizedDescription)
+    switch newStatus {
+    case .qrEngagementReady:
+      guard let qrCode = bleServerTransfer.qrCodePayload else {
+        reject(MdocDataTransferError.QrCodeNotSet.localizedDescription)
+        return
+      }
+      resolve(qrCode)
+    case .error:
+      guard let error = bleServerTransfer.error else {
+        reject(MdocDataTransferError.ErrorNotSet.localizedDescription)
+        return
+      }
+      reject(error.localizedDescription)
+      return
+    case .responseSent:
+      sendEvent(withName: ON_RESPONSE_SENT_EVENT, body: nil)
+    default:
+      os_log("data transfer status change: %@", newStatus.rawValue)
     }
 
-    public func didReceiveRequest(
-        _ request: MdocDataTransfer18013.UserRequestInfo?,
-        handleSelected: @escaping (Bool, MdocDataTransfer18013.RequestItems?) ->
-            Void
-    ) {
-        guard
-            let sessionTranscriptBytes = bleServerTransfer?.sessionEncryption?
-                .sessionTranscriptBytes,
-            let deviceRequestBytes = bleServerTransfer?.deviceRequest?.encode(
-                options: CBOROptions())
-        else {
-            return
-        }
-
-        sendEvent(
-            withName: ON_REQUEST_RECEIVED_EVENT,
-            body: [
-                "sessionTranscript": sessionTranscriptBytes,
-                "deviceRequest": deviceRequestBytes,
-            ])
+  }
+
+  public func didFinishedWithError(_ error: any Error) {
+    reject(error.localizedDescription)
+  }
+
+  public func didReceiveRequest(
+    _ request: MdocDataTransfer18013.UserRequestInfo?,
+    handleSelected: @escaping (Bool, MdocDataTransfer18013.RequestItems?) async -> Void
+  ) {
+    guard
+      let sessionTranscriptBytes = bleServerTransfer?.sessionEncryption?
+        .sessionTranscriptBytes,
+      let deviceRequestBytes = bleServerTransfer?.deviceRequest?.encode(
+        options: CBOROptions())
+    else {
+      return
     }
+
+    sendEvent(
+      withName: ON_REQUEST_RECEIVED_EVENT,
+      body: [
+        "sessionTranscript": sessionTranscriptBytes,
+        "deviceRequest": deviceRequestBytes,
+      ])
+  }
 }

package/ios/MdocDataTransferError.swift

@@ -1,42 +1,42 @@
 public enum MdocDataTransferError: Error {
-    case BleGattServerNotInitialized
-    case BleGattServerAlreadyInitialized
-    case DocumentsNotProvided
-    case RejectorNotInitialized
-    case ResolverNotInitialized
-    case QrCodeNotSet
-    case ErrorNotSet
+  case BleGattServerNotInitialized
+  case BleGattServerAlreadyInitialized
+  case DocumentsNotProvided
+  case RejectorNotInitialized
+  case ResolverNotInitialized
+  case QrCodeNotSet
+  case ErrorNotSet
 }
 
 extension MdocDataTransferError: LocalizedError {
-    public var errorDescription: String? {
-        switch self {
-        case .BleGattServerNotInitialized:
-            return NSLocalizedString(
-                "Ble Gatt Server is not initialized. Please call `initialize()` before.",
-                comment: "")
-        case .BleGattServerAlreadyInitialized:
-            return NSLocalizedString(
-                "Ble Gatt Server is already initialized. Please call `shutdown()` before initializing again.",
-                comment: "")
-        case .DocumentsNotProvided:
-            return NSLocalizedString("Documents are not provided.", comment: "")
-        case .RejectorNotInitialized:
-            return NSLocalizedString(
-                "Rejector is not initialized. Invalid state. Bug occurred.",
-                comment: "")
-        case .ResolverNotInitialized:
-            return NSLocalizedString(
-                "Resolver is not initialized. Invalid state. Bug occurred.",
-                comment: "")
-        case .QrCodeNotSet:
-            return NSLocalizedString(
-                "QRCode not set on the object. Invalid state. Issue in EUDI mdoc library.",
-                comment: "")
-        case .ErrorNotSet:
-            return NSLocalizedString(
-                "Error not set on the object. Invalid state. Issue in EUDI mdoc library.",
-                comment: "")
-        }
+  public var errorDescription: String? {
+    switch self {
+    case .BleGattServerNotInitialized:
+      return NSLocalizedString(
+        "Ble Gatt Server is not initialized. Please call `initialize()` before.",
+        comment: "")
+    case .BleGattServerAlreadyInitialized:
+      return NSLocalizedString(
+        "Ble Gatt Server is already initialized. Please call `shutdown()` before initializing again.",
+        comment: "")
+    case .DocumentsNotProvided:
+      return NSLocalizedString("Documents are not provided.", comment: "")
+    case .RejectorNotInitialized:
+      return NSLocalizedString(
+        "Rejector is not initialized. Invalid state. Bug occurred.",
+        comment: "")
+    case .ResolverNotInitialized:
+      return NSLocalizedString(
+        "Resolver is not initialized. Invalid state. Bug occurred.",
+        comment: "")
+    case .QrCodeNotSet:
+      return NSLocalizedString(
+        "QRCode not set on the object. Invalid state. Issue in EUDI mdoc library.",
+        comment: "")
+    case .ErrorNotSet:
+      return NSLocalizedString(
+        "Error not set on the object. Invalid state. Issue in EUDI mdoc library.",
+        comment: "")
     }
+  }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@animo-id/expo-mdoc-data-transfer",
-  "version": "0.1.3",
+  "version": "0.1.5",
   "description": "Expo mdoc data transfer module",
   "main": "build/index.js",
   "types": "build/index.d.ts",

package/src/specs/NativeMdocDataTransfer.ts

@@ -1,17 +1,13 @@
-import { type TurboModule, TurboModuleRegistry } from 'react-native'
-
-export interface Spec extends TurboModule {
+export interface Spec {
   enableNfc: () => void
 
   // String indicates an error on iOS legacy architecture
-  initialize: () => undefined | string
+  initialize: (serviceName: string) => undefined | string
 
   startQrEngagement: () => Promise<string>
 
-  sendDeviceResponse: (devceResponse: string) => void
+  sendDeviceResponse: (devceResponse: string) => Promise<void>
 
   // String indicates an error on iOS legacy architecture
   shutdown: () => undefined | string
 }
-
-export const turboModuleMdocDataTransfer = () => TurboModuleRegistry.getEnforcing<Spec>('MdocDataTransfer')