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>

internal/auth/repository/eventsourcing/eventstore/auth_request.go

@@ -157,7 +157,7 @@ func (repo *AuthRequestRepo) AuthRequestByCode(ctx context.Context, code string)
 	if err != nil {
 		return nil, err
 	}
-	err = repo.fillLoginPolicy(ctx, request)
+	err = repo.fillPolicies(ctx, request)
 	if err != nil {
 		return nil, err
 	}
@@ -399,7 +399,7 @@ func (repo *AuthRequestRepo) getAuthRequest(ctx context.Context, id, userAgentID
 	if request.AgentID != userAgentID {
 		return nil, errors.ThrowPermissionDenied(nil, "EVENT-adk13", "Errors.AuthRequest.UserAgentNotCorresponding")
 	}
-	err = repo.fillLoginPolicy(ctx, request)
+	err = repo.fillPolicies(ctx, request)
 	if err != nil {
 		return nil, err
 	}
@@ -423,7 +423,7 @@ func (repo *AuthRequestRepo) getLoginPolicyAndIDPProviders(ctx context.Context,
 	return policy.ToLoginPolicyDomain(), providers, nil
 }
 
-func (repo *AuthRequestRepo) fillLoginPolicy(ctx context.Context, request *domain.AuthRequest) error {
+func (repo *AuthRequestRepo) fillPolicies(ctx context.Context, request *domain.AuthRequest) error {
 	orgID := request.RequestedOrgID
 	if orgID == "" {
 		orgID = request.UserOrgID
@@ -450,6 +450,16 @@ func (repo *AuthRequestRepo) fillLoginPolicy(ctx context.Context, request *domai
 		return err
 	}
 	request.LabelPolicy = labelPolicy
+	defaultLoginTranslations, err := repo.getLoginTexts(ctx, domain.IAMID)
+	if err != nil {
+		return err
+	}
+	request.DefaultTranslations = defaultLoginTranslations
+	orgLoginTranslations, err := repo.getLoginTexts(ctx, orgID)
+	if err != nil {
+		return err
+	}
+	request.OrgTranslations = orgLoginTranslations
 	return nil
 }
 
@@ -754,6 +764,14 @@ func (repo *AuthRequestRepo) getLabelPolicy(ctx context.Context, orgID string) (
 	return policy.ToDomain(), err
 }
 
+func (repo *AuthRequestRepo) getLoginTexts(ctx context.Context, aggregateID string) ([]*domain.CustomText, error) {
+	loginTexts, err := repo.View.CustomTextsByAggregateIDAndTemplate(aggregateID, domain.LoginCustomText)
+	if err != nil {
+		return nil, err
+	}
+	return iam_view_model.CustomTextViewsToDomain(loginTexts), err
+}
+
 func setOrgID(orgViewProvider orgViewProvider, request *domain.AuthRequest) error {
 	primaryDomain := request.GetScopeOrgPrimaryDomain()
 	if primaryDomain == "" {

internal/auth/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 = "auth.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-3m0fs", "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)
+}

internal/auth/repository/eventsourcing/handler/handler.go

@@ -71,6 +71,7 @@ func Register(configs Configs, bulkLimit, errorCount uint64, view *view.View, es
 		newFeatures(handler{view, bulkLimit, configs.cycleDuration("Features"), errorCount, es}),
 		newRefreshToken(handler{view, bulkLimit, configs.cycleDuration("RefreshToken"), errorCount, es}),
 		newPrivacyPolicy(handler{view, bulkLimit, configs.cycleDuration("PrivacyPolicy"), errorCount, es}),
+		newCustomText(handler{view, bulkLimit, configs.cycleDuration("CustomTexts"), errorCount, es}),
 	}
 }
 

internal/auth/repository/eventsourcing/handler/label_policy.go

@@ -110,7 +110,7 @@ func (m *LabelPolicy) processLabelPolicy(event *models.Event) (err error) {
 }
 
 func (m *LabelPolicy) OnError(event *models.Event, err error) error {
-	logging.LogWithFields("SPOOL-4Djo9", "id", event.AggregateID).WithError(err).Warn("something went wrong in label policy handler")
+	logging.LogWithFields("SPOOL-2ff7s", "id", event.AggregateID).WithError(err).Warn("something went wrong in label policy handler")
 	return spooler.HandleError(event, err, m.view.GetLatestLabelPolicyFailedEvent, m.view.ProcessedLabelPolicyFailedEvent, m.view.ProcessedLabelPolicySequence, m.errorCountUntilSkip)
 }
 

internal/auth/repository/eventsourcing/handler/password_complexity_policy.go

@@ -97,7 +97,7 @@ func (p *PasswordComplexityPolicy) processPasswordComplexityPolicy(event *es_mod
 }
 
 func (p *PasswordComplexityPolicy) OnError(event *es_models.Event, err error) error {
-	logging.LogWithFields("SPOOL-4Djo9", "id", event.AggregateID).WithError(err).Warn("something went wrong in passwordComplexity policy handler")
+	logging.LogWithFields("SPOOL-6M99S", "id", event.AggregateID).WithError(err).Warn("something went wrong in passwordComplexity policy handler")
 	return spooler.HandleError(event, err, p.view.GetLatestPasswordComplexityPolicyFailedEvent, p.view.ProcessedPasswordComplexityPolicyFailedEvent, p.view.ProcessedPasswordComplexityPolicySequence, p.errorCountUntilSkip)
 }
 

internal/auth/repository/eventsourcing/view/custom_texts.go

@@ -0,0 +1,61 @@
+package view
+
+import (
+	"github.com/caos/zitadel/internal/errors"
+	"github.com/caos/zitadel/internal/eventstore/v1/models"
+	"github.com/caos/zitadel/internal/iam/repository/view"
+	"github.com/caos/zitadel/internal/iam/repository/view/model"
+	global_view "github.com/caos/zitadel/internal/view/repository"
+)
+
+const (
+	customTextTable = "auth.custom_texts"
+)
+
+func (v *View) CustomTextByIDs(aggregateID, template, lang, key string) (*model.CustomTextView, error) {
+	return view.CustomTextByIDs(v.Db, customTextTable, aggregateID, template, lang, key)
+}
+
+func (v *View) CustomTextsByAggregateIDAndTemplateAndLand(aggregateID, template, lang string) ([]*model.CustomTextView, error) {
+	return view.GetCustomTexts(v.Db, customTextTable, aggregateID, template, lang)
+}
+
+func (v *View) CustomTextsByAggregateIDAndTemplate(aggregateID, template string) ([]*model.CustomTextView, error) {
+	return view.GetCustomTextsByAggregateIDAndTemplate(v.Db, customTextTable, aggregateID, template)
+}
+
+func (v *View) PutCustomText(template *model.CustomTextView, event *models.Event) error {
+	err := view.PutCustomText(v.Db, customTextTable, template)
+	if err != nil {
+		return err
+	}
+	return v.ProcessedCustomTextSequence(event)
+}
+
+func (v *View) DeleteCustomText(aggregateID, textType, lang string, event *models.Event) error {
+	err := view.DeleteCustomText(v.Db, customTextTable, aggregateID, textType, lang)
+	if err != nil && !errors.IsNotFound(err) {
+		return err
+	}
+	return v.ProcessedCustomTextSequence(event)
+}
+
+func (v *View) GetLatestCustomTextSequence() (*global_view.CurrentSequence, error) {
+	return v.latestSequence(customTextTable)
+}
+
+func (v *View) ProcessedCustomTextSequence(event *models.Event) error {
+	return v.saveCurrentSequence(customTextTable, event)
+}
+
+func (v *View) UpdateCustomTextSpoolerRunTimestamp() error {
+	return v.updateSpoolerRunSequence(customTextTable)
+}
+
+func (v *View) GetLatestCustomTextFailedEvent(sequence uint64) (*global_view.FailedEvent, error) {
+	return v.latestFailedEvent(customTextTable, sequence)
+}
+
+func (v *View) ProcessedCustomTextFailedEvent(failedEvent *global_view.FailedEvent) error {
+	return v.saveFailedEvent(failedEvent)
+}