12 files changed, 105 insertions, 163 deletions

diff --git a/server/middlewares/validators/index.js b/server/middlewares/validators/index.js
deleted file mode 100644
index 6c3a9c2b4..000000000
--- a/server/middlewares/validators/index.js
+++ /dev/null
@@ -1,21 +0,0 @@
-'use strict'
-
-const paginationValidators = require('./pagination')
-const podsValidators = require('./pods')
-const remoteValidators = require('./remote')
-const sortValidators = require('./sort')
-const usersValidators = require('./users')
-const videosValidators = require('./videos')
-
-const validators = {
-  pagination: paginationValidators,
-  pods: podsValidators,
-  remote: remoteValidators,
-  sort: sortValidators,
-  users: usersValidators,
-  videos: videosValidators
-}
-
-// ---------------------------------------------------------------------------
-
-module.exports = validators
diff --git a/server/middlewares/validators/index.ts b/server/middlewares/validators/index.ts
new file mode 100644
index 000000000..42ba465ec
--- /dev/null
+++ b/server/middlewares/validators/index.ts
@@ -0,0 +1,6 @@
+export * from './remote'
+export * from './pagination'
+export * from './pods'
+export * from './sort'
+export * from './users'
+export * from './videos'
diff --git a/server/middlewares/validators/pagination.js b/server/middlewares/validators/pagination.ts
index 16682696e..de719c05b 100644
--- a/server/middlewares/validators/pagination.js
+++ b/server/middlewares/validators/pagination.ts
@@ -1,13 +1,7 @@
-'use strict'
+import { checkErrors } from './utils'
+import { logger } from '../../helpers'
 
