Upgrade server packages

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

diff --git a/server/middlewares/validators/remote/videos.ts b/server/middlewares/validators/remote/videos.ts
index 3380c29e27850a5785bc87075fd72e06a50512b6..497320cc15ab34ce45972819d6230f1b111f7666 100644 (file)
--- a/server/middlewares/validators/remote/videos.ts
+++ b/server/middlewares/validators/remote/videos.ts
@@ -1,29 +1,56 @@
-import { logger } from '../../../helpers'
+import { body } from 'express-validator/check'
+import * as express from 'express'
+
+import {
+  logger,
+  isArray,
+  removeBadRequestVideos,
+  removeBadRequestVideosQadu,
+  removeBadRequestVideosEvents
+} from '../../../helpers'
 import { checkErrors } from '../utils'
 
-function remoteVideosValidator (req, res, next) {
-  req.checkBody('data').isEachRemoteRequestVideosValid()
+const remoteVideosValidator = [
+  body('data').custom(isArray),
 
-  logger.debug('Checking remoteVideos parameters', { parameters: req.body })
+  (req: express.Request, res: express.Response, next: express.NextFunction) => {
+    logger.debug('Checking remoteVideos parameters', { parameters: req.body })
 
-  checkErrors(req, res, next)
-}
+    checkErrors(req, res, () => {
+      removeBadRequestVideos(req.body.data)
 
-function remoteQaduVideosValidator (req, res, next) {
-  req.checkBody('data').isEachRemoteRequestVideosQaduValid()
+      return next()
+    })
+  }
+]
 
-  logger.debug('Checking remoteQaduVideos parameters', { parameters: req.body })
+const remoteQaduVideosValidator = [
+  body('data').custom(isArray),
 
-  checkErrors(req, res, next)
-}
+  (req: express.Request, res: express.Response, next: express.NextFunction) => {
+    logger.debug('Checking remoteQaduVideos parameters', { parameters: req.body })
 
-function remoteEventsVideosValidator (req, res, next) {
-  req.checkBody('data').isEachRemoteRequestVideosEventsValid()
+    checkErrors(req, res, () => {
+      removeBadRequestVideosQadu(req.body.data)
 
-  logger.debug('Checking remoteEventsVideos parameters', { parameters: req.body })
+      return next()
+    })
+  }
+]
 
-  checkErrors(req, res, next)
-}
+const remoteEventsVideosValidator = [
+  body('data').custom(isArray),
+
+  (req: express.Request, res: express.Response, next: express.NextFunction) => {
+    logger.debug('Checking remoteEventsVideos parameters', { parameters: req.body })
+
+    checkErrors(req, res, () => {
+      removeBadRequestVideosEvents(req.body.data)
+
+      return next()
+    })
+  }
+]
 
 // ---------------------------------------------------------------------------