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/users.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/users.ts')
| -rw-r--r-- | server/middlewares/validators/shared/users.ts | 63 |
1 files changed, 0 insertions, 63 deletions
diff --git a/server/middlewares/validators/shared/users.ts b/server/middlewares/validators/shared/users.ts deleted file mode 100644 index 030adc9f7..000000000 --- a/server/middlewares/validators/shared/users.ts +++ /dev/null | |||
| @@ -1,63 +0,0 @@ | |||
| 1 | import express from 'express' | ||
| 2 | import { ActorModel } from '@server/models/actor/actor' | ||
| 3 | import { UserModel } from '@server/models/user/user' | ||
| 4 | import { MUserDefault } from '@server/types/models' | ||
| 5 | import { forceNumber } from '@shared/core-utils' | ||
| 6 | import { HttpStatusCode } from '@shared/models' | ||
| 7 | |||
| 8 | function checkUserIdExist (idArg: number | string, res: express.Response, withStats = false) { | ||
| 9 | const id = forceNumber(idArg) | ||
| 10 | return checkUserExist(() => UserModel.loadByIdWithChannels(id, withStats), res) | ||
| 11 | } | ||
| 12 | |||
| 13 | function checkUserEmailExist (email: string, res: express.Response, abortResponse = true) { | ||
| 14 | return checkUserExist(() => UserModel.loadByEmail(email), res, abortResponse) | ||
| 15 | } | ||
| 16 | |||
| 17 | async function checkUserNameOrEmailDoNotAlreadyExist (username: string, email: string, res: express.Response) { | ||
| 18 | const user = await UserModel.loadByUsernameOrEmail(username, email) | ||
| 19 | |||
| 20 | if (user) { | ||
| 21 | res.fail({ | ||
| 22 | status: HttpStatusCode.CONFLICT_409, | ||
| 23 | message: 'User with this username or email already exists.' | ||
| 24 | }) | ||
| 25 | return false | ||
| 26 | } | ||
| 27 | |||
| 28 | const actor = await ActorModel.loadLocalByName(username) | ||
| 29 | if (actor) { | ||
| 30 | res.fail({ | ||
| 31 | status: HttpStatusCode.CONFLICT_409, | ||
| 32 | message: 'Another actor (account/channel) with this name on this instance already exists or has already existed.' | ||
| 33 | }) | ||
| 34 | return false | ||
| 35 | } | ||
| 36 | |||
| 37 | return true | ||
| 38 | } | ||
| 39 | |||
| 40 | async function checkUserExist (finder: () => Promise<MUserDefault>, res: express.Response, abortResponse = true) { | ||
| 41 | const user = await finder() | ||
| 42 | |||
| 43 | if (!user) { | ||
| 44 | if (abortResponse === true) { | ||
| 45 | res.fail({ | ||
| 46 | status: HttpStatusCode.NOT_FOUND_404, | ||
| 47 | message: 'User not found' | ||
| 48 | }) | ||
| 49 | } | ||
| 50 | |||
| 51 | return false | ||
| 52 | } | ||
| 53 | |||
| 54 | res.locals.user = user | ||
| 55 | return true | ||
| 56 | } | ||
| 57 | |||
| 58 | export { | ||
| 59 | checkUserIdExist, | ||
| 60 | checkUserEmailExist, | ||
| 61 | checkUserNameOrEmailDoNotAlreadyExist, | ||
| 62 | checkUserExist | ||
| 63 | } | ||