mirror of
https://github.com/zitadel/zitadel.git
synced 2024-12-20 23:07:33 +00:00
d229da6af7
* feat: smtp templates poc * feat: add isActive & ProviderType to SMTP backend * feat: change providertype to uint32 and fix tests * feat: minimal smtp provider component * feat: woking on diiferent providers * feat: keep working on providers * feat: initial stepper for new provider * fix: settings list and working on stepper * feat: step 1 and 2 form inputs * feat: starter for smtp test step * fix: misspelled SMPT * fix: remove tests for now * feat: add tls toggle remove old google provider * feat: working on add smtp and table * fix: duplicated identifiers * fix: settings list * fix: add missing smtp config properties * fix: add configID to smtp config table * fix: working on listproviders * feat: working in listSMTPConfigs * fix: add count to listsmtpconfigs * fix: getting empty results from listSMTPConfigs * feat: table now shows real data * fix: remaining styles for smtp-table * fix: remove old notification-smtp-provider-component * feat: delete smtp configuration * feat: deactivate smtp config * feat: replace isActive with state for smtp config * feat: activate smtp config * fix: remaining errors after main merge * fix: list smtp providers panic and material mdc * feat: refactor to only one provider component * feat: current provider details view * fix: refactor AddSMTPConfig and ChangeSMTPConfig * fix: smtp config reduce issue * fix: recover domain in NewIAMSMTPConfigWriteModel * fix: add code needed by SetUpInstance * fix: go tests and warn about passing context to InstanceAggregateFromWriteModel * fix: i18n and add missing trans for fr, it, zh * fix: add e2e tests * docs: add smtp templates * fix: remove provider_type, add description * fix: remaining error from merge main * fix: add @stebenz change for primary key * fix: inactive placed after removed to prevent deleted configs to show as inactive * fix: smtp provider id can be empty (migrated) * feat: add mailchimp transactional template * feat: add Brevo (Sendinblue) template * feat: change brevo logo, add color to tls icon * fix: queries use resourceowner, id must not be empty * fix: deal with old smtp settings and tests * fix: resourceOwner is the instanceID * fix: remove aggregate_id, rename SMTPConfigByAggregateID with SMTPConfigActive * fix: add tests for multiple configs with different IDs * fix: conflict * fix: remove notification-smtp-provider * fix: add @peintnermax suggestions, rename module and fix e2e tests * fix: remove material legacy modules * fix: remove ctx as parameter for InstanceAggregateFromWriteModel * fix: add Id to SMTPConfigToPb * fix: change InstanceAggregateFromWriteModel to avoid linter errors * fix import * rm unused package-lock * update yarn lock --------- Co-authored-by: Elio Bischof <elio@zitadel.com> Co-authored-by: Max Peintner <max@caos.ch> Co-authored-by: Stefan Benz <46600784+stebenz@users.noreply.github.com>
195 lines
7.3 KiB
Go
195 lines
7.3 KiB
Go
package admin
|
|
|
|
import (
|
|
"google.golang.org/protobuf/types/known/durationpb"
|
|
|
|
"github.com/zitadel/zitadel/internal/api/grpc/object"
|
|
obj_grpc "github.com/zitadel/zitadel/internal/api/grpc/object"
|
|
"github.com/zitadel/zitadel/internal/command"
|
|
"github.com/zitadel/zitadel/internal/crypto"
|
|
"github.com/zitadel/zitadel/internal/domain"
|
|
"github.com/zitadel/zitadel/internal/notification/channels/smtp"
|
|
"github.com/zitadel/zitadel/internal/query"
|
|
"github.com/zitadel/zitadel/internal/zerrors"
|
|
admin_pb "github.com/zitadel/zitadel/pkg/grpc/admin"
|
|
settings_pb "github.com/zitadel/zitadel/pkg/grpc/settings"
|
|
)
|
|
|
|
func listSecretGeneratorToModel(req *admin_pb.ListSecretGeneratorsRequest) (*query.SecretGeneratorSearchQueries, error) {
|
|
offset, limit, asc := object.ListQueryToModel(req.Query)
|
|
queries, err := SecretGeneratorQueriesToModel(req.Queries)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
return &query.SecretGeneratorSearchQueries{
|
|
SearchRequest: query.SearchRequest{
|
|
Offset: offset,
|
|
Limit: limit,
|
|
Asc: asc,
|
|
},
|
|
Queries: queries,
|
|
}, nil
|
|
}
|
|
|
|
func SecretGeneratorQueriesToModel(queries []*settings_pb.SecretGeneratorQuery) (_ []query.SearchQuery, err error) {
|
|
q := make([]query.SearchQuery, len(queries))
|
|
for i, query := range queries {
|
|
q[i], err = SecretGeneratorQueryToModel(query)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
}
|
|
return q, nil
|
|
}
|
|
|
|
func SecretGeneratorQueryToModel(apiQuery *settings_pb.SecretGeneratorQuery) (query.SearchQuery, error) {
|
|
switch q := apiQuery.Query.(type) {
|
|
case *settings_pb.SecretGeneratorQuery_TypeQuery:
|
|
domainType := SecretGeneratorTypeToDomain(q.TypeQuery.GeneratorType)
|
|
return query.NewSecretGeneratorTypeSearchQuery(int32(domainType))
|
|
default:
|
|
return nil, zerrors.ThrowInvalidArgument(nil, "ORG-fm9es", "List.Query.Invalid")
|
|
}
|
|
}
|
|
|
|
func UpdateSecretGeneratorToConfig(req *admin_pb.UpdateSecretGeneratorRequest) *crypto.GeneratorConfig {
|
|
return &crypto.GeneratorConfig{
|
|
Length: uint(req.Length),
|
|
Expiry: req.Expiry.AsDuration(),
|
|
IncludeUpperLetters: req.IncludeUpperLetters,
|
|
IncludeLowerLetters: req.IncludeLowerLetters,
|
|
IncludeDigits: req.IncludeDigits,
|
|
IncludeSymbols: req.IncludeSymbols,
|
|
}
|
|
}
|
|
|
|
func SecretGeneratorsToPb(generators []*query.SecretGenerator) []*settings_pb.SecretGenerator {
|
|
list := make([]*settings_pb.SecretGenerator, len(generators))
|
|
for i, generator := range generators {
|
|
list[i] = SecretGeneratorToPb(generator)
|
|
}
|
|
return list
|
|
}
|
|
|
|
func SecretGeneratorToPb(generator *query.SecretGenerator) *settings_pb.SecretGenerator {
|
|
mapped := &settings_pb.SecretGenerator{
|
|
GeneratorType: SecretGeneratorTypeToPb(generator.GeneratorType),
|
|
Length: uint32(generator.Length),
|
|
Expiry: durationpb.New(generator.Expiry),
|
|
IncludeUpperLetters: generator.IncludeUpperLetters,
|
|
IncludeLowerLetters: generator.IncludeLowerLetters,
|
|
IncludeDigits: generator.IncludeDigits,
|
|
IncludeSymbols: generator.IncludeSymbols,
|
|
Details: obj_grpc.ToViewDetailsPb(generator.Sequence, generator.CreationDate, generator.ChangeDate, generator.AggregateID),
|
|
}
|
|
return mapped
|
|
}
|
|
|
|
func SecretGeneratorTypeToPb(generatorType domain.SecretGeneratorType) settings_pb.SecretGeneratorType {
|
|
switch generatorType {
|
|
case domain.SecretGeneratorTypeInitCode:
|
|
return settings_pb.SecretGeneratorType_SECRET_GENERATOR_TYPE_INIT_CODE
|
|
case domain.SecretGeneratorTypeVerifyEmailCode:
|
|
return settings_pb.SecretGeneratorType_SECRET_GENERATOR_TYPE_VERIFY_EMAIL_CODE
|
|
case domain.SecretGeneratorTypeVerifyPhoneCode:
|
|
return settings_pb.SecretGeneratorType_SECRET_GENERATOR_TYPE_VERIFY_PHONE_CODE
|
|
case domain.SecretGeneratorTypePasswordResetCode:
|
|
return settings_pb.SecretGeneratorType_SECRET_GENERATOR_TYPE_PASSWORD_RESET_CODE
|
|
case domain.SecretGeneratorTypePasswordlessInitCode:
|
|
return settings_pb.SecretGeneratorType_SECRET_GENERATOR_TYPE_PASSWORDLESS_INIT_CODE
|
|
case domain.SecretGeneratorTypeAppSecret:
|
|
return settings_pb.SecretGeneratorType_SECRET_GENERATOR_TYPE_APP_SECRET
|
|
case domain.SecretGeneratorTypeOTPSMS:
|
|
return settings_pb.SecretGeneratorType_SECRET_GENERATOR_TYPE_OTP_SMS
|
|
case domain.SecretGeneratorTypeOTPEmail:
|
|
return settings_pb.SecretGeneratorType_SECRET_GENERATOR_TYPE_OTP_EMAIL
|
|
default:
|
|
return settings_pb.SecretGeneratorType_SECRET_GENERATOR_TYPE_UNSPECIFIED
|
|
}
|
|
}
|
|
|
|
func SecretGeneratorTypeToDomain(generatorType settings_pb.SecretGeneratorType) domain.SecretGeneratorType {
|
|
switch generatorType {
|
|
case settings_pb.SecretGeneratorType_SECRET_GENERATOR_TYPE_INIT_CODE:
|
|
return domain.SecretGeneratorTypeInitCode
|
|
case settings_pb.SecretGeneratorType_SECRET_GENERATOR_TYPE_VERIFY_EMAIL_CODE:
|
|
return domain.SecretGeneratorTypeVerifyEmailCode
|
|
case settings_pb.SecretGeneratorType_SECRET_GENERATOR_TYPE_VERIFY_PHONE_CODE:
|
|
return domain.SecretGeneratorTypeVerifyPhoneCode
|
|
case settings_pb.SecretGeneratorType_SECRET_GENERATOR_TYPE_PASSWORD_RESET_CODE:
|
|
return domain.SecretGeneratorTypePasswordResetCode
|
|
case settings_pb.SecretGeneratorType_SECRET_GENERATOR_TYPE_PASSWORDLESS_INIT_CODE:
|
|
return domain.SecretGeneratorTypePasswordlessInitCode
|
|
case settings_pb.SecretGeneratorType_SECRET_GENERATOR_TYPE_APP_SECRET:
|
|
return domain.SecretGeneratorTypeAppSecret
|
|
case settings_pb.SecretGeneratorType_SECRET_GENERATOR_TYPE_OTP_SMS:
|
|
return domain.SecretGeneratorTypeOTPSMS
|
|
case settings_pb.SecretGeneratorType_SECRET_GENERATOR_TYPE_OTP_EMAIL:
|
|
return domain.SecretGeneratorTypeOTPEmail
|
|
default:
|
|
return domain.SecretGeneratorTypeUnspecified
|
|
}
|
|
}
|
|
|
|
func AddSMTPToConfig(req *admin_pb.AddSMTPConfigRequest) *smtp.Config {
|
|
return &smtp.Config{
|
|
Description: req.Description,
|
|
Tls: req.Tls,
|
|
From: req.SenderAddress,
|
|
FromName: req.SenderName,
|
|
ReplyToAddress: req.ReplyToAddress,
|
|
SMTP: smtp.SMTP{
|
|
Host: req.Host,
|
|
User: req.User,
|
|
Password: req.Password,
|
|
},
|
|
}
|
|
}
|
|
|
|
func UpdateSMTPToConfig(req *admin_pb.UpdateSMTPConfigRequest) *smtp.Config {
|
|
return &smtp.Config{
|
|
Description: req.Description,
|
|
Tls: req.Tls,
|
|
From: req.SenderAddress,
|
|
FromName: req.SenderName,
|
|
ReplyToAddress: req.ReplyToAddress,
|
|
SMTP: smtp.SMTP{
|
|
Host: req.Host,
|
|
User: req.User,
|
|
Password: req.Password,
|
|
},
|
|
}
|
|
}
|
|
|
|
func SMTPConfigToPb(smtp *query.SMTPConfig) *settings_pb.SMTPConfig {
|
|
mapped := &settings_pb.SMTPConfig{
|
|
Description: smtp.Description,
|
|
Tls: smtp.TLS,
|
|
SenderAddress: smtp.SenderAddress,
|
|
SenderName: smtp.SenderName,
|
|
ReplyToAddress: smtp.ReplyToAddress,
|
|
Host: smtp.Host,
|
|
User: smtp.User,
|
|
Details: obj_grpc.ToViewDetailsPb(smtp.Sequence, smtp.CreationDate, smtp.ChangeDate, smtp.ResourceOwner),
|
|
Id: smtp.ID,
|
|
}
|
|
return mapped
|
|
}
|
|
|
|
func SecurityPolicyToPb(policy *query.SecurityPolicy) *settings_pb.SecurityPolicy {
|
|
return &settings_pb.SecurityPolicy{
|
|
Details: obj_grpc.ToViewDetailsPb(policy.Sequence, policy.CreationDate, policy.ChangeDate, policy.AggregateID),
|
|
EnableIframeEmbedding: policy.EnableIframeEmbedding,
|
|
AllowedOrigins: policy.AllowedOrigins,
|
|
EnableImpersonation: policy.EnableImpersonation,
|
|
}
|
|
}
|
|
|
|
func securityPolicyToCommand(req *admin_pb.SetSecurityPolicyRequest) *command.SecurityPolicy {
|
|
return &command.SecurityPolicy{
|
|
EnableIframeEmbedding: req.GetEnableIframeEmbedding(),
|
|
AllowedOrigins: req.GetAllowedOrigins(),
|
|
EnableImpersonation: req.GetEnableImpersonation(),
|
|
}
|
|
}
|