diff options
author | Chocobozzz <me@florianbigard.com> | 2023-07-31 14:34:36 +0200 |
---|---|---|
committer | Chocobozzz <me@florianbigard.com> | 2023-08-11 15:02:33 +0200 |
commit | 3a4992633ee62d5edfbb484d9c6bcb3cf158489d (patch) | |
tree | e4510b39bdac9c318fdb4b47018d08f15368b8f0 /server/middlewares/validators/shared/accounts.ts | |
parent | 04d1da5621d25d59bd5fa1543b725c497bf5d9a8 (diff) | |
download | PeerTube-3a4992633ee62d5edfbb484d9c6bcb3cf158489d.tar.gz PeerTube-3a4992633ee62d5edfbb484d9c6bcb3cf158489d.tar.zst PeerTube-3a4992633ee62d5edfbb484d9c6bcb3cf158489d.zip |
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)
Diffstat (limited to 'server/middlewares/validators/shared/accounts.ts')
-rw-r--r-- | server/middlewares/validators/shared/accounts.ts | 66 |
1 files changed, 0 insertions, 66 deletions
diff --git a/server/middlewares/validators/shared/accounts.ts b/server/middlewares/validators/shared/accounts.ts deleted file mode 100644 index 72b0e235e..000000000 --- a/server/middlewares/validators/shared/accounts.ts +++ /dev/null | |||
@@ -1,66 +0,0 @@ | |||
1 | import { Response } from 'express' | ||
2 | import { AccountModel } from '@server/models/account/account' | ||
3 | import { UserModel } from '@server/models/user/user' | ||
4 | import { MAccountDefault } from '@server/types/models' | ||
5 | import { forceNumber } from '@shared/core-utils' | ||
6 | import { HttpStatusCode } from '@shared/models' | ||
7 | |||
8 | function doesAccountIdExist (id: number | string, res: Response, sendNotFound = true) { | ||
9 | const promise = AccountModel.load(forceNumber(id)) | ||
10 | |||
11 | return doesAccountExist(promise, res, sendNotFound) | ||
12 | } | ||
13 | |||
14 | function doesLocalAccountNameExist (name: string, res: Response, sendNotFound = true) { | ||
15 | const promise = AccountModel.loadLocalByName(name) | ||
16 | |||
17 | return doesAccountExist(promise, res, sendNotFound) | ||
18 | } | ||
19 | |||
20 | function doesAccountNameWithHostExist (nameWithDomain: string, res: Response, sendNotFound = true) { | ||
21 | const promise = AccountModel.loadByNameWithHost(nameWithDomain) | ||
22 | |||
23 | return doesAccountExist(promise, res, sendNotFound) | ||
24 | } | ||
25 | |||
26 | async function doesAccountExist (p: Promise<MAccountDefault>, res: Response, sendNotFound: boolean) { | ||
27 | const account = await p | ||
28 | |||
29 | if (!account) { | ||
30 | if (sendNotFound === true) { | ||
31 | res.fail({ | ||
32 | status: HttpStatusCode.NOT_FOUND_404, | ||
33 | message: 'Account not found' | ||
34 | }) | ||
35 | } | ||
36 | return false | ||
37 | } | ||
38 | |||
39 | res.locals.account = account | ||
40 | return true | ||
41 | } | ||
42 | |||
43 | async function doesUserFeedTokenCorrespond (id: number, token: string, res: Response) { | ||
44 | const user = await UserModel.loadByIdWithChannels(forceNumber(id)) | ||
45 | |||
46 | if (token !== user.feedToken) { | ||
47 | res.fail({ | ||
48 | status: HttpStatusCode.FORBIDDEN_403, | ||
49 | message: 'User and token mismatch' | ||
50 | }) | ||
51 | return false | ||
52 | } | ||
53 | |||
54 | res.locals.user = user | ||
55 | return true | ||
56 | } | ||
57 | |||
58 | // --------------------------------------------------------------------------- | ||
59 | |||
60 | export { | ||
61 | doesAccountIdExist, | ||
62 | doesLocalAccountNameExist, | ||
63 | doesAccountNameWithHostExist, | ||
64 | doesAccountExist, | ||
65 | doesUserFeedTokenCorrespond | ||
66 | } | ||