X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fmiddlewares%2Fvalidators%2Futils.ts;h=4167f6d437f7ca9273abe998d2165ac74966e168;hb=f479685678406a5df864d89615b33d29085ebfc6;hp=0424d59429f6e914fa7f855db71afcb1af4519cb;hpb=69818c9394366b954b6ba3bd697bd9d2b09f2a16;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/server/middlewares/validators/utils.ts b/server/middlewares/validators/utils.ts
index 0424d5942..4167f6d43 100644
--- a/server/middlewares/validators/utils.ts
+++ b/server/middlewares/validators/utils.ts
@@ -1,22 +1,46 @@
-import 'express-validator'
 import * as express from 'express'
-import { inspect } from 'util'
+import { query, validationResult } from 'express-validator'
+import { logger } from '../../helpers/logger'
+import { HttpStatusCode } from '../../../shared/core-utils/miscs/http-error-codes'
 
-import { logger } from '../../helpers'
+function areValidationErrors (req: express.Request, res: express.Response) {
+  const errors = validationResult(req)
 
-function checkErrors (req: express.Request, res: express.Response, next: express.NextFunction, statusCode = 400) {
-  const errors = req.validationErrors()
+  if (!errors.isEmpty()) {
+    logger.warn('Incorrect request parameters', { path: req.originalUrl, err: errors.mapped() })
+    res.status(HttpStatusCode.BAD_REQUEST_400)
+       .json({ errors: errors.mapped() })
 
-  if (errors) {
-    logger.warn('Incorrect request parameters', { path: req.originalUrl, err: errors })
-    return res.status(statusCode).send('There have been validation errors: ' + inspect(errors))
+    return true
   }
 
-  return next()
+  return false
+}
+
+function checkSort (sortableColumns: string[], tags: 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, tags })
+
+      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
 }