X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fmiddlewares%2Fvalidators%2Fsort.ts;h=925f47e5702b94cb00412753f7c91d6e0da68587;hb=bbe0f0645ca958d33a3f409b15166609733b663f;hp=72c6b34e30e1f79bb69da995d276fc13369ce8ad;hpb=265ba139ebf56bbdc1c65f6ea4f367774c691fc0;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/server/middlewares/validators/sort.ts b/server/middlewares/validators/sort.ts
index 72c6b34e3..925f47e57 100644
--- a/server/middlewares/validators/sort.ts
+++ b/server/middlewares/validators/sort.ts
@@ -1,8 +1,5 @@
-import * as express from 'express'
-import { query } from 'express-validator/check'
-import { logger } from '../../helpers/logger'
 import { SORTABLE_COLUMNS } from '../../initializers'
-import { areValidationErrors } from './utils'
+import { checkSort, createSortableColumns } from './utils'
 
 // Initialize constants here for better performances
 const SORTABLE_USERS_COLUMNS = createSortableColumns(SORTABLE_COLUMNS.USERS)
@@ -41,25 +38,3 @@ export {
   jobsSortValidator,
   videoCommentThreadsSortValidator
 }
-
-// ---------------------------------------------------------------------------
-
-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)
-}