X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fmiddlewares%2Fvalidators%2Fjobs.ts;h=e5008adc3650657c6488a21ff35b11e136de272f;hb=564b9b55976873d87e669ace916f037b72fe2865;hp=b57615dbcb48e1261513e40fa372819b0bbd02bc;hpb=1061c73fde3005100ead8764eacb444f240440d6;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/middlewares/validators/jobs.ts b/server/middlewares/validators/jobs.ts index b57615dbc..e5008adc3 100644 --- a/server/middlewares/validators/jobs.ts +++ b/server/middlewares/validators/jobs.ts @@ -1,20 +1,22 @@ -import * as express from 'express' +import express from 'express' import { param, query } from 'express-validator' import { isValidJobState, isValidJobType } from '../../helpers/custom-validators/jobs' -import { logger } from '../../helpers/logger' -import { areValidationErrors } from './utils' +import { loggerTagsFactory } from '../../helpers/logger' +import { areValidationErrors } from './shared' + +const lTags = loggerTagsFactory('validators', 'jobs') const listJobsValidator = [ param('state') - .custom(isValidJobState).not().isEmpty().withMessage('Should have a valid job state'), + .optional() + .custom(isValidJobState), + query('jobType') .optional() - .custom(isValidJobType).withMessage('Should have a valid job state'), + .custom(isValidJobType), (req: express.Request, res: express.Response, next: express.NextFunction) => { - logger.debug('Checking listJobsValidator parameters.', { parameters: req.params }) - - if (areValidationErrors(req, res)) return + if (areValidationErrors(req, res, lTags())) return return next() }