diff options
Diffstat (limited to 'server/src/routes/api')
| -rw-r--r-- | server/src/routes/api/mod.rs | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/server/src/routes/api/mod.rs b/server/src/routes/api/mod.rs index 828b576..d8ea167 100644 --- a/server/src/routes/api/mod.rs +++ b/server/src/routes/api/mod.rs @@ -7,8 +7,9 @@ use super::ui::{ account::{login_logic, session::AdminSession}, error::MyResult, }; -use crate::database::Database; +use crate::database::DataAcid; use anyhow::{anyhow, Context}; +use jellybase::database::{TableExt, T_NODE}; use jellycommon::{user::CreateSessionParams, Node}; use rocket::{ get, @@ -35,7 +36,7 @@ pub fn r_api_version() -> &'static str { #[post("/api/create_session", data = "<data>")] pub fn r_api_account_login( - database: &State<Database>, + database: &State<DataAcid>, data: Json<CreateSessionParams>, ) -> MyResult<Value> { let token = login_logic( @@ -51,13 +52,12 @@ pub fn r_api_account_login( #[get("/api/node_raw/<id>")] pub fn r_api_node_raw( admin: AdminSession, - database: &State<Database>, + database: &State<DataAcid>, id: &str, ) -> MyResult<Json<Node>> { drop(admin); - let node = database - .node - .get(&id.to_string()) + let node = T_NODE + .get(database, id) .context("retrieving library node")? .ok_or(anyhow!("node does not exist"))?; Ok(Json(node)) |