tsk-211: Fix SQL error when checking queue #217

Merged
kdeng00 merged 5 commits from tsk-211 into main 2025-10-22 21:42:19 -04:00
Showing only changes of commit db17fdc0c5 - Show all commits
+2 -10
View File
@@ -67,8 +67,6 @@ pub async fn auth<B>(
req: Request<axum::body::Body>, req: Request<axum::body::Body>,
next: Next, next: Next,
) -> Result<impl IntoResponse, (StatusCode, Json<ErrorResponse>)> { ) -> Result<impl IntoResponse, (StatusCode, Json<ErrorResponse>)> {
println!("Cookie: {cookie_jar:?}");
let token = cookie_jar let token = cookie_jar
.get("token") .get("token")
.map(|cookie| cookie.value().to_string()) .map(|cookie| cookie.value().to_string())
@@ -76,10 +74,7 @@ pub async fn auth<B>(
req.headers() req.headers()
.get(axum::http::header::AUTHORIZATION) .get(axum::http::header::AUTHORIZATION)
.and_then(|auth_header| auth_header.to_str().ok()) .and_then(|auth_header| auth_header.to_str().ok())
.and_then(|auth_value| { .and_then(|auth_value| auth_value.strip_prefix("Bearer ").map(String::from))
println!("Auth value: {auth_value:?}");
auth_value.strip_prefix("Bearer ").map(String::from)
})
}); });
let token = token.ok_or_else(|| { let token = token.ok_or_else(|| {
@@ -94,9 +89,8 @@ pub async fn auth<B>(
let mut validation = Validation::new(jsonwebtoken::Algorithm::HS256); let mut validation = Validation::new(jsonwebtoken::Algorithm::HS256);
validation.set_audience(&["icarus"]); // Must match exactly what's in the token validation.set_audience(&["icarus"]); // Must match exactly what's in the token
let claims = decode::<UserClaims>( let _claims = decode::<UserClaims>(
&token, &token,
// TODO: Replace with code to get secret from env
&DecodingKey::from_secret(secret_key.as_ref()), &DecodingKey::from_secret(secret_key.as_ref()),
&validation, &validation,
) )
@@ -110,7 +104,5 @@ pub async fn auth<B>(
})? })?
.claims; .claims;
println!("Claims: {claims:?}");
Ok(next.run(req).await) Ok(next.run(req).await)
} }