mirrors/mostlymatter
1
0
Форкнуть 0
Код Задачи Запросы на слияние Действия Пакеты Проекты Релизы Вики Активность

[PLT-1015] Make all Mattermost system emails Multi-Part, with both a HTML and Plain Text version. (#5698)

Просмотр исходного кода 
* Implementation to Make all Mattermost system emails Multi-Part, with both a HTML and Plain Text version

* update lib

* update code per review

* update to use the mattermost repo
Этот коммит содержится в:
Carlos Tadeu Panato Junior
2017-08-21 15:31:13 -03:00
коммит произвёл Christopher Speller
родитель 65ccd4afb2
Коммит 12a9180807
5 изменённых файлов: 30 добавлений и 26 удалений
Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

2
NOTICE.txt
Просмотреть файл

@@ -4655,7 +4655,7 @@ MIT license
This product contains a modified portion of 'html2text', an HTML to raw text converter by Carlos Tadeu Panato Junior, based on `html2text` by Jay Taylor. This product contains a modified portion of 'html2text', an HTML to raw text converter by Carlos Tadeu Panato Junior, based on `html2text` by Jay Taylor.
* HOMEPAGE * HOMEPAGE
* https://github.com/cpanato/html2text * https://github.com/mattermost/html2text
* LICENSE * LICENSE

1
app/admin.go
Просмотреть файл

@@ -212,7 +212,6 @@ func TestEmail(userId string, cfg *model.Config) *model.AppError {
return model.NewLocAppError("testEmail", "api.admin.test_email.reenter_password", nil, "") return model.NewLocAppError("testEmail", "api.admin.test_email.reenter_password", nil, "")
} }
} }
if user, err := GetUser(userId); err != nil { if user, err := GetUser(userId); err != nil {
return err return err
} else { } else {

2
app/email_batching.go
Просмотреть файл

@@ -218,7 +218,7 @@ func sendBatchedEmailNotification(userId string, notifications []*batchedNotific
body.Props["BodyText"] = translateFunc("api.email_batching.send_batched_email_notification.body_text", len(notifications)) body.Props["BodyText"] = translateFunc("api.email_batching.send_batched_email_notification.body_text", len(notifications))
if err := utils.SendMail(user.Email, subject, body.Render()); err != nil { if err := utils.SendMail(user.Email, subject, body.Render()); err != nil {
l4g.Warn(utils.T("api.email_batching.send_batched_email_notification.send.app_error"), user.Email, err) l4g.Warn(utils.T("api.email_batchings.send_batched_email_notification.send.app_error"), user.Email, err)
} }
} }

4
app/email_test.go
Просмотреть файл

@@ -70,7 +70,7 @@ func TestSendEmailChangeVerifyEmail(t *testing.T) {
var newUserEmail string = "newtest@example.com" var newUserEmail string = "newtest@example.com"
var locale string = "en" var locale string = "en"
var siteURL string = "" var siteURL string = "http://localhost:8065"
var expectedPartialMessage string = "You updated your email" var expectedPartialMessage string = "You updated your email"
var expectedSubject string = "[" + utils.Cfg.TeamSettings.SiteName + "] Verify new email address" var expectedSubject string = "[" + utils.Cfg.TeamSettings.SiteName + "] Verify new email address"
var token string = "TEST_TOKEN" var token string = "TEST_TOKEN"
@@ -174,7 +174,7 @@ func TestSendVerifyEmail(t *testing.T) {
var userEmail string = "test@example.com" var userEmail string = "test@example.com"
var locale string = "en" var locale string = "en"
var siteURL string = "" var siteURL string = "http://localhost:8605"
var expectedPartialMessage string = "Please verify your email address by clicking below" var expectedPartialMessage string = "Please verify your email address by clicking below"
var expectedSubject string = "[" + utils.Cfg.TeamSettings.SiteName + "] Email Verification" var expectedSubject string = "[" + utils.Cfg.TeamSettings.SiteName + "] Email Verification"
var token string = "TEST_TOKEN" var token string = "TEST_TOKEN"

47
utils/mail.go
Просмотреть файл

@@ -5,14 +5,16 @@ package utils
import ( import (
"crypto/tls" "crypto/tls"
"fmt"
"mime" "mime"
"net" "net"
"net/mail" "net/mail"
"net/smtp" "net/smtp"
"time" "time"
"gopkg.in/gomail.v2"
l4g "github.com/alecthomas/log4go" l4g "github.com/alecthomas/log4go"
"github.com/mattermost/html2text"
"github.com/mattermost/platform/model" "github.com/mattermost/platform/model"
) )
@@ -99,34 +101,38 @@ func TestConnection(config *model.Config) {
defer c.Close() defer c.Close()
} }
func SendMail(to, subject, body string) *model.AppError { func SendMail(to, subject, htmlBody string) *model.AppError {
return SendMailUsingConfig(to, subject, body, Cfg) return SendMailUsingConfig(to, subject, htmlBody, Cfg)
} }
func SendMailUsingConfig(to, subject, body string, config *model.Config) *model.AppError { func SendMailUsingConfig(to, subject, htmlBody string, config *model.Config) *model.AppError {
if !config.EmailSettings.SendEmailNotifications || len(config.EmailSettings.SMTPServer) == 0 { if !config.EmailSettings.SendEmailNotifications || len(config.EmailSettings.SMTPServer) == 0 {
return nil return nil
} }
l4g.Debug(T("utils.mail.send_mail.sending.debug"), to, subject) l4g.Debug(T("utils.mail.send_mail.sending.debug"), to, subject)
htmlMessage := "\r\n<html><body>" + htmlBody + "</body></html>"
fromMail := mail.Address{Name: config.EmailSettings.FeedbackName, Address: config.EmailSettings.FeedbackEmail} fromMail := mail.Address{Name: config.EmailSettings.FeedbackName, Address: config.EmailSettings.FeedbackEmail}
toMail := mail.Address{Name: "", Address: to}
headers := make(map[string]string) txtBody, err := html2text.FromString(htmlBody)
headers["From"] = fromMail.String() if err != nil {
headers["To"] = toMail.String() l4g.Warn(err)
headers["Subject"] = encodeRFC2047Word(subject) txtBody = ""
headers["MIME-version"] = "1.0"
headers["Content-Type"] = "text/html; charset=\"utf-8\""
headers["Content-Transfer-Encoding"] = "8bit"
headers["Date"] = time.Now().Format(time.RFC1123Z)
message := ""
for k, v := range headers {
message += fmt.Sprintf("%s: %s\r\n", k, v)
} }
message += "\r\n<html><body>" + body + "</body></html>"
m := gomail.NewMessage(gomail.SetCharset("UTF-8"))
m.SetHeaders(map[string][]string{
"From": {fromMail.String()},
"To": {to},
"Subject": {encodeRFC2047Word(subject)},
"Content-Transfer-Encoding": {"8bit"},
})
m.SetDateHeader("Date", time.Now())
m.SetBody("text/plain", txtBody)
m.AddAlternative("text/html", htmlMessage)
conn, err1 := connectToSMTPServer(config) conn, err1 := connectToSMTPServer(config)
if err1 != nil { if err1 != nil {
@@ -145,7 +151,7 @@ func SendMailUsingConfig(to, subject, body string, config *model.Config) *model.
return model.NewLocAppError("SendMail", "utils.mail.send_mail.from_address.app_error", nil, err.Error()) return model.NewLocAppError("SendMail", "utils.mail.send_mail.from_address.app_error", nil, err.Error())
} }
if err := c.Rcpt(toMail.Address); err != nil { if err := c.Rcpt(to); err != nil {
return model.NewLocAppError("SendMail", "utils.mail.send_mail.to_address.app_error", nil, err.Error()) return model.NewLocAppError("SendMail", "utils.mail.send_mail.to_address.app_error", nil, err.Error())
} }
@@ -154,11 +160,10 @@ func SendMailUsingConfig(to, subject, body string, config *model.Config) *model.
return model.NewLocAppError("SendMail", "utils.mail.send_mail.msg_data.app_error", nil, err.Error()) return model.NewLocAppError("SendMail", "utils.mail.send_mail.msg_data.app_error", nil, err.Error())
} }
_, err = w.Write([]byte(message)) _, err = m.WriteTo(w)
if err != nil { if err != nil {
return model.NewLocAppError("SendMail", "utils.mail.send_mail.msg.app_error", nil, err.Error()) return model.NewLocAppError("SendMail", "utils.mail.send_mail.msg.app_error", nil, err.Error())
} }
err = w.Close() err = w.Close()
if err != nil { if err != nil {
return model.NewLocAppError("SendMail", "utils.mail.send_mail.close.app_error", nil, err.Error()) return model.NewLocAppError("SendMail", "utils.mail.send_mail.close.app_error", nil, err.Error())