Remove unnecessary middleware and pass more args to getAll.

Author: jameseaster

lib/BedrockKeystoreConfigStorage.js

@@ -34,9 +34,13 @@ export class BedrockKeystoreConfigStorage extends KeystoreConfigStorage {
     return returnRecord ? record : keystoreConfig;
   }
 
-  async getAll({req, returnRecord = false} = {}) {
-    const controller = req.query.controller;
-    const records = await keystores.find({controller});
+  async getAll({
+    controller, req, query = {}, options = {},
+    explain = false, returnRecord = false
+  } = {}) {
+    const records = await keystores.find({
+      controller, query, options, explain
+    });
     const keystoreConfigs = records.map(r => r.config);
     // skip request checks if specifically requested
     if(req === false) {

lib/http.js

@@ -17,6 +17,7 @@ import {
 } from '@bedrock/kms';
 import {reportOperationUsage, SERVICE_TYPE} from './metering.js';
 import {asyncHandler} from '@bedrock/express';
+import {BedrockKeystoreConfigStorage} from './BedrockKeystoreConfigStorage.js';
 import {generateRandom} from '@digitalbazaar/webkms-switch';
 import {meters} from '@bedrock/meter-usage-reporter';
 import {createValidateMiddleware as validate} from '@bedrock/validation';
@@ -44,12 +45,11 @@ bedrock.events.on('bedrock-express.configure.routes', app => {
 
   const {baseUri} = bedrock.config.server;
 
+  const storage = new BedrockKeystoreConfigStorage();
+
   // create middleware for handling KMS operations
   const handleOperation = middleware.createKmsOperationMiddleware();
 
-  // create middleware for returning all keystores from root controller
-  const getAllKeystoreConfigs = middleware.createGetAllKeystoreConfigs();
-
   // create middleware for getting consistent view of the keystore config
   // associated with a request
   const getKeystoreConfig = middleware.createGetKeystoreConfig({routes});
@@ -74,9 +74,11 @@ bedrock.events.on('bedrock-express.configure.routes', app => {
         return req.query.controller;
       }
     }),
-    getAllKeystoreConfigs,
     asyncHandler(async (req, res) => {
-      res.json({results: req.keystores});
+      const controller = req.query.controller;
+      const options = {projection: {_id: 0, config: 1}};
+      const results = await storage.getAll({controller, req, options});
+      res.json({results});
     }));
 
   // create a new keystore

lib/middleware.js

@@ -43,16 +43,6 @@ export function createGetKeystoreConfig({routes}) {
   });
 }
 
-// creates middleware to get all the keystore configs for root controller
-export function createGetAllKeystoreConfigs() {
-  return asyncHandler(async (req, _, next) => {
-    const controller = req.query.controller;
-    const results = await storage.getAll({req, controller});
-    req.keystores = results.map(r => r.config);
-    next();
-  });
-}
-
 // creates middleware for handling KMS operations
 export function createKmsOperationMiddleware() {
   const {kmsOperationOptions} = config['kms-http'];