@bedrock/kms-http 19.0.0 → 20.1.0

package/lib/documentLoader.js

@@ -0,0 +1,28 @@
+/*!
+ * Copyright (c) 2019-2024 Digital Bazaar, Inc. All rights reserved.
+ */
+import {didIo} from '@bedrock/did-io';
+import {documentLoader} from '@bedrock/jsonld-document-loader';
+import '@bedrock/did-context';
+import '@bedrock/security-context';
+import '@bedrock/veres-one-context';
+
+// load config defaults
+import './config.js';
+
+async function defaultDocumentLoader(url) {
+  let document;
+  if(url.startsWith('did:')) {
+    document = await didIo.get({did: url});
+    return {
+      contextUrl: null,
+      documentUrl: url,
+      document
+    };
+  }
+
+  // finally, try the bedrock document loader
+  return documentLoader(url);
+}
+
+export {defaultDocumentLoader as documentLoader};

package/lib/index.js

@@ -1,8 +1,9 @@
 /*!
- * Copyright (c) 2019-2022 Digital Bazaar, Inc. All rights reserved.
+ * Copyright (c) 2019-2024 Digital Bazaar, Inc. All rights reserved.
  */
 import '@bedrock/express';
 
+import './documentLoader.js';
 import './http.js';
 
 // load config defaults

package/lib/middleware.js

@@ -1,27 +1,22 @@
 /*!
- * Copyright (c) 2019-2022 Digital Bazaar, Inc. All rights reserved.
+ * Copyright (c) 2019-2024 Digital Bazaar, Inc. All rights reserved.
  */
 import * as bedrock from '@bedrock/core';
 import * as brZCapStorage from '@bedrock/zcap-storage';
+import * as Ed25519Multikey from '@digitalbazaar/ed25519-multikey';
 import * as helpers from './helpers.js';
 import {
   authorizeZcapInvocation as _authorizeZcapInvocation,
   authorizeZcapRevocation as _authorizeZcapRevocation
 } from '@digitalbazaar/ezcap-express';
-import {
-  defaultDocumentLoader as documentLoader,
-  defaultModuleManager as moduleManager
-} from '@bedrock/kms';
 import {default as _cors} from 'cors';
 import {asyncHandler} from '@bedrock/express';
 import {BedrockKeystoreConfigStorage} from './BedrockKeystoreConfigStorage.js';
 import {createOperationMiddleware} from '@digitalbazaar/webkms-switch';
-import {CryptoLD} from 'crypto-ld';
+import {documentLoader} from './documentLoader.js';
 import {Ed25519Signature2020} from '@digitalbazaar/ed25519-signature-2020';
-import {
-  Ed25519VerificationKey2020
-} from '@digitalbazaar/ed25519-verification-key-2020';
 import {logger} from './logger.js';
+import {defaultModuleManager as moduleManager} from '@bedrock/kms';
 import {reportOperationUsage} from './metering.js';
 
 const {config, util: {BedrockError}} = bedrock;
@@ -30,10 +25,6 @@ const FIVE_MINUTES = 1000 * 60 * 5;
 
 const storage = new BedrockKeystoreConfigStorage();
 
-// create `getVerifier` hook for verifying zcap invocation HTTP signatures
-const cryptoLd = new CryptoLD();
-cryptoLd.use(Ed25519VerificationKey2020);
-
 // creates middleware to get the keystore config for the current request and
 // caches it in `req.webkms.keystore`
 export function createGetKeystoreConfig({routes}) {
@@ -201,7 +192,8 @@ async function getKeystoreController({req}) {
 
 // hook used to verify zcap invocation HTTP signatures
 async function getVerifier({keyId, documentLoader}) {
-  const key = await cryptoLd.fromKeyId({id: keyId, documentLoader});
+  const {document} = await documentLoader(keyId);
+  const key = await Ed25519Multikey.from(document);
   const verificationMethod = await key.export(
     {publicKey: true, includeContext: true});
   const verifier = key.verifier();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bedrock/kms-http",
-  "version": "19.0.0",
+  "version": "20.1.0",
   "type": "module",
   "description": "Bedrock KMS HTTP API",
   "main": "./lib/index.js",
@@ -28,23 +28,27 @@
   },
   "homepage": "https://github.com/digitalbazaar/bedrock-kms-http",
   "dependencies": {
+    "@digitalbazaar/ed25519-multikey": "^1.1.0",
     "@digitalbazaar/ed25519-signature-2020": "^5.0.0",
-    "@digitalbazaar/ed25519-verification-key-2020": "^4.0.0",
     "@digitalbazaar/ezcap-express": "^7.0.0",
     "@digitalbazaar/webkms-switch": "^12.0.0",
     "cidr-regex": "^4.0.0",
     "cors": "^2.8.5",
-    "crypto-ld": "^7.0.0",
     "forwarded": "^0.2.0",
     "ipaddr.js": "^2.0.1"
   },
   "peerDependencies": {
     "@bedrock/app-identity": "^4.0.0",
     "@bedrock/core": "^6.0.1",
+    "@bedrock/did-context": "^5.0.0",
+    "@bedrock/did-io": "^10.1.0",
     "@bedrock/express": "^8.0.0",
-    "@bedrock/kms": "^14.0.0",
+    "@bedrock/jsonld-document-loader": "^4.0.0",
+    "@bedrock/kms": "^15.0.0",
     "@bedrock/meter-usage-reporter": "^9.0.0",
+    "@bedrock/security-context": "^8.0.0",
     "@bedrock/validation": "^7.0.0",
+    "@bedrock/veres-one-context": "^15.0.0",
     "@bedrock/zcap-storage": "^8.0.0"
   },
   "directories": {
@@ -54,7 +58,7 @@
     "eslint": "^8.18.0",
     "eslint-config-digitalbazaar": "^5.0.1",
     "eslint-plugin-jsdoc": "^48.0.2",
-    "eslint-plugin-unicorn": "^50.0.1",
+    "eslint-plugin-unicorn": "^52.0.0",
     "jsdoc-to-markdown": "^8.0.0"
   },
   "engines": {