diff options
author | Chocobozzz <florian.bigard@gmail.com> | 2017-06-25 17:44:19 +0200 |
---|---|---|
committer | Chocobozzz <florian.bigard@gmail.com> | 2017-06-25 17:44:19 +0200 |
commit | 0a381679e04bc7adf097da9a6fb4e2c8f41bbda2 (patch) | |
tree | 02c6745db0cc36517ceffad3bee129f833fd3341 /server/controllers | |
parent | d58cdea854904369c2dcce905ce42f4f6db836a8 (diff) | |
download | PeerTube-0a381679e04bc7adf097da9a6fb4e2c8f41bbda2.tar.gz PeerTube-0a381679e04bc7adf097da9a6fb4e2c8f41bbda2.tar.zst PeerTube-0a381679e04bc7adf097da9a6fb4e2c8f41bbda2.zip |
ClientLocal -> OAuthClientLocal
Diffstat (limited to 'server/controllers')
-rw-r--r-- | server/controllers/api/index.ts | 4 | ||||
-rw-r--r-- | server/controllers/api/oauth-clients.ts (renamed from server/controllers/api/clients.ts) | 10 |
2 files changed, 7 insertions, 7 deletions
diff --git a/server/controllers/api/index.ts b/server/controllers/api/index.ts index 3abe9bcf8..a9205b33c 100644 --- a/server/controllers/api/index.ts +++ b/server/controllers/api/index.ts | |||
@@ -2,7 +2,7 @@ import * as express from 'express' | |||
2 | 2 | ||
3 | import { badRequest } from '../../helpers' | 3 | import { badRequest } from '../../helpers' |
4 | 4 | ||
5 | import { clientsRouter } from './clients' | 5 | import { oauthClientsRouter } from './oauth-clients' |
6 | import { configRouter } from './config' | 6 | import { configRouter } from './config' |
7 | import { podsRouter } from './pods' | 7 | import { podsRouter } from './pods' |
8 | import { remoteRouter } from './remote' | 8 | import { remoteRouter } from './remote' |
@@ -12,7 +12,7 @@ import { videosRouter } from './videos' | |||
12 | 12 | ||
13 | const apiRouter = express.Router() | 13 | const apiRouter = express.Router() |
14 | 14 | ||
15 | apiRouter.use('/clients', clientsRouter) | 15 | apiRouter.use('/oauth-clients', oauthClientsRouter) |
16 | apiRouter.use('/config', configRouter) | 16 | apiRouter.use('/config', configRouter) |
17 | apiRouter.use('/pods', podsRouter) | 17 | apiRouter.use('/pods', podsRouter) |
18 | apiRouter.use('/remote', remoteRouter) | 18 | apiRouter.use('/remote', remoteRouter) |
diff --git a/server/controllers/api/clients.ts b/server/controllers/api/oauth-clients.ts index 96490d04a..b9bc0534f 100644 --- a/server/controllers/api/clients.ts +++ b/server/controllers/api/oauth-clients.ts | |||
@@ -3,11 +3,11 @@ import * as express from 'express' | |||
3 | import { CONFIG } from '../../initializers' | 3 | import { CONFIG } from '../../initializers' |
4 | import { logger } from '../../helpers' | 4 | import { logger } from '../../helpers' |
5 | import { database as db } from '../../initializers/database' | 5 | import { database as db } from '../../initializers/database' |
6 | import { ClientLocal } from '../../../shared' | 6 | import { OAuthClientLocal } from '../../../shared' |
7 | 7 | ||
8 | const clientsRouter = express.Router() | 8 | const oauthClientsRouter = express.Router() |
9 | 9 | ||
10 | clientsRouter.get('/local', getLocalClient) | 10 | oauthClientsRouter.get('/local', getLocalClient) |
11 | 11 | ||
12 | // Get the client credentials for the PeerTube front end | 12 | // Get the client credentials for the PeerTube front end |
13 | function getLocalClient (req: express.Request, res: express.Response, next: express.NextFunction) { | 13 | function getLocalClient (req: express.Request, res: express.Response, next: express.NextFunction) { |
@@ -28,7 +28,7 @@ function getLocalClient (req: express.Request, res: express.Response, next: expr | |||
28 | if (err) return next(err) | 28 | if (err) return next(err) |
29 | if (!client) return next(new Error('No client available.')) | 29 | if (!client) return next(new Error('No client available.')) |
30 | 30 | ||
31 | const json: ClientLocal = { | 31 | const json: OAuthClientLocal = { |
32 | client_id: client.clientId, | 32 | client_id: client.clientId, |
33 | client_secret: client.clientSecret | 33 | client_secret: client.clientSecret |
34 | } | 34 | } |
@@ -39,5 +39,5 @@ function getLocalClient (req: express.Request, res: express.Response, next: expr | |||
39 | // --------------------------------------------------------------------------- | 39 | // --------------------------------------------------------------------------- |
40 | 40 | ||
41 | export { | 41 | export { |
42 | clientsRouter | 42 | oauthClientsRouter |
43 | } | 43 | } |