@velocitycareerlabs/vcl-react-native 1.12.1 → 1.14.1

package/android/build.gradle

@@ -9,7 +9,7 @@ buildscript {
   }
 
   dependencies {
-    classpath 'com.android.tools.build:gradle:7.4.0'
+    classpath 'com.android.tools.build:gradle:7.4.1'
     // noinspection DifferentKotlinGradleVersion
     classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
   }
@@ -131,5 +131,5 @@ dependencies {
 
   // VCL:
   implementation "com.nimbusds:nimbus-jose-jwt:9.31"
-  implementation "io.velocitycareerlabs:vcl:1.12.0"
+  implementation "io.velocitycareerlabs:vcl:1.14.1"
 }

package/android/src/main/java/io/velocitycareerlabs/reactnative/VclReactNativeModule.kt

@@ -16,7 +16,7 @@ import io.velocitycareerlabs.reactnative.utlis.Converter.credentialTypesFormSche
 import io.velocitycareerlabs.reactnative.utlis.Converter.credentialTypesToMap
 import io.velocitycareerlabs.reactnative.utlis.Converter.exchangeToMap
 import io.velocitycareerlabs.reactnative.utlis.Converter.jwtVerifiableCredentialsToMap
-import io.velocitycareerlabs.reactnative.utlis.Converter.generatedOffersToMap
+import io.velocitycareerlabs.reactnative.utlis.Converter.offersToMap
 import io.velocitycareerlabs.reactnative.utlis.Converter.mapToCredentialManifestDescriptor
 import io.velocitycareerlabs.reactnative.utlis.Converter.organizationsToMap
 import io.velocitycareerlabs.reactnative.utlis.Converter.mapToPresentationSubmission
@@ -37,6 +37,7 @@ import io.velocitycareerlabs.api.VCLProvider
 import io.velocitycareerlabs.api.entities.VCLError
 import io.velocitycareerlabs.reactnative.extensions.toThrowable
 import io.velocitycareerlabs.reactnative.utlis.Converter.didJwkToMap
+import io.velocitycareerlabs.reactnative.utlis.Converter.mapToDidJwk
 import io.velocitycareerlabs.reactnative.utlis.Converter.mapToInitializationDescriptor
 import io.velocitycareerlabs.reactnative.utlis.Converter.mapToJwtDescriptor
 import java.lang.Exception
@@ -63,8 +64,8 @@ class VclReactNativeModule(private val reactContext: ReactApplicationContext) :
   ) {
     try {
       vcl.initialize(
+        context = reactContext.applicationContext,
         initializationDescriptor = mapToInitializationDescriptor(
-          reactContext,
           initializationDescriptor
         ),
         successHandler = {
@@ -110,12 +111,12 @@ class VclReactNativeModule(private val reactContext: ReactApplicationContext) :
 
   @ReactMethod
   fun getPresentationRequest(
-    presentationRequestDescriptorReadableMap: ReadableMap,
+    presentationRequestDescriptorMap: ReadableMap,
     promise: Promise
   ) {
     try {
       vcl.getPresentationRequest(
-        mapTopPresentationRequestDescriptor(presentationRequestDescriptorReadableMap),
+        mapTopPresentationRequestDescriptor(presentationRequestDescriptorMap),
         {
           promise.resolve(presentationRequestToMap(it))
         },
@@ -129,12 +130,14 @@ class VclReactNativeModule(private val reactContext: ReactApplicationContext) :
 
   @ReactMethod
   fun submitPresentation(
-    presentationSubmissionReadableMap: ReadableMap,
+    presentationSubmissionMap: ReadableMap,
+    didJwkMap: ReadableMap? = null,
     promise: Promise
   ) {
     try {
       vcl.submitPresentation(
-        mapToPresentationSubmission(presentationSubmissionReadableMap),
+        mapToPresentationSubmission(presentationSubmissionMap),
+        mapToDidJwk(didJwkMap),
         {
           promise.resolve(presentationSubmissionResultToMap(it))
         },
@@ -148,11 +151,11 @@ class VclReactNativeModule(private val reactContext: ReactApplicationContext) :
 
   @ReactMethod
   fun getExchangeProgress(
-    exchangeDescriptorReadableMap: ReadableMap,
+    exchangeDescriptorMap: ReadableMap,
     promise: Promise
   ) {
     try {
-      vcl.getExchangeProgress(mapToExchangeDescriptor(exchangeDescriptorReadableMap),
+      vcl.getExchangeProgress(mapToExchangeDescriptor(exchangeDescriptorMap),
         {
           promise.resolve(exchangeToMap(it))
         },
@@ -207,13 +210,15 @@ class VclReactNativeModule(private val reactContext: ReactApplicationContext) :
   @ReactMethod
   fun generateOffers(
     generateOffersDescriptorMap: ReadableMap,
+    didJwkMap: ReadableMap? = null,
     promise: Promise
   ) {
     try {
       vcl.generateOffers(
         mapToGenerateOffersDescriptor(generateOffersDescriptorMap),
+        mapToDidJwk(didJwkMap),
         {
-          promise.resolve(generatedOffersToMap(it))
+          promise.resolve(offersToMap(it))
         },
         {
           promise.reject(it.toThrowable())
@@ -234,7 +239,7 @@ class VclReactNativeModule(private val reactContext: ReactApplicationContext) :
         mapToGenerateOffersDescriptor(generateOffersDescriptorMap),
         mapToToken(tokenMap),
         {
-          promise.resolve(generatedOffersToMap(it))
+          promise.resolve(offersToMap(it))
         },
         {
           promise.reject(it.toThrowable())
@@ -247,12 +252,14 @@ class VclReactNativeModule(private val reactContext: ReactApplicationContext) :
   @ReactMethod
   fun finalizeOffers(
     finalizeOffersDescriptorMap: ReadableMap,
+    didJwkMap: ReadableMap? = null,
     tokenMap: ReadableMap,
     promise: Promise
   ) {
     try {
       vcl.finalizeOffers(
         mapToFinalizedOffersDescriptor(finalizeOffersDescriptorMap),
+        mapToDidJwk(didJwkMap),
         mapToToken(tokenMap),
         {
           promise.resolve(jwtVerifiableCredentialsToMap(it))

package/android/src/main/java/io/velocitycareerlabs/reactnative/extensions/MapExtensions.kt

@@ -9,7 +9,9 @@
 
 import com.facebook.react.bridge.ReadableArray
 import com.facebook.react.bridge.ReadableMap
+import com.facebook.react.bridge.WritableArray
 import com.facebook.react.bridge.WritableMap
+import org.json.JSONArray
 import org.json.JSONObject
 import java.lang.Exception
 
@@ -100,7 +102,7 @@ fun ReadableMap.toJsonObject(): JSONObject {
     JSONObject(this.toHashMap())
   } catch (e: Exception) {
     e.printStackTrace()
-    JSONObject("{}")
+    JSONObject()
   }
 }
 
@@ -108,3 +110,16 @@ fun WritableMap.toJsonObject(): JSONObject {
   return (this as ReadableMap).toJsonObject()
 }
 
+fun ReadableArray.toJsonArray(): JSONArray {
+  return try {
+    JSONArray(this.toArrayList())
+  } catch (e: Exception) {
+    e.printStackTrace()
+    JSONArray()
+  }
+}
+
+fun WritableArray.toJsonArray(): JSONArray {
+  return (this as ReadableArray).toJsonArray()
+}
+

package/android/src/main/java/io/velocitycareerlabs/reactnative/utlis/Converter.kt

@@ -11,6 +11,7 @@ import com.facebook.react.bridge.*
 import io.velocitycareerlabs.api.*
 import io.velocitycareerlabs.api.entities.*
 import io.velocitycareerlabs.reactnative.extensions.*
+import org.json.JSONArray
 import org.json.JSONObject
 import java.lang.Exception
 
@@ -20,25 +21,41 @@ import java.lang.Exception
 object Converter {
 
   fun mapToInitializationDescriptor(
-    reactContext: ReactApplicationContext,
     initializationDescriptorMap: ReadableMap
-  ) =
-    VCLInitializationDescriptor(
-      context = reactContext,
+  ) = VCLInitializationDescriptor(
       environment = mapToEnvironment(
-        initializationDescriptorMap.getMapOpt("environment")
-          ?: mapOf(Pair("value", VCLEnvironment.PROD.value)).toReadableMap()
+          initializationDescriptorMap.getStringOpt("environment")
+      ),
+      keyServiceType = mapToKeyServiceType(
+        initializationDescriptorMap.getStringOpt("keyServiceType")
+      ),
+      xVnfProtocolVersion = mapToXVnfProtocolVersion(
+        (initializationDescriptorMap.getStringOpt("xVnfProtocolVersion"))
       ),
       cacheSequence = initializationDescriptorMap.getIntOpt("cacheSequence") ?: 0
     )
 
-  fun mapToEnvironment(environmentMap: ReadableMap) =
-    when (environmentMap.getStringOpt("value")) {
-      VCLEnvironment.DEV.value -> VCLEnvironment.DEV
-      VCLEnvironment.QA.value -> VCLEnvironment.QA
-      VCLEnvironment.STAGING.value -> VCLEnvironment.STAGING
-      VCLEnvironment.PROD.value -> VCLEnvironment.PROD
-      else -> VCLEnvironment.PROD
+  private fun mapToEnvironment(environment: String?) =
+    when(environment) {
+      VCLEnvironment.Dev.value -> VCLEnvironment.Dev
+      VCLEnvironment.Qa.value -> VCLEnvironment.Qa
+      VCLEnvironment.Staging.value -> VCLEnvironment.Staging
+      VCLEnvironment.Prod.value -> VCLEnvironment.Prod
+      else -> VCLEnvironment.Prod
+    }
+
+  private fun mapToKeyServiceType(keyServiceType: String?) =
+    when(keyServiceType) {
+      VCLKeyServiceType.Local.value -> VCLKeyServiceType.Local
+      VCLKeyServiceType.Remote.value -> VCLKeyServiceType.Remote
+      else -> VCLKeyServiceType.Local
+    }
+
+  private fun mapToXVnfProtocolVersion(xVnfProtocolVersion: String?) =
+    when(xVnfProtocolVersion) {
+      VCLXVnfProtocolVersion.XVnfProtocolVersion1.value -> VCLXVnfProtocolVersion.XVnfProtocolVersion1
+      VCLXVnfProtocolVersion.XVnfProtocolVersion2.value -> VCLXVnfProtocolVersion.XVnfProtocolVersion2
+      else -> VCLXVnfProtocolVersion.XVnfProtocolVersion1
     }
 
   fun regionToMap(
@@ -178,7 +195,7 @@ object Converter {
   ): ReadableMap {
     val presentationRequestMap = Arguments.createMap()
     val jwtMap = Arguments.createMap()
-    jwtMap.putString("encodedJwt", presentationRequest.jwt.signedJwt.serialize())
+    jwtMap.putString("encodedJwt", presentationRequest.jwt.encodedJwt)
     presentationRequestMap.putMap("jwt", jwtMap)
     val jwkMap = Arguments.createMap()
     jwkMap.putString("valueStr", presentationRequest.jwkPublic.valueStr)
@@ -444,12 +461,13 @@ object Converter {
   ): ReadableMap {
     val credentialManifestMap = Arguments.createMap()
     val jwtMap = Arguments.createMap()
-    jwtMap.putString("encodedJwt", credentialManifest.jwt.signedJwt.serialize())
+    jwtMap.putString("encodedJwt", credentialManifest.jwt.encodedJwt)
     credentialManifestMap.putMap("jwt", jwtMap)
     credentialManifestMap.putString("did", credentialManifest.did)
     credentialManifestMap.putString("iss", credentialManifest.iss)
     credentialManifestMap.putString("exchangeId", credentialManifest.exchangeId)
     credentialManifestMap.putString("vendorOriginContext", credentialManifest.vendorOriginContext)
+    credentialManifestMap.putMap("verifiedProfile", credentialManifest.verifiedProfile.payload.toReadableMap())
     return credentialManifestMap
   }
 
@@ -459,7 +477,12 @@ object Converter {
     val jwt =
       VCLJwt(encodedJwt = credentialManifestMap?.getMapOpt("jwt")?.getStringOpt("encodedJwt") ?: "")
     val vendorOriginContext: String? = credentialManifestMap?.getStringOpt("vendorOriginContext")
-    return VCLCredentialManifest(jwt = jwt, vendorOriginContext = vendorOriginContext)
+    val verifiedProfileMap: ReadableMap? = credentialManifestMap?.getMapOpt("verifiedProfile")
+    return VCLCredentialManifest(
+      jwt = jwt,
+      vendorOriginContext = vendorOriginContext,
+      verifiedProfile = VCLVerifiedProfile(payload = verifiedProfileMap?.toJsonObject() ?: JSONObject())
+    )
   }
 
   fun mapToGenerateOffersDescriptor(
@@ -490,16 +513,28 @@ object Converter {
     )
   }
 
-  fun generatedOffersToMap(
+  fun offersToMap(
     offers: VCLOffers
   ): ReadableMap {
     val generatedOffersMap = Arguments.createMap()
+    generatedOffersMap.putMap("payload", offers.payload.toReadableMap())
     generatedOffersMap.putArray("all", offers.all.toReadableArray())
     generatedOffersMap.putInt("responseCode", offers.responseCode)
     generatedOffersMap.putMap("token", tokenToMap(offers.token))
+    generatedOffersMap.putString("challenge", offers.challenge)
     return generatedOffersMap
   }
 
+  fun mapToOffers(offersMap: ReadableMap?): VCLOffers {
+    return VCLOffers(
+      payload = offersMap?.getMapOpt("payload")?.toJsonObject() ?: JSONObject(),
+      all = offersMap?.getArrayOpt("all")?.toJsonArray() ?: JSONArray(),
+      responseCode = offersMap?.getIntOpt("responseCode") ?: -1,
+      token = mapToToken(offersMap?.getMapOpt("token")),
+      challenge = offersMap?.getStringOpt("challenge") ?: ""
+    )
+  }
+
   fun credentialTypesFormSchemaToMap(
     credentialTypesFormSchema: VCLCredentialTypesUIFormSchema
   ): ReadableMap {
@@ -521,6 +556,7 @@ object Converter {
     finalizedOffersDescriptorMap: ReadableMap
   ) = VCLFinalizeOffersDescriptor(
     credentialManifest = mapToCredentialManifest(finalizedOffersDescriptorMap.getMapOpt("credentialManifest")),
+    offers = mapToOffers(finalizedOffersDescriptorMap.getMapOpt("offers")),
     approvedOfferIds = (finalizedOffersDescriptorMap.getArrayOpt("approvedOfferIds")?.toArrayList()
       ?.toList() as? List<String>) ?: listOf(),
     rejectedOfferIds = (finalizedOffersDescriptorMap.getArrayOpt("rejectedOfferIds")?.toArrayList()
@@ -534,10 +570,10 @@ object Converter {
     val passedCredentials = Arguments.createArray()
     val failedCredentials = Arguments.createArray()
     jwtVerifiableCredentials.passedCredentials.forEach {
-      passedCredentials.pushString(it.signedJwt.serialize())
+      passedCredentials.pushString(it.encodedJwt)
     }
     jwtVerifiableCredentials.failedCredentials.forEach {
-      failedCredentials.pushString(it.signedJwt.serialize())
+      failedCredentials.pushString(it.encodedJwt)
     }
     jwtVerifiableCredentialsMap.putArray("passedCredentials", passedCredentials)
     jwtVerifiableCredentialsMap.putArray("failedCredentials", failedCredentials)
@@ -546,7 +582,7 @@ object Converter {
 
   fun jwtToMap(jwt: VCLJwt): ReadableMap {
     val jwtReadableMap = Arguments.createMap()
-    jwtReadableMap.putString("encodedJwt", jwt.signedJwt.serialize())
+    jwtReadableMap.putString("encodedJwt", jwt.encodedJwt)
     return jwtReadableMap
   }
 
@@ -581,12 +617,26 @@ object Converter {
     jti = jwtDescriptorDictionary.getStringOpt("jti") ?: ""
   )
 
-  fun didJwkToMap(
-    didJwk: VCLDidJwk
-  ): ReadableMap {
-    val didJwkMap = Arguments.createMap()
-    didJwkMap.putString("value", didJwk.value)
-    return didJwkMap
+  fun didJwkToMap(didJwk: VCLDidJwk?): ReadableMap? {
+    didJwk?.let {
+      val didJwkMap = Arguments.createMap()
+      didJwkMap.putString("keyId", it.keyId)
+      didJwkMap.putString("value", it.value)
+      didJwkMap.putString("kid", it.kid)
+      return didJwkMap
+    }
+    return null
+  }
+
+  fun mapToDidJwk(didJwkMap: ReadableMap?): VCLDidJwk? {
+    didJwkMap?.let {
+      return VCLDidJwk(
+        keyId = it.getStringOpt("keyId") ?: "",
+        value = it.getStringOpt("value") ?: "",
+        kid = it.getStringOpt("kid") ?: ""
+      )
+    }
+    return null
   }
 }
 

package/ios/Utils/Converter.swift

@@ -4,8 +4,8 @@
 //
 //  Created by Michael Avoyan on 05/07/2021.
 //
-// Copyright 2022 Velocity Career Labs inc.
-// SPDX-License-Identifier: Apache-2.0
+//  Copyright 2022 Velocity Career Labs inc.
+//  SPDX-License-Identifier: Apache-2.0
 //
 
 import Foundation
@@ -16,26 +16,58 @@ func dictionaryToInitializationDescriptor(
 ) -> VCLInitializationDescriptor {
     return VCLInitializationDescriptor(
         environment: dictionaryToEnvironment(
-            initializationDescriptorDictionary["environment"] as? [String: String] ?? ["value": VCLEnvironment.PROD.rawValue]
+            initializationDescriptorDictionary["environment"] as? String
+        ),
+        keyServiceType: dictionaryToKeyServiceType(
+            initializationDescriptorDictionary["keyServiceType"] as? String
+            ),
+        xVnfProtocolVersion: dictionaryToXVnfProtocolVersion (
+            initializationDescriptorDictionary["xVnfProtocolVersion"] as? String
         ),
         cacheSequence: initializationDescriptorDictionary["cacheSequence"] as? Int ?? 0
     )
 }
 
-func dictionaryToEnvironment(
-    _ environmentDictionary: [String: String]
+private func dictionaryToEnvironment(
+    _ environment: String?
 ) -> VCLEnvironment {
-    switch environmentDictionary["value"] {
-    case VCLEnvironment.DEV.rawValue:
-        return VCLEnvironment.DEV
-    case VCLEnvironment.QA.rawValue:
-        return VCLEnvironment.QA
-    case VCLEnvironment.STAGING.rawValue:
-        return VCLEnvironment.STAGING
-    case VCLEnvironment.PROD.rawValue:
-        return VCLEnvironment.PROD
+    switch environment {
+    case VCLEnvironment.Dev.rawValue:
+        return VCLEnvironment.Dev
+    case VCLEnvironment.Qa.rawValue:
+        return VCLEnvironment.Qa
+    case VCLEnvironment.Staging.rawValue:
+        return VCLEnvironment.Staging
+    case VCLEnvironment.Prod.rawValue:
+        return VCLEnvironment.Prod
+    default:
+        return VCLEnvironment.Prod
+    }
+}
+
+private func dictionaryToKeyServiceType(
+    _ keyServiceType: String?
+) -> VCLKeyServiceType {
+    switch keyServiceType {
+    case VCLKeyServiceType.Local.rawValue:
+        return VCLKeyServiceType.Local
+    case VCLKeyServiceType.Remote.rawValue:
+        return VCLKeyServiceType.Remote
     default:
-        return VCLEnvironment.PROD
+        return VCLKeyServiceType.Local
+    }
+}
+
+private func dictionaryToXVnfProtocolVersion(
+    _ xVnfProtocolVersion: String?
+) -> VCLXVnfProtocolVersion {
+    switch xVnfProtocolVersion {
+    case VCLXVnfProtocolVersion.XVnfProtocolVersion1.rawValue:
+        return VCLXVnfProtocolVersion.XVnfProtocolVersion1
+    case VCLXVnfProtocolVersion.XVnfProtocolVersion2.rawValue:
+        return VCLXVnfProtocolVersion.XVnfProtocolVersion2
+    default:
+        return VCLXVnfProtocolVersion.XVnfProtocolVersion1
     }
 }
 
@@ -414,15 +446,21 @@ func credentialManifestToDictionary(
     credentialManifestDictinary["iss"] = credentialManifest.iss
     credentialManifestDictinary["exchangeId"] = credentialManifest.exchangeId
     credentialManifestDictinary["vendorOriginContext"] = credentialManifest.vendorOriginContext
+    credentialManifestDictinary["verifiedProfile"] = credentialManifest.verifiedProfile.payload
     return credentialManifestDictinary
 }
 
 func dictionaryToCredentialManifest(
-    _ credentialMAnifestDictionary: [String: Any]?
+    _ credentialManifestDictionary: [String: Any]?
 ) -> VCLCredentialManifest {
-    let jwt: VCLJwt = VCLJwt(encodedJwt: (credentialMAnifestDictionary?["jwt"] as? [String: Any])?["encodedJwt"] as? String ?? "")
-    let vendorOriginContext: String? = credentialMAnifestDictionary?["vendorOriginContext"] as? String
-    return VCLCredentialManifest(jwt: jwt, vendorOriginContext: vendorOriginContext)
+    let jwt: VCLJwt = VCLJwt(encodedJwt: (credentialManifestDictionary?["jwt"] as? [String: Any])?["encodedJwt"] as? String ?? "")
+    let vendorOriginContext: String? = credentialManifestDictionary?["vendorOriginContext"] as? String
+    let verifiedProfileDictionary: [String: Any]? = credentialManifestDictionary?["verifiedProfile"] as? [String: Any]
+    return VCLCredentialManifest(
+        jwt: jwt,
+        vendorOriginContext: vendorOriginContext,
+        verifiedProfile: VCLVerifiedProfile(payload: verifiedProfileDictionary ?? [:])
+        )
 }
 
 func dictionaryToGenerateOffersDescriptor(
@@ -450,14 +488,24 @@ func dictionaryToGenerateOffersDescriptor(
     )
 }
 
-func generatedOffersToDictionary(
-    _ offers: VCLOffers
-) -> [String: Any] {
-    var generatedOffersDictionary = [String: Any]()
-    generatedOffersDictionary["all"] = offers.all
-    generatedOffersDictionary["responseCode"] = offers.responseCode
-    generatedOffersDictionary["token"] = tokenToDictionary(offers.token)
-    return generatedOffersDictionary
+func offersToDictionary(_ offers: VCLOffers) -> [String: Any] {
+    var offersDictionary = [String: Any]()
+    offersDictionary["payload"] = offers.payload
+    offersDictionary["all"] = offers.all
+    offersDictionary["responseCode"] = offers.responseCode
+    offersDictionary["token"] = tokenToDictionary(offers.token)
+    offersDictionary["challenge"] = offers.challenge
+    return offersDictionary
+}
+
+func dictionaryToOffers(_ offersDictionary: [String : Any]?) -> VCLOffers {
+    return VCLOffers(
+        payload: offersDictionary?["payload"] as? [String: Any] ?? [String: Any](),
+        all: offersDictionary?["all"] as? [[String: Any]] ?? [[String: Any]](),
+        responseCode: offersDictionary?["responseCode"] as? Int ?? 0,
+        token: dictionaryToToken(offersDictionary?["token"] as? [String: Any]),
+        challenge: offersDictionary?["challenge"] as? String ?? ""
+    )
 }
 
 func credentialTypesFormSchemaToDictionary(
@@ -485,6 +533,7 @@ func dictionaryToFinalizedOffersDescriptor(
 ) -> VCLFinalizeOffersDescriptor {
     return VCLFinalizeOffersDescriptor(
         credentialManifest: dictionaryToCredentialManifest(finalizedOffersDescriptorDictionary["credentialManifest"] as? [String : Any]),
+        offers: dictionaryToOffers(finalizedOffersDescriptorDictionary["offers"] as? [String : Any]),
         approvedOfferIds: finalizedOffersDescriptorDictionary["approvedOfferIds"] as? [String] ?? [String](),
         rejectedOfferIds: finalizedOffersDescriptorDictionary["rejectedOfferIds"] as? [String] ?? [String]()
     )
@@ -545,10 +594,24 @@ func dictionaryToJwtDescriptor(
     )
 }
 
-func didJwkToDictionary(
-    _ didJwk: VCLDidJwk
-) -> [String: Any] {
-    var didJwkDictionary = [String: Any]()
-    didJwkDictionary["value"] = didJwk.value
-    return didJwkDictionary
+func didJwkToDictionary(_ didJwk: VCLDidJwk?) -> [String: Any]? {
+    if let didJwk = didJwk {
+        return [
+            "keyId": didJwk.keyId,
+            "value": didJwk.value,
+            "kid": didJwk.kid
+        ]
+    }
+    return nil
+}
+
+func dictionaryToJwk(_ didJwkDictionary: [String: Any]?) -> VCLDidJwk? {
+    if let didJwkDictionary = didJwkDictionary {
+        return VCLDidJwk(
+            keyId: didJwkDictionary["keyId"] as? String ?? "",
+            value: didJwkDictionary["value"] as? String ?? "",
+            kid: didJwkDictionary["kid"] as? String ?? ""
+        )
+    }
+    return nil
 }

package/ios/VclReactNative.m

@@ -26,6 +26,7 @@ RCT_EXTERN_METHOD(getPresentationRequest:(NSDictionary*)presentationRequestDescr
                   withRejecter:(RCTPromiseRejectBlock)reject)
 
 RCT_EXTERN_METHOD(submitPresentation:(NSDictionary*)presentationSubmissionDictionary
+                  withDidJwkDictionary:(NSDictionary*)didJwkDictionary
                   withResolver:(RCTPromiseResolveBlock)resolve
                   withRejecter:(RCTPromiseRejectBlock)reject)
 
@@ -42,6 +43,7 @@ RCT_EXTERN_METHOD(getCredentialManifest:(NSDictionary*)credentialManifestDescrip
                   withRejecter:(RCTPromiseRejectBlock)reject)
 
 RCT_EXTERN_METHOD(generateOffers:(NSDictionary*)generateOffersDescriptorDictionary
+                  withDidJwkDictionary:(NSDictionary*)didJwkDictionary
                   withResolver:(RCTPromiseResolveBlock)resolve
                   withRejecter:(RCTPromiseRejectBlock)reject)
 
@@ -51,6 +53,7 @@ RCT_EXTERN_METHOD(checkForOffers:(NSDictionary*)generateOffersDescriptorDictiona
                   withRejecter:(RCTPromiseRejectBlock)reject)
 
 RCT_EXTERN_METHOD(finalizeOffers:(NSDictionary*)finalizeOffersDescriptorDictionary
+                  withDidJwkDictionary:(NSDictionary*)didJwkDictionary
                   withTokenDictionary:(NSDictionary*)tokenDictionary
                   withResolver:(RCTPromiseResolveBlock)resolve
                   withRejecter:(RCTPromiseRejectBlock)reject)

package/ios/VclReactNative.swift

@@ -1,7 +1,7 @@
 //  Created by Michael Avoyan on 05/07/2021.
 //
-// Copyright 2022 Velocity Career Labs inc.
-// SPDX-License-Identifier: Apache-2.0
+//  Copyright 2022 Velocity Career Labs inc.
+//  SPDX-License-Identifier: Apache-2.0
 //
 
 import VCL
@@ -78,13 +78,17 @@ class VclReactNative: NSObject {
         )
     }
     
-    @objc(submitPresentation:withResolver:withRejecter:)
+    @objc(submitPresentation:withDidJwkDictionary:withResolver:withRejecter:)
     func submitPresentation(
         presentationSubmissionDictionary: [String: Any],
+        didJwkDictionary: [String: Any]? = nil,
         resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock
     ) {
         vcl.submitPresentation(
-            presentationSubmission: dictionaryToPresentationSubmission(presentationSubmissionDictionary),
+            presentationSubmission: dictionaryToPresentationSubmission(
+                presentationSubmissionDictionary
+            ),
+            didJwk: dictionaryToJwk(didJwkDictionary),
             successHandler: {
                 resolve(presentationSubmissionResultToDictionary($0))
             },
@@ -142,15 +146,17 @@ class VclReactNative: NSObject {
         }
     }
     
-    @objc(generateOffers:withResolver:withRejecter:)
+    @objc(generateOffers:withDidJwkDictionary:withResolver:withRejecter:)
     func generateOffers(
         generateOffersDescriptorDictionary: [String: Any],
+        didJwkDictionary: [String: Any]? = nil,
         resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock
     ) {
         vcl.generateOffers(
             generateOffersDescriptor: dictionaryToGenerateOffersDescriptor(generateOffersDescriptorDictionary),
+            didJwk: dictionaryToJwk(didJwkDictionary),
             successHandler: {
-                resolve(generatedOffersToDictionary($0))
+                resolve(offersToDictionary($0))
             },
             errorHandler: {
                 reject(nil, $0.toDictionary().toJsonString(), $0)
@@ -167,21 +173,23 @@ class VclReactNative: NSObject {
             generateOffersDescriptor: dictionaryToGenerateOffersDescriptor(generateOffersDescriptorDictionary),
             token: dictionaryToToken(tokenDictionary),
             successHandler: {
-                resolve(generatedOffersToDictionary($0))
+                resolve(offersToDictionary($0))
             },
             errorHandler: {
                 reject(nil, $0.toDictionary().toJsonString(), $0)
             })
     }
     
-    @objc(finalizeOffers:withTokenDictionary:withResolver:withRejecter:)
+    @objc(finalizeOffers:withDidJwkDictionary:withTokenDictionary:withResolver:withRejecter:)
     func finalizeOffers(
         finalizeOffersDescriptorDictionary: [String: Any],
+        didJwkDictionary: [String: Any]? = nil,
         tokenDictionary: [String: Any],
         resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock
     ) {
         vcl.finalizeOffers(
             finalizeOffersDescriptor: dictionaryToFinalizedOffersDescriptor(finalizeOffersDescriptorDictionary),
+            didJwk: dictionaryToJwk(didJwkDictionary),
             token: dictionaryToToken(tokenDictionary),
             successHandler: {
                 resolve(jwtVerifiableCredentialsToDictionary($0))