New directory organization

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

diff --git a/middlewares/reqValidators/remote.js b/middlewares/reqValidators/remote.js
index e851b49a463ccba7680e485057b4b0d17fa2d27a..4b161e292c0a7466c20724eae4504a9d5e3b0dd0 100644 (file)
--- a/middlewares/reqValidators/remote.js
+++ b/middlewares/reqValidators/remote.js
@@ -2,7 +2,7 @@
   'use strict'
 
   var checkErrors = require('./utils').checkErrors
-  var logger = require('../../src/logger')
+  var logger = require('../../helpers/logger')
 
   var remote = {}
 
@@ -12,16 +12,14 @@
     req.checkBody('key', 'Should have a key').notEmpty()
     req.checkBody('data', 'Should have data').notEmpty()
 
-    logger.debug('Checking secureRequest parameters', { parameters: req.body })
+    logger.debug('Checking secureRequest parameters', { parameters: { data: req.body.data, keyLength: req.body.key.length } })
 
     checkErrors(req, res, next)
   }
 
   remote.remoteVideosAdd = function (req, res, next) {
-    req.checkBody('data.name', 'Should have a name').isLength(1, 50)
-    req.checkBody('data.description', 'Should have a description').isLength(1, 250)
-    req.checkBody('data.magnetUri', 'Should have a magnetUri').notEmpty()
-    req.checkBody('data.podUrl', 'Should have a podUrl').isURL()
+    req.checkBody('data').isArray()
+    req.checkBody('data').eachIsRemoteVideosAddValid()
 
     logger.debug('Checking remoteVideosAdd parameters', { parameters: req.body })
 
@@ -29,7 +27,8 @@
   }
 
   remote.remoteVideosRemove = function (req, res, next) {
-    req.checkBody('data.magnetUri', 'Should have a magnetUri').notEmpty()
+    req.checkBody('data').isArray()
+    req.checkBody('data').eachIsRemoteVideosRemoveValid()
 
     logger.debug('Checking remoteVideosRemove parameters', { parameters: req.body })