First typescript iteration

4 files changed, 19 insertions, 37 deletions

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
+}