Better 413 error handling in cli script

[github/Chocobozzz/PeerTube.git] / server / middlewares / validators / jobs.ts

diff --git a/server/middlewares/validators/jobs.ts b/server/middlewares/validators/jobs.ts
index 2f8b1738c5054552b782aa359a646929153a19fb..4de90548b067e9ab3378fb4dd26260e88e326599 100644 (file)
--- a/server/middlewares/validators/jobs.ts
+++ b/server/middlewares/validators/jobs.ts
@@ -1,14 +1,22 @@
-import * as express from 'express'
-import { param } from 'express-validator/check'
-import { isValidJobState } from '../../helpers/custom-validators/jobs'
-import { logger } from '../../helpers/logger'
-import { areValidationErrors } from './utils'
+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 { areValidationErrors } from './shared'
+
+const lTags = loggerTagsFactory('validators', 'jobs')
 
 const listJobsValidator = [
-  param('state').custom(isValidJobState).not().isEmpty().withMessage('Should have a valid job state'),
+  param('state')
+  .optional()
+  .custom(isValidJobState).not().isEmpty().withMessage('Should have a valid job state'),
+
+  query('jobType')
+    .optional()
+    .custom(isValidJobType).withMessage('Should have a valid job state'),
 
-  async (req: express.Request, res: express.Response, next: express.NextFunction) => {
-    logger.debug('Checking listJobsValidator parameters.', { parameters: req.params })
+  (req: express.Request, res: express.Response, next: express.NextFunction) => {
+    logger.debug('Checking listJobsValidator parameters.', { parameters: req.params, ...lTags() })
 
     if (areValidationErrors(req, res)) return