matrix/authentication-service
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-authentication-service.git synced 2025-12-03 22:51:11 +03:00
Code Activity

data-model: Make the user_id optional in the OAuth 2.0 sessions

Browse Source
This commit is contained in:
Quentin Gliech
2023-09-04 16:32:43 +02:00
parent 3691090757
commit 7e247830c9
16 changed files with 133 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
crates/storage-pg/src/oauth2/access_token.rs
View File

@@ -135,7 +135,6 @@ impl<'c> OAuth2AccessTokenRepository for PgOAuth2AccessTokenRepository<'c> {
fields(
db.statement,
%session.id,
user.id = %session.user_id,
client.id = %session.client_id,
access_token.id,
),

1
crates/storage-pg/src/oauth2/authorization_grant.rs
View File

@@ -406,7 +406,6 @@ impl<'c> OAuth2AuthorizationGrantRepository for PgOAuth2AuthorizationGrantReposi
%grant.id,
client.id = %grant.client_id,
%session.id,
user.id = %session.user_id,
),
err,
)]

1
crates/storage-pg/src/oauth2/refresh_token.rs
View File

@@ -143,7 +143,6 @@ impl<'c> OAuth2RefreshTokenRepository for PgOAuth2RefreshTokenRepository<'c> {
fields(
db.statement,
%session.id,
user.id = %session.user_id,
client.id = %session.client_id,
refresh_token.id,
),

5
crates/storage-pg/src/oauth2/session.rs
View File

@@ -86,7 +86,7 @@ impl TryFrom<OAuthSessionLookup> for Session {
state,
created_at: value.created_at,
client_id: value.oauth2_client_id.into(),
user_id: value.user_id.into(),
user_id: Some(value.user_id.into()),
user_session_id: value.user_session_id.map(Ulid::from),
scope,
})
@@ -186,7 +186,7 @@ impl<'c> OAuth2SessionRepository for PgOAuth2SessionRepository<'c> {
id,
state: SessionState::Valid,
created_at,
user_id: user_session.user.id,
user_id: Some(user_session.user.id),
user_session_id: Some(user_session.id),
client_id: client.id,
scope,
@@ -200,7 +200,6 @@ impl<'c> OAuth2SessionRepository for PgOAuth2SessionRepository<'c> {
db.statement,
%session.id,
%session.scope,
user.id = %session.user_id,
client.id = %session.client_id,
),
err,