ami/tl-vikunja
1
0
Fork 0
Code

fix: reorder mail options (#2533)

Browse Source 
This PR fixes a bug where setting the SMTP port didn't have any effect, since it is overridden when `NewClient()` executes the `WithTLSPortPolicy()` option.

Reviewed-on: https://kolaente.dev/vikunja/vikunja/pulls/2533
Resolves https://kolaente.dev/vikunja/vikunja/issues/2534
Co-authored-by: Balázs Keresztury <b@belidzs.hu>
Co-committed-by: Balázs Keresztury <b@belidzs.hu>
This commit is contained in:
Balázs Keresztury 2024-07-07 15:00:19 +00:00 committed by konrad
parent 1eb1aa2575
commit 136ef58820
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/mail/mail.go
View File

@ -48,13 +48,13 @@ func getClient() (*mail.Client, error) {
} }
opts := []mail.Option{ opts := []mail.Option{
mail.WithPort(config.MailerPort.GetInt()),
mail.WithTLSPortPolicy(tlsPolicy), mail.WithTLSPortPolicy(tlsPolicy),
mail.WithTLSConfig(&tls.Config{ mail.WithTLSConfig(&tls.Config{
//#nosec G402 //#nosec G402
InsecureSkipVerify: config.MailerSkipTLSVerify.GetBool(), InsecureSkipVerify: config.MailerSkipTLSVerify.GetBool(),
ServerName: config.MailerHost.GetString(), ServerName: config.MailerHost.GetString(),
}), }),
mail.WithPort(config.MailerPort.GetInt()),
mail.WithTimeout((config.MailerQueueTimeout.GetDuration() + 3) * time.Second), // 3s more for us to close before mail server timeout mail.WithTimeout((config.MailerQueueTimeout.GetDuration() + 3) * time.Second), // 3s more for us to close before mail server timeout
mail.WithLogger(log.NewMailLogger(config.LogEnabled.GetBool(), config.LogMail.GetString(), config.LogMailLevel.GetString())), mail.WithLogger(log.NewMailLogger(config.LogEnabled.GetBool(), config.LogMail.GetString(), config.LogMailLevel.GetString())),
mail.WithDebugLog(), mail.WithDebugLog(),