From 562487b2387f28226d7467513c28973bc36b276b Mon Sep 17 00:00:00 2001 From: Allen Date: Fri, 18 Feb 2022 17:32:52 -0800 Subject: [PATCH] cleanup --- src/handlers/login.rs | 37 +++++++++++++++++++------------------ src/main.rs | 9 ++------- 2 files changed, 21 insertions(+), 25 deletions(-) diff --git a/src/handlers/login.rs b/src/handlers/login.rs index 4187899..753ae76 100644 --- a/src/handlers/login.rs +++ b/src/handlers/login.rs @@ -122,25 +122,26 @@ pub(crate) async fn logout( TypedHeader(cookie): TypedHeader, state: Extension>, ) -> Result, MixiniError> { - if let Some(sessid) = cookie.get(SESSION_COOKIE_NAME) { - let prefixed_key = format!("{}{}", SESSION_KEY_PREFIX, sessid); - state.redis_manager.to_owned().del(&prefixed_key).await?; - Ok(Response::builder() + match cookie.get(SESSION_COOKIE_NAME) { + Some(sessid) => { + let prefixed_key = format!("{}{}", SESSION_KEY_PREFIX, sessid); + state.redis_manager.to_owned().del(&prefixed_key).await?; + Ok(Response::builder() + .status(StatusCode::OK) + .header( + header::SET_COOKIE, + format!( + "{cname}=expired; Secure; HttpOnly; Domain={domain}; Max-Age=-1", + cname = SESSION_COOKIE_NAME, + domain = *DOMAIN, + ), + ) + .body(Body::empty()) + .unwrap()) + } + None => Ok(Response::builder() .status(StatusCode::OK) - .header( - header::SET_COOKIE, - format!( - "{cname}=expired; Secure; HttpOnly; Domain={domain}; Max-Age=-1", - cname = SESSION_COOKIE_NAME, - domain = *DOMAIN, - ), - ) .body(Body::empty()) - .unwrap()) - } else { - Ok(Response::builder() - .status(StatusCode::OK) - .body(Body::empty()) - .unwrap()) + .unwrap()), } } diff --git a/src/main.rs b/src/main.rs index 31db254..503715a 100644 --- a/src/main.rs +++ b/src/main.rs @@ -17,7 +17,7 @@ pub(crate) mod utils; pub(crate) const DEV_BUILD: bool = cfg!(debug_assertions); #[tokio::main] -async fn main() -> Result<(), anyhow::Result<()>> { +async fn main() -> anyhow::Result<()> { if DEV_BUILD { dotenv::dotenv().ok(); } else { @@ -28,10 +28,5 @@ async fn main() -> Result<(), anyhow::Result<()>> { std::env::set_var("RUST_LOG", "mixini_server=debug,tower_http=debug") } tracing_subscriber::fmt::init(); - - if let Err(err) = server::run().await { - eprintln!("Error: {}", err); - std::process::exit(1); - } - Ok(()) + server::run().await }