@bedrock/vc-verifier 12.0.0 → 12.2.0

package/lib/config.js

@@ -23,7 +23,11 @@ cfg.documentLoader = {
   https: true
 };
 
-cfg.supportedSuites = ['Ed25519Signature2018', 'Ed25519Signature2020'];
+cfg.supportedSuites = [
+  'Ed25519Signature2018',
+  'Ed25519Signature2020',
+  'eddsa-2022',
+];
 
 cfg.routes = {
   challenges: '/challenges',

package/lib/documentLoader.js

@@ -10,8 +10,10 @@ import {
 import {createContextDocumentLoader} from '@bedrock/service-context-store';
 import {didIo} from '@bedrock/did-io';
 import '@bedrock/credentials-context';
+import '@bedrock/data-integrity-context';
 import '@bedrock/did-context';
 import '@bedrock/did-io';
+import '@bedrock/multikey-context';
 import '@bedrock/security-context';
 import '@bedrock/vc-revocation-list-context';
 import '@bedrock/vc-status-list-context';

package/lib/http.js

@@ -15,8 +15,7 @@ import bodyParser from 'body-parser';
 import {checkStatus} from './status.js';
 import cors from 'cors';
 import {createDocumentLoader} from './documentLoader.js';
-import {Ed25519Signature2018} from '@digitalbazaar/ed25519-signature-2018';
-import {Ed25519Signature2020} from '@digitalbazaar/ed25519-signature-2020';
+import {createSuites} from './suites.js';
 import {createValidateMiddleware as validate} from '@bedrock/validation';
 
 const {util: {BedrockError}} = bedrock;
@@ -28,7 +27,7 @@ bedrock.events.on('bedrock-express.configure.bodyParser', app => {
 
 export async function addRoutes({app, service} = {}) {
   const {routePrefix} = service;
-
+  const suite = createSuites();
   const cfg = bedrock.config['vc-verifier'];
   const baseUrl = `${routePrefix}/:localId`;
   const routes = {
@@ -37,15 +36,6 @@ export async function addRoutes({app, service} = {}) {
     presentationsVerify: `${baseUrl}${cfg.routes.presentationsVerify}`
   };
 
-  const {supportedSuites} = cfg;
-  const suite = [];
-  if(supportedSuites.includes('Ed25519Signature2018')) {
-    suite.push(new Ed25519Signature2018());
-  }
-  if(supportedSuites.includes('Ed25519Signature2020')) {
-    suite.push(new Ed25519Signature2020());
-  }
-
   const getConfigMiddleware = middleware.createGetConfigMiddleware({service});
 
   /* Note: CORS is used on all endpoints. This is safe because authorization
@@ -59,8 +49,7 @@ export async function addRoutes({app, service} = {}) {
     cors(),
     validate({bodySchema: createChallengeBody}),
     getConfigMiddleware,
-    // FIXME: add middleware to switch between oauth2 / zcap based on headers
-    middleware.authorizeConfigZcapInvocation(),
+    middleware.authorizeServiceObjectRequest(),
     asyncHandler(async (req, res) => {
       const {config} = req.serviceObject;
       const challenge = await createChallenge({verifierId: config.id});
@@ -77,8 +66,7 @@ export async function addRoutes({app, service} = {}) {
     cors(),
     validate({bodySchema: verifyCredentialBody}),
     getConfigMiddleware,
-    // FIXME: add middleware to switch between oauth2 / zcap based on headers
-    middleware.authorizeConfigZcapInvocation(),
+    middleware.authorizeServiceObjectRequest(),
     asyncHandler(async (req, res) => {
       const {config} = req.serviceObject;
       const documentLoader = await createDocumentLoader({config});
@@ -135,8 +123,7 @@ export async function addRoutes({app, service} = {}) {
     cors(),
     validate({bodySchema: verifyPresentationBody}),
     getConfigMiddleware,
-    // FIXME: add middleware to switch between oauth2 / zcap based on headers
-    middleware.authorizeConfigZcapInvocation(),
+    middleware.authorizeServiceObjectRequest(),
     asyncHandler(async (req, res) => {
       const {config} = req.serviceObject;
       const documentLoader = await createDocumentLoader({config});

package/lib/suites.js

@@ -0,0 +1,37 @@
+/*!
+ * Copyright (c) 2018-2022 Digital Bazaar, Inc. All rights reserved.
+ */
+import * as bedrock from '@bedrock/core';
+import {DataIntegrityProof} from '@digitalbazaar/data-integrity';
+import {Ed25519Signature2018} from '@digitalbazaar/ed25519-signature-2018';
+import {Ed25519Signature2020} from '@digitalbazaar/ed25519-signature-2020';
+import {
+  cryptosuite as eddsa2022CryptoSuite
+} from '@digitalbazaar/eddsa-2022-cryptosuite';
+
+// DataIntegrityProof should work for multiple cryptosuites
+const SUPPORTED_CRYPTOSUITES = new Map([
+  ['eddsa-2022', eddsa2022CryptoSuite]
+]);
+
+const SUPPORTED_LEGACY_SUITES = new Map([
+  ['Ed25519Signature2018', Ed25519Signature2018],
+  ['Ed25519Signature2020', Ed25519Signature2020]
+]);
+
+export function createSuites() {
+  const cfg = bedrock.config['vc-verifier'];
+  const {supportedSuites} = cfg;
+  const suite = supportedSuites.map(supportedSuite => {
+    const LegacySuite = SUPPORTED_LEGACY_SUITES.get(supportedSuite);
+    if(LegacySuite) {
+      return new LegacySuite();
+    }
+    const cryptosuite = SUPPORTED_CRYPTOSUITES.get(supportedSuite);
+    if(cryptosuite) {
+      return new DataIntegrityProof({cryptosuite});
+    }
+    throw new Error(`Unsupported suite ${supportedSuite}`);
+  });
+  return suite;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bedrock/vc-verifier",
-  "version": "12.0.0",
+  "version": "12.2.0",
   "type": "module",
   "description": "Bedrock VC Verifier",
   "main": "./lib/index.js",
@@ -25,9 +25,11 @@
   },
   "homepage": "https://github.com/digitalbazaar/bedrock-vc-verifier",
   "dependencies": {
+    "@digitalbazaar/data-integrity": "^1.0.0",
     "@digitalbazaar/ed25519-signature-2018": "^3.0.0",
     "@digitalbazaar/ed25519-signature-2020": "^4.0.1",
-    "@digitalbazaar/vc": "^4.0.0",
+    "@digitalbazaar/eddsa-2022-cryptosuite": "^1.0.0",
+    "@digitalbazaar/vc": "^5.0.0",
     "@digitalbazaar/vc-revocation-list": "^4.0.0",
     "@digitalbazaar/vc-status-list": "^5.0.0",
     "assert-plus": "^1.0.0",
@@ -38,16 +40,18 @@
   "peerDependencies": {
     "@bedrock/core": "^6.0.1",
     "@bedrock/credentials-context": "^3.0.0",
+    "@bedrock/data-integrity-context": "^1.0.0",
     "@bedrock/did-context": "^4.0.0",
     "@bedrock/did-io": "^9.0.1",
     "@bedrock/express": "^8.0.0",
     "@bedrock/https-agent": "^4.0.0",
     "@bedrock/jsonld-document-loader": "^3.0.0",
     "@bedrock/mongodb": "^10.0.0",
+    "@bedrock/multikey-context": "^1.0.0",
     "@bedrock/security-context": "^7.0.0",
     "@bedrock/service-agent": "^6.0.0",
-    "@bedrock/service-context-store": "^8.0.0",
-    "@bedrock/service-core": "^6.0.0",
+    "@bedrock/service-context-store": "^8.1.0",
+    "@bedrock/service-core": "^6.1.2",
     "@bedrock/validation": "^7.0.0",
     "@bedrock/vc-revocation-list-context": "^3.1.0",
     "@bedrock/vc-status-list-context": "^4.1.0",