diff --git a/comms/email/initial.go b/comms/email/initial.go index eb60a625..bfc96d29 100644 --- a/comms/email/initial.go +++ b/comms/email/initial.go @@ -39,6 +39,9 @@ func maybeSendInitialEmail(ctx context.Context, destination string) error { func urlEmailInBrowser(public_id string) string { return config.MakeURLReport("/email/render/%s", public_id) } +func urlUnsubscribe(address string) string { + return config.MakeURLReport("/email/unsubscribe?email=%s") +} func sendEmailInitialContact(ctx context.Context, destination string) error { //data := pgtypes.HStore{} data := make(map[string]string, 0) @@ -49,7 +52,7 @@ func sendEmailInitialContact(ctx context.Context, destination string) error { data["URLBrowser"] = urlEmailInBrowser(public_id) data["URLLogo"] = config.MakeURLReport("/static/img/nidus-logo-no-lettering-64.png") data["URLSubscribe"] = config.MakeURLReport("/email/subscribe?email=%s", destination) - data["URLUnsubscribe"] = config.MakeURLReport("/email/unsubscribe") + data["URLUnsubscribe"] = urlUnsubscribe(destination) text, html, err := renderEmailTemplates(templateInitialID, data) if err != nil { diff --git a/comms/email/report_notification_confirmation.go b/comms/email/report_notification_confirmation.go index 7aa23501..5c9871e0 100644 --- a/comms/email/report_notification_confirmation.go +++ b/comms/email/report_notification_confirmation.go @@ -54,7 +54,8 @@ func sendEmailReportConfirmation(ctx context.Context, job Job) error { data["ReportIDStr"] = report_id_str data["URLLogo"] = config.MakeURLReport("/static/img/nidus-logo-no-lettering-64.png") data["URLReportStatus"] = config.MakeURLReport("/foo") - data["URLReportUnsubscribe"] = config.MakeURLReport("/email/unsubscribe") + data["URLReportUnsubscribe"] = config.MakeURLReport("/email/unsubscribe/report/%s", j.reportID) + data["URLUnsubscribe"] = urlUnsubscribe(j.destination()) data["URLViewInBrowser"] = urlEmailInBrowser(public_id) text, html, err := renderEmailTemplates(templateReportNotificationConfirmationID, data) if err != nil { diff --git a/comms/email/template/report-notification-confirmation.html b/comms/email/template/report-notification-confirmation.html index 0eef1e71..2ae0db35 100644 --- a/comms/email/template/report-notification-confirmation.html +++ b/comms/email/template/report-notification-confirmation.html @@ -87,6 +87,7 @@

We'll send you additional updates as work is scheduled and completed.

If you have any questions or need further assistance, please don't hesitate to contact us by replying to this email.

+

You can unsubscribe from notifications about this report by clicking here

diff --git a/rmo/email.go b/rmo/email.go index 0a9422f2..20854b59 100644 --- a/rmo/email.go +++ b/rmo/email.go @@ -11,12 +11,14 @@ import ( "github.com/go-chi/chi/v5" ) -type ContentEmailSubscribe struct { +type ContentEmail struct { Email string } var ( - EmailSubscribeT = buildTemplate("email-subscribe", "base") + EmailConfirmT = buildTemplate("email-confirm", "base") + EmailConfirmCompleteT = buildTemplate("email-confirm-complete", "base") + EmailUnsubscribeT = buildTemplate("email-unsubscribe", "base") ) func getEmailByCode(w http.ResponseWriter, r *http.Request) { @@ -41,8 +43,67 @@ func getEmailByCode(w http.ResponseWriter, r *http.Request) { } w.Write(html) } -func getEmailSubscribe(w http.ResponseWriter, r *http.Request) { +func getEmailReportUnsubscribe(w http.ResponseWriter, r *http.Request) { email := r.FormValue("email") + html.RenderOrError( + w, + EmailConfirmT, + ContentEmail{ + Email: email, + }, + ) +} +func getEmailConfirm(w http.ResponseWriter, r *http.Request) { + email := r.FormValue("email") + if email == "" { + respondError(w, "Not sure what to do with an empty email", nil, http.StatusBadRequest) + return + } + + html.RenderOrError( + w, + EmailConfirmT, + ContentEmail{ + Email: email, + }, + ) +} +func getEmailConfirmComplete(w http.ResponseWriter, r *http.Request) { + html.RenderOrError( + w, + EmailConfirmCompleteT, + map[string]string{}, + ) +} +func getEmailUnsubscribe(w http.ResponseWriter, r *http.Request) { + email := r.FormValue("email") + html.RenderOrError( + w, + EmailUnsubscribeT, + ContentEmail{ + Email: email, + }, + ) +} +func postEmailConfirm(w http.ResponseWriter, r *http.Request) { + email := r.PostFormValue("email") + if email == "" { + respondError(w, "Not sure what to do with an empty email", nil, http.StatusBadRequest) + return + } + ctx := r.Context() + email_contact, err := models.FindCommsEmailContact(ctx, db.PGInstance.BobDB, email) + if err != nil { + respondError(w, "Email not in the database", err, http.StatusNotFound) + return + } + err = email_contact.Update(ctx, db.PGInstance.BobDB, &models.CommsEmailContactSetter{ + Confirmed: omit.From(true), + }) + http.Redirect(w, r, "/email/confirm/complete", http.StatusFound) +} +func postEmailUnsubscribe(w http.ResponseWriter, r *http.Request) { + email := r.PostFormValue("email") if email == "" { respondError(w, "Not sure what to do with an empty email", nil, http.StatusBadRequest) return @@ -58,8 +119,8 @@ func getEmailSubscribe(w http.ResponseWriter, r *http.Request) { }) html.RenderOrError( w, - EmailSubscribeT, - ContentEmailSubscribe{ + EmailConfirmCompleteT, + ContentEmail{ Email: email, }, ) diff --git a/rmo/routes.go b/rmo/routes.go index ad664929..7cc8141b 100644 --- a/rmo/routes.go +++ b/rmo/routes.go @@ -25,7 +25,11 @@ func Router() chi.Router { r.Get("/privacy", getPrivacy) r.Get("/robots.txt", getRobots) r.Get("/email/render/{code}", getEmailByCode) - r.Get("/email/subscribe", getEmailSubscribe) + r.Get("/email/confirm", getEmailConfirm) + r.Post("/email/confirm", postEmailConfirm) + r.Get("/email/confirm/complete", getEmailConfirmComplete) + r.Get("/email/unsubscribe", getEmailUnsubscribe) + r.Get("/email/unsubscribe/report/{report_id}", getEmailReportUnsubscribe) r.Get("/image/{uuid}", getImageByUUID) r.Route("/mock", addMockRoutes) r.Get("/pool-submit-complete", getPoolSubmitComplete) diff --git a/rmo/template/email-confirm-complete.html b/rmo/template/email-confirm-complete.html new file mode 100644 index 00000000..5a6b6c3f --- /dev/null +++ b/rmo/template/email-confirm-complete.html @@ -0,0 +1,24 @@ +{{template "base.html" .}} + +{{define "title"}}Main{{end}} +{{define "extraheader"}} +{{end}} +{{define "content"}} + +
+
+ +
+
+
+

Thanks!

+

You've allowed emails from Report Mosquitoes Online.

+

Go ahead and close this page/tab/window whenever you're ready...

+

...or maybe check out the site

+
+
+
+ +{{end}} diff --git a/rmo/template/email-confirm.html b/rmo/template/email-confirm.html new file mode 100644 index 00000000..a3d32a82 --- /dev/null +++ b/rmo/template/email-confirm.html @@ -0,0 +1,29 @@ +{{template "base.html" .}} + +{{define "title"}}Main{{end}} +{{define "extraheader"}} +{{end}} +{{define "content"}} + +
+
+ +
+
+
+
+
+ + +
+ +
+
+
+
+ +{{end}} diff --git a/rmo/template/email-subscribe.html b/rmo/template/email-subscribe.html index d88a5b08..a5be31f0 100644 --- a/rmo/template/email-subscribe.html +++ b/rmo/template/email-subscribe.html @@ -13,10 +13,14 @@
-

Thanks!

-

You've allowed emails from Report Mosquitoes Online to {{.Email}}.

-

Go ahead and close this page/tab/window whenever you're ready...

-

...or maybe check out the site

+
+
+ +
+ +