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) --- shared/server-commands/users/two-factor-command.ts | 92 ---------------------- 1 file changed, 92 deletions(-) delete mode 100644 shared/server-commands/users/two-factor-command.ts (limited to 'shared/server-commands/users/two-factor-command.ts') diff --git a/shared/server-commands/users/two-factor-command.ts b/shared/server-commands/users/two-factor-command.ts deleted file mode 100644 index 5542acfda..000000000 --- a/shared/server-commands/users/two-factor-command.ts +++ /dev/null @@ -1,92 +0,0 @@ -import { TOTP } from 'otpauth' -import { HttpStatusCode, TwoFactorEnableResult } from '@shared/models' -import { unwrapBody } from '../requests' -import { AbstractCommand, OverrideCommandOptions } from '../shared' - -export class TwoFactorCommand extends AbstractCommand { - - static buildOTP (options: { - secret: string - }) { - const { secret } = options - - return new TOTP({ - issuer: 'PeerTube', - algorithm: 'SHA1', - digits: 6, - period: 30, - secret - }) - } - - request (options: OverrideCommandOptions & { - userId: number - currentPassword?: string - }) { - const { currentPassword, userId } = options - - const path = '/api/v1/users/' + userId + '/two-factor/request' - - return unwrapBody(this.postBodyRequest({ - ...options, - - path, - fields: { currentPassword }, - implicitToken: true, - defaultExpectedStatus: HttpStatusCode.OK_200 - })) - } - - confirmRequest (options: OverrideCommandOptions & { - userId: number - requestToken: string - otpToken: string - }) { - const { userId, requestToken, otpToken } = options - - const path = '/api/v1/users/' + userId + '/two-factor/confirm-request' - - return this.postBodyRequest({ - ...options, - - path, - fields: { requestToken, otpToken }, - implicitToken: true, - defaultExpectedStatus: HttpStatusCode.NO_CONTENT_204 - }) - } - - disable (options: OverrideCommandOptions & { - userId: number - currentPassword?: string - }) { - const { userId, currentPassword } = options - const path = '/api/v1/users/' + userId + '/two-factor/disable' - - return this.postBodyRequest({ - ...options, - - path, - fields: { currentPassword }, - implicitToken: true, - defaultExpectedStatus: HttpStatusCode.NO_CONTENT_204 - }) - } - - async requestAndConfirm (options: OverrideCommandOptions & { - userId: number - currentPassword?: string - }) { - const { userId, currentPassword } = options - - const { otpRequest } = await this.request({ userId, currentPassword }) - - await this.confirmRequest({ - userId, - requestToken: otpRequest.requestToken, - otpToken: TwoFactorCommand.buildOTP({ secret: otpRequest.secret }).generate() - }) - - return otpRequest - } -} -- cgit v1.2.3