fix: v2 setup sequence (#3437)

* add/register human command done

* validations

* crypto

* move clientid

* keys

* fix: clientID

* remove v2 package

* tests

* tests running

* fix: add init instance to eventstore

* fix: mig

* test(eventstore): create instance

* revert old code

* instance domain from ctx

* chore: rename zitadel app ids

* comments

* fix: test

* fix: mock

* fix: test

cmd/admin/setup/setup.go

@@ -3,6 +3,7 @@ package setup
 import (
 	"context"
 	_ "embed"
+	"strings"
 
 	"github.com/caos/logging"
 	"github.com/spf13/cobra"
@@ -49,6 +50,12 @@ func Setup(config *Config, steps *Steps, masterKey string) {
 
 	steps.s1ProjectionTable = &ProjectionTable{dbClient: dbClient}
 	steps.s2AssetsTable = &AssetTable{dbClient: dbClient}
+
+	steps.S3DefaultInstance.InstanceSetup.Org.Human.Email.Address = strings.TrimSpace(steps.S3DefaultInstance.InstanceSetup.Org.Human.Email.Address)
+	if steps.S3DefaultInstance.InstanceSetup.Org.Human.Email.Address == "" {
+		steps.S3DefaultInstance.InstanceSetup.Org.Human.Email.Address = "admin@" + config.ExternalDomain
+	}
+
 	steps.S3DefaultInstance.es = eventstoreClient
 	steps.S3DefaultInstance.db = dbClient
 	steps.S3DefaultInstance.defaults = config.SystemDefaults

cmd/admin/setup/steps.yaml

@@ -9,7 +9,7 @@ S3DefaultInstance:
         NickName:
         DisplayName:
         Email: 
-          Address: admin@zitadel.ch
+          Address: #autogenerated if empty. uses domain from config and prefixes admin@. for example: admin@domain.tdl
           Verified: true
         PreferredLanguage:
         Gender: