Open platform to collect and prioritize feedback
enhancement: allow unauthenticated SMTP requests (#316)
Luke Sheard9a2cc9970e94
diff --git a/app/pkg/email/smtp/smtp.go b/app/pkg/email/smtp/smtp.goindex c644fe212..911721941 100644--- a/app/pkg/email/smtp/smtp.go+++ b/app/pkg/email/smtp/smtp.go@@ -9,6 +9,13 @@ import ("github.com/getfider/fider/app/pkg/log")+func authenticate(username string, password string, host string) gosmtp.Auth {+ if username == "" && password == "" {+ return nil+ }+ return gosmtp.PlainAuth("", username, password, host)+}+//Sender is used to send emailstype Sender struct {logger log.Logger@@ -47,7 +54,7 @@ func (s *Sender) Send(templateName string, params email.Params, from string, tobody += "\r\n" + message.Bodyservername := fmt.Sprintf("%s:%s", s.host, s.port)- auth := gosmtp.PlainAuth("", s.username, s.password, s.host)+ auth := authenticate(s.username, s.password, s.host)err := gosmtp.SendMail(servername, auth, email.NoReply, []string{to.Address}, []byte(body))if err != nil {return errors.Wrap(err, "failed to send email with template %s", templateName)diff --git a/app/services.go b/app/services.goindex 4d622ace0..14a23fd23 100644--- a/app/services.go+++ b/app/services.go@@ -52,7 +52,7 @@ func NewEmailer(logger log.Logger) email.Sender {logger,env.MustGet("EMAIL_SMTP_HOST"),env.MustGet("EMAIL_SMTP_PORT"),- env.MustGet("EMAIL_SMTP_USERNAME"),- env.MustGet("EMAIL_SMTP_PASSWORD"),+ env.GetEnvOrDefault("EMAIL_SMTP_USERNAME", ""),+ env.GetEnvOrDefault("EMAIL_SMTP_PASSWORD", ""),)}