From 3a4992633ee62d5edfbb484d9c6bcb3cf158489d Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Mon, 31 Jul 2023 14:34:36 +0200 Subject: Migrate server to ESM Sorry for the very big commit that may lead to git log issues and merge conflicts, but it's a major step forward: * Server can be faster at startup because imports() are async and we can easily lazy import big modules * Angular doesn't seem to support ES import (with .js extension), so we had to correctly organize peertube into a monorepo: * Use yarn workspace feature * Use typescript reference projects for dependencies * Shared projects have been moved into "packages", each one is now a node module (with a dedicated package.json/tsconfig.json) * server/tools have been moved into apps/ and is now a dedicated app bundled and published on NPM so users don't have to build peertube cli tools manually * server/tests have been moved into packages/ so we don't compile them every time we want to run the server * Use isolatedModule option: * Had to move from const enum to const (https://www.typescriptlang.org/docs/handbook/enums.html#objects-vs-enums) * Had to explictely specify "type" imports when used in decorators * Prefer tsx (that uses esbuild under the hood) instead of ts-node to load typescript files (tests with mocha or scripts): * To reduce test complexity as esbuild doesn't support decorator metadata, we only test server files that do not import server models * We still build tests files into js files for a faster CI * Remove unmaintained peertube CLI import script * Removed some barrels to speed up execution (less imports) --- server/controllers/api/oauth-clients.ts | 54 --------------------------------- 1 file changed, 54 deletions(-) delete mode 100644 server/controllers/api/oauth-clients.ts (limited to 'server/controllers/api/oauth-clients.ts') diff --git a/server/controllers/api/oauth-clients.ts b/server/controllers/api/oauth-clients.ts deleted file mode 100644 index 1899dbb02..000000000 --- a/server/controllers/api/oauth-clients.ts +++ /dev/null @@ -1,54 +0,0 @@ -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 { apiRateLimiter, asyncMiddleware, openapiOperationDoc } from '../../middlewares' - -const oauthClientsRouter = express.Router() - -oauthClientsRouter.use(apiRateLimiter) - -oauthClientsRouter.get('/local', - openapiOperationDoc({ operationId: 'getOAuthClient' }), - asyncMiddleware(getLocalClient) -) - -// Get the client credentials for the PeerTube front end -async function getLocalClient (req: express.Request, res: express.Response, next: express.NextFunction) { - const serverHostname = CONFIG.WEBSERVER.HOSTNAME - const serverPort = CONFIG.WEBSERVER.PORT - let headerHostShouldBe = serverHostname - if (serverPort !== 80 && serverPort !== 443) { - headerHostShouldBe += ':' + serverPort - } - - // Don't make this check if this is a test instance - if (!isTestOrDevInstance() && req.get('host') !== headerHostShouldBe) { - logger.info( - 'Getting client tokens for host %s is forbidden (expected %s).', req.get('host'), headerHostShouldBe, - { webserverConfig: CONFIG.WEBSERVER } - ) - - return res.fail({ - status: HttpStatusCode.FORBIDDEN_403, - message: `Getting client tokens for host ${req.get('host')} is forbidden` - }) - } - - const client = await OAuthClientModel.loadFirstClient() - if (!client) throw new Error('No client available.') - - const json: OAuthClientLocal = { - client_id: client.clientId, - client_secret: client.clientSecret - } - return res.json(json) -} - -// --------------------------------------------------------------------------- - -export { - oauthClientsRouter -} -- cgit v1.2.3