From 17c9f2eded8a6dde5090f6e6ce9ff7c0745390e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89mile=20R=C3=A9?= Date: Tue, 10 Mar 2026 18:19:16 +0400 Subject: [PATCH] Fix profiles default filter MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Émile Ré --- pkg/iam/scim/filter.go | 2 +- pkg/server/api/connect/v1/v1_resolver.go | 7 +++---- pkg/server/api/console/v1/v1_resolver.go | 4 ++-- pkg/server/api/mcp/v1/schema.resolvers.go | 4 ++-- 4 files changed, 8 insertions(+), 9 deletions(-) diff --git a/pkg/iam/scim/filter.go b/pkg/iam/scim/filter.go index 7cdbf9390..c32d38453 100644 --- a/pkg/iam/scim/filter.go +++ b/pkg/iam/scim/filter.go @@ -25,7 +25,7 @@ import ( ) func ParseUserFilter(expr scimfilter.Expression) (*coredata.MembershipProfileFilter, error) { - filter := coredata.NewMembershipProfileFilter(nil) + filter := coredata.NewMembershipProfileFilter(nil).WithMembership() if expr == nil { return filter, nil diff --git a/pkg/server/api/connect/v1/v1_resolver.go b/pkg/server/api/connect/v1/v1_resolver.go index 13521ae3f..d9a8ec2a5 100644 --- a/pkg/server/api/connect/v1/v1_resolver.go +++ b/pkg/server/api/connect/v1/v1_resolver.go @@ -38,9 +38,9 @@ func (r *identityResolver) Profiles(ctx context.Context, obj *types.Identity, fi return nil, err } - filters := coredata.NewMembershipProfileFilter(nil) + filters := coredata.NewMembershipProfileFilter(nil).WithMembership() if filter != nil { - filters = coredata.NewMembershipProfileFilter(filter.ExcludeContractEnded) + filters = coredata.NewMembershipProfileFilter(filter.ExcludeContractEnded).WithMembership() if filter.State != nil { filters.WithState(*filter.State) } @@ -1184,8 +1184,7 @@ func (r *organizationResolver) Profiles(ctx context.Context, obj *types.Organiza return nil, err } - filter := coredata.NewMembershipProfileFilter(nil) - filter = filter.WithMembership() + filter := coredata.NewMembershipProfileFilter(nil).WithMembership() if gqlutils.OnlyTotalCountSelected(ctx) { return &types.ProfileConnection{ diff --git a/pkg/server/api/console/v1/v1_resolver.go b/pkg/server/api/console/v1/v1_resolver.go index 13acd7720..68a92c12e 100644 --- a/pkg/server/api/console/v1/v1_resolver.go +++ b/pkg/server/api/console/v1/v1_resolver.go @@ -5674,9 +5674,9 @@ func (r *organizationResolver) Profiles(ctx context.Context, obj *types.Organiza }, nil } - filters := coredata.NewMembershipProfileFilter(nil) + filters := coredata.NewMembershipProfileFilter(nil).WithMembership() if filter != nil { - filters = coredata.NewMembershipProfileFilter(filter.ExcludeContractEnded) + filters = coredata.NewMembershipProfileFilter(filter.ExcludeContractEnded).WithMembership() } pageOrderBy := page.OrderBy[coredata.MembershipProfileOrderField]{ diff --git a/pkg/server/api/mcp/v1/schema.resolvers.go b/pkg/server/api/mcp/v1/schema.resolvers.go index bcf8edc67..5881f0622 100644 --- a/pkg/server/api/mcp/v1/schema.resolvers.go +++ b/pkg/server/api/mcp/v1/schema.resolvers.go @@ -2754,9 +2754,9 @@ func (r *Resolver) ListUsersTool(ctx context.Context, req *mcp.CallToolRequest, } cursor := types.NewCursor(input.Size, input.Cursor, pageOrderBy) - filter := coredata.NewMembershipProfileFilter(nil) + filter := coredata.NewMembershipProfileFilter(nil).WithMembership() if input.Filter != nil { - filter = coredata.NewMembershipProfileFilter(input.Filter.ExcludeContractEnded) + filter = coredata.NewMembershipProfileFilter(input.Filter.ExcludeContractEnded).WithMembership() } pageResult, err := r.iamSvc.OrganizationService.ListProfiles(ctx, input.OrganizationID, cursor, filter)