diff options
author | Chocobozzz <florian.bigard@gmail.com> | 2016-04-27 22:11:48 +0200 |
---|---|---|
committer | Chocobozzz <florian.bigard@gmail.com> | 2016-04-27 22:11:48 +0200 |
commit | 23a5a916dba8960e77e0dcc9f9050e0df0a5f60b (patch) | |
tree | 4b13e967a5b9715ba2c6b74681f13e6ccdfa86e4 /server | |
parent | 2693922352c23401b658720251db2966c92614bb (diff) | |
download | PeerTube-23a5a916dba8960e77e0dcc9f9050e0df0a5f60b.tar.gz PeerTube-23a5a916dba8960e77e0dcc9f9050e0df0a5f60b.tar.zst PeerTube-23a5a916dba8960e77e0dcc9f9050e0df0a5f60b.zip |
Make angular client load dynamically the generated client id/secret
Diffstat (limited to 'server')
-rw-r--r-- | server/controllers/api/v1/users.js | 24 | ||||
-rw-r--r-- | server/models/users.js | 5 |
2 files changed, 29 insertions, 0 deletions
diff --git a/server/controllers/api/v1/users.js b/server/controllers/api/v1/users.js index f45b47077..1125b9faa 100644 --- a/server/controllers/api/v1/users.js +++ b/server/controllers/api/v1/users.js | |||
@@ -1,13 +1,16 @@ | |||
1 | 'use strict' | 1 | 'use strict' |
2 | 2 | ||
3 | const config = require('config') | ||
3 | const express = require('express') | 4 | const express = require('express') |
4 | const oAuth2 = require('../../../middlewares/oauth2') | 5 | const oAuth2 = require('../../../middlewares/oauth2') |
5 | 6 | ||
6 | const middleware = require('../../../middlewares') | 7 | const middleware = require('../../../middlewares') |
7 | const cacheMiddleware = middleware.cache | 8 | const cacheMiddleware = middleware.cache |
9 | const Users = require('../../../models/users') | ||
8 | 10 | ||
9 | const router = express.Router() | 11 | const router = express.Router() |
10 | 12 | ||
13 | router.get('/client', cacheMiddleware.cache(false), getAngularClient) | ||
11 | router.post('/token', cacheMiddleware.cache(false), oAuth2.token, success) | 14 | router.post('/token', cacheMiddleware.cache(false), oAuth2.token, success) |
12 | 15 | ||
13 | // --------------------------------------------------------------------------- | 16 | // --------------------------------------------------------------------------- |
@@ -16,6 +19,27 @@ module.exports = router | |||
16 | 19 | ||
17 | // --------------------------------------------------------------------------- | 20 | // --------------------------------------------------------------------------- |
18 | 21 | ||
22 | function getAngularClient (req, res, next) { | ||
23 | const server_host = config.get('webserver.host') | ||
24 | const server_port = config.get('webserver.port') | ||
25 | let header_host_should_be = server_host | ||
26 | if (server_port !== 80 && server_port !== 443) { | ||
27 | header_host_should_be += ':' + server_port | ||
28 | } | ||
29 | |||
30 | if (req.get('host') !== header_host_should_be) return res.type('json').status(403).end() | ||
31 | |||
32 | Users.getFirstClient(function (err, client) { | ||
33 | if (err) return next(err) | ||
34 | if (!client) return next(new Error('No client available.')) | ||
35 | |||
36 | res.json({ | ||
37 | client_id: client._id, | ||
38 | client_secret: client.clientSecret | ||
39 | }) | ||
40 | }) | ||
41 | } | ||
42 | |||
19 | function success (req, res, next) { | 43 | function success (req, res, next) { |
20 | res.end() | 44 | res.end() |
21 | } | 45 | } |
diff --git a/server/models/users.js b/server/models/users.js index 046fe462d..a852bf25b 100644 --- a/server/models/users.js +++ b/server/models/users.js | |||
@@ -35,6 +35,7 @@ const Users = { | |||
35 | getAccessToken: getAccessToken, | 35 | getAccessToken: getAccessToken, |
36 | getClient: getClient, | 36 | getClient: getClient, |
37 | getClients: getClients, | 37 | getClients: getClients, |
38 | getFirstClient: getFirstClient, | ||
38 | getRefreshToken: getRefreshToken, | 39 | getRefreshToken: getRefreshToken, |
39 | getUser: getUser, | 40 | getUser: getUser, |
40 | getUsers: getUsers, | 41 | getUsers: getUsers, |
@@ -64,6 +65,10 @@ function getAccessToken (bearerToken, callback) { | |||
64 | return OAuthTokensDB.findOne({ accessToken: bearerToken }).populate('user') | 65 | return OAuthTokensDB.findOne({ accessToken: bearerToken }).populate('user') |
65 | } | 66 | } |
66 | 67 | ||
68 | function getFirstClient (callback) { | ||
69 | return OAuthClientsDB.findOne({}, callback) | ||
70 | } | ||
71 | |||
67 | function getClient (clientId, clientSecret) { | 72 | function getClient (clientId, clientSecret) { |
68 | logger.debug('Getting Client (clientId: ' + clientId + ', clientSecret: ' + clientSecret + ').') | 73 | logger.debug('Getting Client (clientId: ' + clientId + ', clientSecret: ' + clientSecret + ').') |
69 | 74 | ||