email: Remove sync send() fn

Author: Turbo87

src/controllers/github/secret_scanning.rs

@@ -199,7 +199,7 @@ async fn send_notification_email(
         url: &alert.url,
     };
 
-    state.emails.async_send(&recipient, email).await?;
+    state.emails.send(&recipient, email).await?;
 
     Ok(())
 }

src/controllers/krate/owners.rs

@@ -243,7 +243,7 @@ async fn modify_owners(
     for email in emails {
         let addr = email.recipient_email_address().to_string();
 
-        if let Err(e) = app.emails.async_send(&addr, email).await {
+        if let Err(e) = app.emails.send(&addr, email).await {
             warn!("Failed to send co-owner invite email: {e}");
         }
     }

src/controllers/token.rs

@@ -154,7 +154,7 @@ pub async fn new(
         // At this point the token has been created so failing to send the
         // email should not cause an error response to be returned to the
         // caller.
-        let email_ret = app.emails.async_send(&recipient, email).await;
+        let email_ret = app.emails.send(&recipient, email).await;
         if let Err(e) = email_ret {
             error!("Failed to send token creation email: {e}")
         }

src/controllers/user/resend.rs

@@ -45,7 +45,7 @@ pub async fn regenerate_token_and_send(
 
             state
                 .emails
-                .async_send(&email.email, email1)
+                .send(&email.email, email1)
                 .await
                 .map_err(BoxedAppError::from)
         }

src/controllers/user/update.rs

@@ -58,7 +58,7 @@ pub async fn update_user(
                         domain: &state.emails.domain,
                     };
 
-                    if let Err(error) = state.emails.async_send(&email_address, email).await {
+                    if let Err(error) = state.emails.send(&email_address, email).await {
                         warn!("Failed to send publish notifications unsubscribe email to {email_address}: {error}");
                     }
                 }
@@ -103,7 +103,7 @@ pub async fn update_user(
             token,
         };
 
-        let _ = state.emails.async_send(user_email, email).await;
+        let _ = state.emails.send(user_email, email).await;
     }
 
     ok_true()

src/email.rs

@@ -10,7 +10,6 @@ use lettre::transport::stub::AsyncStubTransport;
 use lettre::{Address, AsyncTransport, Message, Tokio1Executor};
 use rand::distributions::{Alphanumeric, DistString};
 use std::sync::Arc;
-use tokio::runtime::Handle;
 
 pub trait Email {
     fn subject(&self) -> String;
@@ -115,15 +114,7 @@ impl Emails {
         Ok(message)
     }
 
-    pub fn send<E: Email>(&self, recipient: &str, email: E) -> Result<(), EmailError> {
-        let email = self.build_message(recipient, email)?;
-
-        Handle::current()
-            .block_on(self.backend.send(email))
-            .map_err(EmailError::TransportError)
-    }
-
-    pub async fn async_send<E: Email>(&self, recipient: &str, email: E) -> Result<(), EmailError> {
+    pub async fn send<E: Email>(&self, recipient: &str, email: E) -> Result<(), EmailError> {
         let email = self.build_message(recipient, email)?;
 
         self.backend
@@ -195,14 +186,14 @@ mod tests {
         let emails = Emails::new_in_memory();
 
         let address = "String.Format(\"{0}.{1}@live.com\", FirstName, LastName)";
-        assert_err!(emails.async_send(address, TestEmail).await);
+        assert_err!(emails.send(address, TestEmail).await);
     }
 
     #[tokio::test]
     async fn sending_to_valid_email_succeeds() {
         let emails = Emails::new_in_memory();
 
         let address = "[email protected]";
-        assert_ok!(emails.async_send(address, TestEmail).await);
+        assert_ok!(emails.send(address, TestEmail).await);
     }
 }

src/models/user.rs

@@ -192,7 +192,7 @@ impl<'a> NewUser<'a> {
                             domain: &emails.domain,
                             token,
                         };
-                        let _ = emails.async_send(user_email, email).await;
+                        let _ = emails.send(user_email, email).await;
                     }
                 }
 

src/worker/jobs/expiry_notification.rs

@@ -84,7 +84,7 @@ async fn handle_expiring_token(
             token_name: &token.name,
             expiry_date: token.expired_at.unwrap().and_utc(),
         };
-        emails.async_send(&recipient, email).await?;
+        emails.send(&recipient, email).await?;
     } else {
         info!(
             "User {} has no email address set. Skipping expiry notification.",

src/worker/jobs/send_publish_notifications.rs

@@ -95,7 +95,7 @@ impl BackgroundJob for SendPublishNotificationsJob {
             };
 
             debug!("Sending publish notification for {krate}@{version} to {email_address}…");
-            let result = ctx.emails.async_send(&email_address, email).await.inspect_err(|err| {
+            let result = ctx.emails.send(&email_address, email).await.inspect_err(|err| {
                 warn!("Failed to send publish notification for {krate}@{version} to {email_address}: {err}")
             });
 

src/worker/jobs/sync_admins.rs

@@ -144,7 +144,7 @@ impl BackgroundJob for SyncAdmins {
         for database_admin in &database_admins {
             let (_, _, email_address) = database_admin;
             if let Some(email_address) = email_address {
-                if let Err(error) = ctx.emails.async_send(email_address, email.clone()).await {
+                if let Err(error) = ctx.emails.send(email_address, email.clone()).await {
                     warn!(
                         "Failed to send email to admin {} ({}, github_id: {}): {}",
                         database_admin.1, email_address, database_admin.0, error