diff --git a/jwt-authorizer/src/layer.rs b/jwt-authorizer/src/layer.rs index bad0b31..3a8e36b 100644 --- a/jwt-authorizer/src/layer.rs +++ b/jwt-authorizer/src/layer.rs @@ -275,7 +275,7 @@ where .and_then(|c| c.get(name.as_str()).map(String::from)), }; - let authorizers: Vec>> = self.auths.iter().map(|a| a.clone()).collect(); + let authorizers: Vec>> = self.auths.iter().cloned().collect(); Box::pin(async move { if let Some(token) = token_o { @@ -292,12 +292,12 @@ where // services down the stack. request.extensions_mut().insert(tdata); - return Ok(request); + Ok(request) } - Err(err) => return Err(err), // TODO: error containing all errors (not just the last one) + Err(err) => Err(err), // TODO: error containing all errors (not just the last one) } } else { - return Err(AuthError::MissingToken()); + Err(AuthError::MissingToken()) } }) } @@ -398,7 +398,7 @@ where pub fn new(inner: S, auths: Vec>>, jwt_source: JwtSource) -> AsyncAuthorizationService { Self { inner, - auths: auths, + auths, jwt_source, } } diff --git a/jwt-authorizer/tests/integration_tests.rs b/jwt-authorizer/tests/integration_tests.rs index a9ac2ef..36b7704 100644 --- a/jwt-authorizer/tests/integration_tests.rs +++ b/jwt-authorizer/tests/integration_tests.rs @@ -11,7 +11,7 @@ use std::{ use axum::{response::Response, routing::get, Json, Router}; use http::{header::AUTHORIZATION, Request, StatusCode}; use hyper::Body; -use jwt_authorizer::{JwtAuthorizer, JwtClaims, Refresh, RefreshStrategy}; +use jwt_authorizer::{JwtAuthorizer, JwtClaims, Refresh, RefreshStrategy, ToAuthorizationLayer}; use lazy_static::lazy_static; use serde::{Deserialize, Serialize}; use serde_json::Value; @@ -104,7 +104,7 @@ async fn app(jwt_auth: JwtAuthorizer) -> Router { let protected_route: Router = Router::new() .route("/protected", get(protected_handler)) .route("/protected-with-user", get(protected_with_user)) - .layer(jwt_auth.layer().await.unwrap()); + .layer(jwt_auth.to_layer().await.unwrap()); Router::new().merge(pub_route).merge(protected_route) }