From b48af7e211759b463eb61d17f82f53f1d14412df Mon Sep 17 00:00:00 2001 From: Andras Schmelczer Date: Tue, 25 Mar 2025 22:26:57 +0000 Subject: [PATCH] Minor changes --- backend/sync_server/src/main.rs | 11 +++-------- backend/sync_server/src/server/auth.rs | 3 ++- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/backend/sync_server/src/main.rs b/backend/sync_server/src/main.rs index 2b8abccd..5ddd45bc 100644 --- a/backend/sync_server/src/main.rs +++ b/backend/sync_server/src/main.rs @@ -1,7 +1,7 @@ +mod app_state; mod cli; mod config; mod consts; -mod database; mod errors; mod server; mod utils; @@ -20,13 +20,8 @@ async fn main() -> Result<(), SyncServerError> { tracing_subscriber::registry() .with( - tracing_subscriber::EnvFilter::try_from_default_env().unwrap_or_else(|_| { - format!( - "{}=debug,tower_http=debug,axum::rejection=trace", - env!("CARGO_CRATE_NAME") - ) - .into() - }), + tracing_subscriber::EnvFilter::try_from_default_env() + .unwrap_or_else(|_| format!("{}=debug", env!("CARGO_CRATE_NAME")).into()), ) .with(tracing_subscriber::fmt::layer()) .try_init() diff --git a/backend/sync_server/src/server/auth.rs b/backend/sync_server/src/server/auth.rs index 9c73070c..ae20e187 100644 --- a/backend/sync_server/src/server/auth.rs +++ b/backend/sync_server/src/server/auth.rs @@ -1,9 +1,10 @@ -use super::app_state::AppState; use crate::{ + app_state::AppState, config::user_config::User, errors::{SyncServerError, unauthorized_error}, }; +// TODO: turn this into a middleware pub fn auth(app_state: &AppState, token: &str) -> Result { app_state .config