matrix/authentication-service
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-authentication-service.git synced 2025-08-09 04:22:45 +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

6
crates/axum-utils/src/session.rs
View File

@@ -14,7 +14,7 @@
use axum_extra::extract::cookie::{Cookie, PrivateCookieJar};
use mas_data_model::BrowserSession;
use mas_storage::user::{lookup_active_session, ActiveSessionLookupError};
use mas_storage::{user::lookup_active_session, DatabaseError};
use serde::{Deserialize, Serialize};
use sqlx::{Executor, Postgres};
use ulid::Ulid;
@@ -47,7 +47,7 @@ impl SessionInfo {
pub async fn load_session(
&self,
executor: impl Executor<'_, Database = Postgres>,
) -> Result<Option<BrowserSession>, ActiveSessionLookupError> {
) -> Result<Option<BrowserSession>, DatabaseError> {
let session_id = if let Some(id) = self.current {
id
} else {
@@ -55,7 +55,7 @@ impl SessionInfo {
};
let res = lookup_active_session(executor, session_id).await?;
Ok(Some(res))
Ok(res)
}
}