mirror of
https://github.com/zitadel/zitadel.git
synced 2025-08-12 07:37:31 +00:00
feat: text query (#2735)
* feat: change mail template to new query side * feat: adminapi message text * feat: adminapi message text * feat: adminapi message text * feat: message texts * feat: admin texts * feat: tests * feat: tests * feat: custom login text on adminapi * feat: custom login text * feat: custom login text * feat: message text prepare test * feat: login text texts * feat: custom login text * merge main * fix go.sum Co-authored-by: Livio Amstutz <livio.a@gmail.com>
This commit is contained in:
Fabi
324
internal/query/message_text.go
Normal file
324
internal/query/message_text.go
Normal file
@@ -0,0 +1,324 @@
|
||||
package query
|
||||
|
||||
import (
|
||||
"context"
|
||||
"database/sql"
|
||||
"encoding/json"
|
||||
errs "errors"
|
||||
"fmt"
|
||||
"io/ioutil"
|
||||
"net/http"
|
||||
"os"
|
||||
"time"
|
||||
|
||||
sq "github.com/Masterminds/squirrel"
|
||||
"golang.org/x/text/language"
|
||||
"sigs.k8s.io/yaml"
|
||||
|
||||
"github.com/caos/zitadel/internal/domain"
|
||||
"github.com/caos/zitadel/internal/errors"
|
||||
"github.com/caos/zitadel/internal/query/projection"
|
||||
)
|
||||
|
||||
type MessageTexts struct {
|
||||
InitCode MessageText
|
||||
PasswordReset MessageText
|
||||
VerifyEmail MessageText
|
||||
VerifyPhone MessageText
|
||||
DomainClaimed MessageText
|
||||
PasswordlessRegistration MessageText
|
||||
}
|
||||
|
||||
type MessageText struct {
|
||||
AggregateID string
|
||||
Sequence uint64
|
||||
CreationDate time.Time
|
||||
ChangeDate time.Time
|
||||
State domain.PolicyState
|
||||
|
||||
IsDefault bool
|
||||
|
||||
Type string
|
||||
Language language.Tag
|
||||
Title string
|
||||
PreHeader string
|
||||
Subject string
|
||||
Greeting string
|
||||
Text string
|
||||
ButtonText string
|
||||
Footer string
|
||||
}
|
||||
|
||||
var (
|
||||
messageTextTable = table{
|
||||
name: projection.MessageTextTable,
|
||||
}
|
||||
MessageTextColAggregateID = Column{
|
||||
name: projection.MessageTextAggregateIDCol,
|
||||
table: messageTextTable,
|
||||
}
|
||||
MessageTextColSequence = Column{
|
||||
name: projection.MessageTextSequenceCol,
|
||||
table: messageTextTable,
|
||||
}
|
||||
MessageTextColCreationDate = Column{
|
||||
name: projection.MessageTextCreationDateCol,
|
||||
table: messageTextTable,
|
||||
}
|
||||
MessageTextColChangeDate = Column{
|
||||
name: projection.MessageTextChangeDateCol,
|
||||
table: messageTextTable,
|
||||
}
|
||||
MessageTextColState = Column{
|
||||
name: projection.MessageTextStateCol,
|
||||
table: messageTextTable,
|
||||
}
|
||||
MessageTextColType = Column{
|
||||
name: projection.MessageTextTypeCol,
|
||||
table: messageTextTable,
|
||||
}
|
||||
MessageTextColLanguage = Column{
|
||||
name: projection.MessageTextLanguageCol,
|
||||
table: messageTextTable,
|
||||
}
|
||||
MessageTextColTitle = Column{
|
||||
name: projection.MessageTextTitleCol,
|
||||
table: messageTextTable,
|
||||
}
|
||||
MessageTextColPreHeader = Column{
|
||||
name: projection.MessageTextPreHeaderCol,
|
||||
table: messageTextTable,
|
||||
}
|
||||
MessageTextColSubject = Column{
|
||||
name: projection.MessageTextSubjectCol,
|
||||
table: messageTextTable,
|
||||
}
|
||||
MessageTextColGreeting = Column{
|
||||
name: projection.MessageTextGreetingCol,
|
||||
table: messageTextTable,
|
||||
}
|
||||
MessageTextColText = Column{
|
||||
name: projection.MessageTextTextCol,
|
||||
table: messageTextTable,
|
||||
}
|
||||
MessageTextColButtonText = Column{
|
||||
name: projection.MessageTextButtonTextCol,
|
||||
table: messageTextTable,
|
||||
}
|
||||
MessageTextColFooter = Column{
|
||||
name: projection.MessageTextFooterCol,
|
||||
table: messageTextTable,
|
||||
}
|
||||
)
|
||||
|
||||
func (q *Queries) MessageTextByOrg(ctx context.Context, orgID string) (*MessageText, error) {
|
||||
stmt, scan := prepareMessageTextQuery()
|
||||
query, args, err := stmt.Where(
|
||||
sq.Or{
|
||||
sq.Eq{
|
||||
MessageTextColAggregateID.identifier(): orgID,
|
||||
},
|
||||
sq.Eq{
|
||||
MessageTextColAggregateID.identifier(): q.iamID,
|
||||
},
|
||||
}).
|
||||
OrderBy(MessageTextColAggregateID.identifier()).
|
||||
Limit(1).ToSql()
|
||||
if err != nil {
|
||||
return nil, errors.ThrowInternal(err, "QUERY-90n3N", "Errors.Query.SQLStatement")
|
||||
}
|
||||
|
||||
row := q.client.QueryRowContext(ctx, query, args...)
|
||||
return scan(row)
|
||||
}
|
||||
|
||||
func (q *Queries) DefaultMessageText(ctx context.Context) (*MessageText, error) {
|
||||
stmt, scan := prepareMessageTextQuery()
|
||||
query, args, err := stmt.Where(sq.Eq{
|
||||
MessageTextColAggregateID.identifier(): q.iamID,
|
||||
}).
|
||||
Limit(1).ToSql()
|
||||
if err != nil {
|
||||
return nil, errors.ThrowInternal(err, "QUERY-1b9mf", "Errors.Query.SQLStatement")
|
||||
}
|
||||
|
||||
row := q.client.QueryRowContext(ctx, query, args...)
|
||||
return scan(row)
|
||||
}
|
||||
|
||||
func (q *Queries) DefaultMessageTextByTypeAndLanguageFromFileSystem(messageType, language string) (*MessageText, error) {
|
||||
contents, err := q.readNotificationTextMessages(language)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
messageTexts := new(MessageTexts)
|
||||
if err := yaml.Unmarshal(contents, messageTexts); err != nil {
|
||||
return nil, errors.ThrowInternal(err, "TEXT-3N9fs", "Errors.TranslationFile.ReadError")
|
||||
}
|
||||
return messageTexts.GetMessageTextByType(messageType), nil
|
||||
}
|
||||
|
||||
func (q *Queries) CustomMessageTextByTypeAndLanguage(ctx context.Context, aggregateID, messageType, language string) (*MessageText, error) {
|
||||
stmt, scan := prepareMessageTextQuery()
|
||||
query, args, err := stmt.Where(
|
||||
sq.Eq{
|
||||
MessageTextColAggregateID.identifier(): aggregateID,
|
||||
MessageTextColType.identifier(): messageType,
|
||||
MessageTextColLanguage.identifier(): language,
|
||||
},
|
||||
).
|
||||
Limit(1).ToSql()
|
||||
if err != nil {
|
||||
return nil, errors.ThrowInternal(err, "QUERY-1b9mf", "Errors.Query.SQLStatement")
|
||||
}
|
||||
|
||||
row := q.client.QueryRowContext(ctx, query, args...)
|
||||
return scan(row)
|
||||
}
|
||||
|
||||
func (q *Queries) IAMMessageTextByTypeAndLanguage(ctx context.Context, messageType, language string) (*MessageText, error) {
|
||||
contents, err := q.readNotificationTextMessages(language)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
notificationTextMap := make(map[string]interface{})
|
||||
if err := yaml.Unmarshal(contents, ¬ificationTextMap); err != nil {
|
||||
return nil, errors.ThrowInternal(err, "QUERY-ekjFF", "Errors.TranslationFile.ReadError")
|
||||
}
|
||||
texts, err := q.CustomTextList(ctx, domain.IAMID, messageType, language)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
for _, text := range texts.CustomTexts {
|
||||
messageTextMap, ok := notificationTextMap[messageType].(map[string]interface{})
|
||||
if !ok {
|
||||
continue
|
||||
}
|
||||
messageTextMap[text.Key] = text.Text
|
||||
}
|
||||
jsonbody, err := json.Marshal(notificationTextMap)
|
||||
|
||||
if err != nil {
|
||||
return nil, errors.ThrowInternal(err, "QUERY-3m8fJ", "Errors.TranslationFile.MergeError")
|
||||
}
|
||||
notificationText := new(MessageTexts)
|
||||
if err := json.Unmarshal(jsonbody, ¬ificationText); err != nil {
|
||||
return nil, errors.ThrowInternal(err, "QUERY-9MkfD", "Errors.TranslationFile.MergeError")
|
||||
}
|
||||
result := notificationText.GetMessageTextByType(messageType)
|
||||
result.IsDefault = true
|
||||
return result, nil
|
||||
}
|
||||
|
||||
func (q *Queries) readNotificationTextMessages(language string) ([]byte, error) {
|
||||
q.mutex.Lock()
|
||||
defer q.mutex.Unlock()
|
||||
var err error
|
||||
contents, ok := q.NotificationTranslationFileContents[language]
|
||||
if !ok {
|
||||
contents, err = q.readTranslationFile(q.NotificationDir, fmt.Sprintf("/i18n/%s.yaml", language))
|
||||
if errors.IsNotFound(err) {
|
||||
contents, err = q.readTranslationFile(q.NotificationDir, fmt.Sprintf("/i18n/%s.yaml", q.DefaultLanguage.String()))
|
||||
}
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
q.NotificationTranslationFileContents[language] = contents
|
||||
}
|
||||
return contents, nil
|
||||
}
|
||||
|
||||
func prepareMessageTextQuery() (sq.SelectBuilder, func(*sql.Row) (*MessageText, error)) {
|
||||
return sq.Select(
|
||||
MessageTextColAggregateID.identifier(),
|
||||
MessageTextColSequence.identifier(),
|
||||
MessageTextColCreationDate.identifier(),
|
||||
MessageTextColChangeDate.identifier(),
|
||||
MessageTextColState.identifier(),
|
||||
MessageTextColType.identifier(),
|
||||
MessageTextColLanguage.identifier(),
|
||||
MessageTextColTitle.identifier(),
|
||||
MessageTextColPreHeader.identifier(),
|
||||
MessageTextColSubject.identifier(),
|
||||
MessageTextColGreeting.identifier(),
|
||||
MessageTextColText.identifier(),
|
||||
MessageTextColButtonText.identifier(),
|
||||
MessageTextColFooter.identifier(),
|
||||
).
|
||||
From(messageTextTable.identifier()).PlaceholderFormat(sq.Dollar),
|
||||
func(row *sql.Row) (*MessageText, error) {
|
||||
msg := new(MessageText)
|
||||
lang := ""
|
||||
title := sql.NullString{}
|
||||
preHeader := sql.NullString{}
|
||||
subject := sql.NullString{}
|
||||
greeting := sql.NullString{}
|
||||
text := sql.NullString{}
|
||||
buttonText := sql.NullString{}
|
||||
footer := sql.NullString{}
|
||||
err := row.Scan(
|
||||
&msg.AggregateID,
|
||||
&msg.Sequence,
|
||||
&msg.CreationDate,
|
||||
&msg.ChangeDate,
|
||||
&msg.State,
|
||||
&msg.Type,
|
||||
&lang,
|
||||
&title,
|
||||
&preHeader,
|
||||
&subject,
|
||||
&greeting,
|
||||
&text,
|
||||
&buttonText,
|
||||
&footer,
|
||||
)
|
||||
if err != nil {
|
||||
if errs.Is(err, sql.ErrNoRows) {
|
||||
return nil, errors.ThrowNotFound(err, "QUERY-3nlrS", "Errors.MessageText.NotFound")
|
||||
}
|
||||
return nil, errors.ThrowInternal(err, "QUERY-499gJ", "Errors.Internal")
|
||||
}
|
||||
msg.Language = language.Make(lang)
|
||||
msg.Title = title.String
|
||||
msg.PreHeader = preHeader.String
|
||||
msg.Subject = subject.String
|
||||
msg.Greeting = greeting.String
|
||||
msg.Text = text.String
|
||||
msg.ButtonText = buttonText.String
|
||||
msg.Footer = footer.String
|
||||
return msg, nil
|
||||
}
|
||||
}
|
||||
|
||||
func (q *Queries) readTranslationFile(dir http.FileSystem, filename string) ([]byte, error) {
|
||||
r, err := dir.Open(filename)
|
||||
if os.IsNotExist(err) {
|
||||
return nil, errors.ThrowNotFound(err, "QUERY-sN9wg", "Errors.TranslationFile.NotFound")
|
||||
}
|
||||
if err != nil {
|
||||
return nil, errors.ThrowInternal(err, "QUERY-93njw", "Errors.TranslationFile.ReadError")
|
||||
}
|
||||
contents, err := ioutil.ReadAll(r)
|
||||
if err != nil {
|
||||
return nil, errors.ThrowInternal(err, "QUERY-l0fse", "Errors.TranslationFile.ReadError")
|
||||
}
|
||||
return contents, nil
|
||||
}
|
||||
|
||||
func (m *MessageTexts) GetMessageTextByType(msgType string) *MessageText {
|
||||
switch msgType {
|
||||
case domain.InitCodeMessageType:
|
||||
return &m.InitCode
|
||||
case domain.PasswordResetMessageType:
|
||||
return &m.PasswordReset
|
||||
case domain.VerifyEmailMessageType:
|
||||
return &m.VerifyEmail
|
||||
case domain.VerifyPhoneMessageType:
|
||||
return &m.VerifyPhone
|
||||
case domain.DomainClaimedMessageType:
|
||||
return &m.DomainClaimed
|
||||
case domain.PasswordlessRegistrationMessageType:
|
||||
return &m.PasswordlessRegistration
|
||||
}
|
||||
return nil
|
||||
}
|
||||
Reference in New Issue
Block a user