TheArchive/zitadel
1
0
Fork 0
mirror of https://github.com/zitadel/zitadel.git synced 2025-12-10 23:52:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat: enable default smtp config on setup (#3622)

Browse Source 
* feat: enable default smtp config on setup

* fix tests

* fix channel order

Co-authored-by: Fabi <38692350+fgerschwiler@users.noreply.github.com>
This commit is contained in:
Livio Amstutz
2022-05-13 14:13:07 +02:00
committed by GitHub
parent 5571db3e1b
commit 024eedc1b5
15 changed files with 261 additions and 159 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
cmd/admin/setup/03.go
View File

@@ -24,6 +24,7 @@ type DefaultInstance struct {
instanceSetup command.InstanceSetup
userEncryptionKey *crypto.KeyConfig
smtpEncryptionKey *crypto.KeyConfig
masterKey string
db *sql.DB
es *eventstore.Eventstore
@@ -42,12 +43,19 @@ func (mig *DefaultInstance) Execute(ctx context.Context) error {
if err = verifyKey(mig.userEncryptionKey, keyStorage); err != nil {
return err
}
userAlg, err := crypto.NewAESCrypto(mig.userEncryptionKey, keyStorage)
if err != nil {
return err
}
if err = verifyKey(mig.smtpEncryptionKey, keyStorage); err != nil {
return err
}
smtpEncryption, err := crypto.NewAESCrypto(mig.smtpEncryptionKey, keyStorage)
if err != nil {
return err
}
cmd, err := command.StartCommands(mig.es,
mig.defaults,
mig.zitadelRoles,
@@ -58,7 +66,7 @@ func (mig *DefaultInstance) Execute(ctx context.Context) error {
mig.externalPort,
nil,
nil,
nil,
smtpEncryption,
nil,
userAlg,
nil,