feat: port reduction (#323)

* move mgmt pkg

* begin package restructure

* rename auth package to authz

* begin start api

* move auth

* move admin

* fix merge

* configs and interceptors

* interceptor

* revert generate-grpc.sh

* some cleanups

* console

* move console

* fix tests and merging

* js linting

* merge

* merging and configs

* change k8s base to current ports

* fixes

* cleanup

* regenerate proto

* remove unnecessary whitespace

* missing param

* go mod tidy

* fix merging

* move login pkg

* cleanup

* move api pkgs again

* fix pkg naming

* fix generate-static.sh for login

* update workflow

* fixes

* logging

* remove duplicate

* comment for optional gateway interfaces

* regenerate protos

* fix proto imports for grpc web

* protos

* grpc web generate

* grpc web generate

* fix changes

* add translation interceptor

* fix merging

* regenerate mgmt proto

internal/management/repository/eventsourcing/eventstore/org.go

@@ -2,17 +2,16 @@ package eventstore
 
 import (
 	"context"
-	usr_es "github.com/caos/zitadel/internal/user/repository/eventsourcing"
 	"strings"
 
-	"github.com/caos/zitadel/internal/api/auth"
-	global_model "github.com/caos/zitadel/internal/model"
-	"github.com/caos/zitadel/internal/org/repository/view/model"
-
+	"github.com/caos/zitadel/internal/api/authz"
 	"github.com/caos/zitadel/internal/errors"
 	mgmt_view "github.com/caos/zitadel/internal/management/repository/eventsourcing/view"
+	global_model "github.com/caos/zitadel/internal/model"
 	org_model "github.com/caos/zitadel/internal/org/model"
 	org_es "github.com/caos/zitadel/internal/org/repository/eventsourcing"
+	"github.com/caos/zitadel/internal/org/repository/view/model"
+	usr_es "github.com/caos/zitadel/internal/user/repository/eventsourcing"
 )
 
 type OrgRepository struct {
@@ -52,12 +51,12 @@ func (repo *OrgRepository) ReactivateOrg(ctx context.Context, id string) (*org_m
 }
 
 func (repo *OrgRepository) GetMyOrgIamPolicy(ctx context.Context) (*org_model.OrgIamPolicy, error) {
-	return repo.OrgEventstore.GetOrgIamPolicy(ctx, auth.GetCtxData(ctx).OrgID)
+	return repo.OrgEventstore.GetOrgIamPolicy(ctx, authz.GetCtxData(ctx).OrgID)
 }
 
 func (repo *OrgRepository) SearchMyOrgDomains(ctx context.Context, request *org_model.OrgDomainSearchRequest) (*org_model.OrgDomainSearchResponse, error) {
 	request.EnsureLimit(repo.SearchLimit)
-	request.Queries = append(request.Queries, &org_model.OrgDomainSearchQuery{Key: org_model.OrgDomainSearchKeyOrgID, Method: global_model.SearchMethodEquals, Value: auth.GetCtxData(ctx).OrgID})
+	request.Queries = append(request.Queries, &org_model.OrgDomainSearchQuery{Key: org_model.OrgDomainSearchKeyOrgID, Method: global_model.SearchMethodEquals, Value: authz.GetCtxData(ctx).OrgID})
 	domains, count, err := repo.View.SearchOrgDomains(request)
 	if err != nil {
 		return nil, err
@@ -71,12 +70,12 @@ func (repo *OrgRepository) SearchMyOrgDomains(ctx context.Context, request *org_
 }
 
 func (repo *OrgRepository) AddMyOrgDomain(ctx context.Context, domain *org_model.OrgDomain) (*org_model.OrgDomain, error) {
-	domain.AggregateID = auth.GetCtxData(ctx).OrgID
+	domain.AggregateID = authz.GetCtxData(ctx).OrgID
 	return repo.OrgEventstore.AddOrgDomain(ctx, domain)
 }
 
 func (repo *OrgRepository) RemoveMyOrgDomain(ctx context.Context, domain string) error {
-	d := org_model.NewOrgDomain(auth.GetCtxData(ctx).OrgID, domain)
+	d := org_model.NewOrgDomain(authz.GetCtxData(ctx).OrgID, domain)
 	return repo.OrgEventstore.RemoveOrgDomain(ctx, d)
 }
 
@@ -104,23 +103,23 @@ func (repo *OrgRepository) OrgMemberByID(ctx context.Context, orgID, userID stri
 }
 
 func (repo *OrgRepository) AddMyOrgMember(ctx context.Context, member *org_model.OrgMember) (*org_model.OrgMember, error) {
-	member.AggregateID = auth.GetCtxData(ctx).OrgID
+	member.AggregateID = authz.GetCtxData(ctx).OrgID
 	return repo.OrgEventstore.AddOrgMember(ctx, member)
 }
 
 func (repo *OrgRepository) ChangeMyOrgMember(ctx context.Context, member *org_model.OrgMember) (*org_model.OrgMember, error) {
-	member.AggregateID = auth.GetCtxData(ctx).OrgID
+	member.AggregateID = authz.GetCtxData(ctx).OrgID
 	return repo.OrgEventstore.ChangeOrgMember(ctx, member)
 }
 
 func (repo *OrgRepository) RemoveMyOrgMember(ctx context.Context, userID string) error {
-	member := org_model.NewOrgMember(auth.GetCtxData(ctx).OrgID, userID)
+	member := org_model.NewOrgMember(authz.GetCtxData(ctx).OrgID, userID)
 	return repo.OrgEventstore.RemoveOrgMember(ctx, member)
 }
 
 func (repo *OrgRepository) SearchMyOrgMembers(ctx context.Context, request *org_model.OrgMemberSearchRequest) (*org_model.OrgMemberSearchResponse, error) {
 	request.EnsureLimit(repo.SearchLimit)
-	request.Queries[len(request.Queries)-1] = &org_model.OrgMemberSearchQuery{Key: org_model.OrgMemberSearchKeyOrgID, Method: global_model.SearchMethodEquals, Value: auth.GetCtxData(ctx).OrgID}
+	request.Queries[len(request.Queries)-1] = &org_model.OrgMemberSearchQuery{Key: org_model.OrgMemberSearchKeyOrgID, Method: global_model.SearchMethodEquals, Value: authz.GetCtxData(ctx).OrgID}
 	members, count, err := repo.View.SearchOrgMembers(request)
 	if err != nil {
 		return nil, err

internal/management/repository/eventsourcing/eventstore/policy.go

@@ -3,7 +3,7 @@ package eventstore
 import (
 	"context"
 
-	"github.com/caos/zitadel/internal/api/auth"
+	"github.com/caos/zitadel/internal/api/authz"
 	pol_model "github.com/caos/zitadel/internal/policy/model"
 	pol_event "github.com/caos/zitadel/internal/policy/repository/eventsourcing"
 )
@@ -17,7 +17,7 @@ func (repo *PolicyRepo) CreatePasswordComplexityPolicy(ctx context.Context, poli
 	return repo.PolicyEvents.CreatePasswordComplexityPolicy(ctx, policy)
 }
 func (repo *PolicyRepo) GetPasswordComplexityPolicy(ctx context.Context) (*pol_model.PasswordComplexityPolicy, error) {
-	ctxData := auth.GetCtxData(ctx)
+	ctxData := authz.GetCtxData(ctx)
 	return repo.PolicyEvents.GetPasswordComplexityPolicy(ctx, ctxData.OrgID)
 }
 func (repo *PolicyRepo) UpdatePasswordComplexityPolicy(ctx context.Context, policy *pol_model.PasswordComplexityPolicy) (*pol_model.PasswordComplexityPolicy, error) {
@@ -27,7 +27,7 @@ func (repo *PolicyRepo) CreatePasswordAgePolicy(ctx context.Context, policy *pol
 	return repo.PolicyEvents.CreatePasswordAgePolicy(ctx, policy)
 }
 func (repo *PolicyRepo) GetPasswordAgePolicy(ctx context.Context) (*pol_model.PasswordAgePolicy, error) {
-	ctxData := auth.GetCtxData(ctx)
+	ctxData := authz.GetCtxData(ctx)
 	return repo.PolicyEvents.GetPasswordAgePolicy(ctx, ctxData.OrgID)
 }
 func (repo *PolicyRepo) UpdatePasswordAgePolicy(ctx context.Context, policy *pol_model.PasswordAgePolicy) (*pol_model.PasswordAgePolicy, error) {
@@ -37,7 +37,7 @@ func (repo *PolicyRepo) CreatePasswordLockoutPolicy(ctx context.Context, policy
 	return repo.PolicyEvents.CreatePasswordLockoutPolicy(ctx, policy)
 }
 func (repo *PolicyRepo) GetPasswordLockoutPolicy(ctx context.Context) (*pol_model.PasswordLockoutPolicy, error) {
-	ctxData := auth.GetCtxData(ctx)
+	ctxData := authz.GetCtxData(ctx)
 	return repo.PolicyEvents.GetPasswordLockoutPolicy(ctx, ctxData.OrgID)
 }
 func (repo *PolicyRepo) UpdatePasswordLockoutPolicy(ctx context.Context, policy *pol_model.PasswordLockoutPolicy) (*pol_model.PasswordLockoutPolicy, error) {

internal/management/repository/eventsourcing/eventstore/project.go

@@ -5,24 +5,22 @@ import (
 	"strings"
 
 	"github.com/caos/logging"
+
+	"github.com/caos/zitadel/internal/api/authz"
 	caos_errs "github.com/caos/zitadel/internal/errors"
 	es_int "github.com/caos/zitadel/internal/eventstore"
 	"github.com/caos/zitadel/internal/eventstore/models"
 	es_models "github.com/caos/zitadel/internal/eventstore/models"
 	es_sdk "github.com/caos/zitadel/internal/eventstore/sdk"
+	"github.com/caos/zitadel/internal/management/repository/eventsourcing/view"
+	global_model "github.com/caos/zitadel/internal/model"
+	proj_model "github.com/caos/zitadel/internal/project/model"
+	proj_event "github.com/caos/zitadel/internal/project/repository/eventsourcing"
 	es_proj_model "github.com/caos/zitadel/internal/project/repository/eventsourcing/model"
+	"github.com/caos/zitadel/internal/project/repository/view/model"
 	usr_event "github.com/caos/zitadel/internal/user/repository/eventsourcing"
 	usr_grant_model "github.com/caos/zitadel/internal/usergrant/model"
 	usr_grant_event "github.com/caos/zitadel/internal/usergrant/repository/eventsourcing"
-
-	"github.com/caos/zitadel/internal/api/auth"
-	global_model "github.com/caos/zitadel/internal/model"
-
-	"github.com/caos/zitadel/internal/management/repository/eventsourcing/view"
-	"github.com/caos/zitadel/internal/project/repository/view/model"
-
-	proj_model "github.com/caos/zitadel/internal/project/model"
-	proj_event "github.com/caos/zitadel/internal/project/repository/eventsourcing"
 )
 
 type ProjectRepo struct {
@@ -81,9 +79,9 @@ func (repo *ProjectRepo) ReactivateProject(ctx context.Context, id string) (*pro
 func (repo *ProjectRepo) SearchProjects(ctx context.Context, request *proj_model.ProjectViewSearchRequest) (*proj_model.ProjectViewSearchResponse, error) {
 	request.EnsureLimit(repo.SearchLimit)
 
-	permissions := auth.GetPermissionsFromCtx(ctx)
-	if !auth.HasGlobalPermission(permissions) {
-		ids := auth.GetPermissionCtxIDs(permissions)
+	permissions := authz.GetPermissionsFromCtx(ctx)
+	if !authz.HasGlobalPermission(permissions) {
+		ids := authz.GetPermissionCtxIDs(permissions)
 		request.Queries = append(request.Queries, &proj_model.ProjectViewSearchQuery{Key: proj_model.ProjectViewSearchKeyProjectID, Method: global_model.SearchMethodIsOneOf, Value: ids})
 	}
 

internal/management/repository/eventsourcing/eventstore/user.go

@@ -5,7 +5,7 @@ import (
 
 	"github.com/caos/logging"
 
-	"github.com/caos/zitadel/internal/api/auth"
+	"github.com/caos/zitadel/internal/api/authz"
 	"github.com/caos/zitadel/internal/management/repository/eventsourcing/view"
 	org_event "github.com/caos/zitadel/internal/org/repository/eventsourcing"
 	policy_event "github.com/caos/zitadel/internal/policy/repository/eventsourcing"
@@ -42,11 +42,11 @@ func (repo *UserRepo) UserByID(ctx context.Context, id string) (*usr_model.UserV
 }
 
 func (repo *UserRepo) CreateUser(ctx context.Context, user *usr_model.User) (*usr_model.User, error) {
-	pwPolicy, err := repo.PolicyEvents.GetPasswordComplexityPolicy(ctx, auth.GetCtxData(ctx).OrgID)
+	pwPolicy, err := repo.PolicyEvents.GetPasswordComplexityPolicy(ctx, authz.GetCtxData(ctx).OrgID)
 	if err != nil {
 		return nil, err
 	}
-	orgPolicy, err := repo.OrgEvents.GetOrgIamPolicy(ctx, auth.GetCtxData(ctx).OrgID)
+	orgPolicy, err := repo.OrgEvents.GetOrgIamPolicy(ctx, authz.GetCtxData(ctx).OrgID)
 	if err != nil {
 		return nil, err
 	}
@@ -54,7 +54,7 @@ func (repo *UserRepo) CreateUser(ctx context.Context, user *usr_model.User) (*us
 }
 
 func (repo *UserRepo) RegisterUser(ctx context.Context, user *usr_model.User, resourceOwner string) (*usr_model.User, error) {
-	policyResourceOwner := auth.GetCtxData(ctx).OrgID
+	policyResourceOwner := authz.GetCtxData(ctx).OrgID
 	if resourceOwner != "" {
 		policyResourceOwner = resourceOwner
 	}
@@ -62,7 +62,7 @@ func (repo *UserRepo) RegisterUser(ctx context.Context, user *usr_model.User, re
 	if err != nil {
 		return nil, err
 	}
-	orgPolicy, err := repo.OrgEvents.GetOrgIamPolicy(ctx, auth.GetCtxData(ctx).OrgID)
+	orgPolicy, err := repo.OrgEvents.GetOrgIamPolicy(ctx, authz.GetCtxData(ctx).OrgID)
 	if err != nil {
 		return nil, err
 	}
@@ -131,7 +131,7 @@ func (repo *UserRepo) UserMfas(ctx context.Context, userID string) ([]*usr_model
 }
 
 func (repo *UserRepo) SetOneTimePassword(ctx context.Context, password *usr_model.Password) (*usr_model.Password, error) {
-	policy, err := repo.PolicyEvents.GetPasswordComplexityPolicy(ctx, auth.GetCtxData(ctx).OrgID)
+	policy, err := repo.PolicyEvents.GetPasswordComplexityPolicy(ctx, authz.GetCtxData(ctx).OrgID)
 	if err != nil {
 		return nil, err
 	}