feat: Custom text login (#1925)

* feat: default custom message text * feat: org custom message text * feat: org custom message text * feat: custom messages query side * feat: default messages * feat: message text user fields * feat: check for inactive user * feat: fix send password reset * feat: fix custom org text * feat: add variables to docs * feat: custom text tests * feat: fix notifications * feat: add custom text feature * feat: add custom text feature * feat: feature in custom message texts * feat: add custom text feature in frontend * feat: merge main * feat: feature tests * feat: change phone message in setup * fix: remove unused code, add event translation * fix: merge main and fix problems * fix: english translation file * fix: migration versions * fix: setup * fix: custom login text * feat: add all possible custom texts for login * feat: iam login texts * feat: org login texts * feat: protos * fix: custom text in admin api * fix: add success login text * fix: docs * fix: add custom login texts to management api * fix: add sub messages to custom login texts * fix: setup custom texts * feat: get org login texts * feat: get org login texts * feat: handler in adminapi * feat: handlers in auth and admin * feat: render login texts * feat: custom login text * feat: add all login text keys * feat: handle correct login texts * feat: custom login texts in command side * feat: custom login texts in command side * feat: fix yaml file * feat: merge master and add confirmation text * feat: fix html * feat: read default login texts * feat: get default text files * feat: get custom texts org * feat: tests * feat: change translator handling * fix translator from authReq * feat: change h1 on login screens * feat: add custom login text for remove * feat: add custom login text for remove * feat: cache translation files * feat: cache translation files * feat: zitadel user in env var * feat: add registration user description * feat: better func naming * feat: tests * feat: add mutex to read file * feat: add mutex to read file * fix mutex for accessing translation map * fix: translation key Co-authored-by: Livio Amstutz <livio.a@gmail.com>
2025-08-11 19:17:32 +00:00 · 2021-07-05 15:10:49 +02:00
parent 7c0bc8f63d
commit 99b2c33ccb
124 changed files with 21023 additions and 474 deletions
--- a/internal/admin/repository/eventsourcing/handler/custom_text.go
+++ b/internal/admin/repository/eventsourcing/handler/custom_text.go
@@ -0,0 +1,121 @@
+package handler
+
+import (
+	"github.com/caos/logging"
+	caos_errs "github.com/caos/zitadel/internal/errors"
+	"github.com/caos/zitadel/internal/eventstore/v1"
+	es_models "github.com/caos/zitadel/internal/eventstore/v1/models"
+	"github.com/caos/zitadel/internal/eventstore/v1/query"
+	"github.com/caos/zitadel/internal/eventstore/v1/spooler"
+	iam_es_model "github.com/caos/zitadel/internal/iam/repository/eventsourcing/model"
+	iam_model "github.com/caos/zitadel/internal/iam/repository/view/model"
+	"github.com/caos/zitadel/internal/org/repository/eventsourcing/model"
+)
+
+type CustomText struct {
+	handler
+	subscription *v1.Subscription
+}
+
+func newCustomText(handler handler) *CustomText {
+	h := &CustomText{
+		handler: handler,
+	}
+
+	h.subscribe()
+
+	return h
+}
+
+func (m *CustomText) subscribe() {
+	m.subscription = m.es.Subscribe(m.AggregateTypes()...)
+	go func() {
+		for event := range m.subscription.Events {
+			query.ReduceEvent(m, event)
+		}
+	}()
+}
+
+const (
+	customTextTable = "adminapi.custom_texts"
+)
+
+func (m *CustomText) ViewModel() string {
+	return customTextTable
+}
+
+func (_ *CustomText) AggregateTypes() []es_models.AggregateType {
+	return []es_models.AggregateType{model.OrgAggregate, iam_es_model.IAMAggregate}
+}
+
+func (p *CustomText) CurrentSequence() (uint64, error) {
+	sequence, err := p.view.GetLatestCustomTextSequence()
+	if err != nil {
+		return 0, err
+	}
+	return sequence.CurrentSequence, nil
+}
+
+func (m *CustomText) EventQuery() (*es_models.SearchQuery, error) {
+	sequence, err := m.view.GetLatestCustomTextSequence()
+	if err != nil {
+		return nil, err
+	}
+	return es_models.NewSearchQuery().
+		AggregateTypeFilter(m.AggregateTypes()...).
+		LatestSequenceFilter(sequence.CurrentSequence), nil
+}
+
+func (m *CustomText) Reduce(event *es_models.Event) (err error) {
+	switch event.AggregateType {
+	case model.OrgAggregate, iam_es_model.IAMAggregate:
+		err = m.processCustomText(event)
+	}
+	return err
+}
+
+func (m *CustomText) processCustomText(event *es_models.Event) (err error) {
+	customText := new(iam_model.CustomTextView)
+	switch event.Type {
+	case iam_es_model.CustomTextSet, model.CustomTextSet:
+		text := new(iam_model.CustomTextView)
+		err = text.SetData(event)
+		if err != nil {
+			return err
+		}
+		customText, err = m.view.CustomTextByIDs(event.AggregateID, text.Template, text.Key, text.Language)
+		if err != nil && !caos_errs.IsNotFound(err) {
+			return err
+		}
+		if caos_errs.IsNotFound(err) {
+			err = nil
+			customText = new(iam_model.CustomTextView)
+			customText.Language = text.Language
+			customText.Template = text.Template
+			customText.CreationDate = event.CreationDate
+		}
+		err = customText.AppendEvent(event)
+	case iam_es_model.CustomTextRemoved, model.CustomTextRemoved:
+		text := new(iam_model.CustomTextView)
+		err = text.SetData(event)
+		if err != nil {
+			return err
+		}
+		return m.view.DeleteCustomText(event.AggregateID, text.Template, text.Language, event)
+	default:
+		return m.view.ProcessedCustomTextSequence(event)
+	}
+	if err != nil {
+		return err
+	}
+	return m.view.PutCustomText(customText, event)
+}
+
+func (m *CustomText) OnError(event *es_models.Event, err error) error {
+	logging.LogWithFields("SPOOL-3m912", "id", event.AggregateID).WithError(err).Warn("something went wrong in custom text handler")
+	return spooler.HandleError(event, err, m.view.GetLatestCustomTextFailedEvent, m.view.ProcessedCustomTextFailedEvent, m.view.ProcessedCustomTextSequence, m.errorCountUntilSkip)
+}
+
+func (o *CustomText) OnSuccess() error {
+	return spooler.HandleSuccess(o.view.UpdateCustomTextSpoolerRunTimestamp)
+}
--- a/internal/admin/repository/eventsourcing/handler/handler.go
+++ b/internal/admin/repository/eventsourcing/handler/handler.go
@@ -68,6 +68,8 @@ func Register(configs Configs, bulkLimit, errorCount uint64, view *view.View, es
 			handler{view, bulkLimit, configs.cycleDuration("Features"), errorCount, es}),
 		newPrivacyPolicy(
 			handler{view, bulkLimit, configs.cycleDuration("PrivacyPolicy"), errorCount, es}),
+		newCustomText(
+			handler{view, bulkLimit, configs.cycleDuration("CustomTexts"), errorCount, es}),
 	}
 	if static != nil {
 		handlers = append(handlers, newStyling(
--- a/internal/admin/repository/eventsourcing/handler/message_text.go
+++ b/internal/admin/repository/eventsourcing/handler/message_text.go
@@ -80,19 +80,19 @@ func (m *MessageText) processMessageText(event *es_models.Event) (err error) {
 	switch event.Type {
 	case model.CustomTextSet,
 		model.CustomTextRemoved:
-		text := new(iam_model.CustomText)
+		text := new(iam_model.CustomTextView)
 		err = text.SetData(event)
 		if err != nil {
 			return err
 		}
-		message, err = m.view.MessageTextByIDs(event.AggregateID, text.Template, text.Language.String())
+		message, err = m.view.MessageTextByIDs(event.AggregateID, text.Template, text.Language)
 		if err != nil && !caos_errs.IsNotFound(err) {
 			return err
 		}
 		if caos_errs.IsNotFound(err) {
 			err = nil
 			message = new(iam_model.MessageTextView)
-			message.Language = text.Language.String()
+			message.Language = text.Language
 			message.MessageTextType = text.Template
 			message.CreationDate = event.CreationDate
 		}