Server: move remote routes in their own directory

4 files changed, 28 insertions, 9 deletions

diff --git a/server/controllers/api/index.js b/server/controllers/api/index.js
index 4cb65ed55..f13ff922c 100644
--- a/server/controllers/api/index.js
+++ b/server/controllers/api/index.js
@@ -2,6 +2,8 @@
 
 const express = require('express')
 
+const utils = require('../../helpers/utils')
+
 const router = express.Router()
 
 const clientsController = require('./clients')
@@ -18,7 +20,7 @@ router.use('/requests', requestsController)
 router.use('/users', usersController)
 router.use('/videos', videosController)
 router.use('/ping', pong)
-router.use('/*', badRequest)
+router.use('/*', utils.badRequest)
 
 // ---------------------------------------------------------------------------
 
@@ -29,7 +31,3 @@ module.exports = router
 function pong (req, res, next) {
   return res.send('pong').status(200).end()
 }
-
-function badRequest (req, res, next) {
-  res.type('json').status(400).end()
-}
diff --git a/server/controllers/api/remote/index.js b/server/controllers/api/remote/index.js
new file mode 100644
index 000000000..2947632d5
--- /dev/null
+++ b/server/controllers/api/remote/index.js
@@ -0,0 +1,16 @@
+'use strict'
+
+const express = require('express')
+
+const utils = require('../../../helpers/utils')
+
+const router = express.Router()
+
+const videosRemoteController = require('./videos')
+
+router.use('/videos', videosRemoteController)
+router.use('/*', utils.badRequest)
+
+// ---------------------------------------------------------------------------
+
+module.exports = router
diff --git a/server/controllers/api/remote.js b/server/controllers/api/remote/videos.js
index be5e6dc98..87c49bff9 100644
--- a/server/controllers/api/remote.js
+++ b/server/controllers/api/remote/videos.js
@@ -4,15 +4,15 @@ const eachSeries = require('async/eachSeries')
 const express = require('express')
 const waterfall = require('async/waterfall')
 
-const db = require('../../initializers/database')
-const middlewares = require('../../middlewares')
+const db = require('../../../initializers/database')
+const middlewares = require('../../../middlewares')
 const secureMiddleware = middlewares.secure
 const validators = middlewares.validators.remote
-const logger = require('../../helpers/logger')
+const logger = require('../../../helpers/logger')
 
 const router = express.Router()
 
-router.post('/videos',
+router.post('/',
   validators.signature,
   secureMiddleware.checkSignature,
   validators.remoteVideos,
diff --git a/server/helpers/utils.js b/server/helpers/utils.js
index 9f27671b6..7e0c9823c 100644
--- a/server/helpers/utils.js
+++ b/server/helpers/utils.js
@@ -5,11 +5,16 @@ const crypto = require('crypto')
 const logger = require('./logger')
 
 const utils = {
+  badRequest,
   cleanForExit,
   generateRandomString,
   isTestInstance
 }
 
+function badRequest (req, res, next) {
+  res.type('json').status(400).end()
+}
+
 function generateRandomString (size, callback) {
   crypto.pseudoRandomBytes(size, function (err, raw) {
     if (err) return callback(err)