@bedrock/vc-delivery 7.17.0 → 7.17.2

package/lib/ExchangeProcessor.js

@@ -258,7 +258,7 @@ export class ExchangeProcessor {
 
     // 5. Set the verification results in
     // `exchange.variables.results[exchange.step]`.
-    const {verificationMethod} = verifyResult;
+    const {verificationMethod, publicKeyJwk} = verifyResult;
     exchange.variables.results[exchange.step] = {
       ...exchange.variables.results[exchange.step],
       // common use case of DID Authentication; provide `did` for ease
@@ -266,6 +266,7 @@ export class ExchangeProcessor {
       // receives `did` not verification method nor VP
       did: verificationMethod?.controller || null,
       verificationMethod,
+      publicKeyJwk,
       verifiablePresentation,
       verifyPresentationResults: buildVerifyPresentationResults({verifyResult})
     };

package/lib/issue.js

@@ -129,6 +129,7 @@ export function getIssueRequestsParams({workflow, exchange, step}) {
       }
     }
     const params = {
+      issuerInstanceId: r.issuerInstanceId,
       oid4vci: r.oid4vci,
       typedTemplate,
       variables: {

package/lib/oid4/http.js

@@ -439,6 +439,13 @@ function _normalizeCredentials({verifiablePresentation}) {
       vc.id?.startsWith('data:application/jwt,')) {
       return vc.id.slice('data:application/jwt,'.length);
     }
+    // parse any mdoc mDL into its non-VC format (includes base64 => base64url)
+    if(vc.type === 'EnvelopedVerifiableCredential' &&
+      vc.id?.startsWith('data:application/mdl;base64,')) {
+      const buffer = Buffer.from(
+        vc.id.slice('data:application/mdl;base64,'.length), 'base64');
+      return buffer.toString('base64url');
+    }
     return vc;
   });
 }

package/lib/verify.js

@@ -142,7 +142,10 @@ export async function verify({
   return {
     verified,
     challengeUses,
+    // return original VM result and w/both common key formats
     verificationMethod,
+    multikey: await _toMultikey({vm: verificationMethod}),
+    publicKeyJwk: await _toJwk(verificationMethod),
     credentialResults,
     presentationResult
   };
@@ -161,12 +164,11 @@ export async function verifyCredentialRequestProof({
   if(diVp) {
     const result = await verifyDidProofDiVp({workflow, exchange, diVp});
     verifyResults.di_vp = verifyResults.di_vp ?? [];
-    // return results w/both common key formats
     verifyResults.di_vp.push({
       did: result.did,
-      verificationMethod: await _toMultikey({
-        vm: result.verifyResult.verificationMethod
-      }),
+      // return original VM result and w/both common key formats
+      verificationMethod: result.verifyResult.verificationMethod,
+      multikey: await _toMultikey({vm: result.verifyResult.verificationMethod}),
       publicKeyJwk: await _toJwk(result.verifyResult.verificationMethod)
     });
     dids.push(result.did);
@@ -175,12 +177,14 @@ export async function verifyCredentialRequestProof({
   if(jwt) {
     const result = await verifyDidProofJwt({workflow, exchange, jwt});
     verifyResults.jwt = verifyResults.jwt ?? [];
-    // return results w/both common key formats
+    const multikey = await _toMultikey({
+      jwk: result.verifyResult.jwk, controller: result.did
+    });
     verifyResults.jwt.push({
       did: result.did,
-      verificationMethod: await _toMultikey({
-        jwk: result.verifyResult.jwk, controller: result.did
-      }),
+      // return original VM result and w/both common key formats
+      verificationMethod: multikey,
+      multikey,
       publicKeyJwk: result.verifyResult.jwk
     });
     dids.push(result.did);
@@ -366,7 +370,14 @@ function _getJwkAlgFromMultibase(mb) {
   }
 }
 
+// tries to convert to JWK and returns undefined if it cannot
 async function _toJwk(vm) {
+  if(vm?.type === 'JsonWebKey') {
+    return vm.publicKeyJwk;
+  }
+  if(!vm?.publicKeyMultibase) {
+    return;
+  }
   let jwk;
   const alg = _getJwkAlgFromMultibase(vm.publicKeyMultibase);
   if(alg === 'EdDSA') {
@@ -381,17 +392,23 @@ async function _toJwk(vm) {
   return jwk;
 }
 
+// tries to convert to multikey and returns undefined if it cannot
 async function _toMultikey({vm, jwk, controller}) {
+  if(vm?.type === 'JsonWebKey') {
+    jwk = vm.publicKeyJwk;
+  }
+
   let keyPair;
   if(jwk) {
-    if(jwk.alg === 'EdDSA') {
+    if(jwk.crv === 'Ed25519' || jwk.alg === 'EdDSA') {
       keyPair = await Ed25519Multikey.fromJwk({jwk, controller});
     }
-    if(jwk.alg.startsWith('ES')) {
+    if(jwk.crv?.startsWith('P-') || jwk.alg?.startsWith('ES')) {
       keyPair = await EcdsaMultikey.fromJwk({jwk, controller});
     }
-  } else if(vm) {
+  } else if(vm?.publicKeyMultibase) {
     if(vm.type === 'Multikey') {
+      // return VM as-is
       return vm;
     }
     const alg = _getJwkAlgFromMultibase(vm.publicKeyMultibase);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bedrock/vc-delivery",
-  "version": "7.17.0",
+  "version": "7.17.2",
   "type": "module",
   "description": "Bedrock Verifiable Credential Delivery",
   "main": "./lib/index.js",