3
0

Fix default-addr and test-email sending

This commit is contained in:
Denis Arh
2020-09-02 12:37:00 +02:00
parent 60b4d4f636
commit a0036bdecf
3 changed files with 14 additions and 7 deletions
+2 -2
View File
@@ -49,9 +49,9 @@ func SetupDialer(host string, port int, user, pass, from string) {
defaultDialerError = errors.New("No port provided for SMTP")
return
}
if from == "" {
defaultDialerError = errors.New("Sender for SMTP is not set")
return
from = "placeholder@example.net"
}
if defaultDialerError != nil {
+2 -3
View File
@@ -97,12 +97,11 @@ func Auth(app serviceInitializer) *cobra.Command {
ntf = service.DefaultAuthNotification
)
err = ntf.EmailConfirmation(ctx, "en", args[0], "notification-testing-token")
cli.HandleError(err)
// Update current settings to be sure that we do not have outdated values
cli.HandleError(service.DefaultSettings.UpdateCurrent(ctx))
err = ntf.PasswordReset(ctx, "en", args[0], "notification-testing-token")
cli.HandleError(err)
},
}
+10 -2
View File
@@ -64,8 +64,16 @@ func (svc authNotification) PasswordReset(ctx context.Context, lang string, emai
}
func (svc authNotification) newMail() *gomail.Message {
m := gomail.NewMessage()
m.SetAddressHeader("From", svc.settings.Auth.Mail.FromAddress, svc.settings.Auth.Mail.FromName)
var (
m = mail.New()
addr = svc.settings.Auth.Mail.FromAddress
name = svc.settings.Auth.Mail.FromName
)
if addr != "" {
m.SetAddressHeader("From", addr, name)
}
return m
}