@bedrock/vc-delivery 3.3.0 → 3.4.1

package/lib/http.js

@@ -48,8 +48,15 @@ export async function addRoutes({app, service} = {}) {
     const {localId, exchangeId: id} = req.params;
     const {baseUri} = bedrock.config.server;
     const exchangerId = `${baseUri}${routePrefix}/${localId}`;
-    // save promise in request, do not wait for it to settle
-    req.exchange = exchanges.get({exchangerId, id});
+    // expose access to result via `req`; do not wait for it to settle here
+    const exchangePromise = exchanges.get({exchangerId, id}).catch(e => e);
+    req.getExchange = async () => {
+      const record = await exchangePromise;
+      if(record instanceof Error) {
+        throw record;
+      }
+      return record;
+    };
     next();
   });
 
@@ -141,7 +148,7 @@ export async function addRoutes({app, service} = {}) {
     getConfigMiddleware,
     middleware.authorizeServiceObjectRequest(),
     asyncHandler(async (req, res) => {
-      const {exchange} = await req.exchange;
+      const {exchange} = await req.getExchange();
       // do not return any oauth2 credentials
       delete exchange.openId?.oauth2?.keyPair?.privateKeyJwk;
       res.json({exchange});
@@ -157,7 +164,7 @@ export async function addRoutes({app, service} = {}) {
     getConfigMiddleware,
     asyncHandler(async (req, res) => {
       const {config: exchanger} = req.serviceObject;
-      const {exchange} = await req.exchange;
+      const {exchange} = await req.getExchange();
 
       // get any `verifiablePresentation` from the body...
       let receivedPresentation = req?.body?.verifiablePresentation;

package/lib/openId.js

@@ -51,6 +51,7 @@ export async function createRoutes({
   const openIdRoute = `${exchangeRoute}/openid`;
   const routes = {
     asMetadata: `/.well-known/oauth-authorization-server${exchangeRoute}`,
+    ciMetadata: `/.well-known/openid-credential-issuer${exchangeRoute}`,
     batchCredential: `${openIdRoute}/batch_credential`,
     credential: `${openIdRoute}/credential`,
     token: `${openIdRoute}/token`,
@@ -60,13 +61,38 @@ export async function createRoutes({
   // urlencoded body parser (extended=true for rich JSON-like representation)
   const urlencoded = bodyParser.urlencoded({extended: true});
 
-  // an authorization server endpoint
+  // an authorization server meta data endpoint
   // serves `.well-known` oauth2 AS config for each exchange; each config is
   // based on the exchanger used to create the exchange
   app.get(
     routes.asMetadata,
     cors(),
     getConfigMiddleware,
+    asyncHandler(async (req, res) => {
+      // generate well-known oauth2 issuer config
+      const {config: exchanger} = req.serviceObject;
+      const exchangeId = `${exchanger.id}/exchanges/${req.params.exchangeId}`;
+      // note that technically, we should not need to serve any credential
+      // issuer metadata, but we do for backwards compatibility purposes as
+      // previous versions of OID4VCI required it
+      const oauth2Config = {
+        issuer: exchangeId,
+        jwks_uri: `${exchangeId}/openid/jwks`,
+        token_endpoint: `${exchangeId}/openid/token`,
+        credential_endpoint: `${exchangeId}/openid/credential`,
+        batch_credential_endpoint: `${exchangeId}/openid/batch_credential`
+        // FIXME: add `credentials_supported`
+      };
+      res.json(oauth2Config);
+    }));
+
+  // a credential issuer meta data endpoint
+  // serves `.well-known` oauth2 AS / CI config for each exchange; each config
+  // is based on the exchanger used to create the exchange
+  app.get(
+    routes.ciMetadata,
+    cors(),
+    getConfigMiddleware,
     asyncHandler(async (req, res) => {
       // generate well-known oauth2 issuer config
       const {config: exchanger} = req.serviceObject;
@@ -90,7 +116,7 @@ export async function createRoutes({
     cors(),
     getExchange,
     asyncHandler(async (req, res) => {
-      const {exchange} = await req.exchange;
+      const {exchange} = await req.getExchange();
       if(!exchange.openId) {
         // FIXME: improve error
         // unsupported protocol for the exchange
@@ -112,7 +138,7 @@ export async function createRoutes({
     getConfigMiddleware,
     getExchange,
     asyncHandler(async (req, res) => {
-      const exchangeRecord = await req.exchange;
+      const exchangeRecord = await req.getExchange();
       const {exchange} = exchangeRecord;
       if(!exchange.openId) {
         // FIXME: improve error
@@ -365,7 +391,7 @@ function _getAlgFromPrivateKey({privateKeyJwk}) {
 
 async function _processCredentialRequests({req, res, isBatchRequest}) {
   const {config: exchanger} = req.serviceObject;
-  const exchangeRecord = await req.exchange;
+  const exchangeRecord = await req.getExchange();
   const {exchange} = exchangeRecord;
   if(!exchange.openId) {
     // FIXME: improve error

package/package.json

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