Merge branch 'release/3.2.0' into develop

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

diff --git a/server/middlewares/validators/pagination.ts b/server/middlewares/validators/pagination.ts
index a5a542cdfe0f3fcf4ace19f879fbd6403750d406..6b0a83d802ac2cd6e8c211bff7b02a4dd4759767 100644 (file)
--- a/server/middlewares/validators/pagination.ts
+++ b/server/middlewares/validators/pagination.ts
@@ -1,22 +1,33 @@
-import { query } from 'express-validator/check'
 import * as express from 'express'
+import { query } from 'express-validator'
+import { logger } from '../../helpers/logger'
+import { areValidationErrors } from './utils'
+import { PAGINATION } from '@server/initializers/constants'
 
-import { checkErrors } from './utils'
-import { logger } from '../../helpers'
+const paginationValidator = paginationValidatorBuilder()
 
-const paginationValidator = [
-  query('start').optional().isInt().withMessage('Should have a number start'),
-  query('count').optional().isInt().withMessage('Should have a number count'),
+function paginationValidatorBuilder (tags: string[] = []) {
+  return [
+    query('start')
+      .optional()
+      .isInt({ min: 0 }).withMessage('Should have a number start'),
+    query('count')
+      .optional()
+      .isInt({ min: 0, max: PAGINATION.GLOBAL.COUNT.MAX }).withMessage(`Should have a number count (max: ${PAGINATION.GLOBAL.COUNT.MAX})`),
 
-  (req: express.Request, res: express.Response, next: express.NextFunction) => {
-    logger.debug('Checking pagination parameters', { parameters: req.query })
+    (req: express.Request, res: express.Response, next: express.NextFunction) => {
+      logger.debug('Checking pagination parameters', { parameters: req.query, tags })
 
-    checkErrors(req, res, next)
-  }
-]
+      if (areValidationErrors(req, res)) return
+
+      return next()
+    }
+  ]
+}
 
 // ---------------------------------------------------------------------------
 
 export {
-  paginationValidator
+  paginationValidator,
+  paginationValidatorBuilder
 }