diff --git a/internal/app/mail/manager.go b/internal/app/mail/manager.go index 7b31406..c7ff431 100644 --- a/internal/app/mail/manager.go +++ b/internal/app/mail/manager.go @@ -71,7 +71,7 @@ func NewMailManager( users UserDatabaseRepo, wg WireguardDatabaseRepo, ) (*Manager, error) { - tplHandler, err := newTemplateHandler(cfg.Web.ExternalUrl) + tplHandler, err := newTemplateHandler(cfg.Web.ExternalUrl, cfg.Web.SiteTitle) if err != nil { return nil, fmt.Errorf("failed to initialize template handler: %w", err) } diff --git a/internal/app/mail/template.go b/internal/app/mail/template.go index 15253bf..722d534 100644 --- a/internal/app/mail/template.go +++ b/internal/app/mail/template.go @@ -17,11 +17,12 @@ var TemplateFiles embed.FS // TemplateHandler is a struct that holds the html and text templates. type TemplateHandler struct { portalUrl string + portalName string htmlTemplates *htmlTemplate.Template textTemplates *template.Template } -func newTemplateHandler(portalUrl string) (*TemplateHandler, error) { +func newTemplateHandler(portalUrl, portalName string) (*TemplateHandler, error) { htmlTemplateCache, err := htmlTemplate.New("Html").ParseFS(TemplateFiles, "tpl_files/*.gohtml") if err != nil { return nil, fmt.Errorf("failed to parse html template files: %w", err) @@ -34,6 +35,7 @@ func newTemplateHandler(portalUrl string) (*TemplateHandler, error) { handler := &TemplateHandler{ portalUrl: portalUrl, + portalName: portalName, htmlTemplates: htmlTemplateCache, textTemplates: txtTemplateCache, } @@ -81,6 +83,7 @@ func (c TemplateHandler) GetConfigMailWithAttachment(user *domain.User, cfgName, "ConfigFileName": cfgName, "QrcodePngName": qrName, "PortalUrl": c.portalUrl, + "PortalName": c.portalName, }) if err != nil { return nil, nil, fmt.Errorf("failed to execute template mail_with_attachment.gotpl: %w", err) @@ -91,6 +94,7 @@ func (c TemplateHandler) GetConfigMailWithAttachment(user *domain.User, cfgName, "ConfigFileName": cfgName, "QrcodePngName": qrName, "PortalUrl": c.portalUrl, + "PortalName": c.portalName, }) if err != nil { return nil, nil, fmt.Errorf("failed to execute template mail_with_attachment.gohtml: %w", err) diff --git a/internal/app/mail/tpl_files/mail_with_attachment.gohtml b/internal/app/mail/tpl_files/mail_with_attachment.gohtml index 0243848..fec3d2c 100644 --- a/internal/app/mail/tpl_files/mail_with_attachment.gohtml +++ b/internal/app/mail/tpl_files/mail_with_attachment.gohtml @@ -19,7 +19,7 @@ -