gractwo/mnemosyne
4
0
Fork 0
Code Pull Requests Actions Packages Activity

make transactions higher level (pass them everywhere)

Browse Source
This commit is contained in:
jakubmanczak
2026-04-03 19:05:29 +02:00
parent e4cccde466
commit 449136ce37
25 changed files with 283 additions and 217 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/api/sessions.rs
View File

@@ -8,6 +8,7 @@ use uuid::Uuid;
use crate::{
api::CompositeError,
database,
users::{
User,
auth::{UserAuthRequired, UserAuthenticate},
@@ -23,10 +24,11 @@ pub async fn get_by_id(
headers: HeaderMap,
) -> Result<Response, CompositeError> {
let u = User::authenticate(&headers)?.required()?;
let s = Session::get_by_id(id)?;
let conn = database::conn()?;
let s = Session::get_by_id(&conn, id)?;
match s.user_id == u.id
|| u.has_permission(Permission::ListOthersSessions)
|| u.has_permission(&conn, Permission::ListOthersSessions)
.is_ok_and(|v| v)
{
true => Ok(Json(s).into_response()),
@@ -39,17 +41,18 @@ pub async fn revoke_by_id(
headers: HeaderMap,
) -> Result<Response, CompositeError> {
let u = User::authenticate(&headers)?.required()?;
let mut s = Session::get_by_id(id)?;
let conn = database::conn()?;
let mut s = Session::get_by_id(&conn, id)?;
match s.user_id == u.id
|| u.has_permission(Permission::RevokeOthersSessions)
|| u.has_permission(&conn, Permission::RevokeOthersSessions)
.is_ok_and(|v| v)
{
true => {
s.revoke(Some(&u))?;
s.revoke(&conn, Some(&u))?;
Ok(Json(s).into_response())
}
false => match u.has_permission(Permission::ListOthersSessions)? {
false => match u.has_permission(&conn, Permission::ListOthersSessions)? {
true => Ok((StatusCode::FORBIDDEN, CANT_REVOKE).into_response()),
false => Err(SessionError::NoSessionWithId(id))?,
},