diff options
Diffstat (limited to 'server/controllers/api')
-rw-r--r-- | server/controllers/api/clients.ts | 6 | ||||
-rw-r--r-- | server/controllers/api/config.ts | 6 | ||||
-rw-r--r-- | server/controllers/api/users.ts | 6 |
3 files changed, 12 insertions, 6 deletions
diff --git a/server/controllers/api/clients.ts b/server/controllers/api/clients.ts index 8c460096b..96490d04a 100644 --- a/server/controllers/api/clients.ts +++ b/server/controllers/api/clients.ts | |||
@@ -3,6 +3,7 @@ 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 | 7 | ||
7 | const clientsRouter = express.Router() | 8 | const clientsRouter = express.Router() |
8 | 9 | ||
@@ -27,10 +28,11 @@ function getLocalClient (req: express.Request, res: express.Response, next: expr | |||
27 | if (err) return next(err) | 28 | if (err) return next(err) |
28 | if (!client) return next(new Error('No client available.')) | 29 | if (!client) return next(new Error('No client available.')) |
29 | 30 | ||
30 | res.json({ | 31 | const json: ClientLocal = { |
31 | client_id: client.clientId, | 32 | client_id: client.clientId, |
32 | client_secret: client.clientSecret | 33 | client_secret: client.clientSecret |
33 | }) | 34 | } |
35 | res.json(json) | ||
34 | }) | 36 | }) |
35 | } | 37 | } |
36 | 38 | ||
diff --git a/server/controllers/api/config.ts b/server/controllers/api/config.ts index c63981797..3e9aa77a5 100644 --- a/server/controllers/api/config.ts +++ b/server/controllers/api/config.ts | |||
@@ -1,6 +1,7 @@ | |||
1 | import * as express from 'express' | 1 | import * as express from 'express' |
2 | 2 | ||
3 | import { CONFIG } from '../../initializers' | 3 | import { CONFIG } from '../../initializers' |
4 | import { ServerConfig } from '../../../shared' | ||
4 | 5 | ||
5 | const configRouter = express.Router() | 6 | const configRouter = express.Router() |
6 | 7 | ||
@@ -8,11 +9,12 @@ configRouter.get('/', getConfig) | |||
8 | 9 | ||
9 | // Get the client credentials for the PeerTube front end | 10 | // Get the client credentials for the PeerTube front end |
10 | function getConfig (req: express.Request, res: express.Response, next: express.NextFunction) { | 11 | function getConfig (req: express.Request, res: express.Response, next: express.NextFunction) { |
11 | res.json({ | 12 | const json: ServerConfig = { |
12 | signup: { | 13 | signup: { |
13 | enabled: CONFIG.SIGNUP.ENABLED | 14 | enabled: CONFIG.SIGNUP.ENABLED |
14 | } | 15 | } |
15 | }) | 16 | } |
17 | res.json(json) | ||
16 | } | 18 | } |
17 | 19 | ||
18 | // --------------------------------------------------------------------------- | 20 | // --------------------------------------------------------------------------- |
diff --git a/server/controllers/api/users.ts b/server/controllers/api/users.ts index ffe5881e5..1e9e65689 100644 --- a/server/controllers/api/users.ts +++ b/server/controllers/api/users.ts | |||
@@ -17,6 +17,7 @@ import { | |||
17 | setUsersSort, | 17 | setUsersSort, |
18 | token | 18 | token |
19 | } from '../../middlewares' | 19 | } from '../../middlewares' |
20 | import { UserVideoRate as FormatedUserVideoRate } from '../../../shared' | ||
20 | 21 | ||
21 | const usersRouter = express.Router() | 22 | const usersRouter = express.Router() |
22 | 23 | ||
@@ -119,10 +120,11 @@ function getUserVideoRating (req: express.Request, res: express.Response, next: | |||
119 | 120 | ||
120 | const rating = ratingObj ? ratingObj.type : 'none' | 121 | const rating = ratingObj ? ratingObj.type : 'none' |
121 | 122 | ||
122 | res.json({ | 123 | const json: FormatedUserVideoRate = { |
123 | videoId, | 124 | videoId, |
124 | rating | 125 | rating |
125 | }) | 126 | } |
127 | res.json(json) | ||
126 | }) | 128 | }) |
127 | } | 129 | } |
128 | 130 | ||