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

storage: finish cleaning up the errors

Browse Source
This commit is contained in:
Quentin Gliech
2022-12-08 15:09:54 +01:00
parent bd93074076
commit 56d43b0166
13 changed files with 111 additions and 157 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
crates/storage/src/oauth2/mod.rs
View File

@@ -24,7 +24,7 @@ use self::client::lookup_clients;
use crate::{
pagination::{process_page, QueryBuilderExt},
user::lookup_active_session,
Clock, DatabaseError, DatabaseInconsistencyError2,
Clock, DatabaseError, DatabaseInconsistencyError,
};
pub mod access_token;
@@ -137,19 +137,19 @@ pub async fn get_paginated_user_oauth_sessions(
let v = lookup_active_session(&mut *conn, id)
.await?
.ok_or_else(|| {
DatabaseInconsistencyError2::on("oauth2_sessions").column("user_session_id")
DatabaseInconsistencyError::on("oauth2_sessions").column("user_session_id")
})?;
browser_sessions.insert(id, v);
}
let page: Result<Vec<_>, DatabaseInconsistencyError2> = page
let page: Result<Vec<_>, DatabaseInconsistencyError> = page
.into_iter()
.map(|item| {
let id = Ulid::from(item.oauth2_session_id);
let client = clients
.get(&Ulid::from(item.oauth2_client_id))
.ok_or_else(|| {
DatabaseInconsistencyError2::on("oauth2_sessions")
DatabaseInconsistencyError::on("oauth2_sessions")
.column("oauth2_client_id")
.row(id)
})?
@@ -158,14 +158,14 @@ pub async fn get_paginated_user_oauth_sessions(
let browser_session = browser_sessions
.get(&Ulid::from(item.user_session_id))
.ok_or_else(|| {
DatabaseInconsistencyError2::on("oauth2_sessions")
DatabaseInconsistencyError::on("oauth2_sessions")
.column("user_session_id")
.row(id)
})?
.clone();
let scope = item.scope.parse().map_err(|e| {
DatabaseInconsistencyError2::on("oauth2_sessions")
DatabaseInconsistencyError::on("oauth2_sessions")
.column("scope")
.row(id)
.source(e)