feat (fix) - MpesaSecurity implementation officially handled by mpesa_derive macro

Author: c12i

mpesa_core/src/client.rs

@@ -3,7 +3,8 @@ use super::services::{
     AccountBalanceBuilder, B2bBuilder, B2cBuilder, C2bRegisterBuilder, C2bSimulateBuilder,
 };
 use crate::services::MpesaExpressRequestBuilder;
-use crate::MpesaError;
+use crate::MpesaSecurity;
+use mpesa_derive::*;
 use reqwest::blocking::Client;
 use serde_json::Value;
 use std::cell::RefCell;
@@ -12,7 +13,7 @@ use std::cell::RefCell;
 pub type MpesaResult<T> = Result<T, MpesaError>;
 
 /// Mpesa client that will facilitate communication with the Safaricom API
-#[derive(Debug)]
+#[derive(Debug, MpesaSecurity)]
 pub struct Mpesa {
     client_key: String,
     client_secret: String,

mpesa_core/src/mpesa_security.rs

@@ -1,8 +1,4 @@
 use crate::client::MpesaResult;
-use crate::Mpesa;
-use base64::encode;
-use openssl::rsa::Padding;
-use openssl::x509::X509;
 
 /// Trait responsible for implementation of security configs for Mpesa
 pub trait MpesaSecurity {
@@ -15,23 +11,3 @@ pub trait MpesaSecurity {
     /// Returns `EncryptionError` variant of `MpesaError`
     fn gen_security_credentials(&self) -> MpesaResult<String>;
 }
-
-impl MpesaSecurity for Mpesa {
-    fn gen_security_credentials(&self) -> MpesaResult<String> {
-        let pem = self.environment().get_certificate().as_bytes();
-        let cert = X509::from_pem(pem)?;
-        // getting the public and rsa keys
-        let pub_key = cert.public_key()?;
-        let rsa_key = pub_key.rsa()?;
-        // configuring the buffer
-        let buf_len = pub_key.size();
-        let mut buffer = vec![0; buf_len];
-
-        rsa_key.public_encrypt(
-            self.initiator_password().as_bytes(),
-            &mut buffer,
-            Padding::PKCS1,
-        )?;
-        Ok(encode(buffer))
-    }
-}