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

* feat: enable default smtp config on setup

* fix tests

* fix channel order

Co-authored-by: Fabi <38692350+fgerschwiler@users.noreply.github.com>

cmd/admin/setup/03.go

@@ -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,

cmd/admin/setup/config.go

@@ -53,6 +53,7 @@ type Steps struct {
 
 type encryptionKeyConfig struct {
 	User *crypto.KeyConfig
+	SMTP *crypto.KeyConfig
 }
 
 func MustNewSteps(v *viper.Viper) *Steps {

cmd/admin/setup/setup.go

@@ -61,6 +61,7 @@ func Setup(config *Config, steps *Steps, masterKey string) {
 
 	steps.S3DefaultInstance.instanceSetup = config.DefaultInstance
 	steps.S3DefaultInstance.userEncryptionKey = config.EncryptionKeys.User
+	steps.S3DefaultInstance.smtpEncryptionKey = config.EncryptionKeys.SMTP
 	steps.S3DefaultInstance.masterKey = masterKey
 	steps.S3DefaultInstance.db = dbClient
 	steps.S3DefaultInstance.es = eventstoreClient