@velocitycareerlabs/vcl-react-native 2.0.1 → 2.2.0

package/android/build.gradle

@@ -100,7 +100,7 @@ dependencies {
 
   // VCL:
   implementation "com.nimbusds:nimbus-jose-jwt:9.37"
-  implementation "io.velocitycareerlabs:vcl:2.0.0"
+  implementation "io.velocitycareerlabs:vcl:2.2.0"
 }
 
 if (isNewArchitectureEnabled()) {

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

@@ -123,13 +123,11 @@ class VclReactNativeModule(private val reactContext: ReactApplicationContext) :
   @ReactMethod
   fun getPresentationRequest(
     presentationRequestDescriptorMap: ReadableMap,
-    remoteCryptoServicesTokenMap: ReadableMap? = null,
     promise: Promise
   ) {
     try {
       vcl.getPresentationRequest(
         presentationRequestDescriptor = mapTopPresentationRequestDescriptor(presentationRequestDescriptorMap),
-        remoteCryptoServicesToken = mapToToken(remoteCryptoServicesTokenMap),
         successHandler = {
           promise.resolve(presentationRequestToMap(it))
         },
@@ -144,15 +142,11 @@ class VclReactNativeModule(private val reactContext: ReactApplicationContext) :
   @ReactMethod
   fun submitPresentation(
     presentationSubmissionMap: ReadableMap,
-    didJwkMap: ReadableMap,
-    remoteCryptoServicesTokenMap: ReadableMap? = null,
     promise: Promise
   ) {
     try {
       vcl.submitPresentation(
         presentationSubmission = mapToPresentationSubmission(presentationSubmissionMap),
-        didJwk = mapToDidJwk(didJwkMap),
-        remoteCryptoServicesToken = mapToToken(remoteCryptoServicesTokenMap),
         successHandler = {
           promise.resolve(presentationSubmissionResultToMap(it))
         },
@@ -204,7 +198,6 @@ class VclReactNativeModule(private val reactContext: ReactApplicationContext) :
   @ReactMethod
   fun getCredentialManifest(
     credentialManifestDescriptorMap: ReadableMap,
-    remoteCryptoServicesTokenMap: ReadableMap? = null,
     promise: Promise
   ) {
     try {
@@ -216,7 +209,6 @@ class VclReactNativeModule(private val reactContext: ReactApplicationContext) :
         )
         vcl.getCredentialManifest(
           credentialManifestDescriptor,
-          mapToToken(remoteCryptoServicesTokenMap),
           successHandler = {
             promise.resolve(credentialManifestToMap(it))
           },
@@ -234,15 +226,11 @@ class VclReactNativeModule(private val reactContext: ReactApplicationContext) :
   @ReactMethod
   fun generateOffers(
     generateOffersDescriptorMap: ReadableMap,
-    didJwkMap: ReadableMap,
-    remoteCryptoServicesTokenMap: ReadableMap? = null,
     promise: Promise
   ) {
     try {
       vcl.generateOffers(
         generateOffersDescriptor = mapToGenerateOffersDescriptor(generateOffersDescriptorMap),
-        didJwk = mapToDidJwk(didJwkMap),
-        remoteCryptoServicesToken = mapToToken(remoteCryptoServicesTokenMap),
         successHandler = {
           promise.resolve(offersToMap(it))
         },
@@ -278,17 +266,13 @@ class VclReactNativeModule(private val reactContext: ReactApplicationContext) :
   @ReactMethod
   fun finalizeOffers(
     finalizeOffersDescriptorMap: ReadableMap,
-    didJwkMap: ReadableMap,
     sessionTokenMap: ReadableMap,
-    remoteCryptoServicesTokenMap: ReadableMap? = null,
     promise: Promise
   ) {
     try {
       vcl.finalizeOffers(
         finalizeOffersDescriptor = mapToFinalizedOffersDescriptor(finalizeOffersDescriptorMap),
-        didJwk = mapToDidJwk(didJwkMap),
         sessionToken = mapToToken(sessionTokenMap),
-        remoteCryptoServicesToken = mapToToken(remoteCryptoServicesTokenMap),
         successHandler = {
           promise.resolve(jwtVerifiableCredentialsToMap(it))
         },
@@ -363,15 +347,15 @@ class VclReactNativeModule(private val reactContext: ReactApplicationContext) :
 
   @ReactMethod
   fun generateSignedJwt(
-    didJwkMap: ReadableMap,
     jwtDescriptorMap: ReadableMap,
+    didJwkMap: ReadableMap,
     remoteCryptoServicesTokenMap: ReadableMap? = null,
     promise: Promise
   ) {
     try {
       vcl.generateSignedJwt(
-        didJwk = mapToDidJwk(didJwkMap),
         jwtDescriptor = mapToJwtDescriptor(jwtDescriptorMap),
+        didJwk = mapToDidJwk(didJwkMap),
         remoteCryptoServicesToken = mapToToken(remoteCryptoServicesTokenMap),
         successHandler = {
           promise.resolve(Converter.jwtToMap(it))

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

@@ -46,6 +46,10 @@ object Converter {
       VCLCryptoServiceType.fromString(
         cryptoServicesDescriptorMap?.getStringOpt("cryptoServiceType") ?: ""
       )
+    val signatureAlgorithm =
+      VCLSignatureAlgorithm.fromString(
+        cryptoServicesDescriptorMap?.getStringOpt("signatureAlgorithm") ?: ""
+      )
     val remoteCryptoServicesUrlsDescriptorMap =
       cryptoServicesDescriptorMap?.getMap("remoteCryptoServicesUrlsDescriptor")
     val keyServiceUrls = remoteCryptoServicesUrlsDescriptorMap?.getMapOpt("keyServiceUrls")
@@ -61,6 +65,7 @@ object Converter {
     )
     return VCLCryptoServicesDescriptor(
       cryptoServiceType = cryptoServiceType,
+      signatureAlgorithm = signatureAlgorithm,
       remoteCryptoServicesUrlsDescriptor = remoteCryptoServicesUrlsDescriptor
     )
   }
@@ -166,7 +171,13 @@ object Converter {
     VCLPresentationRequestDescriptor(
       deepLink = mapToDeepLink(presentationRequestDescriptorLinkMap.getMapOpt("deepLink"))
         ?: VCLDeepLink(""),
-      pushDelegate = mapToPushDelegate(presentationRequestDescriptorLinkMap.getMapOpt("pushDelegate"))
+      pushDelegate = mapToPushDelegate(
+        presentationRequestDescriptorLinkMap.getMapOpt("pushDelegate")
+      ),
+      didJwk = mapToDidJwk(presentationRequestDescriptorLinkMap.getMapOpt("didJwk")),
+      remoteCryptoServicesToken = mapToToken(
+        presentationRequestDescriptorLinkMap.getMapOpt("remoteCryptoServicesToken")
+      )
     )
 
   fun mapToDeepLink(deepLinkMap: ReadableMap?): VCLDeepLink? {
@@ -196,10 +207,10 @@ object Converter {
   fun mapToToken(tokenMap: ReadableMap?) =
     VCLToken(tokenMap?.getStringOpt("value") ?: "")
 
-  fun tokenToMap(token: VCLToken): ReadableMap {
+  fun tokenToMap(token: VCLToken?): ReadableMap {
     val retVal = Arguments.createMap()
-    retVal.putString("value", token.value)
-    token.expiresIn?.toDouble()?.let {
+    retVal.putString("value", token?.value)
+    token?.expiresIn?.toDouble()?.let {
       retVal.putDouble("expiresIn", it)
     }
     return retVal
@@ -208,9 +219,12 @@ object Converter {
   fun mapToPresentationRequest(
     presentationRequestMap: ReadableMap?
   ) = VCLPresentationRequest(
-    mapToJwt(presentationRequestMap?.getMapOpt("jwt")),
-    mapToPublicJwk(presentationRequestMap?.getMapOpt("publicJwk")),
-    mapToDeepLink(presentationRequestMap?.getMapOpt("deepLink")) ?: VCLDeepLink("")
+    jwt = mapToJwt(presentationRequestMap?.getMapOpt("jwt")),
+    publicJwk = mapToPublicJwk(presentationRequestMap?.getMapOpt("publicJwk")),
+    deepLink = mapToDeepLink(presentationRequestMap?.getMapOpt("deepLink")) ?: VCLDeepLink(""),
+    pushDelegate = mapToPushDelegate(presentationRequestMap?.getMapOpt("pushDelegate")),
+    didJwk = mapToDidJwk(presentationRequestMap?.getMapOpt("didJwk")),
+    remoteCryptoServicesToken = mapToToken(presentationRequestMap?.getMapOpt("remoteCryptoServicesToken"))
   )
 
   fun presentationRequestToMap(
@@ -230,6 +244,8 @@ object Converter {
       presentationRequest.presentationDefinitionId
     )
     presentationRequestMap.putMap("deepLink", deepLinkToMap(presentationRequest.deepLink))
+    presentationRequestMap.putMap("didJwk", didJwkToMap(presentationRequest.didJwk))
+    presentationRequestMap.putMap("remoteCryptoServicesToken", tokenToMap(presentationRequest.remoteCryptoServicesToken))
     return presentationRequestMap
   }
 
@@ -427,18 +443,22 @@ object Converter {
     credentialManifestDescriptorByDeepLinkMap: ReadableMap
   ): VCLCredentialManifestDescriptorByDeepLink {
     return VCLCredentialManifestDescriptorByDeepLink(
-      mapToDeepLink(credentialManifestDescriptorByDeepLinkMap.getMapOpt("deepLink"))
+      deepLink = mapToDeepLink(credentialManifestDescriptorByDeepLinkMap.getMapOpt("deepLink"))
         ?: VCLDeepLink(""),
-      mapToIssuingType(credentialManifestDescriptorByDeepLinkMap, VCLIssuingType.Career),
-      mapToPushDelegate(credentialManifestDescriptorByDeepLinkMap.getMapOpt("pushDelegate"))
+      issuingType = mapToIssuingType(credentialManifestDescriptorByDeepLinkMap, VCLIssuingType.Career),
+      pushDelegate = mapToPushDelegate(
+        credentialManifestDescriptorByDeepLinkMap.getMapOpt("pushDelegate")
+      ),
+      didJwk = mapToDidJwk(credentialManifestDescriptorByDeepLinkMap.getMapOpt("didJwk")),
+      remoteCryptoServicesToken = mapToToken(
+        credentialManifestDescriptorByDeepLinkMap.getMapOpt("remoteCryptoServicesToken")
+      )
     )
   }
 
   fun mapToCredentialManifestDescriptorByService(
     credentialManifestDescriptorByServiceMap: ReadableMap
   ): VCLCredentialManifestDescriptorByService {
-    val pushDelegate =
-      mapToPushDelegate(credentialManifestDescriptorByServiceMap.getMapOpt("pushDelegate"))
     return VCLCredentialManifestDescriptorByService(
       service = mapToServiceCredentialAgentIssuer(
         credentialManifestDescriptorByServiceMap.getMapOpt("service")
@@ -450,7 +470,13 @@ object Converter {
       credentialTypes =
       (credentialManifestDescriptorByServiceMap.getArrayOpt("credentialTypes")?.toArrayList()
         ?.toList() as? List<String>),
-      pushDelegate = pushDelegate
+      pushDelegate = mapToPushDelegate(
+        credentialManifestDescriptorByServiceMap.getMapOpt("pushDelegate")
+      ),
+      didJwk = mapToDidJwk(credentialManifestDescriptorByServiceMap.getMapOpt("didJwk")),
+      remoteCryptoServicesToken = mapToToken(
+        credentialManifestDescriptorByServiceMap.getMapOpt("remoteCryptoServicesToken")
+      )
     )
   }
 
@@ -462,7 +488,11 @@ object Converter {
         credentialManifestDescriptorRefreshMap.getMapOpt("service")
       ),
       credentialIds = credentialManifestDescriptorRefreshMap.getArrayOpt("credentialIds")
-        ?.toArrayList()?.toList() as? List<String> ?: listOf()
+        ?.toArrayList()?.toList() as? List<String> ?: listOf(),
+      didJwk = mapToDidJwk(credentialManifestDescriptorRefreshMap.getMapOpt("didJwk")),
+      remoteCryptoServicesToken = mapToToken(
+        credentialManifestDescriptorRefreshMap.getMapOpt("remoteCryptoServicesToken")
+      )
     )
   }
 
@@ -489,6 +519,8 @@ object Converter {
       credentialManifest.verifiedProfile.payload.toReadableMap()
     )
     credentialManifestMap.putMap("deepLink", deepLinkToMap(credentialManifest.deepLink))
+    credentialManifestMap.putMap("didJwk", didJwkToMap(credentialManifest.didJwk))
+    credentialManifestMap.putMap("remoteCryptoServicesToken", tokenToMap(credentialManifest.remoteCryptoServicesToken))
     return credentialManifestMap
   }
 
@@ -500,13 +532,18 @@ object Converter {
     val vendorOriginContext: String? = credentialManifestMap?.getStringOpt("vendorOriginContext")
     val verifiedProfileMap: ReadableMap? = credentialManifestMap?.getMapOpt("verifiedProfile")
     val deepLinkMap: ReadableMap? = credentialManifestMap?.getMapOpt("deepLink")
+    val didJwkMap: ReadableMap? = credentialManifestMap?.getMapOpt("didJwk")
+    val remoteCryptoServicesTokenMap = credentialManifestMap?.getMapOpt("remoteCryptoServicesToken")
+
     return VCLCredentialManifest(
       jwt = jwt,
       vendorOriginContext = vendorOriginContext,
       verifiedProfile = VCLVerifiedProfile(
         payload = verifiedProfileMap?.toJsonObject() ?: JSONObject()
       ),
-      deepLink = mapToDeepLink(deepLinkMap)
+      deepLink = mapToDeepLink(deepLinkMap),
+      didJwk = mapToDidJwk(didJwkMap),
+      remoteCryptoServicesToken = mapToToken(remoteCryptoServicesTokenMap)
     )
   }
 
@@ -677,12 +714,12 @@ object Converter {
       return didJwkMap
   }
 
-  fun mapToDidJwk(didJwkMap: ReadableMap): VCLDidJwk {
+  fun mapToDidJwk(didJwkMap: ReadableMap?): VCLDidJwk {
       return VCLDidJwk(
-        did = didJwkMap.getStringOpt("did") ?: "",
-        publicJwk = mapToPublicJwk(didJwkMap.getMap("publicJwk")),
-        kid = didJwkMap.getStringOpt("kid") ?: "",
-        keyId = didJwkMap.getStringOpt("keyId") ?: ""
+        did = didJwkMap?.getStringOpt("did") ?: "",
+        publicJwk = mapToPublicJwk(didJwkMap?.getMap("publicJwk")),
+        kid = didJwkMap?.getStringOpt("kid") ?: "",
+        keyId = didJwkMap?.getStringOpt("keyId") ?: ""
       )
   }
 }

package/ios/Utils/Converter.swift

@@ -43,6 +43,9 @@ private func dictionaryToCryptoServicesDescriptor(
     VCLCryptoServiceType.fromString(
         value: cryptoServicesDescriptorDictionary?["cryptoServiceType"] as? String ?? ""
     )
+    let signatureAlgorithm = VCLSignatureAlgorithm.fromString(
+        value: cryptoServicesDescriptorDictionary?["signatureAlgorithm"] as? String ?? ""
+    )
     let remoteCryptoServicesUrlsDescriptorDictionary = cryptoServicesDescriptorDictionary?["remoteCryptoServicesUrlsDescriptor"] as? [String: Any]
     let keyServiceUrls = remoteCryptoServicesUrlsDescriptorDictionary?["keyServiceUrls"] as? [String: Any]
     let jwtServiceUrls = remoteCryptoServicesUrlsDescriptorDictionary?["jwtServiceUrls"] as? [String: Any]
@@ -57,6 +60,7 @@ private func dictionaryToCryptoServicesDescriptor(
     )
     return VCLCryptoServicesDescriptor(
         cryptoServiceType: cryptoServiceType,
+        signatureAlgorithm: signatureAlgorithm,
         remoteCryptoServicesUrlsDescriptor: remoteCryptoServicesUrlsDescriptor
     )
 }
@@ -165,7 +169,11 @@ func dictionaryTopPresentationRequestDescriptor(
 ) -> VCLPresentationRequestDescriptor {
     return VCLPresentationRequestDescriptor(
         deepLink: dictionaryToDeepLink(presentationRequestDescriptorLinkDictionary["deepLink"] as? [String: Any]) ?? VCLDeepLink(value: ""),
-        pushDelegate: dictionaryToPushDelegate(presentationRequestDescriptorLinkDictionary["pushDelegate"] as? [String: Any])
+        pushDelegate: dictionaryToPushDelegate(presentationRequestDescriptorLinkDictionary["pushDelegate"] as? [String: Any]),
+        didJwk: dictionaryToDidJwk(presentationRequestDescriptorLinkDictionary["didJwk"] as? [String: Any]),
+        remoteCryptoServicesToken: dictionaryToToken(
+            presentationRequestDescriptorLinkDictionary["remoteCryptoServicesToken"] as? [String: Any]
+        )
     )
 }
 
@@ -187,10 +195,10 @@ func dictionaryToToken(_ tokenDictionary: [String: Any]?) -> VCLToken {
     return VCLToken(value: tokenDictionary?["value"] as? String ?? "")
 }
 
-func tokenToDictionary(_ token: VCLToken) -> [String: Any] {
+func tokenToDictionary(_ token: VCLToken?) -> [String: Any] {
     var retVal = [String: Any]()
-    retVal["value"] = token.value
-    if let expiresIn = token.expiresIn {
+    retVal["value"] = token?.value
+    if let expiresIn = token?.expiresIn {
         retVal["expiresIn"] = expiresIn
     }
     return retVal
@@ -212,7 +220,10 @@ func dictionaryToPresentationRequest(
     return VCLPresentationRequest(
         jwt: dictionaryToJwt(presentationRequestDictionary?["jwt"] as? [String : Any]),
         publicJwk: dictionaryToPublicJwk(presentationRequestDictionary?["publicJwk"] as? [String: Any]),
-        deepLink: dictionaryToDeepLink(presentationRequestDictionary?["deepLink"] as? [String : Any]) ?? VCLDeepLink(value: "")
+        deepLink: dictionaryToDeepLink(presentationRequestDictionary?["deepLink"] as? [String : Any]) ?? VCLDeepLink(value: ""),
+        pushDelegate: dictionaryToPushDelegate(presentationRequestDictionary?["pushDelegate"] as? [String : Any]),
+        didJwk: dictionaryToDidJwk(presentationRequestDictionary?["didJwk"] as? [String : Any]),
+        remoteCryptoServicesToken: dictionaryToToken(presentationRequestDictionary?["remoteCryptoServicesToken"] as? [String : Any])
     )
 }
 
@@ -228,6 +239,8 @@ func presentationRequestToDictionary(
     presentationRequestDictionary["exchangeId"] = presentationRequest.exchangeId
     presentationRequestDictionary["presentationDefinitionId"] = presentationRequest.presentationDefinitionId
     presentationRequestDictionary["deepLink"] = deepLinkToDictionary(presentationRequest.deepLink)
+    presentationRequestDictionary["didJwk"] = didJwkToDictionary(presentationRequest.didJwk)
+    presentationRequestDictionary["remoteCryptoServicesToken"] = tokenToDictionary(presentationRequest.remoteCryptoServicesToken)
     return presentationRequestDictionary
 }
 
@@ -408,15 +421,17 @@ func dictionaryToCredentialManifestDescriptorByDeepLink(
             issuingTypeDictionary: credentialManifestDescriptorByDeepLinkDictionary,
             defaultIssuingType: VCLIssuingType.Career
         ),
-        pushDelegate: dictionaryToPushDelegate(credentialManifestDescriptorByDeepLinkDictionary["pushDelegate"] as? [String: Any])
+        pushDelegate: dictionaryToPushDelegate(credentialManifestDescriptorByDeepLinkDictionary["pushDelegate"] as? [String: Any]),
+        didJwk: dictionaryToDidJwk(credentialManifestDescriptorByDeepLinkDictionary["didJwk"] as? [String: Any]),
+        remoteCryptoServicesToken: dictionaryToToken(
+            credentialManifestDescriptorByDeepLinkDictionary["remoteCryptoServicesToken"] as? [String: Any]
+        )
     )
 }
 
 func dictionaryToCredentialManifestDescriptorByService(
     _ credentialManifestDescriptorByServiceDictionary: [String: Any]
 ) -> VCLCredentialManifestDescriptorByService {
-    let pushDelegateDictionary = credentialManifestDescriptorByServiceDictionary["pushDelegate"] as? [String: Any]
-    let pushDelegate = dictionaryToPushDelegate(pushDelegateDictionary)
     return VCLCredentialManifestDescriptorByService(
         service: dictionaryToServiceCredentialAgentIssuer(
             credentialManifestDescriptorByServiceDictionary["service"] as? [String : Any]
@@ -426,7 +441,13 @@ func dictionaryToCredentialManifestDescriptorByService(
             defaultIssuingType: VCLIssuingType.Career
         ),
         credentialTypes: credentialManifestDescriptorByServiceDictionary["credentialTypes"] as? [String],
-        pushDelegate: pushDelegate
+        pushDelegate: dictionaryToPushDelegate(
+            credentialManifestDescriptorByServiceDictionary["pushDelegate"] as? [String: Any]
+        ),
+        didJwk: dictionaryToDidJwk(credentialManifestDescriptorByServiceDictionary["didJwk"] as? [String: Any]),
+        remoteCryptoServicesToken: dictionaryToToken(
+            credentialManifestDescriptorByServiceDictionary["remoteCryptoServicesToken"] as? [String: Any]
+        )
     )
 }
 
@@ -437,14 +458,18 @@ func dictionaryToCredentialManifestDescriptorRefresh(
         service: dictionaryToServiceCredentialAgentIssuer(
             credentialManifestDescriptorRefreshDictionary["service"] as? [String : Any]
         ),
-        credentialIds: credentialManifestDescriptorRefreshDictionary["credentialIds"] as? [String] ?? [String]()
+        credentialIds: credentialManifestDescriptorRefreshDictionary["credentialIds"] as? [String] ?? [],
+        didJwk: dictionaryToDidJwk(credentialManifestDescriptorRefreshDictionary["didJwk"] as? [String: Any]),
+        remoteCryptoServicesToken: dictionaryToToken(
+            credentialManifestDescriptorRefreshDictionary["remoteCryptoServicesToken"] as? [String: Any]
+        )
     )
 }
 
 func dictionaryToServiceCredentialAgentIssuer(
     _ serviceDictionary: [String: Any]?
 ) -> VCLServiceCredentialAgentIssuer {
-    return VCLServiceCredentialAgentIssuer(payload: serviceDictionary?["payload"] as? [String : Any] ?? [String: Any]())
+    return VCLServiceCredentialAgentIssuer(payload: serviceDictionary?["payload"] as? [String : Any] ?? [:])
 }
 
 func credentialManifestToDictionary(
@@ -458,21 +483,28 @@ func credentialManifestToDictionary(
     credentialManifestDictinary["vendorOriginContext"] = credentialManifest.vendorOriginContext
     credentialManifestDictinary["verifiedProfile"] = credentialManifest.verifiedProfile.payload
     credentialManifestDictinary["deepLink"] = deepLinkToDictionary(credentialManifest.deepLink)
+    credentialManifestDictinary["didJwk"] = didJwkToDictionary(credentialManifest.didJwk)
+    credentialManifestDictinary["remoteCryptoServicesToken"] = tokenToDictionary(credentialManifest.remoteCryptoServicesToken)
     return credentialManifestDictinary
 }
 
 func dictionaryToCredentialManifest(
     _ credentialManifestDictionary: [String: Any]?
 ) -> VCLCredentialManifest {
-    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]
-    let deepLink: VCLDeepLink? = dictionaryToDeepLink(credentialManifestDictionary?["deepLink"] as? [String: Any])
+    let jwt = VCLJwt(encodedJwt: (credentialManifestDictionary?["jwt"] as? [String: Any])?["encodedJwt"] as? String ?? "")
+    let vendorOriginContext = credentialManifestDictionary?["vendorOriginContext"] as? String
+    let verifiedProfileDictionary = credentialManifestDictionary?["verifiedProfile"] as? [String: Any]
+    let deepLink = dictionaryToDeepLink(credentialManifestDictionary?["deepLink"] as? [String: Any])
+    let didJwk = dictionaryToDidJwk(credentialManifestDictionary?["didJwk"] as? [String: Any])
+    let remoteCryptoServicesToken = dictionaryToToken(credentialManifestDictionary?["remoteCryptoServicesToken"] as? [String: Any])
+    
     return VCLCredentialManifest(
         jwt: jwt,
         vendorOriginContext: vendorOriginContext,
         verifiedProfile: VCLVerifiedProfile(payload: verifiedProfileDictionary ?? [:]),
-        deepLink: deepLink
+        deepLink: deepLink,
+        didJwk: didJwk,
+        remoteCryptoServicesToken: remoteCryptoServicesToken
     )
 }
 
@@ -636,11 +668,11 @@ func didJwkToDictionary(_ didJwk: VCLDidJwk) -> [String: Any] {
     ]
 }
 
-func dictionaryToJwk(_ didJwkDictionary: [String: Any]) -> VCLDidJwk {
+func dictionaryToDidJwk(_ didJwkDictionary: [String: Any]?) -> VCLDidJwk {
     return VCLDidJwk(
-        did: didJwkDictionary["did"] as? String ?? "",
-        publicJwk: dictionaryToPublicJwk(didJwkDictionary["publicJwk"] as? [String : Any]),
-        kid: didJwkDictionary["kid"] as? String ?? "",
-        keyId: didJwkDictionary["keyId"] as? String ?? ""
+        did: didJwkDictionary?["did"] as? String ?? "",
+        publicJwk: dictionaryToPublicJwk(didJwkDictionary?["publicJwk"] as? [String : Any]),
+        kid: didJwkDictionary?["kid"] as? String ?? "",
+        keyId: didJwkDictionary?["keyId"] as? String ?? ""
     )
 }

package/ios/VclReactNative.mm

@@ -22,13 +22,10 @@ RCT_EXTERN_METHOD(getCredentialTypes:(RCTPromiseResolveBlock)resolve
                   withRejecter:(RCTPromiseRejectBlock)reject)
 
 RCT_EXTERN_METHOD(getPresentationRequest:(NSDictionary*)presentationRequestDescriptorDictionary
-                  withRemoteCryptoServicesTokenDictionary:(NSDictionary*)remoteCryptoServicesTokenDictionary
                   withResolver:(RCTPromiseResolveBlock)resolve
                   withRejecter:(RCTPromiseRejectBlock)reject)
 
 RCT_EXTERN_METHOD(submitPresentation:(NSDictionary*)presentationSubmissionDictionary
-                  withDidJwkDictionary:(NSDictionary*)didJwkDictionary
-                  withRemoteCryptoServicesTokenDictionary:(NSDictionary*)remoteCryptoServicesTokenDictionary
                   withResolver:(RCTPromiseResolveBlock)resolve
                   withRejecter:(RCTPromiseRejectBlock)reject)
 
@@ -41,13 +38,10 @@ RCT_EXTERN_METHOD(searchForOrganizations:(NSDictionary*)organizationsSearchDescr
                   withRejecter:(RCTPromiseRejectBlock)reject)
 
 RCT_EXTERN_METHOD(getCredentialManifest:(NSDictionary*)credentialManifestDescriptorDictionary
-                  withRemoteCryptoServicesTokenDictionary:(NSDictionary*)remoteCryptoServicesTokenDictionary
                   withResolver:(RCTPromiseResolveBlock)resolve
                   withRejecter:(RCTPromiseRejectBlock)reject)
 
 RCT_EXTERN_METHOD(generateOffers:(NSDictionary*)generateOffersDescriptorDictionary
-                  withDidJwkDictionary:(NSDictionary*)didJwkDictionary
-                  withRemoteCryptoServicesTokenDictionary:(NSDictionary*)remoteCryptoServicesTokenDictionary
                   withResolver:(RCTPromiseResolveBlock)resolve
                   withRejecter:(RCTPromiseRejectBlock)reject)
 
@@ -57,9 +51,7 @@ RCT_EXTERN_METHOD(checkForOffers:(NSDictionary*)generateOffersDescriptorDictiona
                   withRejecter:(RCTPromiseRejectBlock)reject)
 
 RCT_EXTERN_METHOD(finalizeOffers:(NSDictionary*)finalizeOffersDescriptorDictionary
-                  withDidJwkDictionary:(NSDictionary*)didJwkDictionary
                   withSessionTokenDictionary:(NSDictionary*)sessionTokenDictionary
-                  withRemoteCryptoServicesTokenDictionary:(NSDictionary*)remoteCryptoServicesTokenDictionary
                   withResolver:(RCTPromiseResolveBlock)resolve
                   withRejecter:(RCTPromiseRejectBlock)reject)
 
@@ -77,8 +69,8 @@ RCT_EXTERN_METHOD(verifyJwt:(NSDictionary*)jwtDictionary
                   withResolver:(RCTPromiseResolveBlock)resolve
                   withRejecter:(RCTPromiseRejectBlock)reject)
 
-RCT_EXTERN_METHOD(generateSignedJwt:(NSDictionary*)didJwkDictionary
-                  withJwtDescriptorDictionary:(NSDictionary*)jwtDescriptorDictionary
+RCT_EXTERN_METHOD(generateSignedJwt:(NSDictionary*)jwtDescriptorDictionary
+                  withDidJwkDictionary:(NSDictionary*)didJwkDictionary
                   withRemoteCryptoServicesTokenDictionary:(NSDictionary*)remoteCryptoServicesTokenDictionary
                   withResolver:(RCTPromiseResolveBlock)resolve
                   withRejecter:(RCTPromiseRejectBlock)reject)

package/ios/VclReactNative.swift

@@ -71,15 +71,13 @@ class VclReactNative: NSObject {
         }
     }
     
-    @objc(getPresentationRequest:withRemoteCryptoServicesTokenDictionary:withResolver:withRejecter:)
+    @objc(getPresentationRequest:withResolver:withRejecter:)
     func getPresentationRequest(
         presentationRequestDescriptorDictionary: [String: Any],
-        remoteCryptoServicesTokenDictionary: [String: Any]? = nil,
         resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock
     ) {
         vcl.getPresentationRequest(
             presentationRequestDescriptor: dictionaryTopPresentationRequestDescriptor(presentationRequestDescriptorDictionary),
-            remoteCryptoServicesToken: dictionaryToToken(remoteCryptoServicesTokenDictionary),
             successHandler: {
                 resolve(presentationRequestToDictionary($0))
             },
@@ -89,19 +87,15 @@ class VclReactNative: NSObject {
         )
     }
     
-    @objc(submitPresentation:withDidJwkDictionary:withRemoteCryptoServicesTokenDictionary:withResolver:withRejecter:)
+    @objc(submitPresentation:withResolver:withRejecter:)
     func submitPresentation(
         presentationSubmissionDictionary: [String: Any],
-        didJwkDictionary: [String: Any],
-        remoteCryptoServicesTokenDictionary: [String: Any]? = nil,
         resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock
     ) {
         vcl.submitPresentation(
             presentationSubmission: dictionaryToPresentationSubmission(
                 presentationSubmissionDictionary
             ),
-            didJwk: dictionaryToJwk(didJwkDictionary),
-            remoteCryptoServicesToken: dictionaryToToken(remoteCryptoServicesTokenDictionary),
             successHandler: {
                 resolve(presentationSubmissionResultToDictionary($0))
             },
@@ -140,10 +134,9 @@ class VclReactNative: NSObject {
             })
     }
     
-    @objc(getCredentialManifest:withRemoteCryptoServicesTokenDictionary:withResolver:withRejecter:)
+    @objc(getCredentialManifest:withResolver:withRejecter:)
     func getCredentialManifest(
         credentialManifestDescriptorDictionary: [String: Any],
-        remoteCryptoServicesTokenDictionary: [String: Any],
         resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock
     ) {
         VCLLog.d("credentialManifestDescriptorDictionary dictionary: \(credentialManifestDescriptorDictionary)")
@@ -151,7 +144,6 @@ class VclReactNative: NSObject {
             VCLLog.d("credentialManifestDescriptor VCL entity: \(credentialManifestDescriptor.toPropsString())")
             vcl.getCredentialManifest(
                 credentialManifestDescriptor: credentialManifestDescriptor,
-                remoteCryptoServicesToken: dictionaryToToken(remoteCryptoServicesTokenDictionary),
                 successHandler: {
                     resolve(credentialManifestToDictionary($0))
                 },
@@ -163,17 +155,13 @@ class VclReactNative: NSObject {
         }
     }
     
-    @objc(generateOffers:withDidJwkDictionary:withRemoteCryptoServicesTokenDictionary:withResolver:withRejecter:)
+    @objc(generateOffers:withResolver:withRejecter:)
     func generateOffers(
         generateOffersDescriptorDictionary: [String: Any],
-        didJwkDictionary: [String: Any],
-        remoteCryptoServicesTokenDictionary: [String: Any]? = nil,
         resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock
     ) {
         vcl.generateOffers(
             generateOffersDescriptor: dictionaryToGenerateOffersDescriptor(generateOffersDescriptorDictionary),
-            didJwk: dictionaryToJwk(didJwkDictionary),
-            remoteCryptoServicesToken: dictionaryToToken(remoteCryptoServicesTokenDictionary),
             successHandler: {
                 resolve(offersToDictionary($0))
             },
@@ -199,19 +187,15 @@ class VclReactNative: NSObject {
             })
     }
     
-    @objc(finalizeOffers:withDidJwkDictionary:withSessionTokenDictionary:withRemoteCryptoServicesTokenDictionary:withResolver:withRejecter:)
+    @objc(finalizeOffers:withSessionTokenDictionary:withResolver:withRejecter:)
     func finalizeOffers(
         finalizeOffersDescriptorDictionary: [String: Any],
-        didJwkDictionary: [String: Any],
         sessionTokenDictionary: [String: Any],
-        remoteCryptoServicesTokenDictionary: [String: Any]? = nil,
         resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock
     ) {
         vcl.finalizeOffers(
             finalizeOffersDescriptor: dictionaryToFinalizedOffersDescriptor(finalizeOffersDescriptorDictionary),
-            didJwk: dictionaryToJwk(didJwkDictionary),
             sessionToken: dictionaryToToken(sessionTokenDictionary),
-            remoteCryptoServicesToken: dictionaryToToken(remoteCryptoServicesTokenDictionary),
             successHandler: {
                 resolve(jwtVerifiableCredentialsToDictionary($0))
             },
@@ -270,16 +254,16 @@ class VclReactNative: NSObject {
             })
     }
     
-    @objc(generateSignedJwt:withJwtDescriptorDictionary:withRemoteCryptoServicesTokenDictionary:withResolver:withRejecter:)
+    @objc(generateSignedJwt:withDidJwkDictionary:withRemoteCryptoServicesTokenDictionary:withResolver:withRejecter:)
     func generateSignedJwt(
-        didJwkDictionary: [String: Any],
         jwtDescriptorDictionary: [String: Any],
+        didJwkDictionary: [String: Any],
         remoteCryptoServicesTokenDictionary: [String: Any]? = nil,
         resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock
     ) {
         vcl.generateSignedJwt(
-            didJwk: dictionaryToJwk(didJwkDictionary),
             jwtDescriptor: dictionaryToJwtDescriptor(jwtDescriptorDictionary),
+            didJwk: dictionaryToDidJwk(didJwkDictionary),
             remoteCryptoServicesToken: dictionaryToToken(remoteCryptoServicesTokenDictionary),
             successHandler: {
                 resolve(jwtToReadableMap($0))