Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions crates/cloud/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -43,3 +43,6 @@ prometheus = "0.13.3"
aws-sdk-s3 = "0.31.2"
aws-credential-types = "0.56.1"
aws-config = "0.56.1"

[dev-dependencies]
lettre = {version = "0.10.0-rc.4", features = ["file-transport", "builder"]}
2 changes: 1 addition & 1 deletion crates/cloud/src/errors.rs
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ pub enum InternalError {
S3ContentError,
TorNodeListFetchError(reqwest::Error),
ActixMessageError(actix::MailboxError),
SendEmailError(lettre::transport::smtp::Error),
SendEmailError,
EmailBuildError,
Base64DecodeError(base64::DecodeError),
ThumbnailDecodeError(image::ImageError),
Expand Down
18 changes: 11 additions & 7 deletions crates/cloud/src/utils.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ use actix_web::HttpRequest;
use futures::TryStreamExt;
use lazy_static::lazy_static;
use lettre::{Message, SmtpTransport, Transport};
use log::error;
use log::{error, warn};
use lru::LruCache;
use mongodb::{bson::doc, Collection};
use netsblox_cloud_common::{
Expand Down Expand Up @@ -298,17 +298,21 @@ pub(crate) async fn get_authorized_host(
Ok(host)
}

pub(crate) fn send_email(
mailer: &SmtpTransport,
pub(crate) fn send_email<T: lettre::Transport>(
mailer: &T,
email: impl TryInto<Message>,
) -> Result<(), UserError> {
) -> Result<(), UserError>
where
<T as Transport>::Error: std::fmt::Debug,
{
let message = email
.try_into()
.map_err(|_err| InternalError::EmailBuildError)?;

mailer
.send(&message)
.map_err(InternalError::SendEmailError)?;
mailer.send(&message).map_err(|err| {
warn!("Unable to send email: {:?}", err);
InternalError::SendEmailError
})?;

Ok(())
}
Expand Down