Skip to content

armgit / fider

Public Imported from GitHub
0

Open platform to collect and prioritize feedback

fix: ignore email delivery when address is empty(#349)

Guilherme Oenning54f0fddd0c3c
diff --git a/app/pkg/email/mailgun/mailgun.go b/app/pkg/email/mailgun/mailgun.go
index f09723968..6bb3577e9 100644
--- a/app/pkg/email/mailgun/mailgun.go
+++ b/app/pkg/email/mailgun/mailgun.go
@@ -64,11 +64,13 @@ func (s *Sender) BatchSend(tenant *models.Tenant, templateName string, params em
// Set Mailgun's var based on each recipient's variables
recipientVariables := make(map[string]email.Params, 0)
for _, r := range to {
- if email.CanSendTo(r.Address) {
- form.Add("to", fmt.Sprintf("%s <%s>", r.Name, r.Address))
- recipientVariables[r.Address] = r.Params
- } else {
- s.logger.Warnf("Skipping email to '%s <%s>' due to whitelist.", r.Name, r.Address)
+ if r.Address != "" {
+ if email.CanSendTo(r.Address) {
+ form.Add("to", fmt.Sprintf("%s <%s>", r.Name, r.Address))
+ recipientVariables[r.Address] = r.Params
+ } else {
+ s.logger.Warnf("Skipping email to '%s <%s>' due to whitelist.", r.Name, r.Address)
+ }
}
}
diff --git a/app/pkg/email/smtp/smtp.go b/app/pkg/email/smtp/smtp.go
index 7eb7e26cb..a2c4be1d4 100644
--- a/app/pkg/email/smtp/smtp.go
+++ b/app/pkg/email/smtp/smtp.go
@@ -33,6 +33,10 @@ func NewSender(logger log.Logger, host, port, username, password string) *Sender
//Send an email
func (s *Sender) Send(tenant *models.Tenant, templateName string, params email.Params, from string, to email.Recipient) error {
+ if to.Address == "" {
+ return nil
+ }
+
if !email.CanSendTo(to.Address) {
s.logger.Warnf("Skipping email to %s <%s> due to whitelist.", to.Name, to.Address)
return nil