]> git.immae.eu Git - github/Chocobozzz/PeerTube.git/blobdiff - server/middlewares/validators/jobs.ts
Fix filters on playlists
[github/Chocobozzz/PeerTube.git] / server / middlewares / validators / jobs.ts
index 5d89d167f66a38351d20beadf3e533dbe8643ab3..e5008adc3650657c6488a21ff35b11e136de272f 100644 (file)
@@ -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()
   }