diff options
Diffstat (limited to 'internal/middlewares/identity_verification.go')
| -rw-r--r-- | internal/middlewares/identity_verification.go | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/internal/middlewares/identity_verification.go b/internal/middlewares/identity_verification.go index 94c2abd94..1e93f223a 100644 --- a/internal/middlewares/identity_verification.go +++ b/internal/middlewares/identity_verification.go @@ -4,6 +4,7 @@ import ( "bytes" "encoding/json" "fmt" + "net/mail" "time" "github.com/golang-jwt/jwt/v4" @@ -76,16 +77,16 @@ func IdentityVerificationStart(args IdentityVerificationStartArgs, delayFunc Tim disableHTML = ctx.Configuration.Notifier.SMTP.DisableHTMLEmails } - data := map[string]interface{}{ - "Title": args.MailTitle, - "LinkURL": link, - "LinkText": args.MailButtonContent, - "DisplayName": identity.DisplayName, - "RemoteIP": ctx.RemoteIP().String(), + values := templates.EmailIdentityVerificationValues{ + Title: args.MailTitle, + LinkURL: link, + LinkText: args.MailButtonContent, + DisplayName: identity.DisplayName, + RemoteIP: ctx.RemoteIP().String(), } if !disableHTML { - if err = templates.EmailIdentityVerificationHTML.Execute(bufHTML, data); err != nil { + if err = ctx.Providers.Templates.ExecuteEmailIdentityVerificationTemplate(bufHTML, values, templates.HTMLFormat); err != nil { ctx.Error(err, messageOperationFailed) return } @@ -93,7 +94,7 @@ func IdentityVerificationStart(args IdentityVerificationStartArgs, delayFunc Tim bufText := new(bytes.Buffer) - if err = templates.EmailIdentityVerificationPlainText.Execute(bufText, data); err != nil { + if err = ctx.Providers.Templates.ExecuteEmailIdentityVerificationTemplate(bufText, values, templates.PlainTextFormat); err != nil { ctx.Error(err, messageOperationFailed) return } @@ -101,7 +102,7 @@ func IdentityVerificationStart(args IdentityVerificationStartArgs, delayFunc Tim ctx.Logger.Debugf("Sending an email to user %s (%s) to confirm identity for registering a device.", identity.Username, identity.Email) - if err = ctx.Providers.Notifier.Send(identity.Email, args.MailTitle, bufText.String(), bufHTML.String()); err != nil { + if err = ctx.Providers.Notifier.Send(mail.Address{Name: identity.DisplayName, Address: identity.Email}, args.MailTitle, bufText.String(), bufHTML.String()); err != nil { ctx.Error(err, messageOperationFailed) return } |