Merge branch 'release/5.0.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 6b0a83d802ac2cd6e8c211bff7b02a4dd4759767..79ddbbf184d42c0c36be7c538a36f7ae3dc7f44a 100644 (file)
--- a/server/middlewares/validators/pagination.ts
+++ b/server/middlewares/validators/pagination.ts
@@ -1,8 +1,7 @@
-import * as express from 'express'
+import express from 'express'
 import { query } from 'express-validator'
-import { logger } from '../../helpers/logger'
-import { areValidationErrors } from './utils'
 import { PAGINATION } from '@server/initializers/constants'
+import { areValidationErrors } from './shared'
 
 const paginationValidator = paginationValidatorBuilder()
 
@@ -10,15 +9,13 @@ function paginationValidatorBuilder (tags: string[] = []) {
   return [
     query('start')
       .optional()
-      .isInt({ min: 0 }).withMessage('Should have a number start'),
+      .isInt({ min: 0 }),
     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, tags })
-
-      if (areValidationErrors(req, res)) return
+      if (areValidationErrors(req, res, { tags })) return
 
       return next()
     }