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/models/oauth/oauth-client.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/models/oauth/oauth-client.ts')
-rw-r--r-- | server/models/oauth/oauth-client.ts | 63 |
1 files changed, 0 insertions, 63 deletions
diff --git a/server/models/oauth/oauth-client.ts b/server/models/oauth/oauth-client.ts deleted file mode 100644 index 457e84613..000000000 --- a/server/models/oauth/oauth-client.ts +++ /dev/null | |||
@@ -1,63 +0,0 @@ | |||
1 | import { AllowNull, Column, CreatedAt, DataType, HasMany, Model, Table, UpdatedAt } from 'sequelize-typescript' | ||
2 | import { AttributesOnly } from '@shared/typescript-utils' | ||
3 | import { OAuthTokenModel } from './oauth-token' | ||
4 | |||
5 | @Table({ | ||
6 | tableName: 'oAuthClient', | ||
7 | indexes: [ | ||
8 | { | ||
9 | fields: [ 'clientId' ], | ||
10 | unique: true | ||
11 | }, | ||
12 | { | ||
13 | fields: [ 'clientId', 'clientSecret' ], | ||
14 | unique: true | ||
15 | } | ||
16 | ] | ||
17 | }) | ||
18 | export class OAuthClientModel extends Model<Partial<AttributesOnly<OAuthClientModel>>> { | ||
19 | |||
20 | @AllowNull(false) | ||
21 | @Column | ||
22 | clientId: string | ||
23 | |||
24 | @AllowNull(false) | ||
25 | @Column | ||
26 | clientSecret: string | ||
27 | |||
28 | @Column(DataType.ARRAY(DataType.STRING)) | ||
29 | grants: string[] | ||
30 | |||
31 | @Column(DataType.ARRAY(DataType.STRING)) | ||
32 | redirectUris: string[] | ||
33 | |||
34 | @CreatedAt | ||
35 | createdAt: Date | ||
36 | |||
37 | @UpdatedAt | ||
38 | updatedAt: Date | ||
39 | |||
40 | @HasMany(() => OAuthTokenModel, { | ||
41 | onDelete: 'cascade' | ||
42 | }) | ||
43 | OAuthTokens: OAuthTokenModel[] | ||
44 | |||
45 | static countTotal () { | ||
46 | return OAuthClientModel.count() | ||
47 | } | ||
48 | |||
49 | static loadFirstClient () { | ||
50 | return OAuthClientModel.findOne() | ||
51 | } | ||
52 | |||
53 | static getByIdAndSecret (clientId: string, clientSecret: string) { | ||
54 | const query = { | ||
55 | where: { | ||
56 | clientId, | ||
57 | clientSecret | ||
58 | } | ||
59 | } | ||
60 | |||
61 | return OAuthClientModel.findOne(query) | ||
62 | } | ||
63 | } | ||