Allow searching for users with all roles in a tenant (#596)

Author: slavikm

descope/internal/mgmt/user.go

@@ -10,19 +10,6 @@ import (
 	"github.com/descope/go-sdk/descope/sdk"
 )
 
-func mapToValuesObject(inputMap map[string][]string) map[string]map[string][]string {
-	if len(inputMap) == 0 {
-		return nil
-	}
-	result := make(map[string]map[string][]string)
-	for k, v := range inputMap {
-		result[k] = map[string][]string{
-			"values": v,
-		}
-	}
-	return result
-}
-
 type user struct {
 	managementBase
 }
@@ -988,8 +975,8 @@ func makeSearchAllRequest(options *descope.UserSearchOptions) map[string]any {
 		"fromModifiedTime": options.FromModifiedTime,
 		"toModifiedTime":   options.ToModifiedTime,
 		"userIds":          options.UserIDs,
-		"tenantRoleIds":    mapToValuesObject(options.TenantRoleIDs),
-		"tenantRoleNames":  mapToValuesObject(options.TenantRoleNames),
+		"tenantRoleIds":    options.TenantRoleIDs,
+		"tenantRoleNames":  options.TenantRoleNames,
 	}
 }
 

descope/internal/mgmt/user_test.go

@@ -776,8 +776,8 @@ func TestSearchAllUsersSuccess(t *testing.T) {
 			{Field: "nono", Desc: true},
 			{Field: "lolo", Desc: false},
 		},
-		TenantRoleIDs:   map[string][]string{"tenant1": {"id1", "id2"}},
-		TenantRoleNames: map[string][]string{"tenant2": {"name1", "name2"}},
+		TenantRoleIDs:   map[string]*descope.RoleList{"tenant1": {Values: []string{"id1", "id2"}}},
+		TenantRoleNames: map[string]*descope.RoleList{"tenant2": {Values: []string{"name1", "name2"}}},
 	})
 	require.NoError(t, err)
 	require.NotNil(t, res)
@@ -808,8 +808,8 @@ func TestSearchAllTestUsersSuccess(t *testing.T) {
 	}, response))
 	res, _, err := m.User().SearchAllTestUsers(context.Background(), &descope.UserSearchOptions{
 		Emails:          []string{"[email protected]"},
-		TenantRoleIDs:   map[string][]string{"tenant1": {"id1", "id2"}},
-		TenantRoleNames: map[string][]string{"tenant2": {"name1", "name2"}},
+		TenantRoleIDs:   map[string]*descope.RoleList{"tenant1": {Values: []string{"id1", "id2"}}},
+		TenantRoleNames: map[string]*descope.RoleList{"tenant2": {Values: []string{"name1", "name2"}}},
 	})
 	require.NoError(t, err)
 	require.NotNil(t, res)

descope/types.go

@@ -879,15 +879,20 @@ type UserSearchOptions struct {
 	ToCreatedTime    int64
 	FromModifiedTime int64
 	ToModifiedTime   int64
-	TenantRoleIDs    map[string][]string
-	TenantRoleNames  map[string][]string
+	TenantRoleIDs    map[string]*RoleList
+	TenantRoleNames  map[string]*RoleList
 }
 
 type UserSearchSort struct {
 	Field string
 	Desc  bool
 }
 
+type RoleList struct {
+	Values []string `json:"values,omitempty"`
+	And    bool     `json:"and,omitempty"`
+}
+
 type UserStatus string
 
 const (