matrix/authentication-service
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-authentication-service.git synced 2025-07-29 22:01:14 +03:00
Code Activity

Have a consent screen before continuing the SSO login

Browse Source
This commit is contained in:
Quentin Gliech
2022-05-20 15:03:38 +02:00
parent 033d60eb73
commit 1d61a94da4
10 changed files with 214 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
crates/data-model/src/compat.rs
View File

@ -90,6 +90,18 @@ pub struct CompatSession<T: StorageBackend> {
pub deleted_at: Option<DateTime<Utc>>,
}
impl<S: StorageBackendMarker> From<CompatSession<S>> for CompatSession<()> {
fn from(t: CompatSession<S>) -> Self {
Self {
data: (),
user: t.user.into(),
device: t.device,
created_at: t.created_at,
deleted_at: t.deleted_at,
}
}
}
#[derive(Debug, Clone, PartialEq)]
pub struct CompatAccessToken<T: StorageBackend> {
pub data: T::CompatAccessTokenData,
@ -98,6 +110,17 @@ pub struct CompatAccessToken<T: StorageBackend> {
pub expires_at: Option<DateTime<Utc>>,
}
impl<S: StorageBackendMarker> From<CompatAccessToken<S>> for CompatAccessToken<()> {
fn from(t: CompatAccessToken<S>) -> Self {
Self {
data: (),
token: t.token,
created_at: t.created_at,
expires_at: t.expires_at,
}
}
}
#[derive(Debug, Clone, PartialEq)]
pub struct CompatRefreshToken<T: StorageBackend> {
pub data: T::RefreshTokenData,
@ -105,13 +128,12 @@ pub struct CompatRefreshToken<T: StorageBackend> {
pub created_at: DateTime<Utc>,
}
impl<S: StorageBackendMarker> From<CompatAccessToken<S>> for CompatAccessToken<()> {
fn from(t: CompatAccessToken<S>) -> Self {
CompatAccessToken {
impl<S: StorageBackendMarker> From<CompatRefreshToken<S>> for CompatRefreshToken<()> {
fn from(t: CompatRefreshToken<S>) -> Self {
Self {
data: (),
token: t.token,
created_at: t.created_at,
expires_at: t.expires_at,
}
}
}
@ -131,6 +153,30 @@ pub enum CompatSsoLoginState<T: StorageBackend> {
},
}
impl<S: StorageBackendMarker> From<CompatSsoLoginState<S>> for CompatSsoLoginState<()> {
fn from(t: CompatSsoLoginState<S>) -> Self {
match t {
CompatSsoLoginState::Pending => Self::Pending,
CompatSsoLoginState::Fullfilled {
fullfilled_at,
session,
} => Self::Fullfilled {
fullfilled_at,
session: session.into(),
},
CompatSsoLoginState::Exchanged {
fullfilled_at,
exchanged_at,
session,
} => Self::Exchanged {
fullfilled_at,
exchanged_at,
session: session.into(),
},
}
}
}
#[derive(Debug, Clone, PartialEq, Serialize)]
#[serde(bound = "T: StorageBackend")]
pub struct CompatSsoLogin<T: StorageBackend> {
@ -141,3 +187,15 @@ pub struct CompatSsoLogin<T: StorageBackend> {
pub created_at: DateTime<Utc>,
pub state: CompatSsoLoginState<T>,
}
impl<S: StorageBackendMarker> From<CompatSsoLogin<S>> for CompatSsoLogin<()> {
fn from(t: CompatSsoLogin<S>) -> Self {
Self {
data: (),
redirect_uri: t.redirect_uri,
token: t.token,
created_at: t.created_at,
state: t.state.into(),
}
}
}