Skip to content

Commit

Permalink
feat(notification): new mail templates (#1579)
Browse files Browse the repository at this point in the history
* fix: new template light only

* add border radius to img

* system first font, font weight

* fix: change email template

* fix: go mod

* update ref

* fix: template

Co-authored-by: fabi <fabienne.gerschwiler@gmail.com>
  • Loading branch information
peintnermax and hifabienne committed Apr 16, 2021
1 parent a3abdec commit 057537c
Show file tree
Hide file tree
Showing 12 changed files with 345 additions and 670 deletions.
3 changes: 3 additions & 0 deletions cmd/zitadel/setup.yaml

Large diffs are not rendered by default.

3 changes: 0 additions & 3 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -46,14 +46,11 @@ require (
github.com/manifoldco/promptui v0.7.0
github.com/mattn/go-colorable v0.1.8 // indirect; indirect github.com/mitchellh/copystructure v1.0.0 // indirect
github.com/mitchellh/copystructure v1.1.2 // indirect
github.com/mitchellh/reflectwalk v1.0.1 // indirect
github.com/mwitkow/go-proto-validators v0.3.2 // indirect
github.com/nicksnyder/go-i18n/v2 v2.1.1
github.com/pkg/errors v0.9.1
github.com/pquerna/otp v1.2.0
github.com/prometheus/client_golang v1.8.0 // indirect
github.com/prometheus/common v0.15.0 // indirect
github.com/pseudomuto/protoc-gen-doc v1.4.1 // indirect
github.com/rakyll/statik v0.1.7
github.com/rs/cors v1.7.0
github.com/sony/sonyflake v1.0.0
Expand Down
49 changes: 7 additions & 42 deletions go.sum

Large diffs are not rendered by default.

34 changes: 21 additions & 13 deletions internal/command/iam_policy_mail_template.go
Original file line number Diff line number Diff line change
Expand Up @@ -44,33 +44,41 @@ func (c *Commands) addDefaultMailTemplate(ctx context.Context, iamAgg *eventstor
}

func (c *Commands) ChangeDefaultMailTemplate(ctx context.Context, policy *domain.MailTemplate) (*domain.MailTemplate, error) {
existingPolicy, changedEvent, err := c.changeDefaultMailTemplate(ctx, policy)
if err != nil {
return nil, err
}
pushedEvents, err := c.eventstore.PushEvents(ctx, changedEvent)
if err != nil {
return nil, err
}
err = AppendAndReduce(existingPolicy, pushedEvents...)
if err != nil {
return nil, err
}
return writeModelToMailTemplatePolicy(&existingPolicy.MailTemplateWriteModel), nil
}

func (c *Commands) changeDefaultMailTemplate(ctx context.Context, policy *domain.MailTemplate) (*IAMMailTemplateWriteModel, eventstore.EventPusher, error) {
if !policy.IsValid() {
return nil, caos_errs.ThrowInvalidArgument(nil, "IAM-4m9ds", "Errors.IAM.MailTemplate.Invalid")
return nil, nil, caos_errs.ThrowInvalidArgument(nil, "IAM-4m9ds", "Errors.IAM.MailTemplate.Invalid")
}
existingPolicy, err := c.defaultMailTemplateWriteModelByID(ctx)
if err != nil {
return nil, err
return nil, nil, err
}

if existingPolicy.State == domain.PolicyStateUnspecified || existingPolicy.State == domain.PolicyStateRemoved {
return nil, caos_errs.ThrowNotFound(nil, "IAM-2N8fs", "Errors.IAM.MailTemplate.NotFound")
return nil, nil, caos_errs.ThrowNotFound(nil, "IAM-2N8fs", "Errors.IAM.MailTemplate.NotFound")
}

iamAgg := IAMAggregateFromWriteModel(&existingPolicy.MailTemplateWriteModel.WriteModel)
changedEvent, hasChanged := existingPolicy.NewChangedEvent(ctx, iamAgg, policy.Template)
if !hasChanged {
return nil, caos_errs.ThrowPreconditionFailed(nil, "IAM-3nfsG", "Errors.IAM.MailTemplate.NotChanged")
return nil, nil, caos_errs.ThrowPreconditionFailed(nil, "IAM-3nfsG", "Errors.IAM.MailTemplate.NotChanged")
}

pushedEvents, err := c.eventstore.PushEvents(ctx, changedEvent)
if err != nil {
return nil, err
}
err = AppendAndReduce(existingPolicy, pushedEvents...)
if err != nil {
return nil, err
}
return writeModelToMailTemplatePolicy(&existingPolicy.MailTemplateWriteModel), nil
return existingPolicy, changedEvent, nil
}

func (c *Commands) defaultMailTemplateWriteModelByID(ctx context.Context) (policy *IAMMailTemplateWriteModel, err error) {
Expand Down
32 changes: 32 additions & 0 deletions internal/command/setup_step13.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
package command

import (
"context"
"github.com/caos/logging"
"github.com/caos/zitadel/internal/domain"
"github.com/caos/zitadel/internal/eventstore"
)

type Step13 struct {
DefaultMailTemplate domain.MailTemplate
}

func (s *Step13) Step() domain.Step {
return domain.Step13
}

func (s *Step13) execute(ctx context.Context, commandSide *Commands) error {
return commandSide.SetupStep13(ctx, s)
}

func (c *Commands) SetupStep13(ctx context.Context, step *Step13) error {
fn := func(iam *IAMWriteModel) ([]eventstore.EventPusher, error) {
_, mailTemplateEvent, err := c.changeDefaultMailTemplate(ctx, &step.DefaultMailTemplate)
if err != nil {
return nil, err
}
logging.Log("SETUP-4insR").Info("default mail template/text set up")
return []eventstore.EventPusher{mailTemplateEvent}, nil
}
return c.setup(ctx, step, fn)
}
1 change: 1 addition & 0 deletions internal/domain/step.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ const (
Step10
Step11
Step12
Step13
//StepCount marks the the length of possible steps (StepCount-1 == last possible step)
StepCount
)

This file was deleted.

49 changes: 0 additions & 49 deletions internal/notification/static/templates/template 01 Tabelle.mjml

This file was deleted.

32 changes: 0 additions & 32 deletions internal/notification/static/templates/template 02 Absolut.mjml

This file was deleted.

0 comments on commit 057537c

Please sign in to comment.