Merge pull request #84 from collinsmuriuki/fix-auth-response-deserialization-error

Fix auth response deserializion errors

Author: c12i

Cargo.toml

@@ -24,6 +24,7 @@ serde_repr = "0.1"
 thiserror = "1.0.37"
 wiremock = "0.5"
 secrecy = "0.8.0"
+serde-aux = "4.2.0"
 
 [dev-dependencies]
 dotenv = "0.15"

src/auth.rs

@@ -1,5 +1,6 @@
 use cached::proc_macro::cached;
 use serde::{Deserialize, Serialize};
+use serde_aux::field_attributes::deserialize_number_from_string;
 
 use crate::{ApiEnvironment, ApiError, Mpesa, MpesaError, MpesaResult};
 
@@ -39,15 +40,16 @@ pub struct AuthenticationResponse {
     /// Access token which is used as the Bearer-Auth-Token
     pub access_token: String,
     /// Expiry time in seconds
-    pub expiry_in: u64,
+    #[serde(deserialize_with = "deserialize_number_from_string")]
+    pub expires_in: u64,
 }
 
 impl std::fmt::Display for AuthenticationResponse {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         write!(
             f,
             "token :{} expires in: {}",
-            self.access_token, self.expiry_in
+            self.access_token, self.expires_in
         )
     }
 }
@@ -97,7 +99,7 @@ mod tests {
             .respond_with(wiremock::ResponseTemplate::new(200).set_body_json(
                 AuthenticationResponse {
                     access_token: "test_token".to_string(),
-                    expiry_in: 3600,
+                    expires_in: 3600,
                 },
             ))
             .expect(1)

tests/mpesa-rust/helpers.rs

@@ -46,7 +46,7 @@ macro_rules! get_mpesa_client {
             .and(query_param("grant_type", "client_credentials"))
             .respond_with(ResponseTemplate::new(200).set_body_json(json!({
                 "access_token": "dummy_access_token",
-                "expiry_in": 3600
+                "expires_in": "3600"
             })))
             .mount(&server)
             .await;
@@ -73,7 +73,7 @@ macro_rules! get_mpesa_client {
             .and(query_param("grant_type", "client_credentials"))
             .respond_with(ResponseTemplate::new(200).set_body_json(json!({
                 "access_token": "dummy_access_token",
-                "expiry_in": 3600
+                "expires_in": "3600"
             })))
             .mount(&server)
             .await;