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

rustfmt not passing

Browse Source
This commit is contained in:
Andrey Cizov
2019-08-01 19:56:28 +01:00
parent 6cac8f5a06
commit 9b4a3ad3f4
1 changed files with 31 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
src/storage.rs
View File

@@ -95,22 +95,21 @@ impl MemoryStorage {
impl TokenStorage for MemoryStorage {
type Error = NullError;
fn set(&mut self,
scope_hash: u64,
scopes: &Vec<&str>,
token: Option<Token>)
-> Result<(), NullError> {
fn set(
&mut self,
scope_hash: u64,
scopes: &Vec<&str>,
token: Option<Token>,
) -> Result<(), NullError> {
match token {
Some(t) => {
self.tokens.push(
JSONToken {
hash: scope_hash,
scopes: Some(scopes.iter().map(|x| x.to_string()).collect()),
token: t.clone(),
}
);
self.tokens.push(JSONToken {
hash: scope_hash,
scopes: Some(scopes.iter().map(|x| x.to_string()).collect()),
token: t.clone(),
});
()
},
}
None => {
let matched = self.tokens.iter().find_position(|x| x.hash == scope_hash);
if let Some((idx, _)) = matched {
@@ -126,7 +125,10 @@ impl TokenStorage for MemoryStorage {
for t in &self.tokens {
if let Some(token_scopes) = &t.scopes {
let matched = token_scopes.iter().filter(|x| scopes.contains(&&&x[..])).count();
let matched = token_scopes
.iter()
.filter(|x| scopes.contains(&&&x[..]))
.count();
if matched >= scopes.len() {
return Result::Ok(Some(t.token.clone()));
}
@@ -227,11 +229,12 @@ impl DiskTokenStorage {
impl TokenStorage for DiskTokenStorage {
type Error = io::Error;
fn set(&mut self,
scope_hash: u64,
scopes: &Vec<&str>,
token: Option<Token>)
-> Result<(), Self::Error> {
fn set(
&mut self,
scope_hash: u64,
scopes: &Vec<&str>,
token: Option<Token>,
) -> Result<(), Self::Error> {
match token {
None => {
let matched = self.tokens.iter().find_position(|x| x.hash == scope_hash);
@@ -241,13 +244,11 @@ impl TokenStorage for DiskTokenStorage {
()
}
Some(t) => {
self.tokens.push(
JSONToken {
hash: scope_hash,
scopes: Some(scopes.iter().map(|x| x.to_string()).collect()),
token: t.clone(),
}
);
self.tokens.push(JSONToken {
hash: scope_hash,
scopes: Some(scopes.iter().map(|x| x.to_string()).collect()),
token: t.clone(),
});
()
}
}
@@ -258,7 +259,10 @@ impl TokenStorage for DiskTokenStorage {
for t in &self.tokens {
if let Some(token_scopes) = &t.scopes {
let matched = token_scopes.iter().filter(|x| scopes.contains(&&&x[..])).count();
let matched = token_scopes
.iter()
.filter(|x| scopes.contains(&&&x[..]))
.count();
// we may have some of the tokens as denormalized (many namespaces repeated)
if matched >= scopes.len() {
return Result::Ok(Some(t.token.clone()));