diff options
Diffstat (limited to 'src/types/extract.rs')
-rw-r--r-- | src/types/extract.rs | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/src/types/extract.rs b/src/types/extract.rs index af30d3f..50c413b 100644 --- a/src/types/extract.rs +++ b/src/types/extract.rs @@ -4,14 +4,14 @@ use axum::{ async_trait, body::HttpBody, extract::{FromRequest, FromRequestParts}, - headers::Cookie, http::{request::Parts, Request}, response::Response, - BoxError, RequestExt, TypedHeader, + BoxError, RequestExt, }; use axum_client_ip::ClientIp; use bytes::Bytes; use serde::de::DeserializeOwned; +use tower_cookies::Cookies; use crate::{ admin, console, @@ -32,7 +32,7 @@ where type Rejection = Response; async fn from_request_parts(parts: &mut Parts, state: &S) -> Result<Self> { - let Ok(Some(cookies)) = Option::<TypedHeader<Cookie>>::from_request_parts(parts, state).await else { + let Ok(Some(cookies)) = Option::<Cookies>::from_request_parts(parts, state).await else { return Err(ResponseCode::Forbidden.text("No cookies provided")) }; @@ -40,7 +40,7 @@ where return Err(ResponseCode::Forbidden.text("No auth token provided")) }; - let Ok(session) = Session::from_token(token) else { + let Ok(session) = Session::from_token(token.value()) else { return Err(ResponseCode::Unauthorized.text("Auth token invalid")) }; @@ -63,7 +63,7 @@ where type Rejection = Response; async fn from_request_parts(parts: &mut Parts, state: &S) -> Result<Self> { - let Ok(Some(cookies)) = Option::<TypedHeader<Cookie>>::from_request_parts(parts, state).await else { + let Ok(Some(cookies)) = Option::<Cookies>::from_request_parts(parts, state).await else { return Err(ResponseCode::Forbidden.text("No cookies provided")) }; @@ -71,11 +71,9 @@ where return Err(ResponseCode::Forbidden.text("No admin secret provided")) }; - println!("{secret}"); - let check = admin::get_secret().await; - if check != secret { + if check != secret.value() { return Err(ResponseCode::Unauthorized.text("Auth token invalid")); } |