@bedrock/vc-delivery 4.2.0 → 4.3.0

package/lib/openId.js

@@ -8,8 +8,10 @@ import {
 } from '@bedrock/validation';
 import {importJWK, SignJWT} from 'jose';
 import {
-  openIdAuthorizationResponseBody, openIdBatchCredentialBody,
-  openIdCredentialBody, openIdTokenBody,
+  openIdAuthorizationResponseBody,
+  openIdBatchCredentialBody,
+  openIdCredentialBody,
+  openIdTokenBody,
   presentationSubmission as presentationSubmissionSchema
 } from '../schemas/bedrock-vc-exchanger.js';
 import {verify, verifyDidProofJwt} from './verify.js';
@@ -235,7 +237,7 @@ export async function createRoutes({
 
       {
         "format": "ldp_vc",
-        "credential_description": {
+        "credential_definition": {
           "@context": [
             "https://www.w3.org/2018/credentials/v1",
             "https://www.w3.org/2018/credentials/examples/v1"
@@ -289,7 +291,7 @@ export async function createRoutes({
       {
         credential_requests: [{
           "format": "ldp_vc",
-          "credential_description": {
+          "credential_definition": {
             "@context": [
               "https://www.w3.org/2018/credentials/v1",
               "https://www.w3.org/2018/credentials/examples/v1"
@@ -528,6 +530,11 @@ async function _processCredentialRequests({req, res, isBatchRequest}) {
     }
     credentialRequests = [req.body];
   }
+
+  // before asserting, normalize credential requests to use `type` instead of
+  // `types`; this is to allow for OID4VCI draft 20 implementers that followed
+  // the non-normative examples
+  _normalizeCredentialDefinitionTypes({credentialRequests});
   _assertCredentialRequests(
     {credentialRequests, expectedCredentialRequests});
 
@@ -832,3 +839,15 @@ function _validate(validator, data) {
     throw result.error;
   }
 }
+
+function _normalizeCredentialDefinitionTypes({credentialRequests}) {
+  // normalize credential requests to use `type` instead of `types`
+  for(const cr of credentialRequests) {
+    if(cr?.credential_definition?.types) {
+      if(!cr?.credential_definition?.type) {
+        cr.credential_definition.type = cr.credential_definition.types;
+      }
+      delete cr.credential_definition.types;
+    }
+  }
+}

package/package.json

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

package/schemas/bedrock-vc-exchanger.js

@@ -22,6 +22,14 @@ const credentialDefinition = {
       item: {
         type: 'string'
       }
+    },
+    // allow `types` to be flexible for OID4VCI draft 20 implementers
+    types: {
+      type: 'array',
+      minItems: 2,
+      item: {
+        type: 'string'
+      }
     }
   }
 };