Pod URL -> pod host. HTTPS is required to make friends.

[github/Chocobozzz/PeerTube.git] / server / middlewares / validators / pods.js

diff --git a/server/middlewares/validators/pods.js b/server/middlewares/validators/pods.js
index fda2e865f58157ebc6a852aa8e130ce0fa8d5a9c..4f8bad2f9610cd0ce311b43b4b0933d4d78e04ed 100644 (file)
--- a/server/middlewares/validators/pods.js
+++ b/server/middlewares/validators/pods.js
@@ -5,28 +5,34 @@ const friends = require('../../lib/friends')
 const logger = require('../../helpers/logger')
 
 const validatorsPod = {
-  makeFriends: makeFriends,
-  podsAdd: podsAdd
+  makeFriends,
+  podsAdd
 }
 
 function makeFriends (req, res, next) {
-  friends.hasFriends(function (err, hasFriends) {
-    if (err) {
-      logger.error('Cannot know if we have friends.', { error: err })
-      res.sendStatus(500)
-    }
-
-    if (hasFriends === true) {
-      // We need to quit our friends before make new ones
-      res.sendStatus(409)
-    } else {
-      return next()
-    }
+  req.checkBody('hosts', 'Should have an array of unique hosts').isEachUniqueHostValid()
+
+  logger.debug('Checking makeFriends parameters', { parameters: req.body })
+
+  checkErrors(req, res, function () {
+    friends.hasFriends(function (err, hasFriends) {
+      if (err) {
+        logger.error('Cannot know if we have friends.', { error: err })
+        res.sendStatus(500)
+      }
+
+      if (hasFriends === true) {
+        // We need to quit our friends before make new ones
+        res.sendStatus(409)
+      } else {
+        return next()
+      }
+    })
   })
 }
 
 function podsAdd (req, res, next) {
-  req.checkBody('url', 'Should have an url').notEmpty().isURL({ require_protocol: true })
+  req.checkBody('host', 'Should have an host').notEmpty().isURL()
   req.checkBody('publicKey', 'Should have a public key').notEmpty()
 
   // TODO: check we don't have it already