X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fmiddlewares%2Fvalidators%2Fuser-history.ts;h=f2dae313437ad42c8a8835b25bdb21b52bd6504b;hb=5e47f6ab984a7d00782e4c7030afffa1ba480add;hp=1db0d9b264d12b8663b098b5afa2e96aaea8a4d5;hpb=10363c74c1d869f0e0c7bc4d0367b1f34d1bb6a4;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/middlewares/validators/user-history.ts b/server/middlewares/validators/user-history.ts index 1db0d9b26..f2dae3134 100644 --- a/server/middlewares/validators/user-history.ts +++ b/server/middlewares/validators/user-history.ts @@ -1,31 +1,37 @@ -import * as express from 'express' -import { body, query } from 'express-validator' -import { exists, isDateValid } from '../../helpers/custom-validators/misc' -import { logger } from '../../helpers/logger' +import express from 'express' +import { body, param, query } from 'express-validator' +import { exists, isDateValid, isIdValid } from '../../helpers/custom-validators/misc' import { areValidationErrors } from './shared' const userHistoryListValidator = [ query('search') .optional() - .custom(exists).withMessage('Should have a valid search'), + .custom(exists), (req: express.Request, res: express.Response, next: express.NextFunction) => { - logger.debug('Checking userHistoryListValidator parameters', { parameters: req.query }) - if (areValidationErrors(req, res)) return return next() } ] -const userHistoryRemoveValidator = [ +const userHistoryRemoveAllValidator = [ body('beforeDate') .optional() .custom(isDateValid).withMessage('Should have a before date that conforms to ISO 8601'), (req: express.Request, res: express.Response, next: express.NextFunction) => { - logger.debug('Checking userHistoryRemoveValidator parameters', { parameters: req.body }) + if (areValidationErrors(req, res)) return + + return next() + } +] +const userHistoryRemoveElementValidator = [ + param('videoId') + .custom(isIdValid), + + (req: express.Request, res: express.Response, next: express.NextFunction) => { if (areValidationErrors(req, res)) return return next() @@ -36,5 +42,6 @@ const userHistoryRemoveValidator = [ export { userHistoryListValidator, - userHistoryRemoveValidator + userHistoryRemoveElementValidator, + userHistoryRemoveAllValidator }