fix: cleanup some todos (#3642)

* cleanup todo * fix: some todos
2025-08-12 04:37:31 +00:00 · 2022-05-16 16:35:49 +02:00
parent 5c0f527a49
commit 3a63fb765a
45 changed files with 130 additions and 199 deletions
--- a/internal/api/grpc/action/action.go
+++ b/internal/api/grpc/action/action.go
@@ -1,11 +1,12 @@
 package action

 import (
+	"google.golang.org/protobuf/types/known/durationpb"
+
 	object_grpc "github.com/zitadel/zitadel/internal/api/grpc/object"
 	"github.com/zitadel/zitadel/internal/domain"
 	"github.com/zitadel/zitadel/internal/query"
 	action_pb "github.com/zitadel/zitadel/pkg/grpc/action"
-	"google.golang.org/protobuf/types/known/durationpb"
 )

 func FlowTypeToDomain(flowType action_pb.FlowType) domain.FlowType {
--- a/internal/api/grpc/admin/domain_policy.go
+++ b/internal/api/grpc/admin/domain_policy.go
@@ -86,9 +86,6 @@ func domainPolicyToDomain(userLoginMustBeDomain, validateOrgDomains, smtpSenderA

 func updateDomainPolicyToDomain(req *admin_pb.UpdateDomainPolicyRequest) *domain.DomainPolicy {
 	return &domain.DomainPolicy{
-		// ObjectRoot: models.ObjectRoot{
-		// 	// AggreagateID: //TODO: there should only be ONE default
-		// },
 		UserLoginMustBeDomain:                  req.UserLoginMustBeDomain,
 		ValidateOrgDomains:                     req.ValidateOrgDomains,
 		SMTPSenderAddressMatchesInstanceDomain: req.SmtpSenderAddressMatchesInstanceDomain,
--- a/internal/api/grpc/admin/idp_converter_test.go
+++ b/internal/api/grpc/admin/idp_converter_test.go
@@ -45,7 +45,7 @@ func Test_addOIDCIDPRequestToDomain(t *testing.T) {
 				"State",
 				"OIDCConfig.AuthorizationEndpoint",
 				"OIDCConfig.TokenEndpoint",
-				"Type", //TODO: default (0) is oidc
+				"Type",
 				"JWTConfig",
 			)
 		})
@@ -79,7 +79,7 @@ func Test_addOIDCIDPRequestToDomainOIDCIDPConfig(t *testing.T) {
 			got := addOIDCIDPRequestToDomainOIDCIDPConfig(tt.args.req)
 			test.AssertFieldsMapped(t, got,
 				"ObjectRoot",
-				"ClientSecret", //TODO: is client secret string enough for backend?
+				"ClientSecret",
 				"IDPConfigID",
 				"AuthorizationEndpoint",
 				"TokenEndpoint",
@@ -116,7 +116,7 @@ func Test_updateIDPToDomain(t *testing.T) {
 				"OIDCConfig",
 				"JWTConfig",
 				"State",
-				"Type", //TODO: type should not be changeable
+				"Type",
 			)
 		})
 	}
--- a/internal/api/grpc/admin/instance_converter.go
+++ b/internal/api/grpc/admin/instance_converter.go
@@ -5,6 +5,7 @@ import (
 	"github.com/zitadel/zitadel/internal/api/grpc/object"
 	"github.com/zitadel/zitadel/internal/query"
 	admin_pb "github.com/zitadel/zitadel/pkg/grpc/admin"
+	"github.com/zitadel/zitadel/pkg/grpc/instance"
 )

 func ListInstanceDomainsRequestToModel(req *admin_pb.ListInstanceDomainsRequest) (*query.InstanceDomainSearchQueries, error) {
@@ -15,11 +16,26 @@ func ListInstanceDomainsRequestToModel(req *admin_pb.ListInstanceDomainsRequest)
 	}
 	return &query.InstanceDomainSearchQueries{
 		SearchRequest: query.SearchRequest{
-			Offset: offset,
-			Limit:  limit,
-			Asc:    asc,
+			Offset:        offset,
+			Limit:         limit,
+			Asc:           asc,
+			SortingColumn: fieldNameToInstanceDomainColumn(req.SortingColumn),
 		},
-		//SortingColumn: //TODO: sorting
 		Queries: queries,
 	}, nil
 }
+
+func fieldNameToInstanceDomainColumn(fieldName instance.DomainFieldName) query.Column {
+	switch fieldName {
+	case instance.DomainFieldName_DOMAIN_FIELD_NAME_DOMAIN:
+		return query.InstanceDomainDomainCol
+	case instance.DomainFieldName_DOMAIN_FIELD_NAME_PRIMARY:
+		return query.InstanceDomainIsPrimaryCol
+	case instance.DomainFieldName_DOMAIN_FIELD_NAME_GENERATED:
+		return query.InstanceDomainIsGeneratedCol
+	case instance.DomainFieldName_DOMAIN_FIELD_NAME_CREATION_DATE:
+		return query.InstanceDomainCreationDateCol
+	default:
+		return query.Column{}
+	}
+}
--- a/internal/api/grpc/admin/org.go
+++ b/internal/api/grpc/admin/org.go
@@ -52,15 +52,13 @@ func (s *Server) SetUpOrg(ctx context.Context, req *admin_pb.SetUpOrgRequest) (*
 	if err != nil {
 		return nil, err
 	}
-	_ = userIDs                                                                        //TODO: handle userIDs
 	human := setUpOrgHumanToCommand(req.User.(*admin_pb.SetUpOrgRequest_Human_).Human) //TODO: handle machine
-	org := setUpOrgOrgToDomain(req.Org)                                                //TODO: handle domain
-	_ = org

 	userID, objectDetails, err := s.command.SetUpOrg(ctx, &command.OrgSetup{
-		Name:  req.Org.Name,
-		Human: human,
-	})
+		Name:         req.Org.Name,
+		CustomDomain: req.Org.Domain,
+		Human:        human,
+	}, userIDs...)
 	if err != nil {
 		return nil, err
 	}
--- a/internal/api/grpc/admin/org_converter.go
+++ b/internal/api/grpc/admin/org_converter.go
@@ -3,7 +3,6 @@ package admin
 import (
 	"github.com/zitadel/zitadel/internal/api/grpc/object"
 	org_grpc "github.com/zitadel/zitadel/internal/api/grpc/org"
-	"github.com/zitadel/zitadel/internal/domain"
 	"github.com/zitadel/zitadel/internal/query"
 	"github.com/zitadel/zitadel/pkg/grpc/admin"
 	"github.com/zitadel/zitadel/pkg/grpc/org"
@@ -34,14 +33,3 @@ func fieldNameToOrgColumn(fieldName org.OrgFieldName) query.Column {
 		return query.Column{}
 	}
 }
-
-func setUpOrgOrgToDomain(req *admin.SetUpOrgRequest_Org) *domain.Org {
-	org := &domain.Org{
-		Name:    req.Name,
-		Domains: []*domain.OrgDomain{},
-	}
-	if req.Domain != "" {
-		org.Domains = append(org.Domains, &domain.OrgDomain{Domain: req.Domain})
-	}
-	return org
-}
--- a/internal/api/grpc/idp/converter.go
+++ b/internal/api/grpc/idp/converter.go
@@ -190,8 +190,6 @@ func IDPViewToConfigPb(config *query.IDP) idp_pb.IDPConfig {

 func FieldNameToModel(fieldName idp_pb.IDPFieldName) query.Column {
 	switch fieldName {
-	// case admin.IdpSearchKey_IDPSEARCHKEY_IDP_CONFIG_ID: //TODO: not implemented in proto
-	// 	return iam_model.IDPConfigSearchKeyIdpConfigID
 	case idp_pb.IDPFieldName_IDP_FIELD_NAME_NAME:
 		return query.IDPNameCol
 	default:
--- a/internal/api/grpc/management/idp_converter_test.go
+++ b/internal/api/grpc/management/idp_converter_test.go
@@ -45,7 +45,7 @@ func Test_addOIDCIDPRequestToDomain(t *testing.T) {
 				"State",
 				"OIDCConfig.AuthorizationEndpoint",
 				"OIDCConfig.TokenEndpoint",
-				"Type", //TODO: default (0) is oidc
+				"Type",
 				"JWTConfig",
 			)
 		})
@@ -79,7 +79,7 @@ func Test_addOIDCIDPRequestToDomainOIDCIDPConfig(t *testing.T) {
 			got := addOIDCIDPRequestToDomainOIDCIDPConfig(tt.args.req)
 			test.AssertFieldsMapped(t, got,
 				"ObjectRoot",
-				"ClientSecret", //TODO: is client secret string enough for backend?
+				"ClientSecret",
 				"IDPConfigID",
 				"AuthorizationEndpoint",
 				"TokenEndpoint",
@@ -116,7 +116,7 @@ func Test_updateIDPToDomain(t *testing.T) {
 				"OIDCConfig",
 				"JWTConfig",
 				"State",
-				"Type", //TODO: type should not be changeable
+				"Type",
 			)
 		})
 	}
