Infile code reorganization

[github/Chocobozzz/PeerTube.git] / middlewares / reqValidators / remote.js

diff --git a/middlewares/reqValidators/remote.js b/middlewares/reqValidators/remote.js
index 4b161e292c0a7466c20724eae4504a9d5e3b0dd0..9b61481adf513e074ed8419982a891c19f08bbf8 100644 (file)
--- a/middlewares/reqValidators/remote.js
+++ b/middlewares/reqValidators/remote.js
@@ -4,20 +4,13 @@
   var checkErrors = require('./utils').checkErrors
   var logger = require('../../helpers/logger')
 
-  var remote = {}
-
-  remote.secureRequest = function (req, res, next) {
-    req.checkBody('signature.url', 'Should have a signature url').isURL()
-    req.checkBody('signature.signature', 'Should have a signature').notEmpty()
-    req.checkBody('key', 'Should have a key').notEmpty()
-    req.checkBody('data', 'Should have data').notEmpty()
-
-    logger.debug('Checking secureRequest parameters', { parameters: { data: req.body.data, keyLength: req.body.key.length } })
-
-    checkErrors(req, res, next)
+  var reqValidatorsRemote = {
+    remoteVideosAdd: remoteVideosAdd,
+    remoteVideosRemove: remoteVideosRemove,
+    secureRequest: secureRequest
   }
 
-  remote.remoteVideosAdd = function (req, res, next) {
+  function remoteVideosAdd (req, res, next) {
     req.checkBody('data').isArray()
     req.checkBody('data').eachIsRemoteVideosAddValid()
 
@@ -26,7 +19,7 @@
     checkErrors(req, res, next)
   }
 
-  remote.remoteVideosRemove = function (req, res, next) {
+  function remoteVideosRemove (req, res, next) {
     req.checkBody('data').isArray()
     req.checkBody('data').eachIsRemoteVideosRemoveValid()
 
@@ -35,5 +28,18 @@
     checkErrors(req, res, next)
   }
 
-  module.exports = remote
+  function secureRequest (req, res, next) {
+    req.checkBody('signature.url', 'Should have a signature url').isURL()
+    req.checkBody('signature.signature', 'Should have a signature').notEmpty()
+    req.checkBody('key', 'Should have a key').notEmpty()
+    req.checkBody('data', 'Should have data').notEmpty()
+
+    logger.debug('Checking secureRequest parameters', { parameters: { data: req.body.data, keyLength: req.body.key.length } })
+
+    checkErrors(req, res, next)
+  }
+
+  // ---------------------------------------------------------------------------
+
+  module.exports = reqValidatorsRemote
 })()