DeforaNetworks/corteza
DeforaNetworks/corteza
3
0
Fork 0
Code

Fix access to auth email templates (switch to service user)

Browse Source
This commit is contained in:
Denis Arh 2021-07-27 16:28:34 +02:00
parent 00ba60e557
commit fcec5d7ec7
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/provision/migrations_202103_templates.go
View File

@ -40,12 +40,12 @@ func migrateEmailTemplates(ctx context.Context, log *zap.Logger, s store.Storer)
},
"auth.mail.email-confirmation.subject.en": {
Type: "text/plain",
Handle: "auth_email_confirmation_subject",
Handle: "auth_email_confirm_subject",
Meta: types.TemplateMeta{Short: "Password reset subject"},
},
"auth.mail.email-confirmation.body.en": {
Type: "text/html",
Handle: "auth_email_confirmation_body",
Handle: "auth_email_confirm_body",
Meta: types.TemplateMeta{Short: "Password reset content"},
},
"auth.mail.password-reset.subject.en": {

13
system/service/auth_notification.go
View File

@ -7,6 +7,7 @@ import (
"io/ioutil"
"net/url"
intAuth "github.com/cortezaproject/corteza-server/pkg/auth"
"github.com/cortezaproject/corteza-server/pkg/logger"
"github.com/cortezaproject/corteza-server/pkg/mail"
"github.com/cortezaproject/corteza-server/pkg/options"
@ -82,17 +83,21 @@ func (svc authNotification) send(ctx context.Context, name, sendTo string, paylo
tmp []byte
ntf = svc.newMail()
hdl string
// context with service user
// we need this for retrieving & rendering email templates
suCtx = intAuth.SetIdentityToContext(ctx, intAuth.ServiceUser())
)
// Fetch parts
hdl = name + "_subject"
st, err := svc.ts.FindByHandle(ctx, hdl)
st, err := svc.ts.FindByHandle(suCtx, hdl)
if err != nil {
return fmt.Errorf("cannot generate auth email with template %s: %w", hdl, err)
}
hdl = name + "_content"
ct, err := svc.ts.FindByHandle(ctx, hdl)
ct, err := svc.ts.FindByHandle(suCtx, hdl)
if err != nil {
return fmt.Errorf("cannot generate auth email with template %s: %w", hdl, err)
}
@ -105,12 +110,12 @@ func (svc authNotification) send(ctx context.Context, name, sendTo string, paylo
payload["EmailAddress"] = sendTo
// Render document
subject, err := svc.ts.Render(ctx, st.ID, "text/plain", payload, nil)
subject, err := svc.ts.Render(suCtx, st.ID, "text/plain", payload, nil)
if err != nil {
return err
}
content, err := svc.ts.Render(ctx, ct.ID, "text/plain", payload, nil)
content, err := svc.ts.Render(suCtx, ct.ID, "text/plain", payload, nil)
if err != nil {
return err
}