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

storage: unify user operations errors

Browse Source
This commit is contained in:
Quentin Gliech
2022-12-07 19:07:53 +01:00
parent f7f65e314b
commit b7cad48bbd
11 changed files with 165 additions and 206 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
crates/graphql/src/lib.rs
View File

@ -136,9 +136,7 @@ impl RootQuery {
let Some(session) = session else { return Ok(None) };
let current_user = session.user;
let browser_session = mas_storage::user::lookup_active_session(&mut conn, id)
.await
.to_option()?;
let browser_session = mas_storage::user::lookup_active_session(&mut conn, id).await?;
let ret = browser_session.and_then(|browser_session| {
if browser_session.user.id == current_user.id {
@ -166,9 +164,8 @@ impl RootQuery {
let Some(session) = session else { return Ok(None) };
let current_user = session.user;
let user_email = mas_storage::user::lookup_user_email_by_id(&mut conn, &current_user, id)
.await
.to_option()?;
let user_email =
mas_storage::user::lookup_user_email_by_id(&mut conn, &current_user, id).await?;
Ok(user_email.map(UserEmail))
}