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

Save the authentication method on each authorization

Browse Source 
This will help us logging out of the upstream.
This commit is contained in:
Quentin Gliech
2023-08-28 17:00:00 +02:00
parent 096386e9b9
commit d9a12de8a3
10 changed files with 183 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
crates/handlers/src/upstream_oauth2/link.rs
View File

@@ -211,12 +211,13 @@ pub(crate) async fn get(
(Some(session), Some(user_id)) if session.user.id == user_id => {
// Session already linked, and link matches the currently logged
// user. Mark the session as consumed and renew the authentication.
repo.upstream_oauth_session()
let upstream_session = repo
.upstream_oauth_session()
.consume(&clock, upstream_session)
.await?;
repo.browser_session()
.authenticate_with_upstream(&mut rng, &clock, &session, &link)
.authenticate_with_upstream(&mut rng, &clock, &session, &upstream_session)
.await?;
cookie_jar = cookie_jar.set_session(&session);
@@ -265,12 +266,13 @@ pub(crate) async fn get(
let session = repo.browser_session().add(&mut rng, &clock, &user).await?;
repo.upstream_oauth_session()
let upstream_session = repo
.upstream_oauth_session()
.consume(&clock, upstream_session)
.await?;
repo.browser_session()
.authenticate_with_upstream(&mut rng, &clock, &session, &link)
.authenticate_with_upstream(&mut rng, &clock, &session, &upstream_session)
.await?;
cookie_jar = sessions_cookie
@@ -507,12 +509,13 @@ pub(crate) async fn post(
_ => return Err(RouteError::InvalidFormAction),
};
repo.upstream_oauth_session()
let upstream_session = repo
.upstream_oauth_session()
.consume(&clock, upstream_session)
.await?;
repo.browser_session()
.authenticate_with_upstream(&mut rng, &clock, &session, &link)
.authenticate_with_upstream(&mut rng, &clock, &session, &upstream_session)
.await?;
let cookie_jar = sessions_cookie