From 2453cd75ed377753731a2798ff7bb83e477ea56f Mon Sep 17 00:00:00 2001 From: Mirko Teodorovic Date: Tue, 14 Jul 2020 03:06:13 +0200 Subject: [PATCH] NOISSUE: Fix emailer (#1219) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * update swagger Signed-off-by: Mirko Teodorovic * dont return nil Signed-off-by: Mirko Teodorovic * simplify emailer New Signed-off-by: Mirko Teodorovic Co-authored-by: Dušan Borovčanin --- internal/email/email.go | 2 +- users/emailer/emailer.go | 5 +---- users/swagger.yaml | 1 + 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/internal/email/email.go b/internal/email/email.go index 2569c70e..d7827611 100644 --- a/internal/email/email.go +++ b/internal/email/email.go @@ -60,7 +60,7 @@ func New(c *Config) (*Agent, error) { tmpl, err := template.ParseFiles(c.Template) if err != nil { - return nil, errors.Wrap(errParseTemplate, err) + return a, errors.Wrap(errParseTemplate, err) } a.tmpl = tmpl return a, nil diff --git a/users/emailer/emailer.go b/users/emailer/emailer.go index 0618dd6f..5be05ed2 100644 --- a/users/emailer/emailer.go +++ b/users/emailer/emailer.go @@ -19,10 +19,7 @@ type emailer struct { // New creates new emailer utility func New(url string, c *email.Config) (users.Emailer, error) { e, err := email.New(c) - if err != nil { - return nil, err - } - return &emailer{resetURL: url, agent: e}, nil + return &emailer{resetURL: url, agent: e}, err } func (e *emailer) SendPasswordReset(To []string, host string, token string) error { diff --git a/users/swagger.yaml b/users/swagger.yaml index 796ba251..40328688 100644 --- a/users/swagger.yaml +++ b/users/swagger.yaml @@ -127,6 +127,7 @@ paths: description: JSON-formatted document containing user email. in: body schema: + $ref: "#/parameters/Referer" $ref: "#/parameters/Authorization" $ref: "#/definitions/PasswordResetRequest" required: true