diff options
author | Chocobozzz <florian.bigard@gmail.com> | 2016-10-02 15:39:09 +0200 |
---|---|---|
committer | Chocobozzz <florian.bigard@gmail.com> | 2016-10-02 15:39:09 +0200 |
commit | a6375e69668ea42e19531c6bc68dcd37f3f7cbd7 (patch) | |
tree | 03204a408d56311692c3528bedcf95d2455e94f2 /server/middlewares/index.js | |
parent | 052937db8a8d282eccdbdf38d487ed8d85d3c0a7 (diff) | |
parent | c4403b29ad4db097af528a7f04eea07e0ed320d0 (diff) | |
download | PeerTube-a6375e69668ea42e19531c6bc68dcd37f3f7cbd7.tar.gz PeerTube-a6375e69668ea42e19531c6bc68dcd37f3f7cbd7.tar.zst PeerTube-a6375e69668ea42e19531c6bc68dcd37f3f7cbd7.zip |
Merge branch 'master' into webseed-merged
Diffstat (limited to 'server/middlewares/index.js')
-rw-r--r-- | server/middlewares/index.js | 24 |
1 files changed, 14 insertions, 10 deletions
diff --git a/server/middlewares/index.js b/server/middlewares/index.js index 0a233e701..3f253e31b 100644 --- a/server/middlewares/index.js +++ b/server/middlewares/index.js | |||
@@ -1,19 +1,23 @@ | |||
1 | 'use strict' | 1 | 'use strict' |
2 | 2 | ||
3 | const oauth = require('./oauth') | 3 | const adminMiddleware = require('./admin') |
4 | const pagination = require('./pagination') | 4 | const oauthMiddleware = require('./oauth') |
5 | const paginationMiddleware = require('./pagination') | ||
6 | const podsMiddleware = require('./pods') | ||
5 | const validatorsMiddleware = require('./validators') | 7 | const validatorsMiddleware = require('./validators') |
6 | const search = require('./search') | 8 | const searchMiddleware = require('./search') |
7 | const sort = require('./sort') | 9 | const sortMiddleware = require('./sort') |
8 | const secureMiddleware = require('./secure') | 10 | const secureMiddleware = require('./secure') |
9 | 11 | ||
10 | const middlewares = { | 12 | const middlewares = { |
11 | oauth: oauth, | 13 | admin: adminMiddleware, |
12 | pagination: pagination, | 14 | oauth: oauthMiddleware, |
13 | validators: validatorsMiddleware, | 15 | pagination: paginationMiddleware, |
14 | search: search, | 16 | pods: podsMiddleware, |
15 | sort: sort, | 17 | search: searchMiddleware, |
16 | secure: secureMiddleware | 18 | secure: secureMiddleware, |
19 | sort: sortMiddleware, | ||
20 | validators: validatorsMiddleware | ||
17 | } | 21 | } |
18 | 22 | ||
19 | // --------------------------------------------------------------------------- | 23 | // --------------------------------------------------------------------------- |