feat: permit all features to every instance and organisation (#3566)

internal/api/grpc/auth/features.go

@@ -1,18 +0,0 @@
-package auth
-
-import (
-	"context"
-
-	"github.com/zitadel/zitadel/internal/api/authz"
-	auth_pb "github.com/zitadel/zitadel/pkg/grpc/auth"
-)
-
-func (s *Server) ListMyZitadelFeatures(ctx context.Context, _ *auth_pb.ListMyZitadelFeaturesRequest) (*auth_pb.ListMyZitadelFeaturesResponse, error) {
-	features, err := s.query.FeaturesByOrgID(ctx, authz.GetCtxData(ctx).OrgID)
-	if err != nil {
-		return nil, err
-	}
-	return &auth_pb.ListMyZitadelFeaturesResponse{
-		Result: features.EnabledFeatureTypes(),
-	}, nil
-}

internal/api/grpc/auth/server.go

@@ -1,6 +1,8 @@
 package auth
 
 import (
+	"time"
+
 	"google.golang.org/grpc"
 
 	"github.com/zitadel/zitadel/internal/api/authz"
@@ -22,13 +24,14 @@ const (
 
 type Server struct {
 	auth.UnimplementedAuthServiceServer
-	command         *command.Commands
-	query           *query.Queries
-	repo            repository.Repository
-	defaults        systemdefaults.SystemDefaults
-	assetsAPIDomain string
-	userCodeAlg     crypto.EncryptionAlgorithm
-	externalSecure  bool
+	command           *command.Commands
+	query             *query.Queries
+	repo              repository.Repository
+	defaults          systemdefaults.SystemDefaults
+	assetsAPIDomain   string
+	userCodeAlg       crypto.EncryptionAlgorithm
+	externalSecure    bool
+	auditLogRetention time.Duration
 }
 
 type Config struct {
@@ -42,15 +45,17 @@ func CreateServer(command *command.Commands,
 	assetsAPIDomain string,
 	userCodeAlg crypto.EncryptionAlgorithm,
 	externalSecure bool,
+	auditLogRetention time.Duration,
 ) *Server {
 	return &Server{
-		command:         command,
-		query:           query,
-		repo:            authRepo,
-		defaults:        defaults,
-		assetsAPIDomain: assetsAPIDomain,
-		userCodeAlg:     userCodeAlg,
-		externalSecure:  externalSecure,
+		command:           command,
+		query:             query,
+		repo:              authRepo,
+		defaults:          defaults,
+		assetsAPIDomain:   assetsAPIDomain,
+		userCodeAlg:       userCodeAlg,
+		externalSecure:    externalSecure,
+		auditLogRetention: auditLogRetention,
 	}
 }
 

internal/api/grpc/auth/user.go

@@ -56,11 +56,7 @@ func (s *Server) RemoveMyUser(ctx context.Context, _ *auth_pb.RemoveMyUserReques
 
 func (s *Server) ListMyUserChanges(ctx context.Context, req *auth_pb.ListMyUserChangesRequest) (*auth_pb.ListMyUserChangesResponse, error) {
 	sequence, limit, asc := change.ChangeQueryToQuery(req.Query)
-	features, err := s.query.FeaturesByOrgID(ctx, authz.GetCtxData(ctx).ResourceOwner)
-	if err != nil {
-		return nil, err
-	}
-	changes, err := s.query.UserChanges(ctx, authz.GetCtxData(ctx).UserID, sequence, limit, asc, features.AuditLogRetention)
+	changes, err := s.query.UserChanges(ctx, authz.GetCtxData(ctx).UserID, sequence, limit, asc, s.auditLogRetention)
 	if err != nil {
 		return nil, err
 	}