diff options
author | Chocobozzz <florian.bigard@gmail.com> | 2016-07-01 16:03:53 +0200 |
---|---|---|
committer | Chocobozzz <florian.bigard@gmail.com> | 2016-07-01 16:03:53 +0200 |
commit | 69b0a27cbbd69ca019eb7db5f917b1dd06dc82cd (patch) | |
tree | 8659f819818a3da6419959b6b7838a7f0557c948 /server/middlewares | |
parent | a3ee6fa22dee4b68fcde9cd23708b471db446e11 (diff) | |
download | PeerTube-69b0a27cbbd69ca019eb7db5f917b1dd06dc82cd.tar.gz PeerTube-69b0a27cbbd69ca019eb7db5f917b1dd06dc82cd.tar.zst PeerTube-69b0a27cbbd69ca019eb7db5f917b1dd06dc82cd.zip |
OAuth/User models refractoring -> use mongoose api
Diffstat (limited to 'server/middlewares')
-rw-r--r-- | server/middlewares/index.js | 4 | ||||
-rw-r--r-- | server/middlewares/oauth.js (renamed from server/middlewares/oauth2.js) | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/server/middlewares/index.js b/server/middlewares/index.js index b30a7be56..01043cd85 100644 --- a/server/middlewares/index.js +++ b/server/middlewares/index.js | |||
@@ -1,6 +1,6 @@ | |||
1 | 'use strict' | 1 | 'use strict' |
2 | 2 | ||
3 | const oauth2 = require('./oauth2') | 3 | const oauth = require('./oauth') |
4 | const pagination = require('./pagination') | 4 | const pagination = require('./pagination') |
5 | const reqValidatorsMiddleware = require('./reqValidators') | 5 | const reqValidatorsMiddleware = require('./reqValidators') |
6 | const search = require('./search') | 6 | const search = require('./search') |
@@ -8,7 +8,7 @@ const sort = require('./sort') | |||
8 | const secureMiddleware = require('./secure') | 8 | const secureMiddleware = require('./secure') |
9 | 9 | ||
10 | const middlewares = { | 10 | const middlewares = { |
11 | oauth2: oauth2, | 11 | oauth: oauth, |
12 | pagination: pagination, | 12 | pagination: pagination, |
13 | reqValidators: reqValidatorsMiddleware, | 13 | reqValidators: reqValidatorsMiddleware, |
14 | search: search, | 14 | search: search, |
diff --git a/server/middlewares/oauth2.js b/server/middlewares/oauth.js index 1defdc02e..3d7429f1d 100644 --- a/server/middlewares/oauth2.js +++ b/server/middlewares/oauth.js | |||
@@ -5,10 +5,10 @@ const OAuthServer = require('express-oauth-server') | |||
5 | const logger = require('../helpers/logger') | 5 | const logger = require('../helpers/logger') |
6 | 6 | ||
7 | const oAuthServer = new OAuthServer({ | 7 | const oAuthServer = new OAuthServer({ |
8 | model: require('../models/users') | 8 | model: require('../lib/oauth-model') |
9 | }) | 9 | }) |
10 | 10 | ||
11 | const oAuth2 = { | 11 | const oAuth = { |
12 | authenticate: authenticate, | 12 | authenticate: authenticate, |
13 | token: token | 13 | token: token |
14 | } | 14 | } |
@@ -32,4 +32,4 @@ function token (req, res, next) { | |||
32 | 32 | ||
33 | // --------------------------------------------------------------------------- | 33 | // --------------------------------------------------------------------------- |
34 | 34 | ||
35 | module.exports = oAuth2 | 35 | module.exports = oAuth |