feature/ability to disable video history by default (#5728)

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

diff --git a/server/middlewares/validators/feeds.ts b/server/middlewares/validators/feeds.ts
index 04b4e00c9c6a6b6f7b43346c433d0327a471843a..0bfe89e6fb35cf13352b07cae4d27703396af45b 100644 (file)
--- a/server/middlewares/validators/feeds.ts
+++ b/server/middlewares/validators/feeds.ts
@@ -3,7 +3,6 @@ import { param, query } from 'express-validator'
 import { HttpStatusCode } from '../../../shared/models/http/http-error-codes'
 import { isValidRSSFeed } from '../../helpers/custom-validators/feeds'
 import { exists, isIdOrUUIDValid, isIdValid, toCompleteUUID } from '../../helpers/custom-validators/misc'
-import { logger } from '../../helpers/logger'
 import {
   areValidationErrors,
   checkCanSeeVideo,
@@ -16,8 +15,18 @@ import {
 } from './shared'
 
 const feedsFormatValidator = [
-  param('format').optional().custom(isValidRSSFeed).withMessage('Should have a valid format (rss, atom, json)'),
-  query('format').optional().custom(isValidRSSFeed).withMessage('Should have a valid format (rss, atom, json)')
+  param('format')
+    .optional()
+    .custom(isValidRSSFeed).withMessage('Should have a valid format (rss, atom, json)'),
+  query('format')
+    .optional()
+    .custom(isValidRSSFeed).withMessage('Should have a valid format (rss, atom, json)'),
+
+  (req: express.Request, res: express.Response, next: express.NextFunction) => {
+    if (areValidationErrors(req, res)) return
+
+    return next()
+  }
 ]
 
 function setFeedFormatContentType (req: express.Request, res: express.Response, next: express.NextFunction) {
@@ -49,23 +58,19 @@ function setFeedFormatContentType (req: express.Request, res: express.Response,
 const videoFeedsValidator = [
   query('accountId')
     .optional()
-    .custom(isIdValid)
-    .withMessage('Should have a valid account id'),
+    .custom(isIdValid),
 
   query('accountName')
     .optional(),
 
   query('videoChannelId')
     .optional()
-    .custom(isIdValid)
-    .withMessage('Should have a valid channel id'),
+    .custom(isIdValid),
 
   query('videoChannelName')
     .optional(),
 
   async (req: express.Request, res: express.Response, next: express.NextFunction) => {
-    logger.debug('Checking feeds parameters', { parameters: req.query })
-
     if (areValidationErrors(req, res)) return
 
     if (req.query.accountId && !await doesAccountIdExist(req.query.accountId, res)) return
@@ -79,16 +84,12 @@ const videoFeedsValidator = [
 
 const videoSubscriptionFeedsValidator = [
   query('accountId')
-    .custom(isIdValid)
-    .withMessage('Should have a valid account id'),
+    .custom(isIdValid),
 
   query('token')
-    .custom(exists)
-    .withMessage('Should have a token'),
+    .custom(exists),
 
   async (req: express.Request, res: express.Response, next: express.NextFunction) => {
-    logger.debug('Checking subscription feeds parameters', { parameters: req.query })
-
     if (areValidationErrors(req, res)) return
 
     if (!await doesAccountIdExist(req.query.accountId, res)) return
@@ -100,13 +101,11 @@ const videoSubscriptionFeedsValidator = [
 
 const videoCommentsFeedsValidator = [
   query('videoId')
-    .customSanitizer(toCompleteUUID)
     .optional()
+    .customSanitizer(toCompleteUUID)
     .custom(isIdOrUUIDValid),
 
   async (req: express.Request, res: express.Response, next: express.NextFunction) => {
-    logger.debug('Checking feeds parameters', { parameters: req.query })
-
     if (areValidationErrors(req, res)) return
 
     if (req.query.videoId && (req.query.videoChannelId || req.query.videoChannelName)) {