mirror of
https://github.com/TECHNOFAB11/jwt-authorizer.git
synced 2026-02-02 09:25:09 +01:00
fix: merge errors
This commit is contained in:
parent
9054f400dc
commit
e409bee3b3
1 changed files with 12 additions and 7 deletions
|
|
@ -11,15 +11,15 @@ use std::future::Future;
|
||||||
use std::pin::Pin;
|
use std::pin::Pin;
|
||||||
use std::sync::Arc;
|
use std::sync::Arc;
|
||||||
use std::task::{Context, Poll};
|
use std::task::{Context, Poll};
|
||||||
|
use tower_cookies::Cookies;
|
||||||
use tower_layer::Layer;
|
use tower_layer::Layer;
|
||||||
use tower_service::Service;
|
use tower_service::Service;
|
||||||
use tower_cookies::Cookies;
|
|
||||||
|
|
||||||
use crate::authorizer::{Authorizer, FnClaimsChecker, KeySourceType};
|
use crate::authorizer::{Authorizer, FnClaimsChecker, KeySourceType};
|
||||||
use crate::error::InitError;
|
use crate::error::InitError;
|
||||||
use crate::jwks::key_store_manager::Refresh;
|
use crate::jwks::key_store_manager::Refresh;
|
||||||
use crate::validation::Validation;
|
use crate::validation::Validation;
|
||||||
use crate::{AuthError, layer, RefreshStrategy};
|
use crate::{layer, AuthError, RefreshStrategy};
|
||||||
|
|
||||||
/// Authorizer Layer builder
|
/// Authorizer Layer builder
|
||||||
///
|
///
|
||||||
|
|
@ -81,6 +81,7 @@ where
|
||||||
refresh: Default::default(),
|
refresh: Default::default(),
|
||||||
claims_checker: None,
|
claims_checker: None,
|
||||||
validation: None,
|
validation: None,
|
||||||
|
jwt_source: JwtSource::Bearer,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -102,6 +103,7 @@ where
|
||||||
refresh: Default::default(),
|
refresh: Default::default(),
|
||||||
claims_checker: None,
|
claims_checker: None,
|
||||||
validation: None,
|
validation: None,
|
||||||
|
jwt_source: JwtSource::Bearer,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -123,6 +125,7 @@ where
|
||||||
refresh: Default::default(),
|
refresh: Default::default(),
|
||||||
claims_checker: None,
|
claims_checker: None,
|
||||||
validation: None,
|
validation: None,
|
||||||
|
jwt_source: JwtSource::Bearer,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -219,7 +222,9 @@ where
|
||||||
if let Some(c) = request.extensions().get::<Cookies>() {
|
if let Some(c) = request.extensions().get::<Cookies>() {
|
||||||
c.get(name.as_str()).and_then(|c| Some(String::from(c.value())))
|
c.get(name.as_str()).and_then(|c| Some(String::from(c.value())))
|
||||||
} else {
|
} else {
|
||||||
tracing::warn!("You have to add the tower_cookies::CookieManagerLayer middleware to use Cookies as JWT source.");
|
tracing::warn!(
|
||||||
|
"You have to add the tower_cookies::CookieManagerLayer middleware to use Cookies as JWT source."
|
||||||
|
);
|
||||||
None
|
None
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue