feat: pass ApiClient to products by reference (#3)

fix: fix formatting warnings

Author: juanmilkah

.github/workflows/release.yml

@@ -21,6 +21,12 @@ jobs:
           toolchain: stable
           override: true
 
+      - name: Check formatting
+        run: cargo fmt
+
+      - name: Check warnings
+        run: cargo clippy
+
       - name: Build release binary
         run: cargo build --release
 
@@ -29,4 +35,4 @@ jobs:
         with:
           files: target/release/*
         env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

README.md

@@ -43,7 +43,7 @@ let client = ApiClient::new(config).expect("Failed to create API client");
 use smile_id::products::BasicKyc;
 
 // Create a Basic KYC instance
-let basic_kyc = BasicKyc::new(client.clone());
+let basic_kyc = BasicKyc::new(&client());
 
 // Submit a Basic KYC verification request
 let job_id = basic_kyc.verify(
@@ -64,7 +64,7 @@ println!("Job ID: {}", job_id);
 use smile_id::products::EnhancedKyc;
 
 // Create an Enhanced KYC instance
-let enhanced_kyc = EnhancedKyc::new(client.clone());
+let enhanced_kyc = EnhancedKyc::new(&client());
 
 // Submit an Enhanced KYC verification request
 let job_id = enhanced_kyc.verify(
@@ -86,7 +86,7 @@ use smile_id::products::BiometricKyc;
 use smile_id::utils;
 
 // Create a Biometric KYC instance
-let biometric_kyc = BiometricKyc::new(client.clone());
+let biometric_kyc = BiometricKyc::new(&client());
 
 // Encode a selfie image as base64
 let selfie_image = utils::encode_image_file("path/to/selfie.jpg")
@@ -113,7 +113,7 @@ use smile_id::products::DocumentVerification;
 use smile_id::utils;
 
 // Create a Document Verification instance
-let document_verification = DocumentVerification::new(client.clone());
+let document_verification = DocumentVerification::new(&client());
 
 // Encode document images as base64
 let front_image = utils::encode_image_file("path/to/front.jpg")
@@ -138,7 +138,7 @@ use smile_id::products::SmartSelfieAuth;
 use smile_id::utils;
 
 // Create a SmartSelfie™ Authentication instance
-let smartselfie_auth = SmartSelfieAuth::new(client.clone());
+let smartselfie_auth = SmartSelfieAuth::new(&client());
 
 // Encode a selfie image as base64
 let selfie_image = utils::encode_image_file("path/to/selfie.jpg")
@@ -160,7 +160,7 @@ println!("Job ID: {}", job_id);
 use smile_id::products::BusinessVerification;
 
 // Create a Business Verification instance
-let business_verification = BusinessVerification::new(client.clone());
+let business_verification = BusinessVerification::new(&client());
 
 // Submit a Business Verification request
 let job_id = business_verification.verify(
@@ -204,7 +204,7 @@ let config = Config::new("your-api-key", "your-partner-id");
 let client = ApiClient::new(config).expect("Failed to create API client");
 
 // Create a blocking Basic KYC instance
-let basic_kyc = BasicKyc::new(client.clone());
+let basic_kyc = BasicKyc::new(&client());
 
 // Submit a Basic KYC verification request
 let job_id = basic_kyc.verify(

src/api.rs

@@ -10,14 +10,14 @@ use crate::error::{Error, Result};
 use crate::models::{ApiResponse, JobStatusRequest, JobStatusResponse};
 
 #[derive(Debug, Clone)]
-pub struct ApiClient {
+pub struct ApiClient<'a> {
     client: Client,
     auth: Auth,
-    config: Config,
+    config: &'a Config,
 }
 
-impl ApiClient {
-    pub fn new(config: Config) -> Result<Self> {
+impl<'a> ApiClient<'a> {
+    pub fn new(config: &'a Config) -> Result<Self> {
         let client = ClientBuilder::new()
             .timeout(Duration::from_secs(config.timeout))
             .build()
@@ -103,13 +103,13 @@ pub mod blocking {
     use super::*;
 
     #[derive(Debug, Clone)]
-    pub struct ApiClient {
+    pub struct ApiClient<'a> {
         client: reqwest::blocking::Client,
         auth: Auth,
-        config: Config,
+        config: &Config,
     }
 
-    impl ApiClient {
+    impl<'a> ApiClient<'a> {
         pub fn new(config: Config) -> Result<Self> {
             let client = reqwest::blocking::ClientBuilder::new()
                 .timeout(Duration::from_secs(config.timeout))

src/auth.rs

@@ -1,8 +1,8 @@
+use crate::error::{Error, Result};
 use base64::{engine::general_purpose, Engine};
+use chrono::{DateTime, Utc};
 use hmac::{Hmac, Mac};
 use sha2::Sha256;
-use chrono::{Utc, DateTime};
-use crate::error::{Error, Result};
 
 type HmacSha256 = Hmac<Sha256>;
 
@@ -19,26 +19,31 @@ impl Auth {
             partner_id: partner_id.into(),
         }
     }
-    
+
     pub fn generate_signature(&self, timestamp: &DateTime<Utc>, payload: &str) -> Result<String> {
         let timestamp_str = timestamp.to_rfc3339();
         let message = format!("{}{}{}", self.partner_id, timestamp_str, payload);
-        
+
         let mut mac = HmacSha256::new_from_slice(self.api_key.as_bytes())
-            .map_err(|e| Error::Auth(format!("Failed to create HMAC: {}", e)))?;
-        
+            .map_err(|e| Error::Auth(format!("Failed to create HMAC: {e}")))?;
+
         mac.update(message.as_bytes());
         let result = mac.finalize();
         let signature = general_purpose::STANDARD.encode(result.into_bytes());
-        
+
         Ok(signature)
     }
-    
-    pub fn verify_signature(&self, signature: &str, timestamp: &DateTime<Utc>, payload: &str) -> Result<bool> {
+
+    pub fn verify_signature(
+        &self,
+        signature: &str,
+        timestamp: &DateTime<Utc>,
+        payload: &str,
+    ) -> Result<bool> {
         let expected_signature = self.generate_signature(timestamp, payload)?;
         Ok(signature == expected_signature)
     }
-    
+
     pub fn partner_id(&self) -> &str {
         &self.partner_id
     }

src/config.rs

@@ -17,17 +17,17 @@ impl Config {
             timeout: 30,
         }
     }
-    
+
     pub fn with_base_url(mut self, base_url: impl Into<String>) -> Self {
         self.base_url = base_url.into();
         self
     }
-    
+
     pub fn with_version(mut self, version: impl Into<String>) -> Self {
         self.version = version.into();
         self
     }
-    
+
     pub fn with_timeout(mut self, timeout: u64) -> Self {
         self.timeout = timeout;
         self

src/error.rs

@@ -11,10 +11,7 @@ pub enum Error {
     Json(#[from] serde_json::Error),
 
     #[error("API error: {status_code} - {message}")]
-    Api {
-        status_code: u16,
-        message: String,
-    },
+    Api { status_code: u16, message: String },
 
     #[error("Authentication error: {0}")]
     Auth(String),

src/lib.rs

@@ -12,6 +12,7 @@ pub use config::Config;
 pub use error::{Error, Result};
 pub use models::*;
 pub use products::*;
+pub use utils::*;
 
 pub mod prelude {
     pub use crate::api::ApiClient;

src/models.rs

@@ -3,7 +3,6 @@ use std::collections::HashMap;
 
 #[derive(Debug, Clone, Deserialize)]
 pub struct ApiResponse<T> {
-
     pub status_code: u16,
     pub message: String,
 
@@ -51,7 +50,6 @@ pub struct JobHistoryItem {
 
 #[derive(Debug, Clone, Serialize)]
 pub struct BasicKycRequest {
-
     pub id_type: String,
     pub id_number: String,
     pub country: String,
@@ -71,7 +69,6 @@ pub struct BasicKycRequest {
 
 #[derive(Debug, Clone, Serialize)]
 pub struct EnhancedKycRequest {
-
     pub id_type: String,
     pub id_number: String,
     pub country: String,
@@ -85,7 +82,6 @@ pub struct EnhancedKycRequest {
 
 #[derive(Debug, Clone, Serialize)]
 pub struct BiometricKycRequest {
-
     pub id_type: String,
     pub id_number: String,
     pub country: String,
@@ -100,7 +96,6 @@ pub struct BiometricKycRequest {
 
 #[derive(Debug, Clone, Serialize)]
 pub struct DocumentVerificationRequest {
-
     pub document_type: String,
     pub country: String,
     pub document_images: Vec<String>,
@@ -111,7 +106,6 @@ pub struct DocumentVerificationRequest {
 
 #[derive(Debug, Clone, Serialize)]
 pub struct SmartSelfieAuthRequest {
-
     pub user_id: String,
     pub job_id: String,
     pub selfie_image: String,
@@ -122,7 +116,6 @@ pub struct SmartSelfieAuthRequest {
 
 #[derive(Debug, Clone, Serialize)]
 pub struct BusinessVerificationRequest {
-
     pub business_name: String,
     pub registration_number: String,
     pub country: String,
@@ -133,7 +126,6 @@ pub struct BusinessVerificationRequest {
 
 #[derive(Debug, Clone, Serialize)]
 pub struct JobStatusRequest {
-
     pub user_id: String,
     pub job_id: String,
 

src/products/basic_kyc.rs

@@ -5,15 +5,15 @@ use crate::error::Result;
 use crate::models::{ApiResponse, BasicKycRequest};
 
 #[derive(Debug, Clone)]
-pub struct BasicKyc {
-    client: ApiClient,
+pub struct BasicKyc<'a> {
+    client: ApiClient<'a>,
 }
 
-impl BasicKyc {
-    pub fn new(client: ApiClient) -> Self {
+impl<'a> BasicKyc<'a> {
+    pub fn new(client: ApiClient<'a>) -> Self {
         Self { client }
     }
-    
+
     pub async fn verify(
         &self,
         id_type: impl Into<String>,
@@ -32,10 +32,10 @@ impl BasicKyc {
             dob,
             partner_params: None,
         };
-        
+
         let url = format!("{}/basic_kyc", self.client.base_url());
         let response: ApiResponse<VerifyResponse> = self.client.post(&url, &request).await?;
-        
+
         Ok(response.data.job_id)
     }
 }
@@ -49,17 +49,17 @@ struct VerifyResponse {
 pub mod blocking {
     use super::*;
     use crate::api::blocking::ApiClient;
-    
+
     #[derive(Debug, Clone)]
-    pub struct BasicKyc {
-        client: ApiClient,
+    pub struct BasicKyc<'a> {
+        client: ApiClient<'a>,
     }
-    
-    impl BasicKyc {
-        pub fn new(client: ApiClient) -> Self {
+
+    impl<'a> BasicKyc<'a> {
+        pub fn new(client: ApiClient<'a>) -> Self {
             Self { client }
         }
-        
+
         pub fn verify(
             &self,
             id_type: impl Into<String>,
@@ -78,10 +78,10 @@ pub mod blocking {
                 dob,
                 partner_params: None,
             };
-            
+
             let url = format!("{}/basic_kyc", self.client.base_url());
             let response: ApiResponse<VerifyResponse> = self.client.post(&url, &request)?;
-            
+
             Ok(response.data.job_id)
         }
     }