diff options
author | Chocobozzz <me@florianbigard.com> | 2022-10-10 11:19:58 +0200 |
---|---|---|
committer | Chocobozzz <me@florianbigard.com> | 2022-10-10 11:19:58 +0200 |
commit | 63fa260a81a8930c157b73c897fe8696a8cc90d4 (patch) | |
tree | 705ebfae42f9c59b2a1ac97779e4037102dfed1c /shared/models | |
parent | 9b99d32804e99462c6f22df3ec3db9ec5bf8a18c (diff) | |
parent | 1ea868a9456439108fbd87255537093ed8bd456f (diff) | |
download | PeerTube-63fa260a81a8930c157b73c897fe8696a8cc90d4.tar.gz PeerTube-63fa260a81a8930c157b73c897fe8696a8cc90d4.tar.zst PeerTube-63fa260a81a8930c157b73c897fe8696a8cc90d4.zip |
Merge branch 'feature/otp' into develop
Diffstat (limited to 'shared/models')
-rw-r--r-- | shared/models/users/index.ts | 1 | ||||
-rw-r--r-- | shared/models/users/two-factor-enable-result.model.ts | 7 | ||||
-rw-r--r-- | shared/models/users/user.model.ts | 2 |
3 files changed, 10 insertions, 0 deletions
diff --git a/shared/models/users/index.ts b/shared/models/users/index.ts index b25978587..32f7a441c 100644 --- a/shared/models/users/index.ts +++ b/shared/models/users/index.ts | |||
@@ -1,3 +1,4 @@ | |||
1 | export * from './two-factor-enable-result.model' | ||
1 | export * from './user-create-result.model' | 2 | export * from './user-create-result.model' |
2 | export * from './user-create.model' | 3 | export * from './user-create.model' |
3 | export * from './user-flag.model' | 4 | export * from './user-flag.model' |
diff --git a/shared/models/users/two-factor-enable-result.model.ts b/shared/models/users/two-factor-enable-result.model.ts new file mode 100644 index 000000000..1fc801f0a --- /dev/null +++ b/shared/models/users/two-factor-enable-result.model.ts | |||
@@ -0,0 +1,7 @@ | |||
1 | export interface TwoFactorEnableResult { | ||
2 | otpRequest: { | ||
3 | requestToken: string | ||
4 | secret: string | ||
5 | uri: string | ||
6 | } | ||
7 | } | ||
diff --git a/shared/models/users/user.model.ts b/shared/models/users/user.model.ts index 63c5c8a92..7b6494ff8 100644 --- a/shared/models/users/user.model.ts +++ b/shared/models/users/user.model.ts | |||
@@ -62,6 +62,8 @@ export interface User { | |||
62 | pluginAuth: string | null | 62 | pluginAuth: string | null |
63 | 63 | ||
64 | lastLoginDate: Date | null | 64 | lastLoginDate: Date | null |
65 | |||
66 | twoFactorEnabled: boolean | ||
65 | } | 67 | } |
66 | 68 | ||
67 | export interface MyUserSpecialPlaylist { | 69 | export interface MyUserSpecialPlaylist { |