TheArchive/zitadel
1
0
Fork 0
mirror of https://github.com/zitadel/zitadel.git synced 2025-12-13 21:40:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: read custom texts for pages called directly form mail link (#4255)

Browse Source 
* fix: read custom texts for pages called directly form mail link

* log errors
This commit is contained in:
Livio Spring
2022-08-26 10:53:11 +02:00
committed by GitHub
parent e1a981928c
commit 64f589c435
4 changed files with 39 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
internal/api/ui/login/renderer.go
View File

@@ -19,6 +19,7 @@ import (
caos_errs "github.com/zitadel/zitadel/internal/errors"
"github.com/zitadel/zitadel/internal/i18n"
"github.com/zitadel/zitadel/internal/notification/templates"
"github.com/zitadel/zitadel/internal/query"
"github.com/zitadel/zitadel/internal/renderer"
"github.com/zitadel/zitadel/internal/static"
)
@@ -519,10 +520,29 @@ func (l *Login) addLoginTranslations(translator *i18n.Translator, customTexts []
Text: text.Text,
}
err := l.renderer.AddMessages(translator, text.Language, msg)
logging.Log("HANDLE-GD3g2").OnError(err).Warn("could no add message to translator")
logging.OnError(err).Warn("could no add message to translator")
}
}
func (l *Login) customTexts(ctx context.Context, translator *i18n.Translator, orgID string) {
instanceID := authz.GetInstance(ctx).InstanceID()
instanceTexts, err := l.query.CustomTextListByTemplate(ctx, instanceID, domain.LoginCustomText)
if err != nil {
logging.WithFields("instanceID", instanceID).Warn("unable to load custom texts for instance")
return
}
l.addLoginTranslations(translator, query.CustomTextsToDomain(instanceTexts))
if orgID == "" {
return
}
orgTexts, err := l.query.CustomTextListByTemplate(ctx, orgID, domain.LoginCustomText)
if err != nil {
logging.WithFields("instanceID", instanceID, "org", orgID).Warn("unable to load custom texts for org")
return
}
l.addLoginTranslations(translator, query.CustomTextsToDomain(orgTexts))
}
func getRequestID(authReq *domain.AuthRequest, r *http.Request) string {
if authReq != nil {
return authReq.ID