bumped all dependencies

iLert · Nov 1, 2021 · 6ff476c · 6ff476c
1 parent a321328
commit 6ff476c
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 19 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -13,10 +13,10 @@ repository = "https://github.com/iLert/ilert-rust"
 categories = ["api-bindings"]
 
 [dependencies]
-reqwest = "0.9.22"
-base64 = "0.12.3"
+reqwest = { version = "0.11", features = ["blocking", "json"] }
+base64 = "0.13.0"
 serde = "1.0"
 serde_json = "1.0"
 serde_derive = "1.0"
-log = "0.4.8"
-env_logger = "0.7.1"
+log = "0.4.14"
+env_logger = "0.9.0"
diff --git a/src/ilert.rs b/src/ilert.rs
@@ -1,4 +1,6 @@
-use reqwest::{Client, RedirectPolicy};
+use reqwest::blocking::Client;
+use reqwest::redirect::Policy;
+use reqwest::ClientBuilder;
 use reqwest::header;
 use std::time::Duration;
 use log::{debug};
@@ -61,10 +63,9 @@ impl ILert {
     fn get_http_client(timeout_sec: u64) -> reqwest::Result<Client> {
 
         let headers = ILert::get_default_headers();
-        let http_client_result = reqwest::Client::builder()
-            .gzip(true)
+        let http_client_result = reqwest::blocking::Client::builder()
             .timeout(Duration::from_secs(timeout_sec))
-            .redirect(RedirectPolicy::none())
+            .redirect(Policy::none())
             .default_headers(headers)
             .build();
 

diff --git a/src/ilert_builders.rs b/src/ilert_builders.rs
@@ -282,15 +282,17 @@ impl BaseRequestExecutor for GetRequestBuilder<'_> {
             },
         };
 
-        let body_result = response.text();
-        let body_raw = match body_result {
-            Ok(value) => Some(value),
+        let response_status = response.status().clone();
+        let response_headers = response.headers().clone();
+
+        let body_raw = match response.text() {
+            Ok(value) => Some(value.clone()),
             Err(_) => None,
         };
 
         let body_json = match body_raw.clone() {
             Some(raw_value) =>
-                match response.headers().get("content-type") {
+                match response_headers.get("content-type") {
                     Some(ct_value) =>
                         if ct_value.eq(&"application/json") {
                             let parsed_json_result = serde_json::from_str(raw_value.as_str());
@@ -310,8 +312,8 @@ impl BaseRequestExecutor for GetRequestBuilder<'_> {
 
         Ok(BaseRequestResult::new(
             url,
-            response.status(),
-            response.headers().clone(),
+            response_status,
+            response_headers,
             body_raw,
             body_json,
         ))
@@ -404,15 +406,17 @@ impl BaseRequestExecutor for PostRequestBuilder<'_> {
             },
         };
 
-        let body_result = response.text();
-        let body_raw = match body_result {
+        let response_status = response.status().clone();
+        let response_headers = response.headers().clone();
+
+        let body_raw = match response.text() {
             Ok(value) => Some(value),
             Err(_) => None,
         };
 
         let body_json = match body_raw.clone() {
             Some(raw_value) =>
-                match response.headers().get("content-type") {
+                match response_headers.get("content-type") {
                     Some(ct_value) =>
                         if ct_value.eq(&"application/json") {
                             let parsed_json_result = serde_json::from_str(raw_value.as_str());
@@ -432,8 +436,8 @@ impl BaseRequestExecutor for PostRequestBuilder<'_> {
 
         Ok(BaseRequestResult::new(
             url,
-            response.status(),
-            response.headers().clone(),
+            response_status,
+            response_headers,
             body_raw,
             body_json,
         ))