refactoring.

This commit is contained in:
John Livingston 2023-09-07 17:25:48 +02:00
parent b4db6be7c0
commit 1a1b246d45
No known key found for this signature in database
GPG Key ID: B17B5640CE66CDBC
2 changed files with 5 additions and 8 deletions

View File

@ -35,6 +35,8 @@ async function initApiRouter (options: RegisterServerOptions): Promise<Router> {
await initFederationServerInfosApiRouter(options, router)
await initConfigurationApiRouter(options, router)
if (isDebugMode(options)) {
// Only add this route if the debug mode is enabled at time of the server launch.
// Note: the isDebugMode will be tested again when the API is called.
@ -53,8 +55,6 @@ async function initApiRouter (options: RegisterServerOptions): Promise<Router> {
))
}
router.use('/configuration', await initConfigurationApiRouter(options))
return router
}

View File

@ -7,11 +7,10 @@ import { checkConfigurationEnabledMiddleware } from '../../middlewares/configura
import { getChannelConfigurationOptions, storeChannelConfigurationOptions } from '../../configuration/channel/storage'
import { sanitizeChannelConfigurationOptions } from '../../configuration/channel/sanitize'
async function initConfigurationApiRouter (options: RegisterServerOptions): Promise<Router> {
const router = options.getRouter()
async function initConfigurationApiRouter (options: RegisterServerOptions, router: Router): Promise<void> {
const logger = options.peertubeHelpers.logger
router.get('/channel/:channelId', asyncMiddleware([
router.get('/configuration/channel/:channelId', asyncMiddleware([
checkConfigurationEnabledMiddleware(options),
getCheckConfigurationChannelMiddleware(options),
async (req: Request, res: Response, _next: NextFunction): Promise<void> => {
@ -28,7 +27,7 @@ async function initConfigurationApiRouter (options: RegisterServerOptions): Prom
}
]))
router.post('/channel/:channelId', asyncMiddleware([
router.post('/configuration/channel/:channelId', asyncMiddleware([
checkConfigurationEnabledMiddleware(options),
getCheckConfigurationChannelMiddleware(options),
async (req: Request, res: Response, _next: NextFunction): Promise<void> => {
@ -59,8 +58,6 @@ async function initConfigurationApiRouter (options: RegisterServerOptions): Prom
res.json(result)
}
]))
return router
}
export {