(breaking): Always list nsfw videos in playlists

[github/Chocobozzz/PeerTube.git] / server / controllers / api / oauth-clients.ts

diff --git a/server/controllers/api/oauth-clients.ts b/server/controllers/api/oauth-clients.ts
index ac1ee9e36f44cf481c151d15d8861ff37c09feaa..eb7942fd68247ce9f093ecac92de189fcce54c2c 100644 (file)
--- 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 { database as db } from '../../initializers/database'
-import { OAuthClientLocal } from '../../../shared'
+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,12 +23,15 @@ 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 db.OAuthClient.loadFirstClient()
+  const client = await OAuthClientModel.loadFirstClient()
   if (!client) throw new Error('No client available.')
 
   const json: OAuthClientLocal = {