Fachschaft/sprechstunden-go
7
1
Fork 0
Code Issues 6 Pull requests Releases Activity

Compare commits

base: Fachschaft:a077e60cc5d62552746251883b33f19c368b8364
Branches Tags
Fachschaft:main
Fachschaft:wochen2
Fachschaft:darkmode
Fachschaft:configSupportMail
..
compare: Fachschaft:d77b1a8d43dcf506990201f4e2fac41921ce0360
Branches Tags
Fachschaft:main
Fachschaft:wochen2
Fachschaft:darkmode
Fachschaft:configSupportMail

1 commit
a077e60cc5 ... d77b1a8d43

Author SHA1 Message Date
Gonne
d77b1a8d43
Change to more powerful mail library that especially adds a correct Date heeader for us. 2025-03-25 21:21:58 +01:00
1 changed files with 14 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

23
repositories/request.go
View file

@ -7,6 +7,7 @@ import (
"database/sql" "database/sql"
"errors" "errors"
"fmt" "fmt"
"html/template"
"log" "log"
"math/big" "math/big"
"github.com/wneessen/go-mail" "github.com/wneessen/go-mail"
@ -135,7 +136,8 @@ func (r *RequestRepo) sendConfirmationMail(request models.Request) error {
var data = struct { var data = struct {
Config config.Config Config config.Config
Request models.Request Request models.Request
}{r.config, request } MessageId template.HTML
}{r.config, request, template.HTML("<" + randomString(15) + "@" + r.config.Server.Domain + ">")}
err := templating.WriteTemplate(&messageText, "confirmationMail", data) err := templating.WriteTemplate(&messageText, "confirmationMail", data)
if err != nil { if err != nil {
err = fmt.Errorf("error parsing confirmation Mail: %w", err) err = fmt.Errorf("error parsing confirmation Mail: %w", err)
@ -163,14 +165,8 @@ func (r *RequestRepo) sendConfirmationMail(request models.Request) error {
message.Subject("Sprechstunde löschen") message.Subject("Sprechstunde löschen")
} }
message.SetBodyString(mail.TypeTextPlain, messageText.String()) message.SetBodyString(mail.TypeTextPlain, messageText.String())
client, err := mail.NewClient(r.config.Mailer.SmtpHost, mail.WithPort(r.config.Mailer.SmtpPort))/*, mail.WithSMTPAuth(mail.SMTPAuthPlain),
var options []mail.Option mail.WithUsername(r.config.Mailer.SmtpIdentity), mail.WithPassword(r.config.Mailer.SmtpPassword))*/
if r.config.Mailer.SmtpUseAuth {
options = append(options, mail.WithSMTPAuth(mail.SMTPAuthPlain))
options = append(options, mail.WithUsername(r.config.Mailer.SmtpIdentity))
options = append(options, mail.WithPassword(r.config.Mailer.SmtpPassword))
}
client, err := mail.NewClient(r.config.Mailer.SmtpHost, mail.WithPort(r.config.Mailer.SmtpPort))
if err != nil { if err != nil {
log.Println(err.Error()) log.Println(err.Error())
return err; return err;
@ -179,6 +175,15 @@ func (r *RequestRepo) sendConfirmationMail(request models.Request) error {
log.Println(err.Error()) log.Println(err.Error())
return err; return err;
} }
/* var auth smtp.Auth
if r.config.Mailer.SmtpUseAuth {
auth = smtp.PlainAuth(r.config.Mailer.SmtpIdentity, r.config.Mailer.FromAddress, r.config.Mailer.SmtpPassword, r.config.Mailer.SmtpHost)
}
err = smtp.SendMail(fmt.Sprintf("%s:%d", r.config.Mailer.SmtpHost, r.config.Mailer.SmtpPort), auth, string(r.config.Mailer.FromName), to, message.Bytes())
if err != nil {
err = fmt.Errorf("error sending mail by smtp: %w", err)
log.Println(err.Error())
}*/
} }
return nil return nil
} }