-const checkErrors = require('./utils').checkErrors
-const logger = require('../../helpers/logger')
-
-const validatorsPagination = {
-  pagination
-}
-
-function pagination (req, res, next) {
+function paginationValidator (req, res, next) {
   req.checkQuery('start', 'Should have a number start').optional().isInt()
   req.checkQuery('count', 'Should have a number count').optional().isInt()
 
@@ -18,4 +12,6 @@ function pagination (req, res, next) {
 
 // ---------------------------------------------------------------------------
 
-module.exports = validatorsPagination
+export {
+  paginationValidator
+}
diff --git a/server/middlewares/validators/pods.js b/server/middlewares/validators/pods.ts
index 0bf4b1844..fbfd268d0 100644
--- a/server/middlewares/validators/pods.js
+++ b/server/middlewares/validators/pods.ts
@@ -1,20 +1,13 @@
-'use strict'
-
-const checkErrors = require('./utils').checkErrors
-const constants = require('../../initializers/constants')
 const db = require('../../initializers/database')
-const friends = require('../../lib/friends')
-const logger = require('../../helpers/logger')
-const utils = require('../../helpers/utils')
-
-const validatorsPod = {
-  makeFriends,
-  podsAdd
-}
+import { checkErrors } from './utils'
+import { logger } from '../../helpers'
+import { CONFIG } from '../../initializers'
+import { hasFriends } from '../../lib'
+import { isTestInstance } from '../../helpers'
 
-function makeFriends (req, res, next) {
+function makeFriendsValidator (req, res, next) {
   // Force https if the administrator wants to make friends
-  if (utils.isTestInstance() === false && constants.CONFIG.WEBSERVER.SCHEME === 'http') {
+  if (isTestInstance() === false && CONFIG.WEBSERVER.SCHEME === 'http') {
     return res.status(400).send('Cannot make friends with a non HTTPS webserver.')
   }
 
@@ -23,13 +16,13 @@ function makeFriends (req, res, next) {
   logger.debug('Checking makeFriends parameters', { parameters: req.body })
 
   checkErrors(req, res, function () {
-    friends.hasFriends(function (err, hasFriends) {
+    hasFriends(function (err, heHasFriends) {
       if (err) {
         logger.error('Cannot know if we have friends.', { error: err })
         res.sendStatus(500)
       }
 
-      if (hasFriends === true) {
+      if (heHasFriends === true) {
         // We need to quit our friends before make new ones
         return res.sendStatus(409)
       }
@@ -39,7 +32,7 @@ function makeFriends (req, res, next) {
   })
 }
 
-function podsAdd (req, res, next) {
+function podsAddValidator (req, res, next) {
   req.checkBody('host', 'Should have a host').isHostValid()
   req.checkBody('email', 'Should have an email').isEmail()
   req.checkBody('publicKey', 'Should have a public key').notEmpty()
@@ -64,4 +57,7 @@ function podsAdd (req, res, next) {
 
 // ---------------------------------------------------------------------------
 
-module.exports = validatorsPod
+export {
+  makeFriendsValidator,
+  podsAddValidator
+}
diff --git a/server/middlewares/validators/remote/index.js b/server/middlewares/validators/remote/index.js
deleted file mode 100644
index 022a2fe50..000000000
--- a/server/middlewares/validators/remote/index.js
+++ /dev/null
@@ -1,13 +0,0 @@
-'use strict'
-
-const remoteSignatureValidators = require('./signature')
-const remoteVideosValidators = require('./videos')
-
-const validators = {
-  signature: remoteSignatureValidators,
-  videos: remoteVideosValidators
-}
-
-// ---------------------------------------------------------------------------
-
-module.exports = validators
diff --git a/server/middlewares/validators/remote/index.ts b/server/middlewares/validators/remote/index.ts
new file mode 100644
index 000000000..d0d7740b1
--- /dev/null
+++ b/server/middlewares/validators/remote/index.ts
@@ -0,0 +1,2 @@
+export * from './signature'
+export * from './videos'
diff --git a/server/middlewares/validators/remote/signature.js b/server/middlewares/validators/remote/signature.ts
index 002232c05..6e3ebe7db 100644
--- a/server/middlewares/validators/remote/signature.js
+++ b/server/middlewares/validators/remote/signature.ts
@@ -1,13 +1,7 @@
-'use strict'
+import { logger } from '../../../helpers'
+import { checkErrors } from '../utils'
 
-const checkErrors = require('../utils').checkErrors
-const logger = require('../../../helpers/logger')
-
-const validatorsRemoteSignature = {
-  signature
-}
-
-function signature (req, res, next) {
+function signatureValidator (req, res, next) {
   req.checkBody('signature.host', 'Should have a signature host').isURL()
   req.checkBody('signature.signature', 'Should have a signature').notEmpty()
 
@@ -18,4 +12,6 @@ function signature (req, res, next) {
 
 // ---------------------------------------------------------------------------
 
-module.exports = validatorsRemoteSignature
+export {
+  signatureValidator
+}
diff --git a/server/middlewares/validators/remote/videos.js b/server/middlewares/validators/remote/videos.ts
index f2c6cba5e..3380c29e2 100644
--- a/server/middlewares/validators/remote/videos.js
+++ b/server/middlewares/validators/remote/videos.ts
@@ -1,15 +1,7 @@
-'use strict'
+import { logger } from '../../../helpers'
+import { checkErrors } from '../utils'
 
-const checkErrors = require('../utils').checkErrors
-const logger = require('../../../helpers/logger')
-
-const validatorsRemoteVideos = {
-  remoteVideos,
-  remoteQaduVideos,
-  remoteEventsVideos
-}
-
-function remoteVideos (req, res, next) {
+function remoteVideosValidator (req, res, next) {
   req.checkBody('data').isEachRemoteRequestVideosValid()
 
   logger.debug('Checking remoteVideos parameters', { parameters: req.body })
@@ -17,7 +9,7 @@ function remoteVideos (req, res, next) {
   checkErrors(req, res, next)
 }
 
-function remoteQaduVideos (req, res, next) {
+function remoteQaduVideosValidator (req, res, next) {
   req.checkBody('data').isEachRemoteRequestVideosQaduValid()
 
   logger.debug('Checking remoteQaduVideos parameters', { parameters: req.body })
@@ -25,13 +17,18 @@ function remoteQaduVideos (req, res, next) {
   checkErrors(req, res, next)
 }
 
-function remoteEventsVideos (req, res, next) {
+function remoteEventsVideosValidator (req, res, next) {
   req.checkBody('data').isEachRemoteRequestVideosEventsValid()
 
   logger.debug('Checking remoteEventsVideos parameters', { parameters: req.body })
 
   checkErrors(req, res, next)
 }
+
 // ---------------------------------------------------------------------------
 
-module.exports = validatorsRemoteVideos
+export {
+  remoteVideosValidator,
+  remoteQaduVideosValidator,
+  remoteEventsVideosValidator
+}
diff --git a/server/middlewares/validators/sort.js b/server/middlewares/validators/sort.ts
index 017d266e6..ebc7333c7 100644
--- a/server/middlewares/validators/sort.js
+++ b/server/middlewares/validators/sort.ts
@@ -1,35 +1,31 @@
-'use strict'
-
-const checkErrors = require('./utils').checkErrors
-const constants = require('../../initializers/constants')
-const logger = require('../../helpers/logger')
-
-const validatorsSort = {
-  usersSort,
-  videoAbusesSort,
-  videosSort
-}
+import { checkErrors } from './utils'
+import { logger } from '../../helpers'
+import { SORTABLE_COLUMNS } from '../../initializers'
 
 // Initialize constants here for better performances
-const SORTABLE_USERS_COLUMNS = createSortableColumns(constants.SORTABLE_COLUMNS.USERS)
-const SORTABLE_VIDEO_ABUSES_COLUMNS = createSortableColumns(constants.SORTABLE_COLUMNS.VIDEO_ABUSES)
-const SORTABLE_VIDEOS_COLUMNS = createSortableColumns(constants.SORTABLE_COLUMNS.VIDEOS)
+const SORTABLE_USERS_COLUMNS = createSortableColumns(SORTABLE_COLUMNS.USERS)
+const SORTABLE_VIDEO_ABUSES_COLUMNS = createSortableColumns(SORTABLE_COLUMNS.VIDEO_ABUSES)
+const SORTABLE_VIDEOS_COLUMNS = createSortableColumns(SORTABLE_COLUMNS.VIDEOS)
 
-function usersSort (req, res, next) {
+function usersSortValidator (req, res, next) {
   checkSort(req, res, next, SORTABLE_USERS_COLUMNS)
 }
 
-function videoAbusesSort (req, res, next) {
+function videoAbusesSortValidator (req, res, next) {
   checkSort(req, res, next, SORTABLE_VIDEO_ABUSES_COLUMNS)
 }
 
-function videosSort (req, res, next) {
+function videosSortValidator (req, res, next) {
   checkSort(req, res, next, SORTABLE_VIDEOS_COLUMNS)
 }
 
 // ---------------------------------------------------------------------------
 
-module.exports = validatorsSort
+export {
+  usersSortValidator,
+  videoAbusesSortValidator,
+  videosSortValidator
+}
 
 // ---------------------------------------------------------------------------
 
diff --git a/server/middlewares/validators/users.js b/server/middlewares/validators/users.ts
index 1e7a64793..a9149fe1b 100644
--- a/server/middlewares/validators/users.js
+++ b/server/middlewares/validators/users.ts
@@ -1,17 +1,8 @@
-'use strict'
-
-const checkErrors = require('./utils').checkErrors
 const db = require('../../initializers/database')
-const logger = require('../../helpers/logger')
-
-const validatorsUsers = {
-  usersAdd,
-  usersRemove,
-  usersUpdate,
-  usersVideoRating
-}
+import { checkErrors } from './utils'
+import { logger } from '../../helpers'
 
-function usersAdd (req, res, next) {
+function usersAddValidator (req, res, next) {
   req.checkBody('username', 'Should have a valid username').isUserUsernameValid()
   req.checkBody('password', 'Should have a valid password').isUserPasswordValid()
   req.checkBody('email', 'Should have a valid email').isEmail()
@@ -32,7 +23,7 @@ function usersAdd (req, res, next) {
   })
 }
 
-function usersRemove (req, res, next) {
+function usersRemoveValidator (req, res, next) {
   req.checkParams('id', 'Should have a valid id').notEmpty().isInt()
 
   logger.debug('Checking usersRemove parameters', { parameters: req.params })
@@ -53,7 +44,7 @@ function usersRemove (req, res, next) {
   })
 }
 
-function usersUpdate (req, res, next) {
+function usersUpdateValidator (req, res, next) {
   req.checkParams('id', 'Should have a valid id').notEmpty().isInt()
   // Add old password verification
   req.checkBody('password', 'Should have a valid password').optional().isUserPasswordValid()
@@ -64,7 +55,7 @@ function usersUpdate (req, res, next) {
   checkErrors(req, res, next)
 }
 
-function usersVideoRating (req, res, next) {
+function usersVideoRatingValidator (req, res, next) {
   req.checkParams('videoId', 'Should have a valid video id').notEmpty().isUUID(4)
 
   logger.debug('Checking usersVideoRating parameters', { parameters: req.params })
@@ -85,4 +76,9 @@ function usersVideoRating (req, res, next) {
 
 // ---------------------------------------------------------------------------
 
-module.exports = validatorsUsers
+export {
+  usersAddValidator,
+  usersRemoveValidator,
+  usersUpdateValidator,
+  usersVideoRatingValidator
+}
diff --git a/server/middlewares/validators/utils.js b/server/middlewares/validators/utils.ts
index 3741b84c6..710e65529 100644
--- a/server/middlewares/validators/utils.js
+++ b/server/middlewares/validators/utils.ts
@@ -1,20 +1,14 @@
-'use strict'
+import { inspect } from 'util'
 
-const util = require('util')
+import { logger } from '../../helpers'
 
-const logger = require('../../helpers/logger')
-
-const validatorsUtils = {
-  checkErrors
-}
-
-function checkErrors (req, res, next, statusCode) {
+function checkErrors (req, res, next, statusCode?) {
   if (statusCode === undefined) statusCode = 400
   const errors = req.validationErrors()
 
   if (errors) {
     logger.warn('Incorrect request parameters', { path: req.originalUrl, err: errors })
-    return res.status(statusCode).send('There have been validation errors: ' + util.inspect(errors))
+    return res.status(statusCode).send('There have been validation errors: ' + inspect(errors))
   }
 
   return next()
@@ -22,4 +16,6 @@ function checkErrors (req, res, next, statusCode) {
 
 // ---------------------------------------------------------------------------
 
-module.exports = validatorsUtils
+export {
+  checkErrors
+}
diff --git a/server/middlewares/validators/videos.js b/server/middlewares/validators/videos.ts
index f18ca1597..5a49cf73c 100644
--- a/server/middlewares/validators/videos.js
+++ b/server/middlewares/validators/videos.ts
@@ -1,26 +1,9 @@
-'use strict'
-
-const checkErrors = require('./utils').checkErrors
-const constants = require('../../initializers/constants')
-const customVideosValidators = require('../../helpers/custom-validators').videos
 const db = require('../../initializers/database')
-const logger = require('../../helpers/logger')
-
-const validatorsVideos = {
-  videosAdd,
-  videosUpdate,
-  videosGet,
-  videosRemove,
-  videosSearch,
-
-  videoAbuseReport,
-
-  videoRate,
-
-  videosBlacklist
-}
+import { checkErrors } from './utils'
+import { CONSTRAINTS_FIELDS, SEARCHABLE_COLUMNS } from '../../initializers'
+import { logger, isVideoDurationValid } from '../../helpers'
 
-function videosAdd (req, res, next) {
+function videosAddValidator (req, res, next) {
   req.checkBody('videofile', 'Should have a valid file').isVideoFile(req.files)
   req.checkBody('name', 'Should have a valid name').isVideoNameValid()
   req.checkBody('category', 'Should have a valid category').isVideoCategoryValid()
@@ -40,8 +23,8 @@ function videosAdd (req, res, next) {
         return res.status(400).send('Cannot retrieve metadata of the file.')
       }
 
-      if (!customVideosValidators.isVideoDurationValid(duration)) {
-        return res.status(400).send('Duration of the video file is too big (max: ' + constants.CONSTRAINTS_FIELDS.VIDEOS.DURATION.max + 's).')
+      if (!isVideoDurationValid(duration)) {
+        return res.status(400).send('Duration of the video file is too big (max: ' + CONSTRAINTS_FIELDS.VIDEOS.DURATION.max + 's).')
       }
 
       videoFile.duration = duration
@@ -50,7 +33,7 @@ function videosAdd (req, res, next) {
   })
 }
 
-function videosUpdate (req, res, next) {
+function videosUpdateValidator (req, res, next) {
   req.checkParams('id', 'Should have a valid id').notEmpty().isUUID(4)
   req.checkBody('name', 'Should have a valid name').optional().isVideoNameValid()
   req.checkBody('category', 'Should have a valid category').optional().isVideoCategoryValid()
@@ -78,7 +61,7 @@ function videosUpdate (req, res, next) {
   })
 }
 
-function videosGet (req, res, next) {
+function videosGetValidator (req, res, next) {
   req.checkParams('id', 'Should have a valid id').notEmpty().isUUID(4)
 
   logger.debug('Checking videosGet parameters', { parameters: req.params })
@@ -88,7 +71,7 @@ function videosGet (req, res, next) {
   })
 }
 
-function videosRemove (req, res, next) {
+function videosRemoveValidator (req, res, next) {
   req.checkParams('id', 'Should have a valid id').notEmpty().isUUID(4)
 
   logger.debug('Checking videosRemove parameters', { parameters: req.params })
@@ -105,8 +88,8 @@ function videosRemove (req, res, next) {
   })
 }
 
-function videosSearch (req, res, next) {
-  const searchableColumns = constants.SEARCHABLE_COLUMNS.VIDEOS
+function videosSearchValidator (req, res, next) {
+  const searchableColumns = SEARCHABLE_COLUMNS.VIDEOS
   req.checkParams('value', 'Should have a valid search').notEmpty()
   req.checkQuery('field', 'Should have correct searchable column').optional().isIn(searchableColumns)
 
@@ -115,7 +98,7 @@ function videosSearch (req, res, next) {
   checkErrors(req, res, next)
 }
 
-function videoAbuseReport (req, res, next) {
+function videoAbuseReportValidator (req, res, next) {
   req.checkParams('id', 'Should have a valid id').notEmpty().isUUID(4)
   req.checkBody('reason', 'Should have a valid reason').isVideoAbuseReasonValid()
 
@@ -126,7 +109,7 @@ function videoAbuseReport (req, res, next) {
   })
 }
 
-function videoRate (req, res, next) {
+function videoRateValidator (req, res, next) {
   req.checkParams('id', 'Should have a valid id').notEmpty().isUUID(4)
   req.checkBody('rating', 'Should have a valid rate type').isVideoRatingTypeValid()
 
@@ -137,7 +120,7 @@ function videoRate (req, res, next) {
   })
 }
 
-function videosBlacklist (req, res, next) {
+function videosBlacklistValidator (req, res, next) {
   req.checkParams('id', 'Should have a valid id').notEmpty().isUUID(4)
 
   logger.debug('Checking videosBlacklist parameters', { parameters: req.params })
@@ -151,7 +134,19 @@ function videosBlacklist (req, res, next) {
 
 // ---------------------------------------------------------------------------
 
-module.exports = validatorsVideos
+export {
+  videosAddValidator,
+  videosUpdateValidator,
+  videosGetValidator,
+  videosRemoveValidator,
+  videosSearchValidator,
+
+  videoAbuseReportValidator,
+
+  videoRateValidator,
+
+  videosBlacklistValidator
+}
 
 // ---------------------------------------------------------------------------