Refactor email sending to use gomail instead of Mailgun

Irae Hueck Costa · Irae Hueck Costa · commit e4469805b9e9 · 2025-03-03T20:09:56.000-05:00
diff --git a/backend/endpoints/feedback.go b/backend/endpoints/feedback.go
@@ -1,11 +1,9 @@
 package endpoints
 
 import (
-	"context"
 	"fmt"
 	"github.com/ihucos/counter.dev/lib"
-	"github.com/mailgun/mailgun-go/v4"
-	"time"
+	"gopkg.in/gomail.v2"
 )
 
 func init() {
@@ -16,21 +14,26 @@ func init() {
 			ctx.ReturnBadRequest("No input given.")
 		}
 		user := ctx.GetUserId()
-		mg := mailgun.NewMailgun("counter.dev", ctx.App.Config.MailgunSecretApiKey)
+		m := gomail.NewMessage()
+
+		m.SetHeader("From", "hey@counter.dev")
+		m.SetHeader("To", "hey@counter.dev")
+		m.SetBody("text/plain", feedback)
+
 		var title string
 		if user == "" {
 			title = "User feedback received"
 		} else {
 			title = fmt.Sprintf("User feedback received from %s", user)
 		}
-                if mail != "" {
-                    title += fmt.Sprintf(" (%s)", mail)
-                }
-		message := mg.NewMessage("hey@counter.dev", title, feedback, "hey@counter.dev")
-		c, cancel := context.WithTimeout(context.Background(), time.Second*30)
-		defer cancel()
-		_, _, err := mg.Send(c, message)
+		if mail != "" {
+			title += fmt.Sprintf(" (%s)", mail)
+		}
+		m.SetHeader("Subject", title)
+
+		d := gomail.NewDialer("smtp.protonmail.ch", 587, "hey@counter.dev", ctx.App.Config.SMTPSecret)
 
+		err := d.DialAndSend(m)
 		if err != nil {
 			ctx.CatchError(err)
 		}
diff --git a/backend/endpoints/register.go b/backend/endpoints/register.go
@@ -35,7 +35,7 @@ func init() {
 				ctx.CatchError(err)
 			}
 
-      user.SendSurvey(ctx.App.Config.MailgunSecretApiKey)
+      user.SendSurvey(ctx.App.Config.SMTPSecret)
 			ctx.SetSessionUser(userId)
 			ctx.ReturnUser()
 
diff --git a/backend/go.mod b/backend/go.mod
@@ -9,6 +9,8 @@ require (
 	github.com/mailgun/mailgun-go/v4 v4.8.1
 	github.com/xavivars/uasurfer v0.0.0-20210227184249-298e5855ffd5
 	golang.org/x/text v0.3.8
+	gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc // indirect
+	gopkg.in/gomail.v2 v2.0.0-20160411212932-81ebce5c23df // indirect
 	gorm.io/driver/sqlite v1.3.2
 	gorm.io/gorm v1.23.5
 )
diff --git a/backend/go.sum b/backend/go.sum
@@ -68,8 +68,12 @@ golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGm
 golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc h1:2gGKlE2+asNV9m7xrywl36YYNnBG5ZQ0r/BOOxqPpmk=
+gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc/go.mod h1:m7x9LTH6d71AHyAX77c9yqWCCa3UKHcVEj9y7hAtKDk=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/gomail.v2 v2.0.0-20160411212932-81ebce5c23df h1:n7WqCuqOuCbNr617RXOY0AWRXxgwEyPp2z+p0+hgMuE=
+gopkg.in/gomail.v2 v2.0.0-20160411212932-81ebce5c23df/go.mod h1:LRQQ+SO6ZHR7tOkpBDuZnXENFzX8qRjMDMyPD6BRkCw=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gorm.io/driver/sqlite v1.3.2 h1:nWTy4cE52K6nnMhv23wLmur9Y3qWbZvOBz+V4PrGAxg=
diff --git a/backend/lib/config.go b/backend/lib/config.go
@@ -14,6 +14,7 @@ type Config struct {
 	ArchiveDatabase string
 	ArchiveMaxAge time.Duration
 	MailgunSecretApiKey string
+	SMTPSecret string
 }
 
 func env(env string) string {
@@ -50,6 +51,6 @@ func NewConfigFromEnv() Config {
 		ArchiveDatabase: env("WEBSTATS_ARCHIVE_DATABASE"),
 		ArchiveMaxAge: envDuration("WEBSTATS_ARCHIVE_MAX_AGE"),
 		MailgunSecretApiKey:     envDefault("WEBSTATS_MAILGUN_SECRET_API_KEY", "dummy"),
+		SMTPSecret:     envDefault("WEBSTATS_SMTP_SECREET", "dummy"),
 	}
-
 }

Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ func init() {`
`35`	`35`	`ctx.CatchError(err)`
`36`	`36`	`}`
`37`	`37`
`38`		`- user.SendSurvey(ctx.App.Config.MailgunSecretApiKey)`
	`38`	`+ user.SendSurvey(ctx.App.Config.SMTPSecret)`
`39`	`39`	`ctx.SetSessionUser(userId)`
`40`	`40`	`ctx.ReturnUser()`
`41`	`41`
Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,8 @@ require (`
`9`	`9`	`github.com/mailgun/mailgun-go/v4 v4.8.1`
`10`	`10`	`github.com/xavivars/uasurfer v0.0.0-20210227184249-298e5855ffd5`
`11`	`11`	`golang.org/x/text v0.3.8`
	`12`	`+ gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc // indirect`
	`13`	`+ gopkg.in/gomail.v2 v2.0.0-20160411212932-81ebce5c23df // indirect`
`12`	`14`	`gorm.io/driver/sqlite v1.3.2`
`13`	`15`	`gorm.io/gorm v1.23.5`
`14`	`16`	`)`
Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,7 @@ type Config struct {`
`14`	`14`	`ArchiveDatabase string`
`15`	`15`	`ArchiveMaxAge time.Duration`
`16`	`16`	`MailgunSecretApiKey string`
	`17`	`+ SMTPSecret string`
`17`	`18`	`}`
`18`	`19`
`19`	`20`	`func env(env string) string {`
`@@ -50,6 +51,6 @@ func NewConfigFromEnv() Config {`
`50`	`51`	`ArchiveDatabase: env("WEBSTATS_ARCHIVE_DATABASE"),`
`51`	`52`	`ArchiveMaxAge: envDuration("WEBSTATS_ARCHIVE_MAX_AGE"),`
`52`	`53`	`MailgunSecretApiKey: envDefault("WEBSTATS_MAILGUN_SECRET_API_KEY", "dummy"),`
	`54`	`+ SMTPSecret: envDefault("WEBSTATS_SMTP_SECREET", "dummy"),`
`53`	`55`	`}`
`54`		`-`
`55`	`56`	`}`