X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fmiddlewares%2Fvalidators%2Fpagination.ts;h=74eae251e04790dbbd53a60b02e7446106995f12;hb=9e8789497377cac5554a622da605f5b89587aa9c;hp=e1ed8cd65cb6979c7c85fdb1aee46f1b6cceec01;hpb=da854ddd502cd70685ef779c673b9e63757b8aa0;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/middlewares/validators/pagination.ts b/server/middlewares/validators/pagination.ts index e1ed8cd65..74eae251e 100644 --- a/server/middlewares/validators/pagination.ts +++ b/server/middlewares/validators/pagination.ts @@ -1,23 +1,33 @@ import * as express from 'express' -import { query } from 'express-validator/check' +import { query } from 'express-validator' +import { PAGINATION } from '@server/initializers/constants' import { logger } from '../../helpers/logger' -import { areValidationErrors } from './utils' +import { areValidationErrors } from './shared' -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'), +const paginationValidator = paginationValidatorBuilder() - (req: express.Request, res: express.Response, next: express.NextFunction) => { - logger.debug('Checking pagination parameters', { parameters: req.query }) +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})`), - if (areValidationErrors(req, res)) return + (req: express.Request, res: express.Response, next: express.NextFunction) => { + logger.debug('Checking pagination parameters', { parameters: req.query, tags }) - return next() - } -] + if (areValidationErrors(req, res)) return + + return next() + } + ] +} // --------------------------------------------------------------------------- export { - paginationValidator + paginationValidator, + paginationValidatorBuilder }