Skip to content

Commit

Permalink
Merge branch 'release/0.0.18'
Browse files Browse the repository at this point in the history
  • Loading branch information
@Razican
Razican committed Sep 2, 2016
2 parents 2c9b7f3 + 7efc4b6 commit fb40ab9
Show file tree
Hide file tree
Showing 3 changed files with 226 additions and 57 deletions.
2 changes: 1 addition & 1 deletion Cargo.toml
View file
@@ -1,6 +1,6 @@
[package]
name = "fractal-api"
version = "0.0.17"
version = "0.0.18"
authors = [
"Iban Eguia <iban@fractal.global>",
"Eric Remigino <eric@fractal.global>",
Expand Down
106 changes: 53 additions & 53 deletions src/lib.rs
View file
Expand Up @@ -114,7 +114,7 @@ impl ClientV1 {
match response.status {
StatusCode::Ok => {
let mut response_str = String::new();
try!(response.read_to_string(&mut response_str));
let _ = try!(response.read_to_string(&mut response_str));
Ok(try!(AccessToken::from_dto(try!(json::decode(&response_str)))))
}
StatusCode::Unauthorized => Err(Error::Unauthorized),
Expand All @@ -140,7 +140,7 @@ impl ClientV1 {
match response.status {
StatusCode::Ok => {
let mut response_str = String::new();
try!(response.read_to_string(&mut response_str));
let _ = try!(response.read_to_string(&mut response_str));
let dto_users: Vec<UserDTO> = try!(json::decode(&response_str));
Ok(dto_users.into_iter()
.filter_map(|u| match User::from_dto(u) {
Expand All @@ -152,7 +152,7 @@ impl ClientV1 {
StatusCode::Unauthorized => Err(Error::Unauthorized),
StatusCode::Accepted => {
let mut response_str = String::new();
try!(response.read_to_string(&mut response_str));
let _ = try!(response.read_to_string(&mut response_str));
match json::decode::<ResponseDTO>(&response_str) {
Ok(r) => Err(Error::ClientError(r)),
Err(e) => Err(e.into()),
Expand Down Expand Up @@ -180,14 +180,14 @@ impl ClientV1 {
match response.status {
StatusCode::Ok => {
let mut response_str = String::new();
try!(response.read_to_string(&mut response_str));
let _ = try!(response.read_to_string(&mut response_str));
let transactions: Vec<Transaction> = try!(json::decode(&response_str));
Ok(transactions.into_iter().collect())
}
StatusCode::Unauthorized => Err(Error::Unauthorized),
StatusCode::Accepted => {
let mut response_str = String::new();
try!(response.read_to_string(&mut response_str));
let _ = try!(response.read_to_string(&mut response_str));
match json::decode::<ResponseDTO>(&response_str) {
Ok(r) => Err(Error::ClientError(r)),
Err(e) => Err(e.into()),
Expand Down Expand Up @@ -237,7 +237,7 @@ impl ClientV1 {
StatusCode::Unauthorized => Err(Error::Unauthorized),
StatusCode::Accepted => {
let mut response_str = String::new();
try!(response.read_to_string(&mut response_str));
let _ = try!(response.read_to_string(&mut response_str));
match json::decode::<ResponseDTO>(&response_str) {
Ok(r) => Err(Error::ClientError(r)),
Err(e) => Err(e.into()),
Expand Down Expand Up @@ -273,13 +273,13 @@ impl ClientV1 {
match response.status {
StatusCode::Ok => {
let mut response_str = String::new();
try!(response.read_to_string(&mut response_str));
let _ = try!(response.read_to_string(&mut response_str));
Ok(try!(AccessToken::from_dto(try!(json::decode(&response_str)))))
}
StatusCode::Unauthorized => Err(Error::Unauthorized),
StatusCode::Accepted => {
let mut response_str = String::new();
try!(response.read_to_string(&mut response_str));
let _ = try!(response.read_to_string(&mut response_str));
match json::decode::<ResponseDTO>(&response_str) {
Ok(r) => Err(Error::ClientError(r)),
Err(e) => Err(e.into()),
Expand Down Expand Up @@ -359,28 +359,28 @@ impl ClientV1 {
.get(&format!("{}user/{}", self.url, user_id))
.headers(headers)
.send());
match response.status {
StatusCode::Ok => {
let mut response_str = String::new();
try!(response.read_to_string(&mut response_str));
match json::decode::<User>(&response_str) {
Ok(user) => Ok(user),
Err(e) => Err(e.into()),
}
},
StatusCode::Accepted => {
let mut response_str = String::new();
try!(response.read_to_string(&mut response_str));
match json::decode::<ResponseDTO>(&response_str) {
Ok(r) => Err(Error::ClientError(r)),
Err(e) => Err(e.into()),
}
match response.status {
StatusCode::Ok => {
let mut response_str = String::new();
let _ = try!(response.read_to_string(&mut response_str));
match json::decode::<User>(&response_str) {
Ok(user) => Ok(user),
Err(e) => Err(e.into()),
}
}
StatusCode::Accepted => {
let mut response_str = String::new();
let _ = try!(response.read_to_string(&mut response_str));
match json::decode::<ResponseDTO>(&response_str) {
Ok(r) => Err(Error::ClientError(r)),
Err(e) => Err(e.into()),
}
StatusCode::Unauthorized => Err(Error::Unauthorized),
_ => Err(Error::ServerError),
}
} else {
Err(Error::Unauthorized)
StatusCode::Unauthorized => Err(Error::Unauthorized),
_ => Err(Error::ServerError),
}
} else {
Err(Error::Unauthorized)
}
}

Expand All @@ -397,35 +397,35 @@ impl ClientV1 {
for scope in access_token.scopes() {
match scope {
&Scope::User(id) => user_id = id,
_ => {},
_ => {}
}
}
let mut response = try!(self.client
.get(&format!("{}user/{}", self.url, user_id))
.headers(headers)
.send());
match response.status {
StatusCode::Ok => {
let mut response_str = String::new();
try!(response.read_to_string(&mut response_str));
match json::decode::<User>(&response_str) {
Ok(user) => Ok(user),
Err(e) => Err(e.into()),
}
},
StatusCode::Accepted => {
let mut response_str = String::new();
try!(response.read_to_string(&mut response_str));
match json::decode::<ResponseDTO>(&response_str) {
Ok(r) => Err(Error::ClientError(r)),
Err(e) => Err(e.into()),
}
match response.status {
StatusCode::Ok => {
let mut response_str = String::new();
let _ = try!(response.read_to_string(&mut response_str));
match json::decode::<User>(&response_str) {
Ok(user) => Ok(user),
Err(e) => Err(e.into()),
}
}
StatusCode::Accepted => {
let mut response_str = String::new();
let _ = try!(response.read_to_string(&mut response_str));
match json::decode::<ResponseDTO>(&response_str) {
Ok(r) => Err(Error::ClientError(r)),
Err(e) => Err(e.into()),
}
StatusCode::Unauthorized => Err(Error::Unauthorized),
_ => Err(Error::ServerError),
}
} else {
Err(Error::Unauthorized)
StatusCode::Unauthorized => Err(Error::Unauthorized),
_ => Err(Error::ServerError),
}
} else {
Err(Error::Unauthorized)
}
}

Expand Down Expand Up @@ -453,7 +453,7 @@ impl ClientV1 {
StatusCode::Ok => Ok(()),
StatusCode::Accepted => {
let mut response_str = String::new();
try!(response.read_to_string(&mut response_str));
let _ = try!(response.read_to_string(&mut response_str));
match json::decode::<ResponseDTO>(&response_str) {
Ok(r) => Err(Error::ClientError(r)),
Err(e) => Err(e.into()),
Expand Down Expand Up @@ -894,7 +894,7 @@ impl ClientV1 {
StatusCode::Unauthorized => Err(Error::Unauthorized),
StatusCode::Accepted => {
let mut response_str = String::new();
try!(response.read_to_string(&mut response_str));
let _ = try!(response.read_to_string(&mut response_str));
match json::decode::<ResponseDTO>(&response_str) {
Ok(r) => Err(Error::ClientError(r)),
Err(e) => Err(e.into()),
Expand Down Expand Up @@ -939,12 +939,12 @@ impl ClientV1 {
StatusCode::Ok => Ok(()),
StatusCode::Unauthorized => {
let mut response_str = String::new();
try!(response.read_to_string(&mut response_str));
let _ = try!(response.read_to_string(&mut response_str));
Err(Error::Unauthorized)
}
StatusCode::Accepted => {
let mut response_str = String::new();
try!(response.read_to_string(&mut response_str));
let _ = try!(response.read_to_string(&mut response_str));
match json::decode::<ResponseDTO>(&response_str) {
Ok(r) => Err(Error::ClientError(r)),
Err(e) => Err(e.into()),
Expand Down

0 comments on commit fb40ab9

Please sign in to comment.