From 5eea06f8878a8f225b99f260c720850804d1795f Mon Sep 17 00:00:00 2001 From: Vishal Dalwadi Date: Thu, 28 Aug 2025 13:58:21 +0530 Subject: [PATCH] feat(go): apply filters only if they exist; --- pro/idp/google/google.go | 28 ++++++++++++++++++---------- 1 file changed, 18 insertions(+), 10 deletions(-) diff --git a/pro/idp/google/google.go b/pro/idp/google/google.go index 84ff5f7f..c117cc63 100644 --- a/pro/idp/google/google.go +++ b/pro/idp/google/google.go @@ -68,14 +68,18 @@ func (g *Client) GetUsers(filters []string) ([]idp.User, error) { Fields("users(id,primaryEmail,name,suspended,archived)", "nextPageToken"). Pages(context.TODO(), func(users *admindir.Users) error { for _, user := range users.Users { - var found bool - for _, filter := range filters { - if strings.HasPrefix(user.PrimaryEmail, filter) { - found = true + var keep bool + if len(filters) > 0 { + for _, filter := range filters { + if strings.HasPrefix(user.PrimaryEmail, filter) { + keep = true + } } + } else { + keep = true } - if !found { + if !keep { continue } @@ -101,14 +105,18 @@ func (g *Client) GetGroups(filters []string) ([]idp.Group, error) { Fields("groups(id,name)", "nextPageToken"). Pages(context.TODO(), func(groups *admindir.Groups) error { for _, group := range groups.Groups { - var found bool - for _, filter := range filters { - if strings.HasPrefix(group.Name, filter) { - found = true + var keep bool + if len(filters) > 0 { + for _, filter := range filters { + if strings.HasPrefix(group.Name, filter) { + keep = true + } } + } else { + keep = true } - if !found { + if !keep { continue }