diff options
author | Chocobozzz <me@florianbigard.com> | 2020-04-24 11:33:01 +0200 |
---|---|---|
committer | Chocobozzz <chocobozzz@cpy.re> | 2020-05-04 16:21:39 +0200 |
commit | e307e4fce39853d445d086f92b8c556c363ee15d (patch) | |
tree | 0f3faaf3c73222db0fb55b72260c787aeeeb05eb /shared/models | |
parent | e1c5503114deef954731904695cd40dccfcef555 (diff) | |
download | PeerTube-e307e4fce39853d445d086f92b8c556c363ee15d.tar.gz PeerTube-e307e4fce39853d445d086f92b8c556c363ee15d.tar.zst PeerTube-e307e4fce39853d445d086f92b8c556c363ee15d.zip |
Add ability for auth plugins to hook tokens validity
Diffstat (limited to 'shared/models')
-rw-r--r-- | shared/models/activitypub/context.ts | 1 | ||||
-rw-r--r-- | shared/models/plugins/register-server-auth.model.ts | 8 | ||||
-rw-r--r-- | shared/models/server/job.model.ts | 2 |
3 files changed, 9 insertions, 2 deletions
diff --git a/shared/models/activitypub/context.ts b/shared/models/activitypub/context.ts new file mode 100644 index 000000000..bd795a2fd --- /dev/null +++ b/shared/models/activitypub/context.ts | |||
@@ -0,0 +1 @@ | |||
export type ContextType = 'All' | 'View' | 'Announce' | 'CacheFile' | |||
diff --git a/shared/models/plugins/register-server-auth.model.ts b/shared/models/plugins/register-server-auth.model.ts index dc46dcbc8..403a49994 100644 --- a/shared/models/plugins/register-server-auth.model.ts +++ b/shared/models/plugins/register-server-auth.model.ts | |||
@@ -1,4 +1,5 @@ | |||
1 | import { UserRole } from '@shared/models' | 1 | import { UserRole } from '@shared/models' |
2 | import { MOAuthToken } from '@server/typings/models' | ||
2 | 3 | ||
3 | export type RegisterServerAuthOptions = RegisterServerAuthPassOptions | RegisterServerAuthExternalOptions | 4 | export type RegisterServerAuthOptions = RegisterServerAuthPassOptions | RegisterServerAuthExternalOptions |
4 | 5 | ||
@@ -6,11 +7,16 @@ export interface RegisterServerAuthPassOptions { | |||
6 | // Authentication name (a plugin can register multiple auth strategies) | 7 | // Authentication name (a plugin can register multiple auth strategies) |
7 | authName: string | 8 | authName: string |
8 | 9 | ||
9 | onLogout?: Function | 10 | // Called by PeerTube when a user from your plugin logged out |
11 | onLogout?(): void | ||
10 | 12 | ||
11 | // Weight of this authentication so PeerTube tries the auth methods in DESC weight order | 13 | // Weight of this authentication so PeerTube tries the auth methods in DESC weight order |
12 | getWeight(): number | 14 | getWeight(): number |
13 | 15 | ||
16 | // Your plugin can hook PeerTube access/refresh token validity | ||
17 | // So you can control for your plugin the user session lifetime | ||
18 | hookTokenValidity?(options: { token: MOAuthToken, type: 'access' | 'refresh' }): Promise<{ valid: boolean }> | ||
19 | |||
14 | // Used by PeerTube to login a user | 20 | // Used by PeerTube to login a user |
15 | // Returns null if the login failed, or { username, email } on success | 21 | // Returns null if the login failed, or { username, email } on success |
16 | login(body: { | 22 | login(body: { |
diff --git a/shared/models/server/job.model.ts b/shared/models/server/job.model.ts index 694361276..57d61c480 100644 --- a/shared/models/server/job.model.ts +++ b/shared/models/server/job.model.ts | |||
@@ -1,6 +1,6 @@ | |||
1 | import { ContextType } from '@server/helpers/activitypub' | ||
2 | import { SendEmailOptions } from './emailer.model' | 1 | import { SendEmailOptions } from './emailer.model' |
3 | import { VideoResolution } from '@shared/models' | 2 | import { VideoResolution } from '@shared/models' |
3 | import { ContextType } from '../activitypub/context' | ||
4 | 4 | ||
5 | export type JobState = 'active' | 'completed' | 'failed' | 'waiting' | 'delayed' | 5 | export type JobState = 'active' | 'completed' | 'failed' | 'waiting' | 'delayed' |
6 | 6 | ||