From 2f48c42677adf59d4ec8360a2de4da3a3668e5e3 Mon Sep 17 00:00:00 2001 From: Samuel Lorch Date: Wed, 25 Oct 2023 19:02:20 +0200 Subject: [PATCH] Pass AppState instead of Session State --- src/main.rs | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/main.rs b/src/main.rs index 678c8f3..24f80cb 100644 --- a/src/main.rs +++ b/src/main.rs @@ -26,20 +26,18 @@ async fn main() { // TODO Check Config Manager Setup Error let config_manager = ConfigManager::new().unwrap(); - let session_state = SessionState { - sessions: Arc::new(RwLock::new(HashMap::new())), - }; - let app_state = AppState { config_manager, - session_state: session_state.clone(), + session_state: SessionState { + sessions: Arc::new(RwLock::new(HashMap::new())), + }, }; // Note: The Router Works Bottom Up, So the auth middleware will only applies to everything above it. let main_router = Router::new() .merge(web::rpc::routes()) .layer(middleware::from_fn_with_state( - session_state, + app_state.clone(), web::auth::mw_auth, )) .merge(web::auth::routes())