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 e4682a60b5a9a7fb103cc3037cc1ae9a7faae0ea..497320cc15ab34ce45972819d6230f1b111f7666 100644 (file)
--- a/server/middlewares/validators/remote/videos.ts
+++ b/server/middlewares/validators/remote/videos.ts
@@ -3,39 +3,52 @@ import * as express from 'express'
 
 import {
   logger,
-  isEachRemoteRequestVideosValid,
-  isEachRemoteRequestVideosQaduValid,
-  isEachRemoteRequestVideosEventsValid
+  isArray,
+  removeBadRequestVideos,
+  removeBadRequestVideosQadu,
+  removeBadRequestVideosEvents
 } from '../../../helpers'
 import { checkErrors } from '../utils'
 
 const remoteVideosValidator = [
-  body('data').custom(isEachRemoteRequestVideosValid),
+  body('data').custom(isArray),
 
   (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)
+
+      return next()
+    })
   }
 ]
 
 const remoteQaduVideosValidator = [
-  body('data').custom(isEachRemoteRequestVideosQaduValid),
+  body('data').custom(isArray),
 
   (req: express.Request, res: express.Response, next: express.NextFunction) => {
     logger.debug('Checking remoteQaduVideos parameters', { parameters: req.body })
 
-    checkErrors(req, res, next)
+    checkErrors(req, res, () => {
+      removeBadRequestVideosQadu(req.body.data)
+
+      return next()
+    })
   }
 ]
 
 const remoteEventsVideosValidator = [
-  body('data').custom(isEachRemoteRequestVideosEventsValid),
+  body('data').custom(isArray),
 
   (req: express.Request, res: express.Response, next: express.NextFunction) => {
     logger.debug('Checking remoteEventsVideos parameters', { parameters: req.body })
 
-    checkErrors(req, res, next)
+    checkErrors(req, res, () => {
+      removeBadRequestVideosEvents(req.body.data)
+
+      return next()
+    })
   }
 ]