aboutsummaryrefslogtreecommitdiff
path: root/server/src/routes/ui/account/session/guard.rs
diff options
context:
space:
mode:
Diffstat (limited to 'server/src/routes/ui/account/session/guard.rs')
-rw-r--r--server/src/routes/ui/account/session/guard.rs17
1 files changed, 3 insertions, 14 deletions
diff --git a/server/src/routes/ui/account/session/guard.rs b/server/src/routes/ui/account/session/guard.rs
index 6a9bdaf..57540cf 100644
--- a/server/src/routes/ui/account/session/guard.rs
+++ b/server/src/routes/ui/account/session/guard.rs
@@ -4,9 +4,8 @@
Copyright (C) 2025 metamuffin <metamuffin.org>
*/
use super::{AdminSession, Session};
-use crate::{database::DataAcid, routes::ui::error::MyError};
+use crate::{database::Database, routes::ui::error::MyError};
use anyhow::anyhow;
-use jellybase::database::T_USER;
use log::warn;
use rocket::{
async_trait,
@@ -36,19 +35,9 @@ impl Session {
username = "admin".to_string();
}
- let db = req.guard::<&State<DataAcid>>().await.unwrap();
+ let db = req.guard::<&State<Database>>().await.unwrap();
- let user = {
- let txn = db.inner.begin_read()?;
- let table = txn.open_table(T_USER)?;
- let user = table
- .get(&*username)?
- .ok_or(anyhow!("user not found"))?
- .value()
- .0;
- drop(table);
- user
- };
+ let user = db.get_user(&username)?.ok_or(anyhow!("user not found"))?;
Ok(Session { user })
}