X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fmiddlewares%2Fvalidators%2Fjobs.ts;h=e5008adc3650657c6488a21ff35b11e136de272f;hb=16ccb43767c45e74877ab7beaa4adb61a404c128;hp=5d89d167f66a38351d20beadf3e533dbe8643ab3;hpb=10363c74c1d869f0e0c7bc4d0367b1f34d1bb6a4;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/middlewares/validators/jobs.ts b/server/middlewares/validators/jobs.ts index 5d89d167f..e5008adc3 100644 --- a/server/middlewares/validators/jobs.ts +++ b/server/middlewares/validators/jobs.ts @@ -1,24 +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, loggerTagsFactory } from '../../helpers/logger' +import { loggerTagsFactory } from '../../helpers/logger' import { areValidationErrors } from './shared' const lTags = loggerTagsFactory('validators', 'jobs') const listJobsValidator = [ param('state') - .optional() - .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, ...lTags() }) - - if (areValidationErrors(req, res)) return + if (areValidationErrors(req, res, lTags())) return return next() }