aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--server/controllers/api/v1/pods.js8
-rw-r--r--server/controllers/api/v1/remote.js8
-rw-r--r--server/controllers/api/v1/users.js1
-rw-r--r--server/controllers/api/v1/videos.js24
-rw-r--r--server/middlewares/index.js4
-rw-r--r--server/middlewares/reqValidators/index.js19
-rw-r--r--server/middlewares/validators/index.js19
-rw-r--r--server/middlewares/validators/pagination.js (renamed from server/middlewares/reqValidators/pagination.js)4
-rw-r--r--server/middlewares/validators/pods.js (renamed from server/middlewares/reqValidators/pods.js)4
-rw-r--r--server/middlewares/validators/remote.js (renamed from server/middlewares/reqValidators/remote.js)4
-rw-r--r--server/middlewares/validators/sort.js (renamed from server/middlewares/reqValidators/sort.js)4
-rw-r--r--server/middlewares/validators/utils.js (renamed from server/middlewares/reqValidators/utils.js)4
-rw-r--r--server/middlewares/validators/videos.js (renamed from server/middlewares/reqValidators/videos.js)4
13 files changed, 54 insertions, 53 deletions
diff --git a/server/controllers/api/v1/pods.js b/server/controllers/api/v1/pods.js
index 9ce8120b2..4413fbc1e 100644
--- a/server/controllers/api/v1/pods.js
+++ b/server/controllers/api/v1/pods.js
@@ -8,16 +8,16 @@ const logger = require('../../../helpers/logger')
8const friends = require('../../../lib/friends') 8const friends = require('../../../lib/friends')
9const middlewares = require('../../../middlewares') 9const middlewares = require('../../../middlewares')
10const oAuth = middlewares.oauth 10const oAuth = middlewares.oauth
11const reqValidator = middlewares.reqValidators.pods 11const validators = middlewares.validators.pods
12const signatureValidator = middlewares.reqValidators.remote.signature 12const signatureValidator = middlewares.validators.remote.signature
13 13
14const router = express.Router() 14const router = express.Router()
15const Pod = mongoose.model('Pod') 15const Pod = mongoose.model('Pod')
16const Video = mongoose.model('Video') 16const Video = mongoose.model('Video')
17 17
18router.get('/', listPodsUrl) 18router.get('/', listPodsUrl)
19router.post('/', reqValidator.podsAdd, addPods) 19router.post('/', validators.podsAdd, addPods)
20router.get('/makefriends', oAuth.authenticate, reqValidator.makeFriends, makeFriends) 20router.get('/makefriends', oAuth.authenticate, validators.makeFriends, makeFriends)
21router.get('/quitfriends', oAuth.authenticate, quitFriends) 21router.get('/quitfriends', oAuth.authenticate, quitFriends)
22// Post because this is a secured request 22// Post because this is a secured request
23router.post('/remove', signatureValidator, removePods) 23router.post('/remove', signatureValidator, removePods)
diff --git a/server/controllers/api/v1/remote.js b/server/controllers/api/v1/remote.js
index 2d71c605d..7af9b7e84 100644
--- a/server/controllers/api/v1/remote.js
+++ b/server/controllers/api/v1/remote.js
@@ -6,17 +6,17 @@ const mongoose = require('mongoose')
6 6
7const middlewares = require('../../../middlewares') 7const middlewares = require('../../../middlewares')
8const secureMiddleware = middlewares.secure 8const secureMiddleware = middlewares.secure
9const reqValidator = middlewares.reqValidators.remote 9const validators = middlewares.validators.remote
10const logger = require('../../../helpers/logger') 10const logger = require('../../../helpers/logger')
11 11
12const router = express.Router() 12const router = express.Router()
13const Video = mongoose.model('Video') 13const Video = mongoose.model('Video')
14 14
15router.post('/videos', 15router.post('/videos',
16 reqValidator.signature, 16 validators.signature,
17 reqValidator.dataToDecrypt, 17 validators.dataToDecrypt,
18 secureMiddleware.decryptBody, 18 secureMiddleware.decryptBody,
19 reqValidator.remoteVideos, 19 validators.remoteVideos,
20 remoteVideos 20 remoteVideos
21) 21)
22 22
diff --git a/server/controllers/api/v1/users.js b/server/controllers/api/v1/users.js
index caa979567..dde459a73 100644
--- a/server/controllers/api/v1/users.js
+++ b/server/controllers/api/v1/users.js
@@ -3,6 +3,7 @@
3const config = require('config') 3const config = require('config')
4const mongoose = require('mongoose') 4const mongoose = require('mongoose')
5const express = require('express') 5const express = require('express')
6
6const oAuth = require('../../../middlewares').oauth 7const oAuth = require('../../../middlewares').oauth
7 8
8const Client = mongoose.model('OAuthClient') 9const Client = mongoose.model('OAuthClient')
diff --git a/server/controllers/api/v1/videos.js b/server/controllers/api/v1/videos.js
index ab115bc30..a37e9278e 100644
--- a/server/controllers/api/v1/videos.js
+++ b/server/controllers/api/v1/videos.js
@@ -11,10 +11,10 @@ const friends = require('../../../lib/friends')
11const middlewares = require('../../../middlewares') 11const middlewares = require('../../../middlewares')
12const oAuth = middlewares.oauth 12const oAuth = middlewares.oauth
13const pagination = middlewares.pagination 13const pagination = middlewares.pagination
14const reqValidator = middlewares.reqValidators 14const validators = middlewares.validators
15const reqValidatorPagination = reqValidator.pagination 15const validatorsPagination = validators.pagination
16const reqValidatorSort = reqValidator.sort 16const validatorsSort = validators.sort
17const reqValidatorVideos = reqValidator.videos 17const validatorsVideos = validators.videos
18const search = middlewares.search 18const search = middlewares.search
19const sort = middlewares.sort 19const sort = middlewares.sort
20const utils = require('../../../helpers/utils') 20const utils = require('../../../helpers/utils')
@@ -44,8 +44,8 @@ const storage = multer.diskStorage({
44const reqFiles = multer({ storage: storage }).fields([{ name: 'videofile', maxCount: 1 }]) 44const reqFiles = multer({ storage: storage }).fields([{ name: 'videofile', maxCount: 1 }])
45 45
46router.get('/', 46router.get('/',
47 reqValidatorPagination.pagination, 47 validatorsPagination.pagination,
48 reqValidatorSort.videosSort, 48 validatorsSort.videosSort,
49 sort.setVideosSort, 49 sort.setVideosSort,
50 pagination.setPagination, 50 pagination.setPagination,
51 listVideos 51 listVideos
@@ -53,22 +53,22 @@ router.get('/',
53router.post('/', 53router.post('/',
54 oAuth.authenticate, 54 oAuth.authenticate,
55 reqFiles, 55 reqFiles,
56 reqValidatorVideos.videosAdd, 56 validatorsVideos.videosAdd,
57 addVideo 57 addVideo
58) 58)
59router.get('/:id', 59router.get('/:id',
60 reqValidatorVideos.videosGet, 60 validatorsVideos.videosGet,
61 getVideo 61 getVideo
62) 62)
63router.delete('/:id', 63router.delete('/:id',
64 oAuth.authenticate, 64 oAuth.authenticate,
65 reqValidatorVideos.videosRemove, 65 validatorsVideos.videosRemove,
66 removeVideo 66 removeVideo
67) 67)
68router.get('/search/:value', 68router.get('/search/:value',
69 reqValidatorVideos.videosSearch, 69 validatorsVideos.videosSearch,
70 reqValidatorPagination.pagination, 70 validatorsPagination.pagination,
71 reqValidatorSort.videosSort, 71 validatorsSort.videosSort,
72 sort.setVideosSort, 72 sort.setVideosSort,
73 pagination.setPagination, 73 pagination.setPagination,
74 search.setVideosSearch, 74 search.setVideosSearch,
diff --git a/server/middlewares/index.js b/server/middlewares/index.js
index 01043cd85..0a233e701 100644
--- a/server/middlewares/index.js
+++ b/server/middlewares/index.js
@@ -2,7 +2,7 @@
2 2
3const oauth = require('./oauth') 3const oauth = require('./oauth')
4const pagination = require('./pagination') 4const pagination = require('./pagination')
5const reqValidatorsMiddleware = require('./reqValidators') 5const validatorsMiddleware = require('./validators')
6const search = require('./search') 6const search = require('./search')
7const sort = require('./sort') 7const sort = require('./sort')
8const secureMiddleware = require('./secure') 8const secureMiddleware = require('./secure')
@@ -10,7 +10,7 @@ const secureMiddleware = require('./secure')
10const middlewares = { 10const middlewares = {
11 oauth: oauth, 11 oauth: oauth,
12 pagination: pagination, 12 pagination: pagination,
13 reqValidators: reqValidatorsMiddleware, 13 validators: validatorsMiddleware,
14 search: search, 14 search: search,
15 sort: sort, 15 sort: sort,
16 secure: secureMiddleware 16 secure: secureMiddleware
diff --git a/server/middlewares/reqValidators/index.js b/server/middlewares/reqValidators/index.js
deleted file mode 100644
index be68f6a29..000000000
--- a/server/middlewares/reqValidators/index.js
+++ /dev/null
@@ -1,19 +0,0 @@
1'use strict'
2
3const paginationReqValidators = require('./pagination')
4const podsReqValidators = require('./pods')
5const remoteReqValidators = require('./remote')
6const sortReqValidators = require('./sort')
7const videosReqValidators = require('./videos')
8
9const reqValidators = {
10 pagination: paginationReqValidators,
11 pods: podsReqValidators,
12 remote: remoteReqValidators,
13 sort: sortReqValidators,
14 videos: videosReqValidators
15}
16
17// ---------------------------------------------------------------------------
18
19module.exports = reqValidators
diff --git a/server/middlewares/validators/index.js b/server/middlewares/validators/index.js
new file mode 100644
index 000000000..0471b3f92
--- /dev/null
+++ b/server/middlewares/validators/index.js
@@ -0,0 +1,19 @@
1'use strict'
2
3const paginationValidators = require('./pagination')
4const podsValidators = require('./pods')
5const remoteValidators = require('./remote')
6const sortValidators = require('./sort')
7const videosValidators = require('./videos')
8
9const validators = {
10 pagination: paginationValidators,
11 pods: podsValidators,
12 remote: remoteValidators,
13 sort: sortValidators,
14 videos: videosValidators
15}
16
17// ---------------------------------------------------------------------------
18
19module.exports = validators
diff --git a/server/middlewares/reqValidators/pagination.js b/server/middlewares/validators/pagination.js
index e598f269a..8e9a01053 100644
--- a/server/middlewares/reqValidators/pagination.js
+++ b/server/middlewares/validators/pagination.js
@@ -3,7 +3,7 @@
3const checkErrors = require('./utils').checkErrors 3const checkErrors = require('./utils').checkErrors
4const logger = require('../../helpers/logger') 4const logger = require('../../helpers/logger')
5 5
6const reqValidatorsPagination = { 6const validatorsPagination = {
7 pagination: pagination 7 pagination: pagination
8} 8}
9 9
@@ -18,4 +18,4 @@ function pagination (req, res, next) {
18 18
19// --------------------------------------------------------------------------- 19// ---------------------------------------------------------------------------
20 20
21module.exports = reqValidatorsPagination 21module.exports = validatorsPagination
diff --git a/server/middlewares/reqValidators/pods.js b/server/middlewares/validators/pods.js
index 78a4b76c1..fda2e865f 100644
--- a/server/middlewares/reqValidators/pods.js
+++ b/server/middlewares/validators/pods.js
@@ -4,7 +4,7 @@ const checkErrors = require('./utils').checkErrors
4const friends = require('../../lib/friends') 4const friends = require('../../lib/friends')
5const logger = require('../../helpers/logger') 5const logger = require('../../helpers/logger')
6 6
7const reqValidatorsPod = { 7const validatorsPod = {
8 makeFriends: makeFriends, 8 makeFriends: makeFriends,
9 podsAdd: podsAdd 9 podsAdd: podsAdd
10} 10}
@@ -38,4 +38,4 @@ function podsAdd (req, res, next) {
38 38
39// --------------------------------------------------------------------------- 39// ---------------------------------------------------------------------------
40 40
41module.exports = reqValidatorsPod 41module.exports = validatorsPod
diff --git a/server/middlewares/reqValidators/remote.js b/server/middlewares/validators/remote.js
index dd8ee5f6e..1be119458 100644
--- a/server/middlewares/reqValidators/remote.js
+++ b/server/middlewares/validators/remote.js
@@ -3,7 +3,7 @@
3const checkErrors = require('./utils').checkErrors 3const checkErrors = require('./utils').checkErrors
4const logger = require('../../helpers/logger') 4const logger = require('../../helpers/logger')
5 5
6const reqValidatorsRemote = { 6const validatorsRemote = {
7 dataToDecrypt: dataToDecrypt, 7 dataToDecrypt: dataToDecrypt,
8 remoteVideos: remoteVideos, 8 remoteVideos: remoteVideos,
9 signature: signature 9 signature: signature
@@ -38,4 +38,4 @@ function signature (req, res, next) {
38 38
39// --------------------------------------------------------------------------- 39// ---------------------------------------------------------------------------
40 40
41module.exports = reqValidatorsRemote 41module.exports = validatorsRemote
diff --git a/server/middlewares/reqValidators/sort.js b/server/middlewares/validators/sort.js
index 06e680ef4..56b63cc8b 100644
--- a/server/middlewares/reqValidators/sort.js
+++ b/server/middlewares/validators/sort.js
@@ -4,7 +4,7 @@ const checkErrors = require('./utils').checkErrors
4const constants = require('../../initializers/constants') 4const constants = require('../../initializers/constants')
5const logger = require('../../helpers/logger') 5const logger = require('../../helpers/logger')
6 6
7const reqValidatorsSort = { 7const validatorsSort = {
8 videosSort: videosSort 8 videosSort: videosSort
9} 9}
10 10
@@ -20,4 +20,4 @@ function videosSort (req, res, next) {
20 20
21// --------------------------------------------------------------------------- 21// ---------------------------------------------------------------------------
22 22
23module.exports = reqValidatorsSort 23module.exports = validatorsSort
diff --git a/server/middlewares/reqValidators/utils.js b/server/middlewares/validators/utils.js
index 198ed8d26..f6e5b2b38 100644
--- a/server/middlewares/reqValidators/utils.js
+++ b/server/middlewares/validators/utils.js
@@ -4,7 +4,7 @@ const util = require('util')
4 4
5const logger = require('../../helpers/logger') 5const logger = require('../../helpers/logger')
6 6
7const reqValidatorsUtils = { 7const validatorsUtils = {
8 checkErrors: checkErrors 8 checkErrors: checkErrors
9} 9}
10 10
@@ -22,4 +22,4 @@ function checkErrors (req, res, next, statusCode) {
22 22
23// --------------------------------------------------------------------------- 23// ---------------------------------------------------------------------------
24 24
25module.exports = reqValidatorsUtils 25module.exports = validatorsUtils
diff --git a/server/middlewares/reqValidators/videos.js b/server/middlewares/validators/videos.js
index 452fbc859..24e2299dc 100644
--- a/server/middlewares/reqValidators/videos.js
+++ b/server/middlewares/validators/videos.js
@@ -9,7 +9,7 @@ const logger = require('../../helpers/logger')
9 9
10const Video = mongoose.model('Video') 10const Video = mongoose.model('Video')
11 11
12const reqValidatorsVideos = { 12const validatorsVideos = {
13 videosAdd: videosAdd, 13 videosAdd: videosAdd,
14 videosGet: videosGet, 14 videosGet: videosGet,
15 videosRemove: videosRemove, 15 videosRemove: videosRemove,
@@ -94,4 +94,4 @@ function videosSearch (req, res, next) {
94 94
95// --------------------------------------------------------------------------- 95// ---------------------------------------------------------------------------
96 96
97module.exports = reqValidatorsVideos 97module.exports = validatorsVideos