cybercinch/openaccounting-server
0
0
Fork 1
mirror of https://github.com/openaccounting/oa-server.git synced 2025-12-09 09:00:42 +13:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #19 from pnagurny/enhance/mailgun-sender

Browse Source 
Enhance/mailgun sender
This commit is contained in:
Patrick Nagurny
2020-11-25 10:29:29 -05:00
committed by GitHub
parent 2f07dd4cda 4e472c9508
commit a4500d9114
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/model/user.go
View File

@@ -181,7 +181,7 @@ func (model *Model) SendVerificationEmail(user *types.User) error {
link := model.config.WebUrl + "/user/verify?code=" + user.EmailVerifyCode link := model.config.WebUrl + "/user/verify?code=" + user.EmailVerifyCode
from := model.config.MailgunSender + "<" + model.config.MailgunEmail + ">" from := model.config.MailgunSender + " <" + model.config.MailgunEmail + ">"
subject := "Verify your email" subject := "Verify your email"
to := user.Email to := user.Email
@@ -192,6 +192,7 @@ func (model *Model) SendVerificationEmail(user *types.User) error {
"<a href=\"" + link + "\">" + link + "</a>" "<a href=\"" + link + "\">" + link + "</a>"
message := mg.NewMessage(from, subject, plainTextContent, to) message := mg.NewMessage(from, subject, plainTextContent, to)
message.AddHeader("Sender", from)
message.SetHtml(htmlContent) message.SetHtml(htmlContent)
ctx, cancel := context.WithTimeout(context.Background(), time.Second*10) ctx, cancel := context.WithTimeout(context.Background(), time.Second*10)
@@ -216,7 +217,7 @@ func (model *Model) SendPasswordResetEmail(user *types.User) error {
link := model.config.WebUrl + "/user/reset-password?code=" + user.PasswordReset link := model.config.WebUrl + "/user/reset-password?code=" + user.PasswordReset
from := model.config.MailgunSender + "<" + model.config.MailgunEmail + ">" from := model.config.MailgunSender + " <" + model.config.MailgunEmail + ">"
subject := "Reset password" subject := "Reset password"
to := user.Email to := user.Email
@@ -229,6 +230,7 @@ func (model *Model) SendPasswordResetEmail(user *types.User) error {
"nothing will happen." "nothing will happen."
message := mg.NewMessage(from, subject, plainTextContent, to) message := mg.NewMessage(from, subject, plainTextContent, to)
message.AddHeader("Sender", from)
message.SetHtml(htmlContent) message.SetHtml(htmlContent)
ctx, cancel := context.WithTimeout(context.Background(), time.Second*10) ctx, cancel := context.WithTimeout(context.Background(), time.Second*10)