andwati/zitadel
1
0
Fork 0
mirror of https://github.com/andwati/zitadel.git synced 2026-11-11 08:35:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat: mail tempaltes/texts and step 10 (#1266)

Browse Source 
* feat: mail template/text events

* feat: mail template/text events

* feat: mail template/text on iam and org

* feat: setup step 10

* fix: add template event

* fix: add unique constraints

* Update internal/static/i18n/de.yaml

Co-authored-by: Livio Amstutz <[email protected]>

* Update internal/static/i18n/de.yaml

Co-authored-by: Livio Amstutz <[email protected]>

* Update internal/static/i18n/de.yaml

Co-authored-by: Livio Amstutz <[email protected]>

* Update internal/static/i18n/de.yaml

Co-authored-by: Livio Amstutz <[email protected]>

* Update internal/v2/command/iam_policy_mail_template.go

Co-authored-by: Livio Amstutz <[email protected]>

* Update internal/v2/command/org_policy_mail_text.go

Co-authored-by: Livio Amstutz <[email protected]>

* Update internal/v2/command/iam_policy_mail_template.go

Co-authored-by: Livio Amstutz <[email protected]>

* Update internal/v2/command/iam_policy_mail_text.go

Co-authored-by: Livio Amstutz <[email protected]>

* Update internal/v2/command/iam_policy_mail_text.go

Co-authored-by: Livio Amstutz <[email protected]>

* Update internal/v2/command/org_policy_mail_template.go

Co-authored-by: Livio Amstutz <[email protected]>

* Update internal/v2/command/org_policy_mail_template.go

Co-authored-by: Livio Amstutz <[email protected]>

* Update internal/v2/command/org_policy_mail_text.go

Co-authored-by: Livio Amstutz <[email protected]>

* fix: org iam policy

Co-authored-by: Livio Amstutz <[email protected]>
This commit is contained in:
Fabi
2021-02-10 10:48:40 +01:00
committed by GitHub
co-authored by Livio Amstutz
parent b0bcc13a92
commit fbc75d89b2
48 changed files with 1689 additions and 287 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/api/grpc/admin/text_converter.go
+9 -21
View File
@@ -1,14 +1,14 @@
package admin
import (
"github.com/caos/logging"
iam_model "github.com/caos/zitadel/internal/iam/model"
"github.com/caos/zitadel/internal/v2/domain"
"github.com/caos/zitadel/pkg/grpc/admin"
"github.com/golang/protobuf/ptypes"
"google.golang.org/protobuf/types/known/timestamppb"
)
func textToModel(text *admin.DefaultMailTextUpdate) *iam_model.MailText {
return &iam_model.MailText{
func textToDomain(text *admin.DefaultMailTextUpdate) *domain.MailText {
return &domain.MailText{
MailTextType: text.MailTextType,
Language: text.Language,
Title: text.Title,
@@ -20,13 +20,7 @@ func textToModel(text *admin.DefaultMailTextUpdate) *iam_model.MailText {
}
}
func textFromModel(text *iam_model.MailText) *admin.DefaultMailText {
creationDate, err := ptypes.TimestampProto(text.CreationDate)
logging.Log("ADMIN-Jlzsj").OnError(err).Debug("date parse failed")
changeDate, err := ptypes.TimestampProto(text.ChangeDate)
logging.Log("ADMIN-mw5b8").OnError(err).Debug("date parse failed")
func textFromDomain(text *domain.MailText) *admin.DefaultMailText {
return &admin.DefaultMailText{
MailTextType: text.MailTextType,
Language: text.Language,
@@ -36,8 +30,8 @@ func textFromModel(text *iam_model.MailText) *admin.DefaultMailText {
Greeting: text.Greeting,
Text: text.Text,
ButtonText: text.ButtonText,
CreationDate: creationDate,
ChangeDate: changeDate,
CreationDate: timestamppb.New(text.CreationDate),
ChangeDate: timestamppb.New(text.ChangeDate),
}
}
@@ -57,12 +51,6 @@ func textsViewToModel(queries []*iam_model.MailTextView) []*admin.DefaultMailTex
}
func textViewFromModel(text *iam_model.MailTextView) *admin.DefaultMailTextView {
creationDate, err := ptypes.TimestampProto(text.CreationDate)
logging.Log("ADMIN-7RyJc").OnError(err).Debug("date parse failed")
changeDate, err := ptypes.TimestampProto(text.ChangeDate)
logging.Log("ADMIN-fTFgY").OnError(err).Debug("date parse failed")
return &admin.DefaultMailTextView{
MailTextType: text.MailTextType,
Language: text.Language,
@@ -72,7 +60,7 @@ func textViewFromModel(text *iam_model.MailTextView) *admin.DefaultMailTextView
Greeting: text.Greeting,
Text: text.Text,
ButtonText: text.ButtonText,
CreationDate: creationDate,
ChangeDate: changeDate,
CreationDate: timestamppb.New(text.CreationDate),
ChangeDate: timestamppb.New(text.ChangeDate),
}
}