Merge branch 'release/v1.3.0' into develop

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

diff --git a/server/middlewares/validators/utils.ts b/server/middlewares/validators/utils.ts
index 8845f83995be3536abd9c5f3f1b05be5b6f0e3bf..8f77c9fbd84060118df26ab1a6b8607b19d28f7a 100644 (file)
--- a/server/middlewares/validators/utils.ts
+++ b/server/middlewares/validators/utils.ts
@@ -1,21 +1,44 @@
-import { validationResult } from 'express-validator/check'
 import * as express from 'express'
+import { query, validationResult } from 'express-validator/check'
+import { logger } from '../../helpers/logger'
 
-import { logger } from '../../helpers'
-
-function checkErrors (req: express.Request, res: express.Response, next: express.NextFunction, statusCode = 400) {
+function areValidationErrors (req: express.Request, res: express.Response) {
   const errors = validationResult(req)
 
   if (!errors.isEmpty()) {
     logger.warn('Incorrect request parameters', { path: req.originalUrl, err: errors.mapped() })
-    return res.status(statusCode).json({ errors: errors.mapped() })
+    res.status(400).json({ errors: errors.mapped() })
+
+    return true
   }
 
-  return next()
+  return false
+}
+
+function checkSort (sortableColumns: string[]) {
+  return [
+    query('sort').optional().isIn(sortableColumns).withMessage('Should have correct sortable column'),
+
+    (req: express.Request, res: express.Response, next: express.NextFunction) => {
+      logger.debug('Checking sort parameters', { parameters: req.query })
+
+      if (areValidationErrors(req, res)) return
+
+      return next()
+    }
+  ]
+}
+
+function createSortableColumns (sortableColumns: string[]) {
+  const sortableColumnDesc = sortableColumns.map(sortableColumn => '-' + sortableColumn)
+
+  return sortableColumns.concat(sortableColumnDesc)
 }
 
 // ---------------------------------------------------------------------------
 
 export {
-  checkErrors
+  areValidationErrors,
+  checkSort,
+  createSortableColumns
 }