5 files changed, 45 insertions, 3 deletions

diff --git a/server/middlewares/index.js b/server/middlewares/index.js
index f0fad3418..35858da2c 100644
--- a/server/middlewares/index.js
+++ b/server/middlewares/index.js
@@ -3,12 +3,14 @@
 const oauth2 = require('./oauth2')
 const pagination = require('./pagination')
 const reqValidatorsMiddleware = require('./reqValidators')
+const sort = require('./sort')
 const secureMiddleware = require('./secure')
 
 const middlewares = {
   oauth2: oauth2,
   pagination: pagination,
   reqValidators: reqValidatorsMiddleware,
+  sort: sort,
   secure: secureMiddleware
 }
 
diff --git a/server/middlewares/reqValidators/index.js b/server/middlewares/reqValidators/index.js
index b732a27b6..be68f6a29 100644
--- a/server/middlewares/reqValidators/index.js
+++ b/server/middlewares/reqValidators/index.js
@@ -3,12 +3,14 @@
 const paginationReqValidators = require('./pagination')
 const podsReqValidators = require('./pods')
 const remoteReqValidators = require('./remote')
+const sortReqValidators = require('./sort')
 const videosReqValidators = require('./videos')
 
 const reqValidators = {
   pagination: paginationReqValidators,
   pods: podsReqValidators,
   remote: remoteReqValidators,
+  sort: sortReqValidators,
   videos: videosReqValidators
 }
 
diff --git a/server/middlewares/reqValidators/pagination.js b/server/middlewares/reqValidators/pagination.js
index ca8375396..e598f269a 100644
--- a/server/middlewares/reqValidators/pagination.js
+++ b/server/middlewares/reqValidators/pagination.js
@@ -8,10 +8,10 @@ const reqValidatorsPagination = {
 }
 
 function pagination (req, res, next) {
-  req.checkParams('start', 'Should have a number start').optional().isInt()
-  req.checkParams('count', 'Should have a number count').optional().isInt()
+  req.checkQuery('start', 'Should have a number start').optional().isInt()
+  req.checkQuery('count', 'Should have a number count').optional().isInt()
 
-  logger.debug('Checking pagination parameters', { parameters: req.params })
+  logger.debug('Checking pagination parameters', { parameters: req.query })
 
   checkErrors(req, res, next)
 }
diff --git a/server/middlewares/reqValidators/sort.js b/server/middlewares/reqValidators/sort.js
new file mode 100644
index 000000000..06e680ef4
--- /dev/null
+++ b/server/middlewares/reqValidators/sort.js
@@ -0,0 +1,23 @@
+'use strict'
+
+const checkErrors = require('./utils').checkErrors
+const constants = require('../../initializers/constants')
+const logger = require('../../helpers/logger')
+
+const reqValidatorsSort = {
+  videosSort: videosSort
+}
+
+function videosSort (req, res, next) {
+  const sortableColumns = constants.SORTABLE_COLUMNS.VIDEOS
+
+  req.checkQuery('sort', 'Should have correct sortable column').optional().isIn(sortableColumns)
+
+  logger.debug('Checking sort parameters', { parameters: req.query })
+
+  checkErrors(req, res, next)
+}
+
+// ---------------------------------------------------------------------------
+
+module.exports = reqValidatorsSort
diff --git a/server/middlewares/sort.js b/server/middlewares/sort.js
new file mode 100644
index 000000000..9f52290a6
--- /dev/null
+++ b/server/middlewares/sort.js
@@ -0,0 +1,15 @@
+'use strict'
+
+const sortMiddleware = {
+  setVideosSort: setVideosSort
+}
+
+function setVideosSort (req, res, next) {
+  if (!req.query.sort) req.query.sort = '-createdDate'
+
+  return next()
+}
+
+// ---------------------------------------------------------------------------
+
+module.exports = sortMiddleware