From e60c421069d955843845ccc701e89a64eea46f0e Mon Sep 17 00:00:00 2001 From: jcchr Date: Wed, 10 Sep 2025 14:41:45 +0200 Subject: [PATCH 1/2] handling filtering based on resource type only --- platform/services/account/app/grpc/user/find.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/platform/services/account/app/grpc/user/find.go b/platform/services/account/app/grpc/user/find.go index 38e500f1b6..ef845969ff 100644 --- a/platform/services/account/app/grpc/user/find.go +++ b/platform/services/account/app/grpc/user/find.go @@ -280,7 +280,9 @@ func filterUserRoles(ctx context.Context, userData *pb.UserData, userRolesMap Us if isAuthTokenPresent { logger.Debug("auth token present, filtering by permissions...") var err error + logger.Debugf("1 - Returning filtered roles %v for user %v", filteredRoles, authTokenData.UserID) filteredRoles, err = common.FilterRolesByCurrentUserPermissions(authTokenData.UserID, filteredRoles) + logger.Debugf("2 - Returning filtered roles %v for user %v", filteredRoles, authTokenData.UserID) if err != nil { logger.Errorf("error during filtering roles: %v", err) return status.Errorf(codes.Unknown, "unexpected error") @@ -365,7 +367,7 @@ func (s *GRPCServer) Find(ctx context.Context, findRequest *pb.FindUserRequest) return nil, err } - if len(findRequest.ResourceType) > 0 || findRequest.Role != "" || findRequest.ResourceId != "" { + if (len(findRequest.ResourceType) > 0 && findRequest.ResourceId != "") || findRequest.Role != "" { users = filterUsersByRole(findRequest, users, userRolesMap) response.TotalMatchedCount = int32(len(users)) } From 537dc2d4582624dd072d901d3262e15440f99dae Mon Sep 17 00:00:00 2001 From: jcchr Date: Wed, 10 Sep 2025 15:35:20 +0200 Subject: [PATCH 2/2] removal of additional debug logging --- platform/services/account/app/grpc/user/find.go | 2 -- 1 file changed, 2 deletions(-) diff --git a/platform/services/account/app/grpc/user/find.go b/platform/services/account/app/grpc/user/find.go index ef845969ff..9bad5eb88e 100644 --- a/platform/services/account/app/grpc/user/find.go +++ b/platform/services/account/app/grpc/user/find.go @@ -280,9 +280,7 @@ func filterUserRoles(ctx context.Context, userData *pb.UserData, userRolesMap Us if isAuthTokenPresent { logger.Debug("auth token present, filtering by permissions...") var err error - logger.Debugf("1 - Returning filtered roles %v for user %v", filteredRoles, authTokenData.UserID) filteredRoles, err = common.FilterRolesByCurrentUserPermissions(authTokenData.UserID, filteredRoles) - logger.Debugf("2 - Returning filtered roles %v for user %v", filteredRoles, authTokenData.UserID) if err != nil { logger.Errorf("error during filtering roles: %v", err) return status.Errorf(codes.Unknown, "unexpected error")