Middleware refractoring

3 files changed, 16 insertions, 13 deletions

diff --git a/routes/api/v1/pods.js b/routes/api/v1/pods.js
index 8ae676834..2bb8f89ab 100644
--- a/routes/api/v1/pods.js
+++ b/routes/api/v1/pods.js
@@ -4,7 +4,8 @@
   var express = require('express')
   var router = express.Router()
   var middleware = require('../../../middlewares')
-  var reqValidator = require('../../../middlewares/reqValidators').pods
+  var miscMiddleware = middleware.misc
+  var reqValidator = middleware.reqValidators.pods
   var pods = require('../../../src/pods')
 
   function listPods (req, res, next) {
@@ -31,9 +32,9 @@
     })
   }
 
-  router.get('/', middleware.cache(false), listPods)
-  router.get('/makefriends', middleware.cache(false), makeFriends)
-  router.post('/', reqValidator.podsAdd, middleware.cache(false), addPods)
+  router.get('/', miscMiddleware.cache(false), listPods)
+  router.get('/makefriends', miscMiddleware.cache(false), makeFriends)
+  router.post('/', reqValidator.podsAdd, miscMiddleware.cache(false), addPods)
 
   module.exports = router
 })()
diff --git a/routes/api/v1/remoteVideos.js b/routes/api/v1/remoteVideos.js
index 23bdcbe24..10793b2b4 100644
--- a/routes/api/v1/remoteVideos.js
+++ b/routes/api/v1/remoteVideos.js
@@ -4,7 +4,8 @@
   var express = require('express')
   var router = express.Router()
   var middleware = require('../../../middlewares')
-  var requestValidator = require('../../../middlewares/reqValidators').remote
+  var miscMiddleware = middleware.misc
+  var reqValidator = middleware.reqValidators.remote
   var videos = require('../../../src/videos')
 
   function addRemoteVideos (req, res, next) {
@@ -23,8 +24,8 @@
     })
   }
 
-  router.post('/add', requestValidator.secureRequest, middleware.decryptBody, requestValidator.remoteVideosAdd, middleware.cache(false), addRemoteVideos)
-  router.post('/remove', requestValidator.secureRequest, middleware.decryptBody, requestValidator.remoteVideosRemove, middleware.cache(false), removeRemoteVideo)
+  router.post('/add', reqValidator.secureRequest, miscMiddleware.decryptBody, reqValidator.remoteVideosAdd, miscMiddleware.cache(false), addRemoteVideos)
+  router.post('/remove', reqValidator.secureRequest, miscMiddleware.decryptBody, reqValidator.remoteVideosRemove, miscMiddleware.cache(false), removeRemoteVideo)
 
   module.exports = router
 })()
diff --git a/routes/api/v1/videos.js b/routes/api/v1/videos.js
index 06b248244..33c565437 100644
--- a/routes/api/v1/videos.js
+++ b/routes/api/v1/videos.js
@@ -4,7 +4,8 @@
   var express = require('express')
   var router = express.Router()
   var middleware = require('../../../middlewares')
-  var reqValidator = require('../../../middlewares/reqValidators').videos
+  var miscMiddleware = middleware.misc
+  var reqValidator = middleware.reqValidators.videos
   var videos = require('../../../src/videos')
 
   function listVideos (req, res, next) {
@@ -52,11 +53,11 @@
     })
   }
 
-  router.get('/', middleware.cache(false), listVideos)
-  router.post('/', reqValidator.videosAdd, middleware.cache(false), addVideos)
-  router.get('/search/:name', reqValidator.videosSearch, middleware.cache(false), searchVideos)
-  router.get('/:id', reqValidator.videosGet, middleware.cache(false), getVideos)
-  router.delete('/:id', reqValidator.videosRemove, middleware.cache(false), removeVideo)
+  router.get('/', miscMiddleware.cache(false), listVideos)
+  router.post('/', reqValidator.videosAdd, miscMiddleware.cache(false), addVideos)
+  router.get('/search/:name', reqValidator.videosSearch, miscMiddleware.cache(false), searchVideos)
+  router.get('/:id', reqValidator.videosGet, miscMiddleware.cache(false), getVideos)
+  router.delete('/:id', reqValidator.videosRemove, miscMiddleware.cache(false), removeVideo)
 
   module.exports = router
 })()