Merge branch 'collinsmuriuki:master' into master

kodesoul · Jan 8, 2022 · 6cdbf86 · 6cdbf86
2 parents add32f7 + 0cd303a
commit 6cdbf86
Show file tree

Hide file tree

Showing 8 changed files with 42 additions and 21 deletions.
diff --git a/.github/workflows/general.yml b/.github/workflows/general.yml
@@ -22,6 +22,7 @@ jobs:
       - uses: actions-rs/cargo@v1
         with:
           command: test
+          args: --no-fail-fast
 
   fmt:
     name: Rustfmt
@@ -72,4 +73,4 @@ jobs:
       - name: Run cargo-tarpaulin
         uses: actions-rs/[email protected]
         with:
-          args: '--ignore-tests'
+          args: '--ignore-tests --no-fail-fast'
diff --git a/mpesa_core/src/client.rs b/mpesa_core/src/client.rs
@@ -1,8 +1,8 @@
 use super::environment::Environment;
 use super::services::{
     AccountBalanceBuilder, B2bBuilder, B2cBuilder, C2bRegisterBuilder, C2bSimulateBuilder,
+    MpesaExpressRequestBuilder,
 };
-use crate::services::MpesaExpressRequestBuilder;
 use crate::MpesaSecurity;
 use mpesa_derive::*;
 use reqwest::blocking::Client;
@@ -19,6 +19,7 @@ pub struct Mpesa {
     client_secret: String,
     initiator_password: RefCell<Option<String>>,
     environment: Environment,
+    pub(crate) http_client: Client,
 }
 
 impl<'a> Mpesa {
@@ -33,11 +34,17 @@ impl<'a> Mpesa {
     /// );
     /// ```
     pub fn new(client_key: String, client_secret: String, environment: Environment) -> Self {
+        let http_client = Client::builder()
+            .connect_timeout(std::time::Duration::from_millis(10000))
+            .build()
+            // TODO: Potentialy return a `Result` enum from Mpesa::new?
+            .expect("Error building http client");
         Self {
             client_key,
             client_secret,
             initiator_password: RefCell::new(None),
             environment,
+            http_client,
         }
     }
 
@@ -94,7 +101,8 @@ impl<'a> Mpesa {
             "{}/oauth/v1/generate?grant_type=client_credentials",
             self.environment.base_url()
         );
-        let resp = Client::new()
+        let resp = self
+            .http_client
             .get(&url)
             .basic_auth(&self.client_key, Some(&self.client_secret))
             .send()?;

diff --git a/mpesa_core/src/services/account_balance.rs b/mpesa_core/src/services/account_balance.rs
@@ -1,7 +1,6 @@
 use crate::client::MpesaResult;
 use crate::constants::{CommandId, IdentifierTypes};
 use crate::{Mpesa, MpesaError, MpesaSecurity};
-use reqwest::blocking::Client;
 use serde::{Deserialize, Serialize};
 use serde_json::Value;
 
@@ -164,11 +163,14 @@ impl<'a> AccountBalanceBuilder<'a> {
             security_credential: &credentials,
         };
 
-        let response = Client::new()
+        let response = self
+            .client
+            .http_client
             .post(&url)
             .bearer_auth(self.client.auth()?)
             .json(&payload)
