From df32e69c4cf48d18cd414f04b6015c62515ed8f6 Mon Sep 17 00:00:00 2001 From: Brandon Thomas Date: Wed, 18 Mar 2026 12:21:57 -0400 Subject: [PATCH] remove smtp email sender from storyteller-web --- Cargo.lock | 1 - crates/service/web/storyteller_web/Cargo.toml | 1 - .../endpoints/users/password_reset_request_handler.rs | 2 -- crates/service/web/storyteller_web/src/main.rs | 9 --------- .../web/storyteller_web/src/state/server_state.rs | 3 --- 5 files changed, 16 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index d96a64eac3..e19b8cb84d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -11576,7 +11576,6 @@ dependencies = [ "easyenv", "elasticsearch", "elasticsearch_schema", - "email_sender", "enums", "enums_public", "errors", diff --git a/crates/service/web/storyteller_web/Cargo.toml b/crates/service/web/storyteller_web/Cargo.toml index 8ca2da612e..70084414d7 100644 --- a/crates/service/web/storyteller_web/Cargo.toml +++ b/crates/service/web/storyteller_web/Cargo.toml @@ -49,7 +49,6 @@ crockford = { path = "../../../lib/data/crockford" } datetimes = { path = "../../../lib/data/datetimes" } easyenv.workspace = true elasticsearch_schema = { path = "../../../schema/database/elasticsearch_schema" } -email_sender= { path = "../../../lib/email_sender" } enums.workspace = true enums_public.workspace = true errors.workspace = true diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/users/password_reset_request_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/users/password_reset_request_handler.rs index 394ad3a85b..2617fbd612 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/users/password_reset_request_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/users/password_reset_request_handler.rs @@ -8,7 +8,6 @@ use sqlx::MySqlPool; use strum_macros::Display; use crockford::crockford_entropy_lower; -use email_sender::smtp_email_sender::SmtpEmailSender; use enums::by_table::email_sender_jobs::email_category::EmailCategory; use http_server_common::request::get_request_ip::get_request_ip; use http_server_common::response::serialize_as_json_error::serialize_as_json_error; @@ -86,7 +85,6 @@ pub async fn password_reset_request_handler( mysql_pool: web::Data, server_environment: web::Data, server_state: web::Data>, - _sender: web::Data, ) -> Result { let username_or_email = request.username_or_email.trim(); diff --git a/crates/service/web/storyteller_web/src/main.rs b/crates/service/web/storyteller_web/src/main.rs index ddbcd39526..00332e837d 100644 --- a/crates/service/web/storyteller_web/src/main.rs +++ b/crates/service/web/storyteller_web/src/main.rs @@ -50,7 +50,6 @@ use config::common_env::CommonEnv; use config::shared_constants::DEFAULT_RUST_LOG; use elasticsearch::http::transport::Transport; use elasticsearch::Elasticsearch; -use email_sender::smtp_email_sender::SmtpEmailSender; use errors::AnyhowResult; use fal_client::creds::fal_api_key::FalApiKey; use log::info; @@ -393,12 +392,6 @@ async fn main() -> AnyhowResult<()> { .trim() .to_string(); - // TODO(bt,2023-11-11): Password and account details should be a secret, but gotta go fast. - let email_sender = SmtpEmailSender::new( - "smtp.gmail.com", - "noreply@storyteller.ai".to_string(), - "FakeYouHanashi1".to_string())?; - let server_environment_typed = match server_environment { ServerEnvironment::Production => server_environment::ServerEnvironment::Production, ServerEnvironment::Development => server_environment::ServerEnvironment::Development, @@ -465,7 +458,6 @@ async fn main() -> AnyhowResult<()> { audio_uploads_bucket_root, sort_key_crypto, static_api_token_set, - email_sender, fal: FalData { api_key: fal_api_key, webhook_url: fal_webhook_url, @@ -661,7 +653,6 @@ pub async fn serve(server_state: ServerState) -> AnyhowResult<()> .app_data(web::Data::new(server_state_arc.stripe.clone().client.clone())) .app_data(web::Data::new(server_state_arc.third_party_url_redirector)) .app_data(web::Data::new(server_state_arc.google_sign_in_cert.clone())) - .app_data(web::Data::new(server_state_arc.email_sender.clone())) .app_data(web::Data::new(old_server_environment)) .app_data(web::Data::new(new_server_environment)) .app_data(web::Data::from(product_lookup)) // NB: Data::from(Arc) for dynamic dispatch diff --git a/crates/service/web/storyteller_web/src/state/server_state.rs b/crates/service/web/storyteller_web/src/state/server_state.rs index 7fc4a0a35f..e7cf443c0b 100644 --- a/crates/service/web/storyteller_web/src/state/server_state.rs +++ b/crates/service/web/storyteller_web/src/state/server_state.rs @@ -6,7 +6,6 @@ use billing_component::stripe::stripe_config::StripeConfig; use chrono::{DateTime, Utc}; use cloud_storage::bucket_client::BucketClient; use elasticsearch::Elasticsearch; -use email_sender::smtp_email_sender::SmtpEmailSender; use fal_client::creds::fal_api_key::FalApiKey; use memory_caching::arc_ttl_sieve::ArcTtlSieve; use memory_caching::single_item_ttl_cache::SingleItemTtlCache; @@ -106,8 +105,6 @@ pub struct ServerState { pub sort_key_crypto: SortKeyCrypto, - pub email_sender: SmtpEmailSender, - pub ip_ban_list: IpBanList, pub cidr_ban_set: BannedCidrSet,