mirror of
https://github.com/zitadel/zitadel.git
synced 2024-12-13 19:44:21 +00:00
289378713e
There were some problems after changing from SMTP providers to email providers (https://github.com/zitadel/zitadel/pull/8545): - panic (nil pointer) on SMTP provider retrieval for HTTP configs - old SMTP configuration created before the multi SMTP configurations (without id) - were not projected / listed - could not be always be activated - Console treated HTTP configs as SMTP --------- Co-authored-by: Livio Spring <livio.a@gmail.com>
59 lines
1.9 KiB
Go
59 lines
1.9 KiB
Go
package admin
|
|
|
|
import (
|
|
"github.com/zitadel/zitadel/internal/api/grpc/object"
|
|
"github.com/zitadel/zitadel/internal/domain"
|
|
"github.com/zitadel/zitadel/internal/query"
|
|
admin_pb "github.com/zitadel/zitadel/pkg/grpc/admin"
|
|
settings_pb "github.com/zitadel/zitadel/pkg/grpc/settings"
|
|
)
|
|
|
|
func listSMTPConfigsToModel(req *admin_pb.ListSMTPConfigsRequest) (*query.SMTPConfigsSearchQueries, error) {
|
|
offset, limit, asc := object.ListQueryToModel(req.Query)
|
|
return &query.SMTPConfigsSearchQueries{
|
|
SearchRequest: query.SearchRequest{
|
|
Offset: offset,
|
|
Limit: limit,
|
|
Asc: asc,
|
|
},
|
|
}, nil
|
|
}
|
|
|
|
func SMTPConfigToProviderPb(config *query.SMTPConfig) *settings_pb.SMTPConfig {
|
|
ret := &settings_pb.SMTPConfig{
|
|
Details: object.ToViewDetailsPb(config.Sequence, config.CreationDate, config.ChangeDate, config.ResourceOwner),
|
|
Id: config.ID,
|
|
Description: config.Description,
|
|
State: SMTPConfigStateToPb(config.State),
|
|
}
|
|
if config.SMTPConfig != nil {
|
|
ret.Tls = config.SMTPConfig.TLS
|
|
ret.Host = config.SMTPConfig.Host
|
|
ret.User = config.SMTPConfig.User
|
|
ret.SenderAddress = config.SMTPConfig.SenderAddress
|
|
ret.SenderName = config.SMTPConfig.SenderName
|
|
}
|
|
return ret
|
|
}
|
|
|
|
func SMTPConfigsToPb(configs []*query.SMTPConfig) []*settings_pb.SMTPConfig {
|
|
c := make([]*settings_pb.SMTPConfig, len(configs))
|
|
for i, config := range configs {
|
|
c[i] = SMTPConfigToProviderPb(config)
|
|
}
|
|
return c
|
|
}
|
|
|
|
func SMTPConfigStateToPb(state domain.SMTPConfigState) settings_pb.SMTPConfigState {
|
|
switch state {
|
|
case domain.SMTPConfigStateUnspecified, domain.SMTPConfigStateRemoved:
|
|
return settings_pb.SMTPConfigState_SMTP_CONFIG_STATE_UNSPECIFIED
|
|
case domain.SMTPConfigStateActive:
|
|
return settings_pb.SMTPConfigState_SMTP_CONFIG_ACTIVE
|
|
case domain.SMTPConfigStateInactive:
|
|
return settings_pb.SMTPConfigState_SMTP_CONFIG_INACTIVE
|
|
default:
|
|
return settings_pb.SMTPConfigState_SMTP_CONFIG_STATE_UNSPECIFIED
|
|
}
|
|
}
|