Match upstream code from W3C VC WG repo.

Not much variation. Mostly comments. Key change is adding `localSettings` export.

Author: BigBlueHat

lib/main.js

@@ -6,11 +6,11 @@
 
 import {Implementation} from './Implementation.js';
 import {implementerFiles} from '../implementations/index.js';
-export {Endpoint} from './Endpoint.js';
 
 const keyValues = implementerFiles.map(
   implementation => [implementation.name, new Implementation(implementation)]);
 
+export {localSettings} from '../implementations/index.js';
 export const implementations = new Map(keyValues);
 export const allImplementations = implementations;
 
@@ -25,9 +25,9 @@ export const allImplementations = implementations;
  * @param {Map} [options.implementations=allImplementations] - A Map of
  *   implementations.
  * @param {Function<boolean>} options.filter - A function to
- * filter the map's entries on that returns true or false.
+ *   filter the map's entries on that returns true or false.
  *
- * @returns {{match: Map, nonMatch: Map}} Returns an object with matching
+ * @returns {Object<string, Map>} Returns an object with matching
  *   and non-matching maps.
  */
 export const filterImplementations = ({
@@ -50,7 +50,7 @@ export const filterImplementations = ({
 /**
  * Filters implementations by tags on a property in the settings.
  *
- * @example filterByTag({property: 'issuers', tags: ['VC-HTTP-API']})
+ * @example filterByTag({property: 'issuers', tags: ['ecdsa-rdfc-2019']})
  *
  * @param {object} options - Options to use.
  * @param {Map} [options.implementations=allImplementations] -
@@ -59,7 +59,7 @@ export const filterImplementations = ({
  * @param {string} [options.property='issuers'] - The property to search for on
  *   an implementation.
  *
- * @returns {{match: Map, nonMatch: Map}} Returns an object with matching
+ * @returns {Object<string, Map>} Returns an object with matching
  *   and non-matching maps.
  */
 export const filterByTag = ({
@@ -87,7 +87,7 @@ export const endpoints = {
  * @param {Map} [options.implementations=allImplementations] - A Map of
  *   implementations.
  * @param {Function<boolean>} options.filter - A function to
- * filter the map's entries that returns true or false.
+ *  filter the map's entries that returns true or false.
  *
  * @returns {{match: Map, nonMatch: Map}} Returns an object with matching
  *   and non-matching Maps with respective endpoints.
@@ -111,7 +111,9 @@ export const endpoints = {
   /**
  * Filters endpoints by tags on a property in the settings.
  *
- * @example endpoints.filterByTag({property: 'issuers', tags: ['vc-api']})
+ * @example endpoints.filterByTag({
+ *   property: 'issuers', tags: ['ecdsa-rdfc-2019']
+ * })
  *
  * @param {object} options - Options to use.
  * @param {Map} [options.implementations=allImplementations] -

lib/requests.js

@@ -50,12 +50,12 @@ export async function makeHttpsRequest({
       body, method, json, headers, agent, searchParams
     });
   } catch(e) {
-    error = _sanitizeErrorHeaders({error: e});
+    error = _sanitizeError({error: e});
   }
   const {data, statusCode} = _getDataAndStatus({result, error});
   // if a result is returned sanitize it
   if(result) {
-    result = _sanitizeResponseHeaders({response: result, data});
+    result = _sanitizeResponse({response: result, data});
   }
   return {result, error, data, statusCode};
 }
@@ -91,12 +91,12 @@ export async function zcapRequest({
       capability
     });
   } catch(e) {
-    error = _sanitizeErrorHeaders({error: e});
+    error = _sanitizeError({error: e});
   }
   const {data, statusCode} = _getDataAndStatus({result, error});
   // if a result is returned sanitize it
   if(result) {
-    result = _sanitizeResponseHeaders({response: result, data});
+    result = _sanitizeResponse({response: result, data});
   }
   return {result, error, data, statusCode};
 }
@@ -114,7 +114,7 @@ async function _getZcapClient({secretKeySeed}) {
 
 function _getDataAndStatus({result = {}, error = {}}) {
   let data = result.data || error.data;
-  // FIXME remove this once VC-API returns from the issuer
+  // FIXME remove this once data returned from the issuers
   // are finalized.
   if(data && data.verifiableCredential) {
     data = data.verifiableCredential;
@@ -123,22 +123,20 @@ function _getDataAndStatus({result = {}, error = {}}) {
   return {data, statusCode};
 }
 
-function _sanitizeErrorHeaders({error}) {
+function _sanitizeError({error}) {
   if(error.response) {
-    error.response = _sanitizeResponseHeaders({
+    error.response = _sanitizeResponse({
       response: error.response,
       data: error.data
     });
   }
   if(error.request) {
-    error.request = new global.Request(error.request, {
-      headers: _sanitizeHeaders({httpMessage: error.request})
-    });
+    error.request = _sanitizeRequest({request: error.request});
   }
   return error;
 }
 
-function _sanitizeResponseHeaders({response, data}) {
+function _sanitizeResponse({response, data}) {
   const newResponse = new global.Response(JSON.stringify(data), {
     headers: _sanitizeHeaders({httpMessage: response}),
     status: response.status,
@@ -152,6 +150,25 @@ function _sanitizeResponseHeaders({response, data}) {
   return newResponse;
 }
 
+function _sanitizeRequest({request}) {
+  // get the url and the remaining properties from the request
+  const {url, ...props} = request;
+  // create an options object to pass to the new request
+  const options = {};
+  // do not copy these properties from the request
+  const skipKeys = new Set(['body', 'headers']);
+  for(const key in props) {
+    if(skipKeys.has(key)) {
+      continue;
+    }
+    options[key] = request[key];
+  }
+  return new global.Request(url, {
+    ...options,
+    headers: _sanitizeHeaders({httpMessage: request})
+  });
+}
+
 /**
  * Takes in either a response or request & sanitizes the headers.
  *
@@ -174,7 +191,7 @@ function _sanitizeHeaders({httpMessage, headers = sanitizeHeaders}) {
   for(const header of headers) {
     // sanitize the headers to prevent
     // authn tokens / information potentially in logs
-    newHeaders.set(header, '** SANITIZED TO PREVENT EXPOSING OF SECRETS ***');
+    newHeaders.set(header, 'sanitized to prevent exposure of secrets');
   }
   return newHeaders;
 }