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

data-model: simplify users and sessions

Browse Source
This commit is contained in:
Quentin Gliech
2022-12-06 17:50:55 +01:00
parent dff2f98167
commit feebbd0e97
34 changed files with 399 additions and 491 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -114,7 +114,7 @@ impl RootQuery {
let Some(session) = session else { return Ok(None) };
let current_user = session.user;
if current_user.data == id {
if current_user.id == id {
Ok(Some(User(current_user)))
} else {
Ok(None)
@@ -141,7 +141,7 @@ impl RootQuery {
.to_option()?;
let ret = browser_session.and_then(|browser_session| {
if browser_session.user.data == current_user.data {
if browser_session.user.id == current_user.id {
Some(BrowserSession(browser_session))
} else {
None
@@ -193,7 +193,7 @@ impl RootQuery {
.to_option()?;
// Ensure that the link belongs to the current user
let link = link.filter(|link| link.user_id == Some(current_user.data));
let link = link.filter(|link| link.user_id == Some(current_user.id));
Ok(link.map(UpstreamOAuth2Link::new))
}