Upgrade server packages

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

diff --git a/server/middlewares/validators/pods.ts b/server/middlewares/validators/pods.ts
index fbfd268d05e1d9a2b572cb072a2ccf4d8751dfdf..8465fea53ca2107cf44739c746aa4271ea524eca 100644 (file)
--- a/server/middlewares/validators/pods.ts
+++ b/server/middlewares/validators/pods.ts
@@ -1,63 +1,73 @@
-const db = require('../../initializers/database')
+import { body, param } from 'express-validator/check'
+import * as express from 'express'
+
+import { database as db } from '../../initializers/database'
 import { checkErrors } from './utils'
-import { logger } from '../../helpers'
+import { logger, isEachUniqueHostValid, isTestInstance } from '../../helpers'
 import { CONFIG } from '../../initializers'
 import { hasFriends } from '../../lib'
-import { isTestInstance } from '../../helpers'
-
-function makeFriendsValidator (req, res, next) {
-  // Force https if the administrator wants to make friends
-  if (isTestInstance() === false && CONFIG.WEBSERVER.SCHEME === 'http') {
-    return res.status(400).send('Cannot make friends with a non HTTPS webserver.')
-  }
 
-  req.checkBody('hosts', 'Should have an array of unique hosts').isEachUniqueHostValid()
+const makeFriendsValidator = [
+  body('hosts').custom(isEachUniqueHostValid).withMessage('Should have an array of unique hosts'),
 
-  logger.debug('Checking makeFriends parameters', { parameters: req.body })
+  (req: express.Request, res: express.Response, next: express.NextFunction) => {
+    // Force https if the administrator wants to make friends
+    if (isTestInstance() === false && CONFIG.WEBSERVER.SCHEME === 'http') {
+      return res.status(400)
+                .json({
+                  error: 'Cannot make friends with a non HTTPS web server.'
+                })
+                .end()
+    }
 
-  checkErrors(req, res, function () {
-    hasFriends(function (err, heHasFriends) {
-      if (err) {
-        logger.error('Cannot know if we have friends.', { error: err })
-        res.sendStatus(500)
-      }
+    logger.debug('Checking makeFriends parameters', { parameters: req.body })
 
-      if (heHasFriends === true) {
-        // We need to quit our friends before make new ones
-        return res.sendStatus(409)
-      }
+    checkErrors(req, res, () => {
+      hasFriends()
+        .then(heHasFriends => {
+          if (heHasFriends === true) {
+            // We need to quit our friends before make new ones
+            return res.sendStatus(409)
+          }
 
-      return next()
+          return next()
+        })
+        .catch(err => {
+          logger.error('Cannot know if we have friends.', err)
+          res.sendStatus(500)
+        })
     })
-  })
-}
+  }
+]
 
-function podsAddValidator (req, res, next) {
-  req.checkBody('host', 'Should have a host').isHostValid()
-  req.checkBody('email', 'Should have an email').isEmail()
-  req.checkBody('publicKey', 'Should have a public key').notEmpty()
-  logger.debug('Checking podsAdd parameters', { parameters: req.body })
-
-  checkErrors(req, res, function () {
-    db.Pod.loadByHost(req.body.host, function (err, pod) {
-      if (err) {
-        logger.error('Cannot load pod by host.', { error: err })
-        res.sendStatus(500)
-      }
-
-      // Pod with this host already exists
-      if (pod) {
-        return res.sendStatus(409)
-      }
-
-      return next()
+const podRemoveValidator = [
+  param('id').isNumeric().not().isEmpty().withMessage('Should have a valid id'),
+
+  (req: express.Request, res: express.Response, next: express.NextFunction) => {
+    logger.debug('Checking podRemoveValidator parameters', { parameters: req.params })
+
+    checkErrors(req, res, () => {
+      db.Pod.load(req.params.id)
+        .then(pod => {
+          if (!pod) {
+            logger.error('Cannot find pod %d.', req.params.id)
+            return res.sendStatus(404)
+          }
+
+          res.locals.pod = pod
+          return next()
+        })
+        .catch(err => {
+          logger.error('Cannot load pod %d.', req.params.id, err)
+          res.sendStatus(500)
+        })
     })
-  })
-}
+  }
+]
 
 // ---------------------------------------------------------------------------
 
 export {
   makeFriendsValidator,
-  podsAddValidator
+  podRemoveValidator
 }