1
0
mirror of https://github.com/hrfee/jfa-go.git synced 2024-09-19 10:50:11 +00:00

email: use proxy for mailgun, too

adds proxy transport to the http.Client in the mailgun api client.
This commit is contained in:
Harvey Tindall 2024-08-09 21:11:18 +01:00
parent 6308db495a
commit a52dd26ec6
Signed by: hrfee
GPG Key ID: BBC65952848FB1A2

View File

@ -10,6 +10,7 @@ import (
"html/template"
"io"
"io/fs"
"net/http"
"net/url"
"os"
"strconv"
@ -99,7 +100,7 @@ func NewEmailer(app *appContext) *Emailer {
app.err.Printf(lm.FailedInitSMTP, err)
}
} else if method == "mailgun" {
emailer.NewMailgun(app.config.Section("mailgun").Key("api_url").String(), app.config.Section("mailgun").Key("api_key").String())
emailer.NewMailgun(app.config.Section("mailgun").Key("api_url").String(), app.config.Section("mailgun").Key("api_key").String(), app.proxyTransport)
} else if method == "dummy" {
emailer.sender = &DummyClient{}
}
@ -201,10 +202,14 @@ type Mailgun struct {
}
// NewMailgun returns a Mailgun emailClient.
func (emailer *Emailer) NewMailgun(url, key string) {
func (emailer *Emailer) NewMailgun(url, key string, transport *http.Transport) {
sender := &Mailgun{
client: mailgun.NewMailgun(strings.Split(emailer.fromAddr, "@")[1], key),
}
if transport != nil {
cli := sender.client.Client()
cli.Transport = transport
}
// Mailgun client takes the base url, so we need to trim off the end (e.g 'v3/messages')
if strings.Contains(url, "messages") {
url = url[0:strings.LastIndex(url, "/")]