X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fmiddlewares%2Fvalidators%2Fpagination.ts;h=e1ed8cd65cb6979c7c85fdb1aee46f1b6cceec01;hb=54b3316099ed7d2dfcb6d708fdb686f1e125ce61;hp=de719c05bc42fd7f80c2a414332205c535655e5d;hpb=65fcc3119c334b75dd13bcfdebf186afdc580a8f;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/server/middlewares/validators/pagination.ts b/server/middlewares/validators/pagination.ts
index de719c05b..e1ed8cd65 100644
--- a/server/middlewares/validators/pagination.ts
+++ b/server/middlewares/validators/pagination.ts
@@ -1,14 +1,20 @@
-import { checkErrors } from './utils'
-import { logger } from '../../helpers'
+import * as express from 'express'
+import { query } from 'express-validator/check'
+import { logger } from '../../helpers/logger'
+import { areValidationErrors } from './utils'
 
-function paginationValidator (req, res, next) {
-  req.checkQuery('start', 'Should have a number start').optional().isInt()
-  req.checkQuery('count', 'Should have a number count').optional().isInt()
+const paginationValidator = [
+  query('start').optional().isInt({ min: 0 }).withMessage('Should have a number start'),
+  query('count').optional().isInt({ min: 0 }).withMessage('Should have a number count'),
 
-  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 })
 
-  checkErrors(req, res, next)
-}
+    if (areValidationErrors(req, res)) return
+
+    return next()
+  }
+]
 
 // ---------------------------------------------------------------------------