Fix video tag validator

[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..1cae7848c400fe14f40392f5152c7e96a2097933 100644 (file)
--- a/server/middlewares/validators/pagination.ts
+++ b/server/middlewares/validators/pagination.ts
@@ -1,17 +1,23 @@
-import { query } from 'express-validator/check'
 import * as express from 'express'
-
-import { checkErrors } from './utils'
-import { logger } from '../../helpers'
+import { query } from 'express-validator'
+import { logger } from '../../helpers/logger'
+import { areValidationErrors } from './utils'
+import { PAGINATION } from '@server/initializers/constants'
 
 const paginationValidator = [
-  query('start').optional().isInt().withMessage('Should have a number start'),
-  query('count').optional().isInt().withMessage('Should have a number count'),
+  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 })
 
-    checkErrors(req, res, next)
+    if (areValidationErrors(req, res)) return
+
+    return next()
   }
 ]