Update to support for v2 API.

Author: mailboxvalidator-com

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "mailboxvalidator"
-version = "1.0.0"
+version = "1.1.0"
 authors = ["MailboxValidator <support@mailboxvalidator.com>"]
 edition = "2021"
 description = "Email verification package for Rust using MailboxValidator API. It validates if the email is valid, from a free provider, contains high-risk keywords, whether it's a catch-all address and so much more."
@@ -11,6 +11,7 @@ repository = "https://github.com/MailboxValidator/mailboxvalidator-rust/"
 license = "MIT"
 keywords = ["email", "validation", "validator", "free", "disposable"]
 categories = ["email", "accessibility"]
+readme = "readme.md"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 

LICENSE.txt

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2021 MailboxValidator.com
+Copyright (c) 2023 MailboxValidator.com
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

readme.md

@@ -11,7 +11,7 @@ This module can be useful in many types of projects, for example
 
 # Installation
 
-Just add `mailboxvalidator = "1.0.0"` into your *Cargo.toml*.
+Just add `mailboxvalidator = "1.1.0"` into your *Cargo.toml*.
 
 # Dependencies
 
@@ -90,8 +90,7 @@ let validation_result = mailboxvalidator::validate_email("example@example.com",P
 match validation_result {
     Ok(num) => {
         let ok_result = num;
-        assert_eq!(ok_result["status"], "False");
-        assert_eq!(ok_result["error_code"], "");
+        println!("{:#?}", ok_result);
     },
     Err(err) => println!("{:#?}", err),
 };
@@ -107,8 +106,7 @@ let validation_result = mailboxvalidator::is_disposable_email("example@example.c
 match validation_result {
     Ok(num) => {
         let ok_result = num;
-        assert_eq!(ok_result["is_disposable"], "True");
-        assert_eq!(ok_result["error_code"], "");
+        println!("{:#?}", ok_result);
     },
     Err(err) => println!("{:#?}", err),
 };
@@ -124,8 +122,7 @@ let validation_result = mailboxvalidator::is_free_email("example@example.com",PA
 match validation_result {
     Ok(num) => {
         let ok_result = num;
-        assert_eq!(ok_result["is_free"], "False");
-        assert_eq!(ok_result["error_code"], "");
+        println!("{:#?}", ok_result);
     },
     Err(err) => println!("{:#?}", err),
 };

src/lib.rs

@@ -35,8 +35,16 @@
 use serde::Deserialize;
 use serde::Serialize;
 
+use reqwest::StatusCode;
+
 pub use reqwest::Error as ReqError;
 
+// #[derive(PartialEq, Debug, Clone, Serialize, Deserialize)]
+// pub enum ALLELE {
+    // bool(bool),
+    // null(null),
+// }
+
 ///! Wrapper result type returning `reqwest` errors
 pub type MailboxValidatorResult<T> = Result<T, ReqError>;
 
@@ -45,46 +53,53 @@ pub type MailboxValidatorResult<T> = Result<T, ReqError>;
 pub struct SingleEmailValidationRecord {
     email_address: String,
     domain: String,
-    is_free: String,
-    is_syntax: String,
-    is_domain: String,
-    is_smtp: String,
-    is_verified: String,
-    is_server_down: String,
-    is_greylisted: String,
-    is_disposable: String,
-    is_suppressed: String,
-    is_role: String,
-    is_high_risk: String,
-    is_catchall: String,
-    status: String,
-    error_code: String,
-    error_message: String,
-    mailboxvalidator_score: String,
-    time_taken: String,
+    is_free: Option<bool>,
+    is_syntax: Option<bool>,
+    is_domain: Option<bool>,
+    is_smtp: Option<bool>,
+    is_verified: Option<bool>,
+    is_server_down: Option<bool>,
+    is_greylisted: Option<bool>,
+    is_disposable: Option<bool>,
+    is_suppressed: Option<bool>,
+    is_role: Option<bool>,
+    is_high_risk: Option<bool>,
+    is_catchall: Option<bool>,
+    status: Option<bool>,
+    mailboxvalidator_score: f64,
+    time_taken: f64,
     credits_available: i64,
 }
 
 /// MailboxValidator Disposable Email API result record.
 #[derive(PartialEq, Debug, Clone, Serialize, Deserialize)]
 pub struct DisposableEmailRecord {
     email_address: String,
-    is_disposable: String,
-    error_code: String,
-    error_message: String,
+    is_disposable: Option<bool>,
     credits_available: i64,
 }
 
 /// MailboxValidator Free Email API result record.
 #[derive(PartialEq, Debug, Clone, Serialize, Deserialize)]
 pub struct FreeEmailRecord {
     email_address: String,
-    is_free: String,
-    error_code: String,
-    error_message: String,
+    is_free: Option<bool>,
     credits_available: i64,
 }
 
+/// MailboxValidator Error object
+#[derive(PartialEq, Debug, Clone, Serialize, Deserialize)]
+pub struct ErrorRecord {
+    error: ErrorRecord1,
+}
+
+/// MailboxValidator Error Response object 
+#[derive(PartialEq, Debug, Clone, Serialize, Deserialize)]
+pub struct ErrorRecord1 {
+    error_code: i64,
+    error_message: String,
+}
+
 /// Validates email address using MailboxValidator Single Validation API.
 ///
 /// # Examples
@@ -108,17 +123,27 @@ pub struct FreeEmailRecord {
 pub fn validate_email(email_address: &str, apikey: &str) -> MailboxValidatorResult<serde_json::value::Value>  {
     let client = reqwest::blocking::Client::new();
     let url = format!(
-            "https://api.mailboxvalidator.com/v1/validation/single?email={}&key={}&format=json",
+            "https://api.mailboxvalidator.com/v2/validation/single?email={}&key={}&format=json&source=sdk-rust-mbv",
             email_address, apikey
         );
     let res = client
     .get(url)
-    .send()?
-    .error_for_status()?;
+    .send()?;
 
-    let parsed: SingleEmailValidationRecord = res.json()?;
-    let json_value = serde_json::json!(&parsed);
-    Ok(json_value)
+    if res.status() == StatusCode::OK {
+		let parsed: SingleEmailValidationRecord = res.json()?;
+		let json_value = serde_json::json!(&parsed);
+		return Ok(json_value);		
+	} else if (res.status() == StatusCode::BAD_REQUEST) || (res.status() == StatusCode::UNAUTHORIZED) {
+		let parsed: ErrorRecord = res.json()?;
+		let json_value = serde_json::json!(&parsed);
+		return Ok(json_value);
+	} else {
+		println!("Something else happened. Status: {:?}", res.status());
+	}
+
+    // Ok(())
+    Ok(().into())
 }
 
 /// Validates email address using MailboxValidator Disposable Email API.
@@ -144,17 +169,27 @@ pub fn validate_email(email_address: &str, apikey: &str) -> MailboxValidatorResu
 pub fn is_disposable_email(email_address: &str, apikey: &str) -> MailboxValidatorResult<serde_json::value::Value>  {
     let client1 = reqwest::blocking::Client::new();
     let url = format!(
-            "https://api.mailboxvalidator.com/v1/email/disposable?email={}&key={}&format=json",
+            "https://api.mailboxvalidator.com/v2/email/disposable?email={}&key={}&format=json&source=sdk-rust-mbv",
             email_address, apikey
         );
     let res = client1
     .get(url)
-    .send()?
-    .error_for_status()?;
+    .send()?;
+
+    if res.status() == StatusCode::OK {
+		let parsed: DisposableEmailRecord = res.json()?;
+		let json_value = serde_json::json!(&parsed);
+		return Ok(json_value);		
+	} else if (res.status() == StatusCode::BAD_REQUEST) || (res.status() == StatusCode::UNAUTHORIZED) {
+		let parsed: ErrorRecord = res.json()?;
+		let json_value = serde_json::json!(&parsed);
+		return Ok(json_value);
+	} else {
+		println!("Something else happened. Status: {:?}", res.status());
+	}
 
-    let parsed: DisposableEmailRecord = res.json()?;
-    let json_value = serde_json::json!(&parsed);
-    Ok(json_value)
+    // Ok(())
+    Ok(().into())
 }
 
 /// Validates email address using MailboxValidator Free Email API.
@@ -180,15 +215,25 @@ pub fn is_disposable_email(email_address: &str, apikey: &str) -> MailboxValidato
 pub fn is_free_email(email_address: &str, apikey: &str) -> MailboxValidatorResult<serde_json::value::Value>  {
     let client = reqwest::blocking::Client::new();
     let url = format!(
-            "https://api.mailboxvalidator.com/v1/email/free?email={}&key={}&format=json",
+            "https://api.mailboxvalidator.com/v2/email/free?email={}&key={}&format=json&source=sdk-rust-mbv",
             email_address, apikey
         );
     let res = client
     .get(url)
-    .send()?
-    .error_for_status()?;
+    .send()?;
+
+    if res.status() == StatusCode::OK {
+		let parsed: FreeEmailRecord = res.json()?;
+		let json_value = serde_json::json!(&parsed);
+		return Ok(json_value);		
+	} else if (res.status() == StatusCode::BAD_REQUEST) || (res.status() == StatusCode::UNAUTHORIZED) {
+		let parsed: ErrorRecord = res.json()?;
+		let json_value = serde_json::json!(&parsed);
+		return Ok(json_value);
+	} else {
+		println!("Something else happened. Status: {:?}", res.status());
+	}
 
-    let parsed: FreeEmailRecord = res.json()?;
-    let json_value = serde_json::json!(&parsed);
-    Ok(json_value)
+    // Ok(())
+    Ok(().into())
 }