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

internal/query/instance.go

@@ -68,6 +68,7 @@ type Instance struct {
 	DefaultLanguage language.Tag
 	SetupStarted    domain.Step
 	SetupDone       domain.Step
+	Host            string
 }
 
 func (i *Instance) InstanceID() string {
@@ -82,6 +83,10 @@ func (i *Instance) ConsoleClientID() string {
 	return i.ConsoleID
 }
 
+func (i *Instance) RequestedDomain() string {
+	return i.Host
+}
+
 type InstanceSearchQueries struct {
 	SearchRequest
 	Queries []SearchQuery
@@ -96,7 +101,7 @@ func (q *InstanceSearchQueries) toQuery(query sq.SelectBuilder) sq.SelectBuilder
 }
 
 func (q *Queries) Instance(ctx context.Context) (*Instance, error) {
-	stmt, scan := prepareIAMQuery()
+	stmt, scan := prepareInstanceQuery(authz.GetInstance(ctx).RequestedDomain())
 	query, args, err := stmt.Where(sq.Eq{
 		InstanceColumnID.identifier(): authz.GetInstance(ctx).InstanceID(),
 	}).ToSql()
@@ -109,7 +114,7 @@ func (q *Queries) Instance(ctx context.Context) (*Instance, error) {
 }
 
 func (q *Queries) InstanceByHost(ctx context.Context, host string) (authz.Instance, error) {
-	stmt, scan := prepareIAMQuery()
+	stmt, scan := prepareInstanceQuery(host)
 	query, args, err := stmt.Where(sq.Eq{
 		InstanceColumnID.identifier(): "system", //TODO: change column to domain when available
 	}).ToSql()
@@ -129,7 +134,7 @@ func (q *Queries) GetDefaultLanguage(ctx context.Context) language.Tag {
 	return iam.DefaultLanguage
 }
 
-func prepareIAMQuery() (sq.SelectBuilder, func(*sql.Row) (*Instance, error)) {
+func prepareInstanceQuery(host string) (sq.SelectBuilder, func(*sql.Row) (*Instance, error)) {
 	return sq.Select(
 			InstanceColumnID.identifier(),
 			InstanceColumnChangeDate.identifier(),
@@ -143,17 +148,17 @@ func prepareIAMQuery() (sq.SelectBuilder, func(*sql.Row) (*Instance, error)) {
 		).
 			From(instanceTable.identifier()).PlaceholderFormat(sq.Dollar),
 		func(row *sql.Row) (*Instance, error) {
-			iam := new(Instance)
+			instance := &Instance{Host: host}
 			lang := ""
 			err := row.Scan(
-				&iam.ID,
-				&iam.ChangeDate,
-				&iam.Sequence,
-				&iam.GlobalOrgID,
-				&iam.IAMProjectID,
-				&iam.ConsoleID,
-				&iam.SetupStarted,
-				&iam.SetupDone,
+				&instance.ID,
+				&instance.ChangeDate,
+				&instance.Sequence,
+				&instance.GlobalOrgID,
+				&instance.IAMProjectID,
+				&instance.ConsoleID,
+				&instance.SetupStarted,
+				&instance.SetupDone,
 				&lang,
 			)
 			if err != nil {
@@ -162,7 +167,7 @@ func prepareIAMQuery() (sq.SelectBuilder, func(*sql.Row) (*Instance, error)) {
 				}
 				return nil, errors.ThrowInternal(err, "QUERY-d9nw", "Errors.Internal")
 			}
-			iam.DefaultLanguage = language.Make(lang)
-			return iam, nil
+			instance.DefaultLanguage = language.Make(lang)
+			return instance, nil
 		}
 }

internal/query/instance_test.go

@@ -10,6 +10,7 @@ import (
 
 	"golang.org/x/text/language"
 
+	sq "github.com/Masterminds/squirrel"
 	"github.com/caos/zitadel/internal/domain"
 	errs "github.com/caos/zitadel/internal/errors"
 )
@@ -26,8 +27,10 @@ func Test_InstancePrepares(t *testing.T) {
 		object  interface{}
 	}{
 		{
-			name:    "prepareInstanceQuery no result",
-			prepare: prepareIAMQuery,
+			name: "prepareInstanceQuery no result",
+			prepare: func() (sq.SelectBuilder, func(*sql.Row) (*Instance, error)) {
+				return prepareInstanceQuery("")
+			},
 			want: want{
 				sqlExpectations: mockQueries(
 					regexp.QuoteMeta(`SELECT projections.instances.id,`+
@@ -53,8 +56,10 @@ func Test_InstancePrepares(t *testing.T) {
 			object: (*Instance)(nil),
 		},
 		{
-			name:    "prepareInstanceQuery found",
-			prepare: prepareIAMQuery,
+			name: "prepareInstanceQuery found",
+			prepare: func() (sq.SelectBuilder, func(*sql.Row) (*Instance, error)) {
+				return prepareInstanceQuery("")
+			},
 			want: want{
 				sqlExpectations: mockQuery(
 					regexp.QuoteMeta(`SELECT projections.instances.id,`+
@@ -104,8 +109,10 @@ func Test_InstancePrepares(t *testing.T) {
 			},
 		},
 		{
-			name:    "prepareInstanceQuery sql err",
-			prepare: prepareIAMQuery,
+			name: "prepareInstanceQuery sql err",
+			prepare: func() (sq.SelectBuilder, func(*sql.Row) (*Instance, error)) {
+				return prepareInstanceQuery("")
+			},
 			want: want{
 				sqlExpectations: mockQueryErr(
 					regexp.QuoteMeta(`SELECT projections.instances.id,`+

internal/query/projection/event_test.go

@@ -26,7 +26,7 @@ func testEvent(
 		Version:                       "v1",
 		AggregateID:                   "agg-id",
 		ResourceOwner:                 sql.NullString{String: "ro-id", Valid: true},
-		InstanceID:                    sql.NullString{String: "instance-id", Valid: true},
+		InstanceID:                    "instance-id",
 		ID:                            "event-id",
 		EditorService:                 "editor-svc",
 		EditorUser:                    "editor-user",

internal/query/projection/secret_generator.go

@@ -8,7 +8,6 @@ import (
 	"github.com/caos/zitadel/internal/eventstore/handler"
 	"github.com/caos/zitadel/internal/eventstore/handler/crdb"
 	"github.com/caos/zitadel/internal/repository/instance"
-	"github.com/caos/zitadel/internal/repository/project"
 )
 
 const (
@@ -63,7 +62,7 @@ func NewSecretGeneratorProjection(ctx context.Context, config crdb.StatementHand
 func (p *SecretGeneratorProjection) reducers() []handler.AggregateReducer {
 	return []handler.AggregateReducer{
 		{
-			Aggregate: project.AggregateType,
+			Aggregate: instance.AggregateType,
 			EventRedusers: []handler.EventReducer{
 				{
 					Event:  instance.SecretGeneratorAddedEventType,