--- a/internal/api/grpc/project/application.go
+++ b/internal/api/grpc/project/application.go
@@ -65,7 +65,6 @@ func AppAPIConfigToPb(app *query.APIApp) app_pb.AppConfig {
 	return &app_pb.App_ApiConfig{
 		ApiConfig: &app_pb.APIConfig{
 			ClientId:       app.ClientID,
-			ClientSecret:   "", //TODO: remove from proto
 			AuthMethodType: APIAuthMethodeTypeToPb(app.AuthMethodType),
 		},
 	}
--- a/internal/api/grpc/user/membership.go
+++ b/internal/api/grpc/user/membership.go
@@ -2,10 +2,8 @@ package user

 import (
 	"github.com/zitadel/zitadel/internal/api/grpc/object"
-	"github.com/zitadel/zitadel/internal/domain"
 	"github.com/zitadel/zitadel/internal/errors"
 	"github.com/zitadel/zitadel/internal/query"
-	user_model "github.com/zitadel/zitadel/internal/user/model"
 	user_pb "github.com/zitadel/zitadel/pkg/grpc/user"
 )

@@ -36,62 +34,6 @@ func MembershipQueryToQuery(req *user_pb.MembershipQuery) (query.SearchQuery, er
 	}
 }

-func MembershipIAMQueryToModel(q *user_pb.MembershipIAMQuery) []*user_model.UserMembershipSearchQuery {
-	return []*user_model.UserMembershipSearchQuery{
-		{
-			Key:    user_model.UserMembershipSearchKeyMemberType,
-			Method: domain.SearchMethodEquals,
-			Value:  user_model.MemberTypeIam,
-		},
-		//TODO: q.IAM?
-	}
-}
-
-func MembershipOrgQueryToModel(q *user_pb.MembershipOrgQuery) []*user_model.UserMembershipSearchQuery {
-	return []*user_model.UserMembershipSearchQuery{
-		{
-			Key:    user_model.UserMembershipSearchKeyMemberType,
-			Method: domain.SearchMethodEquals,
-			Value:  user_model.MemberTypeOrganisation,
-		},
-		{
-			Key:    user_model.UserMembershipSearchKeyObjectID,
-			Method: domain.SearchMethodEquals,
-			Value:  q.OrgId,
-		},
-	}
-}
-
-func MembershipProjectQueryToModel(q *user_pb.MembershipProjectQuery) []*user_model.UserMembershipSearchQuery {
-	return []*user_model.UserMembershipSearchQuery{
-		{
-			Key:    user_model.UserMembershipSearchKeyMemberType,
-			Method: domain.SearchMethodEquals,
-			Value:  user_model.MemberTypeProject,
-		},
-		{
-			Key:    user_model.UserMembershipSearchKeyObjectID,
-			Method: domain.SearchMethodEquals,
-			Value:  q.ProjectId,
-		},
-	}
-}
-
-func MembershipProjectGrantQueryToModel(q *user_pb.MembershipProjectGrantQuery) []*user_model.UserMembershipSearchQuery {
-	return []*user_model.UserMembershipSearchQuery{
-		{
-			Key:    user_model.UserMembershipSearchKeyMemberType,
-			Method: domain.SearchMethodEquals,
-			Value:  user_model.MemberTypeProjectGrant,
-		},
-		{
-			Key:    user_model.UserMembershipSearchKeyObjectID,
-			Method: domain.SearchMethodEquals,
-			Value:  q.ProjectGrantId,
-		},
-	}
-}
-
 func MembershipsToMembershipsPb(memberships []*query.Membership) []*user_pb.Membership {
 	converted := make([]*user_pb.Membership, len(memberships))
 	for i, membership := range memberships {