X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fcontrollers%2Fapi%2Foauth-clients.ts;h=eb7942fd68247ce9f093ecac92de189fcce54c2c;hb=923e41fa4f342019298b46e407ea1f0207f74205;hp=bc02fce904a20785af626b34194d3e979e9760d2;hpb=3fd3ab2d34d512b160a5e6084d7609be7b4f4452;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/controllers/api/oauth-clients.ts b/server/controllers/api/oauth-clients.ts index bc02fce90..eb7942fd6 100644 --- a/server/controllers/api/oauth-clients.ts +++ b/server/controllers/api/oauth-clients.ts @@ -1,14 +1,15 @@ -import * as express from 'express' - -import { CONFIG } from '../../initializers' -import { logger } from '../../helpers' -import { asyncMiddleware } from '../../middlewares' -import { OAuthClientLocal } from '../../../shared' -import { OAuthClientModel } from '../../models/oauth/oauth-client' +import express from 'express' +import { isTestOrDevInstance } from '@server/helpers/core-utils' +import { OAuthClientModel } from '@server/models/oauth/oauth-client' +import { HttpStatusCode, OAuthClientLocal } from '@shared/models' +import { logger } from '../../helpers/logger' +import { CONFIG } from '../../initializers/config' +import { asyncMiddleware, openapiOperationDoc } from '../../middlewares' const oauthClientsRouter = express.Router() oauthClientsRouter.get('/local', + openapiOperationDoc({ operationId: 'getOAuthClient' }), asyncMiddleware(getLocalClient) ) @@ -22,9 +23,12 @@ async function getLocalClient (req: express.Request, res: express.Response, next } // Don't make this check if this is a test instance - if (process.env.NODE_ENV !== 'test' && req.get('host') !== headerHostShouldBe) { + if (!isTestOrDevInstance() && req.get('host') !== headerHostShouldBe) { logger.info('Getting client tokens for host %s is forbidden (expected %s).', req.get('host'), headerHostShouldBe) - return res.type('json').status(403).end() + return res.fail({ + status: HttpStatusCode.FORBIDDEN_403, + message: `Getting client tokens for host ${req.get('host')} is forbidden` + }) } const client = await OAuthClientModel.loadFirstClient()