fix(core): Fix default CheckEmailInput

reacherhq · Jan 9, 2023 · 09215a1 · 09215a1
1 parent d04f84c
commit 09215a1
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 91 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/backend/openapi.json b/backend/openapi.json
@@ -330,10 +330,6 @@
 						"type": "number",
 						"description": "SMTP port to use for email validation. Generally, ports 25, 465, 587 and 2525 are used."
 					},
-					"smtp_timeout": {
-						"type": "number",
-						"description": "Add optional timeout for the SMTP verification step, in seconds."
-					},
 					"yahoo_use_api": {
 						"type": "boolean",
 						"description": "For Yahoo email addresses, use Yahoo's API instead of connecting directly to their SMTP servers."
@@ -369,6 +365,9 @@
 							"Wrapper"
 						],
 						"description": "How to apply TLS to a SMTP client connection."
+					},
+					"smtp_timeout": {
+						"$ref": "#/components/schemas/Duration"
 					}
 				},
 				"required": ["to_email"]
@@ -403,6 +402,25 @@
 					}
 				},
 				"required": ["host", "port"]
+			},
+			"Duration": {
+				"title": "Duration",
+				"x-stoplight": {
+					"id": "0s9q75wxim1iw"
+				},
+				"type": "object",
+				"description": "An object representing a duration (seconds + nanoseconds).",
+				"properties": {
+					"secs": {
+						"type": "number",
+						"description": "Seconds"
+					},
+					"nanos": {
+						"type": "string",
+						"description": "Nanoseconds"
+					}
+				},
+				"required": ["secs", "nanos"]
 			}
 		},
 		"securitySchemes": {

diff --git a/core/Cargo.toml b/core/Cargo.toml
@@ -31,7 +31,6 @@ serde_json = "1.0.91"
 trust-dns-proto = "0.21.2"
 md5 = "0.7.0"
 levenshtein = "1.0.5"
-serde_with = "2.1.0"
 
 [dev-dependencies]
 tokio = { version = "1.23.0" }

diff --git a/core/src/util/input_output.rs b/core/src/util/input_output.rs
@@ -18,7 +18,6 @@ use std::time::Duration;
 
 use async_smtp::{ClientSecurity, ClientTlsParameters};
 use serde::{ser::SerializeMap, Deserialize, Serialize, Serializer};
-use serde_with::{serde_as, DurationSeconds};
 
 use crate::misc::{MiscDetails, MiscError};
 use crate::mx::{MxDetails, MxError};
@@ -72,20 +71,18 @@ impl SmtpSecurity {
 
 /// Builder pattern for the input argument into the main `email_exists`
 /// function.
-#[serde_as]
 #[derive(Debug, Clone, Deserialize, Serialize)]
+#[serde(default)]
 pub struct CheckEmailInput {
 	/// The email to validate.
 	pub to_email: String,
 	/// Email to use in the `MAIL FROM:` SMTP command.
 	///
 	/// Defaults to "user@example.org".
-	#[serde(default)]
 	pub from_email: String,
 	/// Name to use in the `EHLO:` SMTP command.
 	///
 	/// Defaults to "localhost" (note: "localhost" is not a FQDN).
-	#[serde(default)]
 	pub hello_name: String,
 	/// Perform the email verification via the specified SOCK5 proxy. The usage of a
 	/// proxy is optional.
@@ -94,37 +91,30 @@ pub struct CheckEmailInput {
 	/// and 2525 are used.
 	///
 	/// Defaults to 25.
-	#[serde(default)]
 	pub smtp_port: u16,
 	/// Add timeout for the SMTP verification step. Set to None if you don't
 	/// want to use a timeout.
 	///
 	/// Defaults to 10s.
-	#[serde_as(as = "Option<DurationSeconds>")]
-	#[serde(default)]
 	pub smtp_timeout: Option<Duration>,
 	/// For Yahoo email addresses, use Yahoo's API instead of connecting
 	/// directly to their SMTP servers.
 	///
 	/// Defaults to true.
-	#[serde(default)]
 	pub yahoo_use_api: bool,
 	/// For Gmail email addresses, use Gmail's API instead of connecting
 	/// directly to their SMTP servers.
 	///
 	/// Defaults to false.
-	#[serde(default)]
 	pub gmail_use_api: bool,
 	/// For Microsoft 365 email addresses, use OneDrive's API instead of
 	/// connecting directly to their SMTP servers.
 	///
 	/// Defaults to false.
-	#[serde(default)]
 	pub microsoft365_use_api: bool,
 	// Whether to check if a gravatar image is existing for the given email.
 	//
 	// Defaults to false.
-	#[serde(default)]
 	pub check_gravatar: bool,
 	/// For Hotmail/Outlook email addresses, use a headless navigator
 	/// connecting to the password recovery page instead of the SMTP server.
@@ -134,17 +124,14 @@ pub struct CheckEmailInput {
 	///
 	/// Defaults to None.
 	#[cfg(feature = "headless")]
-	#[serde(default)]
 	pub hotmail_use_headless: Option<String>,
 	/// Number of retries of SMTP connections to do.
 	///
 	/// Defaults to 2 to avoid greylisting.
-	#[serde(default)]
 	pub retries: usize,
 	/// How to apply TLS to a SMTP client connection.
 	///
 	/// Defaults to Opportunistic.
-	#[serde(default)]
 	pub smtp_security: SmtpSecurity,
 }