Mirrors/chatmail-core
1
0
Fork 0
mirror of https://github.com/chatmail/core.git synced 2026-04-28 02:46:29 +03:00
Code Issues Packages Projects Releases Wiki Activity

Update reqwest to 0.10.0

Browse Source
This commit is contained in:
Alexander Krotov
2020-01-09 11:09:29 +03:00
parent 02bb41697d
commit 43e0109d44
4 changed files with 240 additions and 307 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/configure/read_url.rs
View File

@@ -11,10 +11,10 @@ pub type Result<T> = std::result::Result<T, Error>;
pub fn read_url(context: &Context, url: &str) -> Result<String> {
info!(context, "Requesting URL {}", url);
match reqwest::Client::new()
match reqwest::blocking::Client::new()
.get(url)
.send()
.and_then(|mut res| res.text())
.and_then(|res| res.text())
{
Ok(res) => Ok(res),
Err(err) => {

8
src/oauth2.rs
View File

@@ -154,7 +154,7 @@ pub fn dc_get_oauth2_access_token(
}
// ... and POST
let response = reqwest::Client::new()
let response = reqwest::blocking::Client::new()
.post(post_url)
.form(&post_param)
.send();
@@ -165,7 +165,7 @@ pub fn dc_get_oauth2_access_token(
);
return None;
}
let mut response = response.unwrap();
let response = response.unwrap();
if !response.status().is_success() {
warn!(
context,
@@ -291,12 +291,12 @@ impl Oauth2 {
// "verified_email": true,
// "picture": "https://lh4.googleusercontent.com/-Gj5jh_9R0BY/AAAAAAAAAAI/AAAAAAAAAAA/IAjtjfjtjNA/photo.jpg"
// }
let response = reqwest::Client::new().get(&userinfo_url).send();
let response = reqwest::blocking::Client::new().get(&userinfo_url).send();
if response.is_err() {
warn!(context, "Error getting userinfo: {:?}", response);
return None;
}
let mut response = response.unwrap();
let response = response.unwrap();
if !response.status().is_success() {
warn!(context, "Error getting userinfo: {:?}", response.status());
return None;