From 9add73b9da55cbb65faae8ee18b72cb1b233b0f5 Mon Sep 17 00:00:00 2001
From: rob <rob@digitaltelepresence.com>
Date: Mon, 29 Apr 2024 15:45:59 -0400
Subject: [PATCH] more cleanup

---
 app/controllers/admin.js  | 14 +++++---------
 app/controllers/client.js | 12 ++++++++----
 app/controllers/report.js | 10 ++++++++--
 app/controllers/task.js   |  9 +++++++--
 4 files changed, 28 insertions(+), 17 deletions(-)

diff --git a/app/controllers/admin.js b/app/controllers/admin.js
index 2e783e7..c4b4ac0 100644
--- a/app/controllers/admin.js
+++ b/app/controllers/admin.js
@@ -15,7 +15,7 @@ const Video = mongoose.model('Video');
 
 import express from 'express';
 
-import { SiteController, SiteError } from '../../lib/site-lib.js';
+import { SiteController } from '../../lib/site-lib.js';
 
 export default class AdminController extends SiteController {
 
@@ -29,18 +29,14 @@ export default class AdminController extends SiteController {
   async start ( ) {
     const { session: sessionService } = this.dtp.services;
 
-    const router = express.Router();
-    this.dtp.app.use('/admin', router);
+    const authCheck = sessionService.authCheckMiddleware({ requireLogin: true, requireAdmin: true });
 
-    const authRequired = sessionService.authCheckMiddleware({ requireLogin: true, requireAdmin: true });
-    router.use(authRequired);
+    const router = express.Router();
+    this.dtp.app.use('/admin', authCheck, router);
 
     router.use('/user', await this.loadChild(path.join(__dirname, 'admin', 'user.js')));
 
-    router.get(
-      '/',
-      this.getDashboard.bind(this),
-    );
+    router.get('/', this.getDashboard.bind(this));
 
     return router;
   }
diff --git a/app/controllers/client.js b/app/controllers/client.js
index 7c741b2..aa772c6 100644
--- a/app/controllers/client.js
+++ b/app/controllers/client.js
@@ -19,12 +19,13 @@ export default class ClientController extends SiteController {
 
   async start ( ) {
     const { dtp } = this;
+    const {
+      limiter: limiterService,
+      session: sessionService,
+    } = dtp.services;
 
-    const router = express.Router();
-    dtp.app.use('/client', router);
-
-    const { limiter: limiterService } = dtp.services;
     const limiterConfig = limiterService.config.client;
+    const authCheck = sessionService.authCheckMiddleware({ requireLogin: true });
 
     function checkClientOwnership (req, res, next) {
       if (!res.locals.client.user._id.equals(req.user._id)) {
@@ -40,6 +41,9 @@ export default class ClientController extends SiteController {
       return next();
     }
 
+    const router = express.Router();
+    dtp.app.use('/client', authCheck, router);
+
     router.param('clientId', this.populateClientId.bind(this));
     router.param('projectId', this.populateProjectId.bind(this));
 
diff --git a/app/controllers/report.js b/app/controllers/report.js
index 4707252..96819b3 100644
--- a/app/controllers/report.js
+++ b/app/controllers/report.js
@@ -18,11 +18,17 @@ export default class ReportController extends SiteController {
   }
 
   async start ( ) {
-    // const { limiter: limiterService } = dtp.services;
+    const {
+      // limiter: limiterService,
+      session: sessionService,
+    } = this.dtp.services;
+
     // const limiterConfig = limiterService.config.report;
 
+    const authCheck = sessionService.authCheckMiddleware({ requireLogin: true });
+
     const router = express.Router();
-    this.dtp.app.use('/report', router);
+    this.dtp.app.use('/report', authCheck, router);
 
     router.get('/', this.getDashboard.bind(this));
   }
diff --git a/app/controllers/task.js b/app/controllers/task.js
index f1f02f7..d944e97 100644
--- a/app/controllers/task.js
+++ b/app/controllers/task.js
@@ -20,7 +20,10 @@ export default class TaskController extends SiteController {
   async start ( ) {
     const { dtp } = this;
 
-    const { limiter: limiterService } = dtp.services;
+    const {
+      limiter: limiterService,
+      session: sessionService,
+    } = dtp.services;
     const limiterConfig = limiterService.config.task;
 
     const multer = this.createMulter(TaskController.slug, {
@@ -29,8 +32,10 @@ export default class TaskController extends SiteController {
       },
     });
 
+    const authCheck = sessionService.authCheckMiddleware({ requireLogin: true });
+
     const router = express.Router();
-    dtp.app.use('/task', router);
+    dtp.app.use('/task', authCheck, router);
 
     router.use(async (req, res, next) => {
       res.locals.currentView = TaskController.name;