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

switch to mailgun

Browse Source
This commit is contained in:
Patrick Nagurny
2020-11-23 11:13:23 -05:00
parent ece803ec68
commit 73bf3953c2
3 changed files with 40 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
config.json.sample
View File

@@ -9,7 +9,8 @@
"Database": "openaccounting", "Database": "openaccounting",
"User": "openaccounting", "User": "openaccounting",
"Password": "openaccounting", "Password": "openaccounting",
"SendgridKey": "", "MailgunDomain": "mg.domain.com",
"SendgridEmail": "noreply@domain.com", "MailgunKey": "",
"SendgridSender": "Sender" "MailgunEmail": "noreply@domain.com",
"MailgunSender": "Sender"
} }

7
core/model/types/config.go
View File

@@ -11,7 +11,8 @@ type Config struct {
Database string Database string
User string User string
Password string Password string
SendgridKey string MailgunDomain string
SendgridEmail string MailgunKey string
SendgridSender string MailgunEmail string
MailgunSender string
} }

52
core/model/user.go
View File

@@ -1,13 +1,15 @@
package model package model
import ( import (
"context"
"errors" "errors"
"github.com/openaccounting/oa-server/core/model/types"
"github.com/openaccounting/oa-server/core/util"
"github.com/sendgrid/sendgrid-go"
"github.com/sendgrid/sendgrid-go/helpers/mail"
"log" "log"
"regexp" "regexp"
"time"
"github.com/mailgun/mailgun-go/v4"
"github.com/openaccounting/oa-server/core/model/types"
"github.com/openaccounting/oa-server/core/util"
) )
type UserInterface interface { type UserInterface interface {
@@ -175,11 +177,13 @@ func (model *Model) ConfirmResetPassword(password string, code string) (*types.U
func (model *Model) SendVerificationEmail(user *types.User) error { func (model *Model) SendVerificationEmail(user *types.User) error {
log.Println("Sending verification email to " + user.Email) log.Println("Sending verification email to " + user.Email)
mg := mailgun.NewMailgun(model.config.MailgunDomain, model.config.MailgunKey)
link := model.config.WebUrl + "/user/verify?code=" + user.EmailVerifyCode link := model.config.WebUrl + "/user/verify?code=" + user.EmailVerifyCode
from := mail.NewEmail(model.config.SendgridSender, model.config.SendgridEmail) from := model.config.MailgunSender + "<" + model.config.MailgunEmail + ">"
subject := "Verify your email" subject := "Verify your email"
to := mail.NewEmail(user.FirstName+" "+user.LastName, user.Email) to := user.Email
plainTextContent := "Thank you for signing up with Open Accounting! " + plainTextContent := "Thank you for signing up with Open Accounting! " +
"Please click on the link below to verify your email address:\n\n" + link "Please click on the link below to verify your email address:\n\n" + link
@@ -187,17 +191,20 @@ func (model *Model) SendVerificationEmail(user *types.User) error {
"Please click on the link below to verify your email address:<br><br>" + "Please click on the link below to verify your email address:<br><br>" +
"<a href=\"" + link + "\">" + link + "</a>" "<a href=\"" + link + "\">" + link + "</a>"
message := mail.NewSingleEmail(from, subject, to, plainTextContent, htmlContent) message := mg.NewMessage(from, subject, plainTextContent, to)
client := sendgrid.NewSendClient(model.config.SendgridKey) message.SetHtml(htmlContent)
response, err := client.Send(message)
ctx, cancel := context.WithTimeout(context.Background(), time.Second*10)
defer cancel()
// Send the message with a 10 second timeout
resp, id, err := mg.Send(ctx, message)
if err != nil { if err != nil {
return err return err
} }
log.Println(response.StatusCode) log.Printf("ID: %s Resp: %s\n", id, resp)
log.Println(response.Body)
log.Println(response.Headers)
return nil return nil
} }
@@ -205,11 +212,13 @@ func (model *Model) SendVerificationEmail(user *types.User) error {
func (model *Model) SendPasswordResetEmail(user *types.User) error { func (model *Model) SendPasswordResetEmail(user *types.User) error {
log.Println("Sending password reset email to " + user.Email) log.Println("Sending password reset email to " + user.Email)
mg := mailgun.NewMailgun(model.config.MailgunDomain, model.config.MailgunKey)
link := model.config.WebUrl + "/user/reset-password?code=" + user.PasswordReset link := model.config.WebUrl + "/user/reset-password?code=" + user.PasswordReset
from := mail.NewEmail(model.config.SendgridSender, model.config.SendgridEmail) from := model.config.MailgunSender + "<" + model.config.MailgunEmail + ">"
subject := "Reset password" subject := "Reset password"
to := mail.NewEmail(user.FirstName+" "+user.LastName, user.Email) to := user.Email
plainTextContent := "Please click the following link to reset your password:\n\n" + link + plainTextContent := "Please click the following link to reset your password:\n\n" + link +
"If you did not request to have your password reset, please ignore this email and " + "If you did not request to have your password reset, please ignore this email and " +
@@ -219,17 +228,20 @@ func (model *Model) SendPasswordResetEmail(user *types.User) error {
"If you did not request to have your password reset, please ignore this email and " + "If you did not request to have your password reset, please ignore this email and " +
"nothing will happen." "nothing will happen."
message := mail.NewSingleEmail(from, subject, to, plainTextContent, htmlContent) message := mg.NewMessage(from, subject, plainTextContent, to)
client := sendgrid.NewSendClient(model.config.SendgridKey) message.SetHtml(htmlContent)
response, err := client.Send(message)
ctx, cancel := context.WithTimeout(context.Background(), time.Second*10)
defer cancel()
// Send the message with a 10 second timeout
resp, id, err := mg.Send(ctx, message)
if err != nil { if err != nil {
return err return err
} }
log.Println(response.StatusCode) log.Printf("ID: %s Resp: %s\n", id, resp)
log.Println(response.Body)
log.Println(response.Headers)
return nil return nil
} }