fix: features query (#2610)

internal/api/grpc/admin/features.go

@@ -10,12 +10,12 @@ import (
 )
 
 func (s *Server) GetDefaultFeatures(ctx context.Context, _ *admin_pb.GetDefaultFeaturesRequest) (*admin_pb.GetDefaultFeaturesResponse, error) {
-	features, err := s.features.GetDefaultFeatures(ctx)
+	features, err := s.query.DefaultFeatures(ctx)
 	if err != nil {
 		return nil, err
 	}
 	return &admin_pb.GetDefaultFeaturesResponse{
-		Features: features_grpc.FeaturesFromModel(features),
+		Features: features_grpc.ModelFeaturesToPb(features),
 	}, nil
 }
 
@@ -30,12 +30,12 @@ func (s *Server) SetDefaultFeatures(ctx context.Context, req *admin_pb.SetDefaul
 }
 
 func (s *Server) GetOrgFeatures(ctx context.Context, req *admin_pb.GetOrgFeaturesRequest) (*admin_pb.GetOrgFeaturesResponse, error) {
-	features, err := s.features.GetOrgFeatures(ctx, req.OrgId)
+	features, err := s.query.FeaturesByOrgID(ctx, req.OrgId)
 	if err != nil {
 		return nil, err
 	}
 	return &admin_pb.GetOrgFeaturesResponse{
-		Features: features_grpc.FeaturesFromModel(features),
+		Features: features_grpc.ModelFeaturesToPb(features),
 	}, nil
 }
 

internal/api/grpc/admin/server.go

@@ -25,7 +25,6 @@ type Server struct {
 	iam           repository.IAMRepository
 	administrator repository.AdministratorRepository
 	repo          repository.Repository
-	features      repository.FeaturesRepository
 	users         repository.UserRepository
 	iamDomain     string
 }
@@ -41,7 +40,6 @@ func CreateServer(command *command.Commands, query *query.Queries, repo reposito
 		iam:           repo,
 		administrator: repo,
 		repo:          repo,
-		features:      repo,
 		users:         repo,
 		iamDomain:     iamDomain,
 	}

internal/api/grpc/auth/features.go

@@ -8,11 +8,11 @@ import (
 )
 
 func (s *Server) ListMyZitadelFeatures(ctx context.Context, _ *auth_pb.ListMyZitadelFeaturesRequest) (*auth_pb.ListMyZitadelFeaturesResponse, error) {
-	features, err := s.repo.GetOrgFeatures(ctx, authz.GetCtxData(ctx).OrgID)
+	features, err := s.query.FeaturesByOrgID(ctx, authz.GetCtxData(ctx).OrgID)
 	if err != nil {
 		return nil, err
 	}
 	return &auth_pb.ListMyZitadelFeaturesResponse{
-		Result: features.FeatureList(),
+		Result: features.EnabledFeatureTypes(),
 	}, nil
 }

internal/api/grpc/auth/user.go

@@ -26,7 +26,7 @@ func (s *Server) GetMyUser(ctx context.Context, _ *auth_pb.GetMyUserRequest) (*a
 
 func (s *Server) ListMyUserChanges(ctx context.Context, req *auth_pb.ListMyUserChangesRequest) (*auth_pb.ListMyUserChangesResponse, error) {
 	sequence, limit, asc := change.ChangeQueryToModel(req.Query)
-	features, err := s.repo.GetOrgFeatures(ctx, authz.GetCtxData(ctx).ResourceOwner)
+	features, err := s.query.FeaturesByOrgID(ctx, authz.GetCtxData(ctx).ResourceOwner)
 	if err != nil {
 		return nil, err
 	}

internal/api/grpc/features/features.go

@@ -5,16 +5,14 @@ import (
 
 	object_grpc "github.com/caos/zitadel/internal/api/grpc/object"
 	"github.com/caos/zitadel/internal/domain"
-	features_model "github.com/caos/zitadel/internal/features/model"
+	"github.com/caos/zitadel/internal/query"
 	features_pb "github.com/caos/zitadel/pkg/grpc/features"
 )
 
-func FeaturesFromModel(features *features_model.FeaturesView) *features_pb.Features {
+func ModelFeaturesToPb(features *query.Features) *features_pb.Features {
 	return &features_pb.Features{
-		Details:   object_grpc.ToViewDetailsPb(features.Sequence, features.CreationDate, features.ChangeDate, features.AggregateID),
-		Tier:      FeatureTierToPb(features.TierName, features.TierDescription, features.State, features.StateDescription),
-		IsDefault: features.Default,
-
+		IsDefault:                features.IsDefault,
+		Tier:                     FeatureTierToPb(features.TierName, features.TierDescription, features.State, features.StateDescription),
 		AuditLogRetention:        durationpb.New(features.AuditLogRetention),
 		LoginPolicyFactors:       features.LoginPolicyFactors,
 		LoginPolicyIdp:           features.LoginPolicyIDP,
@@ -34,6 +32,11 @@ func FeaturesFromModel(features *features_model.FeaturesView) *features_pb.Featu
 		MetadataUser:             features.MetadataUser,
 		LockoutPolicy:            features.LockoutPolicy,
 		Actions:                  features.Actions,
+		Details: object_grpc.ChangeToDetailsPb(
+			features.Sequence,
+			features.ChangeDate,
+			features.AggregateID,
+		),
 	}
 }
 

internal/api/grpc/management/features.go

@@ -9,11 +9,11 @@ import (
 )
 
 func (s *Server) GetFeatures(ctx context.Context, req *mgmt_pb.GetFeaturesRequest) (*mgmt_pb.GetFeaturesResponse, error) {
-	features, err := s.features.GetOrgFeatures(ctx, authz.GetCtxData(ctx).OrgID)
+	features, err := s.query.FeaturesByOrgID(ctx, authz.GetCtxData(ctx).OrgID)
 	if err != nil {
 		return nil, err
 	}
 	return &mgmt_pb.GetFeaturesResponse{
-		Features: features_grpc.FeaturesFromModel(features),
+		Features: features_grpc.ModelFeaturesToPb(features),
 	}, nil
 }

internal/api/grpc/management/org.go

@@ -36,7 +36,7 @@ func (s *Server) GetOrgByDomainGlobal(ctx context.Context, req *mgmt_pb.GetOrgBy
 
 func (s *Server) ListOrgChanges(ctx context.Context, req *mgmt_pb.ListOrgChangesRequest) (*mgmt_pb.ListOrgChangesResponse, error) {
 	sequence, limit, asc := change_grpc.ChangeQueryToModel(req.Query)
-	features, err := s.features.GetOrgFeatures(ctx, authz.GetCtxData(ctx).OrgID)
+	features, err := s.query.FeaturesByOrgID(ctx, authz.GetCtxData(ctx).OrgID)
 	if err != nil {
 		return nil, err
 	}

internal/api/grpc/management/project.go

@@ -110,7 +110,7 @@ func (s *Server) ListGrantedProjectRoles(ctx context.Context, req *mgmt_pb.ListG
 
 func (s *Server) ListProjectChanges(ctx context.Context, req *mgmt_pb.ListProjectChangesRequest) (*mgmt_pb.ListProjectChangesResponse, error) {
 	sequence, limit, asc := change_grpc.ChangeQueryToModel(req.Query)
-	features, err := s.features.GetOrgFeatures(ctx, authz.GetCtxData(ctx).OrgID)
+	features, err := s.query.FeaturesByOrgID(ctx, authz.GetCtxData(ctx).OrgID)
 	if err != nil {
 		return nil, err
 	}

internal/api/grpc/management/project_application.go

@@ -42,7 +42,7 @@ func (s *Server) ListApps(ctx context.Context, req *mgmt_pb.ListAppsRequest) (*m
 
 func (s *Server) ListAppChanges(ctx context.Context, req *mgmt_pb.ListAppChangesRequest) (*mgmt_pb.ListAppChangesResponse, error) {
 	sequence, limit, asc := change_grpc.ChangeQueryToModel(req.Query)
-	features, err := s.features.GetOrgFeatures(ctx, authz.GetCtxData(ctx).OrgID)
+	features, err := s.query.FeaturesByOrgID(ctx, authz.GetCtxData(ctx).OrgID)
 	if err != nil {
 		return nil, err
 	}

internal/api/grpc/management/server.go

@@ -28,7 +28,6 @@ type Server struct {
 	user           repository.UserRepository
 	usergrant      repository.UserGrantRepository
 	iam            repository.IamRepository
-	features       repository.FeaturesRepository
 	authZ          authz.Config
 	systemDefaults systemdefaults.SystemDefaults
 }
@@ -46,7 +45,6 @@ func CreateServer(command *command.Commands, query *query.Queries, repo reposito
 		user:           repo,
 		usergrant:      repo,
 		iam:            repo,
-		features:       repo,
 		systemDefaults: sd,
 	}
 }

internal/api/grpc/management/user.go

@@ -57,7 +57,7 @@ func (s *Server) ListUsers(ctx context.Context, req *mgmt_pb.ListUsersRequest) (
 
 func (s *Server) ListUserChanges(ctx context.Context, req *mgmt_pb.ListUserChangesRequest) (*mgmt_pb.ListUserChangesResponse, error) {
 	sequence, limit, asc := change_grpc.ChangeQueryToModel(req.Query)
-	features, err := s.features.GetOrgFeatures(ctx, authz.GetCtxData(ctx).OrgID)
+	features, err := s.query.FeaturesByOrgID(ctx, authz.GetCtxData(ctx).OrgID)
 	if err != nil {
 		return nil, err
 	}