From 212a0f23bc894faf88e159560c113f504349cc05 Mon Sep 17 00:00:00 2001 From: metamuffin Date: Tue, 29 Apr 2025 17:06:23 +0200 Subject: comiles again but still many logic holes --- server/src/api.rs | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'server/src/api.rs') diff --git a/server/src/api.rs b/server/src/api.rs index a9df1bd..fb5ee88 100644 --- a/server/src/api.rs +++ b/server/src/api.rs @@ -3,11 +3,14 @@ which is licensed under the GNU Affero General Public License (version 3); see /COPYING. Copyright (C) 2025 metamuffin */ -use super::ui::{account::login_logic, error::MyResult}; -use crate::database::Database; +use super::ui::error::MyResult; +use crate::{database::Database, helper::A}; use jellybase::assetfed::AssetInner; use jellycommon::{user::CreateSessionParams, NodeID, Visibility}; -use jellylogic::session::{AdminSession, Session}; +use jellylogic::{ + login::login_logic, + session::{AdminSession, Session}, +}; use rocket::{ get, http::MediaType, @@ -47,13 +50,13 @@ pub fn r_api_account_login( } #[get("/api/asset_token_raw/")] -pub fn r_api_asset_token_raw(_admin: AdminSession, token: &str) -> MyResult> { +pub fn r_api_asset_token_raw(_admin: A, token: &str) -> MyResult> { Ok(Json(AssetInner::deser(token)?)) } #[get("/api/nodes_modified?")] pub fn r_api_nodes_modified_since( - _session: Session, + _session: A, database: &State, since: u64, ) -> MyResult>> { -- cgit v1.2.3-70-g09d2