- Finish cleanup

Signed-off-by: Dave Richer <dave@imexsystems.ca>

server/routes/miscellaneousRoutes.js

@@ -3,11 +3,12 @@ const router = express.Router();
 const logger = require("../../server/utils/logger");
 const sendEmail = require("../email/sendemail");
 const data = require("../data/data");
-const fb = require("../firebase/firebase-handler");
 const bodyParser = require("body-parser");
 const ioevent = require("../ioevent/ioevent");
 const taskHandler = require("../tasks/tasks");
 const os = require("../opensearch/os-handler");
+const eventAuthorizationMiddleware = require("../middleware/eventAuthorizationMIddleware");
+const validateFirebaseIdTokenMiddleware = require("../middleware/validateFirebaseIdTokenMiddleware");
 
 //Test route to ensure Express is responding.
 router.get("/test", async function (req, res) {
@@ -29,15 +30,21 @@ router.get("/test", async function (req, res) {
     res.status(200).send(`OK - ${commit}`);
 });
 
-router.post("/search", fb.validateFirebaseIdToken, os.search);
-router.post("/opensearch", os.handler);
+// Search
+router.post("/search", validateFirebaseIdTokenMiddleware, os.search);
+router.post("/opensearch", eventAuthorizationMiddleware, os.handler);
 
 
+// IO Events
 router.post('/ioevent', ioevent.default);
-router.post('/sendemail', fb.validateFirebaseIdToken, sendEmail.sendEmail);
+
+// Email
+router.post('/sendemail', validateFirebaseIdTokenMiddleware, sendEmail.sendEmail);
 router.post('/emailbounce', bodyParser.text(), sendEmail.emailBounce);
+
+// Handlers
 router.post('/record-handler/arms', data.arms);
-router.post("/taskHandler", fb.validateFirebaseIdToken, taskHandler.taskHandler);
+router.post("/taskHandler", validateFirebaseIdTokenMiddleware, taskHandler.taskHandler);
 
 
 module.exports = router;