From 9b04e88b7277266e47cc5447d84dd4a575c1c9ae Mon Sep 17 00:00:00 2001 From: Chris Mann Date: Wed, 26 Jul 2023 10:48:07 +0200 Subject: [PATCH] Refactoring --- model-user.go | 11 +++++++++-- utils.go | 1 + 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/model-user.go b/model-user.go index b8f629f..2109168 100644 --- a/model-user.go +++ b/model-user.go @@ -115,8 +115,9 @@ func add(user User, config *ConfigFile, ldapConn *ldap.Conn) error { if err != nil { return err } + // Send the email - err = sendMail(SendMailTplData{ + sendMailTplData := SendMailTplData{ From: "alice@resdigita.org", To: user.OtherMailbox, RelTemplatePath: "user/mail.txt", @@ -125,7 +126,13 @@ func add(user User, config *ConfigFile, ldapConn *ldap.Conn) error { "SebAddress": "https://www.gvoisins.org", "Code": "...", }, - }) + } + err = sendMail(sendMailTplData) + if err != nil { + log.Printf("add(user) sendMail: %v", err) + log.Printf("add(user) sendMail: %v", user) + log.Printf("add(user) sendMail: %v", sendMailTplData) + } return err } diff --git a/utils.go b/utils.go index 368c2d5..d8dbdeb 100644 --- a/utils.go +++ b/utils.go @@ -54,6 +54,7 @@ func suggestPassword() string { // Sends an email according to the enclosed information func sendMail(sendMailTplData SendMailTplData) error { + log.Printf("sendMail") templateMail := template.Must(template.ParseFiles(templatePath + "/" + sendMailTplData.RelTemplatePath)) buf := bytes.NewBuffer([]byte{}) err := templateMail.Execute(buf, sendMailTplData)