Merge pull request #67 from dxphilo/master

fix: extract an api struct to store error details

Author: c12i

src/client.rs

@@ -3,7 +3,7 @@ use crate::services::{
     AccountBalanceBuilder, B2bBuilder, B2cBuilder, C2bRegisterBuilder, C2bSimulateBuilder,
     MpesaExpressRequestBuilder, TransactionReversalBuilder, TransactionStatusBuilder,
 };
-use crate::MpesaError;
+use crate::{ApiError, MpesaError};
 use openssl::base64;
 use openssl::rsa::Padding;
 use openssl::x509::X509;
@@ -116,14 +116,17 @@ impl<'mpesa, Env: ApiEnvironment> Mpesa<Env> {
             let value = response.json::<Value>().await?;
             let access_token = value
                 .get("access_token")
-                .ok_or_else(|| MpesaError::AuthenticationError(value.clone()))?;
+                .ok_or_else(|| String::from("Failed to extract token from the response"))
+                .unwrap();
             let access_token = access_token
                 .as_str()
-                .ok_or_else(|| MpesaError::AuthenticationError(value.clone()))?;
+                .ok_or_else(|| String::from("Error converting access token to string"))
+                .unwrap();
+
             return Ok(access_token.to_string());
         }
-        let value = response.json::<Value>().await?;
-        Err(MpesaError::AuthenticationError(value))
+        let error = response.json::<ApiError>().await?;
+        Err(MpesaError::AuthenticationError(error))
     }
 
     /// **B2C Builder**

src/errors.rs

@@ -1,26 +1,27 @@
-use std::env::VarError;
+use serde::{Deserialize, Serialize};
+use std::{env::VarError, fmt};
 
 /// Mpesa error stack
 #[derive(thiserror::Error, Debug)]
 pub enum MpesaError {
-    #[error("Authentication request failed: {0}")]
-    AuthenticationError(serde_json::Value),
+    #[error("{0}")]
+    AuthenticationError(ApiError),
     #[error("B2B request failed: {0}")]
-    B2bError(serde_json::Value),
+    B2bError(ApiError),
     #[error("B2C request failed: {0}")]
-    B2cError(serde_json::Value),
+    B2cError(ApiError),
     #[error("C2B register request failed: {0}")]
-    C2bRegisterError(serde_json::Value),
+    C2bRegisterError(ApiError),
     #[error("C2B simulate request failed: {0}")]
-    C2bSimulateError(serde_json::Value),
+    C2bSimulateError(ApiError),
     #[error("Account Balance request failed: {0}")]
-    AccountBalanceError(serde_json::Value),
+    AccountBalanceError(ApiError),
     #[error("Mpesa Express request/ STK push failed: {0}")]
-    MpesaExpressRequestError(serde_json::Value),
+    MpesaExpressRequestError(ApiError),
     #[error("Mpesa Transaction reversal failed: {0}")]
-    MpesaTransactionReversalError(serde_json::Value),
+    MpesaTransactionReversalError(ApiError),
     #[error("Mpesa Transaction status failed: {0}")]
-    MpesaTransactionStatusError(serde_json::Value),
+    MpesaTransactionStatusError(ApiError),
     #[error("An error has occured while performing the http request")]
     NetworkError(#[from] reqwest::Error),
     #[error("An error has occured while serializig/ deserializing")]
@@ -32,3 +33,20 @@ pub enum MpesaError {
     #[error("{0}")]
     Message(&'static str),
 }
+
+#[derive(Debug, Serialize, Deserialize)]
+pub struct ApiError {
+    pub request_id: String,
+    pub error_code: String,
+    pub error_message: String,
+}
+
+impl fmt::Display for ApiError {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        write!(
+            f,
+            "requestID: {}, errorCode:{}, errorMessage:{}",
+            self.request_id, self.error_code, self.error_message
+        )
+    }
+}

src/lib.rs

@@ -357,4 +357,4 @@ pub use client::{Mpesa, MpesaResult};
 pub use constants::{CommandId, IdentifierTypes, ResponseType};
 pub use environment::ApiEnvironment;
 pub use environment::Environment::{self, Production, Sandbox};
-pub use errors::MpesaError;
+pub use errors::{ApiError, MpesaError};