-            .send()?;
+            .send()?
+            .error_for_status()?;
 
         if response.status().is_success() {
             let value: AccountBalanceResponse = response.json()?;

diff --git a/mpesa_core/src/services/b2b.rs b/mpesa_core/src/services/b2b.rs
@@ -2,7 +2,6 @@ use crate::client::{Mpesa, MpesaResult};
 use crate::constants::{CommandId, IdentifierTypes};
 use crate::errors::MpesaError;
 use crate::MpesaSecurity;
-use reqwest::blocking::Client;
 use serde::{Deserialize, Serialize};
 use serde_json::Value;
 
@@ -231,11 +230,14 @@ impl<'a> B2bBuilder<'a> {
             account_reference: self.account_ref.unwrap_or(""),
         };
 
-        let response = Client::new()
+        let response = self
+            .client
+            .http_client
             .post(&url)
             .bearer_auth(self.client.auth()?)
             .json(&payload)
-            .send()?;
+            .send()?
+            .error_for_status()?;
 
         if response.status().is_success() {
             let value: B2bResponse = response.json()?;

diff --git a/mpesa_core/src/services/b2c.rs b/mpesa_core/src/services/b2c.rs
@@ -1,6 +1,5 @@
 use crate::client::MpesaResult;
 use crate::{CommandId, Mpesa, MpesaError, MpesaSecurity};
-use reqwest::blocking::Client;
 use serde::{Deserialize, Serialize};
 use serde_json::Value;
 
@@ -197,11 +196,14 @@ impl<'a> B2cBuilder<'a> {
             occasion: self.occasion.unwrap_or("None"),
         };
 
-        let response = Client::new()
+        let response = self
+            .client
+            .http_client
             .post(&url)
             .bearer_auth(self.client.auth()?)
             .json(&payload)
-            .send()?;
+            .send()?
+            .error_for_status()?;
 
         if response.status().is_success() {
             let value: B2cResponse = response.json()?;

diff --git a/mpesa_core/src/services/c2b_register.rs b/mpesa_core/src/services/c2b_register.rs
@@ -1,7 +1,6 @@
 use crate::client::{Mpesa, MpesaResult};
 use crate::constants::ResponseType;
 use crate::errors::MpesaError;
-use reqwest::blocking::Client;
 use serde::{Deserialize, Serialize};
 use serde_json::Value;
 
@@ -112,11 +111,14 @@ impl<'a> C2bRegisterBuilder<'a> {
             short_code: self.short_code.unwrap_or("None"),
         };
 
-        let response = Client::new()
+        let response = self
+            .client
+            .http_client
             .post(&url)
             .bearer_auth(self.client.auth()?)
             .json(&payload)
-            .send()?;
+            .send()?
+            .error_for_status()?;
 
         if response.status().is_success() {
             let value: C2bRegisterResponse = response.json()?;

diff --git a/mpesa_core/src/services/c2b_simulate.rs b/mpesa_core/src/services/c2b_simulate.rs
@@ -1,7 +1,6 @@
 use crate::client::{Mpesa, MpesaResult};
 use crate::constants::CommandId;
 use crate::errors::MpesaError;
-use reqwest::blocking::Client;
 use serde::{Deserialize, Serialize};
 use serde_json::Value;
 
@@ -122,11 +121,14 @@ impl<'a> C2bSimulateBuilder<'a> {
             short_code: self.short_code.unwrap_or("None"),
         };
 
-        let response = Client::new()
+        let response = self
+            .client
+            .http_client
             .post(&url)
             .bearer_auth(self.client.auth()?)
             .json(&payload)
-            .send()?;
+            .send()?
+            .error_for_status()?;
 
         if response.status().is_success() {
             let value: C2bSimulateResponse = response.json()?;

diff --git a/mpesa_core/src/services/express_request.rs b/mpesa_core/src/services/express_request.rs
@@ -2,7 +2,6 @@ use crate::client::{Mpesa, MpesaResult};
 use crate::constants::CommandId;
 use crate::errors::MpesaError;
 use chrono::prelude::Local;
-use reqwest::blocking::Client;
 use serde::{Deserialize, Serialize};
 use serde_json::Value;
 
@@ -215,11 +214,14 @@ impl<'a> MpesaExpressRequestBuilder<'a> {
             transaction_desc: self.transaction_desc.unwrap_or("None"),
         };
 
-        let response = Client::new()
+        let response = self
+            .client
+            .http_client
             .post(&url)
             .bearer_auth(self.client.auth()?)
             .json(&payload)
-            .send()?;
+            .send()?
+            .error_for_status()?;
 
         if response.status().is_success() {
             let value: MpesaExpressRequestResponse = response.json()?;