fix: v2 human command (#3435)

* add/register human command done

* validations

* crypto

* move clientid

* keys

* fix: clientID

* remove v2 package

* tests

* tests running

* revert old code

* instance domain from ctx

* chore: rename zitadel app ids

* comments

* fix: test

cmd/admin/setup/03.go

@@ -2,21 +2,62 @@ package setup
 
 import (
 	"context"
+	"database/sql"
+	"fmt"
 
-	"github.com/caos/zitadel/internal/command/v2"
+	"github.com/caos/zitadel/internal/api/authz"
+	"github.com/caos/zitadel/internal/command"
+	"github.com/caos/zitadel/internal/config/systemdefaults"
+	"github.com/caos/zitadel/internal/crypto"
+	crypto_db "github.com/caos/zitadel/internal/crypto/database"
+	"github.com/caos/zitadel/internal/eventstore"
 )
 
 type DefaultInstance struct {
-	cmd           *command.Command
 	InstanceSetup command.InstanceSetup
+
+	userEncryptionKey *crypto.KeyConfig
+	masterKey         string
+	db                *sql.DB
+	es                *eventstore.Eventstore
+	domain            string
+	defaults          systemdefaults.SystemDefaults
+	zitadelRoles      []authz.RoleMapping
 }
 
 func (mig *DefaultInstance) Execute(ctx context.Context) error {
-	_, err := mig.cmd.SetUpInstance(ctx, &mig.InstanceSetup)
+	keyStorage, err := crypto_db.NewKeyStorage(mig.db, mig.masterKey)
+	if err != nil {
+		return fmt.Errorf("cannot start key storage: %w", err)
+	}
+	if err = verifyKey(mig.userEncryptionKey, keyStorage); err != nil {
+		return err
+	}
 
+	userAlg, err := crypto.NewAESCrypto(mig.userEncryptionKey, keyStorage)
+	if err != nil {
+		return err
+	}
+
+	cmd := command.NewCommandV2(mig.es, mig.defaults, userAlg, mig.zitadelRoles)
+
+	ctx = authz.WithRequestedDomain(ctx, mig.domain)
+	_, err = cmd.SetUpInstance(ctx, &mig.InstanceSetup)
 	return err
 }
 
 func (mig *DefaultInstance) String() string {
 	return "03_default_instance"
 }
+
+func verifyKey(key *crypto.KeyConfig, storage crypto.KeyStorage) (err error) {
+	_, err = crypto.LoadKey(key.EncryptionKeyID, storage)
+	if err == nil {
+		return nil
+	}
+	k, err := crypto.NewKey(key.EncryptionKeyID)
+	if err != nil {
+		return err
+	}
+	return storage.CreateKeys(k)
+}