OMGeeky/yup-oauth2
1
0
Fork 0
mirror of https://github.com/OMGeeky/yup-oauth2.git synced 2026-01-23 02:18:53 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix(ServiceAccount): Make cache behavior more intuitive.

Browse Source 
Now the cache is only checked for a token when the future is polled, not
at future creation time.

This also allows for reverting c2b41c3.
This commit is contained in:
Lewin Bormann
2019-06-21 18:39:51 +02:00
parent e0f3298904
commit c321f6d2e6
2 changed files with 51 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

75
src/service_account.rs
View File

@@ -333,43 +333,56 @@ where
T: AsRef<str> + Ord + 'b,
I: Iterator<Item = &'b T>,
{
let (hash, scps) = hash_scopes(scopes);
let (hash, scps0) = hash_scopes(scopes);
let cache = self.cache.clone();
let scps = scps0.clone();
match self
.cache
.lock()
.unwrap()
.get(hash, &scps.iter().map(|s| s.as_str()).collect())
{
Ok(Some(token)) => {
if !token.expired() {
return Box::new(future::ok(token));
let cache_lookup = futures::lazy(move || {
match cache
.lock()
.unwrap()
.get(hash, &scps.iter().map(|s| s.as_str()).collect())
{
Ok(Some(token)) => {
if !token.expired() {
return Ok(token);
}
return Err(Box::new(StringError::new("expired token in cache", None))
as Box<dyn error::Error + Send>);
}
Err(e) => return Err(Box::new(e) as Box<dyn error::Error + Send>),
Ok(None) => {
return Err(Box::new(StringError::new("no token in cache", None))
as Box<dyn error::Error + Send>)
}
}
Err(e) => return Box::new(future::err(Box::new(e) as Box<dyn error::Error + Send>)),
_ => {}
}
});
let cache = self.cache.clone();
Box::new(
Self::request_token(
self.client.clone(),
self.sub.clone(),
self.key.clone(),
scps.iter().map(|s| s.to_string()).collect(),
)
.then(move |r| match r {
Ok(token) => {
let _ = cache.lock().unwrap().set(
hash,
&scps.iter().map(|s| s.as_str()).collect(),
Some(token.clone()),
);
Box::new(future::ok(token))
}
Err(e) => Box::new(future::err(e)),
}),
let req_token = Self::request_token(
self.client.clone(),
self.sub.clone(),
self.key.clone(),
scps0.iter().map(|s| s.to_string()).collect(),
)
.then(move |r| match r {
Ok(token) => {
let _ = cache.lock().unwrap().set(
hash,
&scps0.iter().map(|s| s.as_str()).collect(),
Some(token.clone()),
);
Box::new(future::ok(token))
}
Err(e) => Box::new(future::err(e)),
});
Box::new(cache_lookup.then(|r| match r {
Ok(t) => Box::new(Ok(t).into_future())
as Box<dyn Future<Item = Token, Error = Box<dyn error::Error + Send>> + Send>,
Err(_) => Box::new(req_token)
as Box<dyn Future<Item = Token, Error = Box<dyn error::Error + Send>> + Send>,
}))
}
/// Returns an empty ApplicationSecret as tokens for service accounts don't need to be