Merge pull request #758 from Darneus/master

muety · web-flow · commit 3f6c3c2c6d92 · 2025-03-05T16:15:50.000+01:00
allow smtp with no auth
diff --git a/services/mail/smtp.go b/services/mail/smtp.go
@@ -65,11 +65,8 @@ func (s *SMTPSendingService) Send(mail *models.Mail) error {
 		defer c.Close()
 	}
 
-	if s.auth != nil {
-		if ok, _ := c.Extension("AUTH"); !ok {
-			return errors.New("smtp: server doesn't support AUTH")
-		}
-
+	// authenticate if required
+	if ok, _ := c.Extension("AUTH"); ok && s.auth != nil {
 		if len(s.config.Username) == 0 || len(s.config.Password) == 0 {
 			return errors.New("smtp: server requires authentication, but no authentication is provided")
 		}

Original file line number	Diff line number	Diff line change
`@@ -65,11 +65,8 @@ func (s SMTPSendingService) Send(mail models.Mail) error {`
`65`	`65`	`defer c.Close()`
`66`	`66`	`}`
`67`	`67`
`68`		`- if s.auth != nil {`
`69`		`- if ok, _ := c.Extension("AUTH"); !ok {`
`70`		`- return errors.New("smtp: server doesn't support AUTH")`
`71`		`- }`
`72`		`-`
	`68`	`+ // authenticate if required`
	`69`	`+ if ok, _ := c.Extension("AUTH"); ok && s.auth != nil {`
`73`	`70`	`if len(s.config.Username) == 0 \|\| len(s.config.Password) == 0 {`
`74`	`71`	`return errors.New("smtp: server requires authentication, but no authentication is provided")`
`75`	`72`	`}`