From 8d7090e0d95bd750687f40d7288fc725fa03708b Mon Sep 17 00:00:00 2001 From: David Disch Date: Thu, 13 Sep 2018 19:22:07 -0400 Subject: [PATCH 1/3] Send confirmation email for adminUserCreate adminUserCreate does not send a confirmation email if the "confirm" parameter is set to false or is not set. However, this new user cannot be used until they are confirmed. This PR sends a confirmation email to the new user when necessary. --- api/admin.go | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/api/admin.go b/api/admin.go index 38a2057a3..6b3764b15 100644 --- a/api/admin.go +++ b/api/admin.go @@ -210,6 +210,12 @@ func (a *API) adminUserCreate(w http.ResponseWriter, r *http.Request) error { if terr := user.Confirm(tx); terr != nil { return terr } + } else { + mailer := a.Mailer(ctx) + referrer := a.getReferrer(r) + if terr = sendConfirmation(tx, user, mailer, config.SMTP.MaxFrequency, referrer); terr != nil { + return internalServerError("Error sending confirmation mail").WithInternalError(terr) + } } return nil From 5e6d028df449a9747e5268187443be9c1c4d3908 Mon Sep 17 00:00:00 2001 From: David Disch Date: Fri, 8 Mar 2019 08:05:31 -0600 Subject: [PATCH 2/3] Update admin.go --- api/admin.go | 1 + 1 file changed, 1 insertion(+) diff --git a/api/admin.go b/api/admin.go index 6b3764b15..7620525d0 100644 --- a/api/admin.go +++ b/api/admin.go @@ -216,6 +216,7 @@ func (a *API) adminUserCreate(w http.ResponseWriter, r *http.Request) error { if terr = sendConfirmation(tx, user, mailer, config.SMTP.MaxFrequency, referrer); terr != nil { return internalServerError("Error sending confirmation mail").WithInternalError(terr) } + } return nil From d7978a84929633b010ff835a3d0b9006a12db68f Mon Sep 17 00:00:00 2001 From: David Disch Date: Fri, 8 Mar 2019 08:29:20 -0600 Subject: [PATCH 3/3] Update admin.go --- api/admin.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/api/admin.go b/api/admin.go index 6239a0dd0..8b84f42f6 100644 --- a/api/admin.go +++ b/api/admin.go @@ -213,7 +213,7 @@ func (a *API) adminUserCreate(w http.ResponseWriter, r *http.Request) error { } else { mailer := a.Mailer(ctx) referrer := a.getReferrer(r) - if terr = sendConfirmation(tx, user, mailer, config.SMTP.MaxFrequency, referrer); terr != nil { + if terr := sendConfirmation(tx, user, mailer, config.SMTP.MaxFrequency, referrer); terr != nil { return internalServerError("Error sending confirmation mail").WithInternalError(terr) }