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/users/email-verification.ts | 72 ---------------------- 1 file changed, 72 deletions(-) delete mode 100644 server/controllers/api/users/email-verification.ts (limited to 'server/controllers/api/users/email-verification.ts') diff --git a/server/controllers/api/users/email-verification.ts b/server/controllers/api/users/email-verification.ts deleted file mode 100644 index 230aaa9af..000000000 --- a/server/controllers/api/users/email-verification.ts +++ /dev/null @@ -1,72 +0,0 @@ -import express from 'express' -import { HttpStatusCode } from '@shared/models' -import { CONFIG } from '../../../initializers/config' -import { sendVerifyRegistrationEmail, sendVerifyUserEmail } from '../../../lib/user' -import { asyncMiddleware, buildRateLimiter } from '../../../middlewares' -import { - registrationVerifyEmailValidator, - usersAskSendVerifyEmailValidator, - usersVerifyEmailValidator -} from '../../../middlewares/validators' - -const askSendEmailLimiter = buildRateLimiter({ - windowMs: CONFIG.RATES_LIMIT.ASK_SEND_EMAIL.WINDOW_MS, - max: CONFIG.RATES_LIMIT.ASK_SEND_EMAIL.MAX -}) - -const emailVerificationRouter = express.Router() - -emailVerificationRouter.post([ '/ask-send-verify-email', '/registrations/ask-send-verify-email' ], - askSendEmailLimiter, - asyncMiddleware(usersAskSendVerifyEmailValidator), - asyncMiddleware(reSendVerifyUserEmail) -) - -emailVerificationRouter.post('/:id/verify-email', - asyncMiddleware(usersVerifyEmailValidator), - asyncMiddleware(verifyUserEmail) -) - -emailVerificationRouter.post('/registrations/:registrationId/verify-email', - asyncMiddleware(registrationVerifyEmailValidator), - asyncMiddleware(verifyRegistrationEmail) -) - -// --------------------------------------------------------------------------- - -export { - emailVerificationRouter -} - -async function reSendVerifyUserEmail (req: express.Request, res: express.Response) { - const user = res.locals.user - const registration = res.locals.userRegistration - - if (user) await sendVerifyUserEmail(user) - else if (registration) await sendVerifyRegistrationEmail(registration) - - return res.status(HttpStatusCode.NO_CONTENT_204).end() -} - -async function verifyUserEmail (req: express.Request, res: express.Response) { - const user = res.locals.user - user.emailVerified = true - - if (req.body.isPendingEmail === true) { - user.email = user.pendingEmail - user.pendingEmail = null - } - - await user.save() - - return res.status(HttpStatusCode.NO_CONTENT_204).end() -} - -async function verifyRegistrationEmail (req: express.Request, res: express.Response) { - const registration = res.locals.userRegistration - registration.emailVerified = true - - await registration.save() - - return res.status(HttpStatusCode.NO_CONTENT_204).end() -} -- cgit v1.2.3