matrix/authentication-service
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-authentication-service.git synced 2025-08-07 17:03:01 +03:00
Code Activity

Move some common dependencies on the workspace level

Browse Source 
Also deprecates the AWS SESv2 transport for emails
This commit is contained in:
Quentin Gliech
2023-08-14 12:08:32 +02:00
parent 21964cbeab
commit 7c83dce66e
36 changed files with 171 additions and 711 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
crates/cli/src/commands/server.rs
View File

@@ -89,7 +89,7 @@ impl Options {
let templates = templates_from_config(&config.templates, &url_builder).await?;
if !self.no_worker {
let mailer = mailer_from_config(&config.email, &templates).await?;
let mailer = mailer_from_config(&config.email, &templates)?;
mailer.test_connection().await?;
#[allow(clippy::disallowed_methods)]

2
crates/cli/src/commands/worker.rs
View File

@@ -46,7 +46,7 @@ impl Options {
// Load and compile the templates
let templates = templates_from_config(&config.templates, &url_builder).await?;
let mailer = mailer_from_config(&config.email, &templates).await?;
let mailer = mailer_from_config(&config.email, &templates)?;
mailer.test_connection().await?;
let http_client_factory = HttpClientFactory::new(50);

5
crates/cli/src/util.rs
View File

@@ -55,7 +55,7 @@ pub async fn password_manager_from_config(
PasswordManager::new(schemes)
}
pub async fn mailer_from_config(
pub fn mailer_from_config(
config: &EmailConfig,
templates: &Templates,
) -> Result<Mailer, anyhow::Error> {
@@ -83,7 +83,8 @@ pub async fn mailer_from_config(
.context("failed to build SMTP transport")?
}
EmailTransportConfig::Sendmail { command } => MailTransport::sendmail(command),
EmailTransportConfig::AwsSes => MailTransport::aws_ses().await?,
#[allow(deprecated)]
EmailTransportConfig::AwsSes => anyhow::bail!("AWS SESv2 backend has been removed"),
};
Ok(Mailer::new(templates.clone(), transport, from, reply_to))