Skip to content

handling filtering based on resource type only #1292

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

handling filtering based on resource type only #1292

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e60c421
handling filtering based on resource type only
jcchr Sep 10, 2025
537dc2d
removal of additional debug logging
jcchr Sep 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion platform/services/account/app/grpc/user/find.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down Expand Up @@ -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))
}
Expand Down
Loading