resolved issues

Author: developerkunal

internal/acctest/sweep/organizations.go

@@ -24,9 +24,16 @@ func Organizations() {
 
 			var result *multierror.Error
 			var from string
+			firstTime := true
 
 			for {
-				organizationList, err := api.Organization.List(ctx, management.From(from), management.Take(100))
+				var options []management.RequestOption
+				if !firstTime {
+					options = append(options, management.From(from))
+				}
+				options = append(options, management.Take(100))
+
+				organizationList, err := api.Organization.List(ctx, options...)
 				if err != nil {
 					return err
 				}
@@ -49,6 +56,7 @@ func Organizations() {
 				}
 
 				from = organizationList.Next
+				firstTime = false
 			}
 
 			return result.ErrorOrNil()

internal/auth0/organization/data_source.go

@@ -127,25 +127,33 @@ func fetchAllOrganizationConnections(ctx context.Context, api *management.Manage
 	return foundConnections, nil
 }
 
-func fetchAllOrganizationMembers(ctx context.Context, api *management.Management, organizationID string) ([]string, error) {
-	foundMembers := make([]string, 0)
+func fetchAllOrganizationMembers(ctx context.Context, api *management.Management, organizationID string) ([]*management.OrganizationMember, error) {
+	var foundMembers []*management.OrganizationMember
 	var from string
+	firstTime := true
 
 	for {
-		members, err := api.Organization.Members(ctx, organizationID, management.From(from), management.Take(100), management.IncludeFields("user_id"))
+		var options []management.RequestOption
+		if !firstTime {
+			options = append(options, management.From(from))
+		}
+		options = append(options, management.Take(100), management.IncludeFields("user_id"))
+
+		membersList, err := api.Organization.Members(ctx, organizationID, options...)
 		if err != nil {
 			return nil, err
 		}
 
-		for _, member := range members.Members {
-			foundMembers = append(foundMembers, member.GetUserID())
+		for _, member := range membersList.Members {
+			foundMembers = append(foundMembers, &member)
 		}
 
-		if !members.HasNext() {
+		if !membersList.HasNext() {
 			break
 		}
 
-		from = members.Next
+		from = membersList.Next
+		firstTime = false
 	}
 
 	return foundMembers, nil

internal/auth0/organization/flatten.go

@@ -21,14 +21,23 @@ func flattenOrganizationForDataSource(
 	data *schema.ResourceData,
 	organization *management.Organization,
 	connections []*management.OrganizationConnection,
-	memberIDs []string,
+	members []*management.OrganizationMember,
 ) error {
 	result := multierror.Append(
 		flattenOrganization(data, organization),
 		data.Set("connections", flattenOrganizationEnabledConnections(connections)),
-		data.Set("members", memberIDs),
 	)
 
+	var memberIDs []string
+	for _, member := range members {
+		memberIDs = append(memberIDs, member.GetUserID())
+	}
+
+	err := data.Set("members", memberIDs)
+	if err != nil {
+		result = multierror.Append(result, err)
+	}
+
 	return result.ErrorOrNil()
 }
 
@@ -89,7 +98,7 @@ func flattenOrganizationMemberRole(data *schema.ResourceData, role management.Or
 	return result.ErrorOrNil()
 }
 
-func flattenOrganizationMembers(data *schema.ResourceData, members []string) error {
+func flattenOrganizationMembers(data *schema.ResourceData, members []*management.OrganizationMember) error {
 	result := multierror.Append(
 		data.Set("organization_id", data.Id()),
 		data.Set("members", flattenOrganizationMembersSlice(members)),
@@ -98,10 +107,14 @@ func flattenOrganizationMembers(data *schema.ResourceData, members []string) err
 	return result.ErrorOrNil()
 }
 
-func flattenOrganizationMembersSlice(members []string) []string {
+func flattenOrganizationMembersSlice(members []*management.OrganizationMember) []string {
 	if len(members) == 0 {
 		return nil
 	}
+	flattenedMembers := make([]string, 0)
+	for _, member := range members {
+		flattenedMembers = append(flattenedMembers, member.GetUserID())
+	}
 
-	return members
+	return flattenedMembers
 }

internal/auth0/organization/resource_member.go

@@ -64,8 +64,8 @@ func readOrganizationMember(ctx context.Context, data *schema.ResourceData, meta
 	}
 
 	userID := data.Get("user_id").(string)
-	for _, memberID := range members {
-		if memberID == userID {
+	for _, member := range members {
+		if member.UserID != nil && *member.UserID == userID {
 			return nil
 		}
 	}

internal/auth0/organization/resource_members.go

@@ -3,6 +3,7 @@ package organization
 import (
 	"context"
 	"fmt"
+	"github.com/auth0/go-auth0/management"
 
 	"github.com/google/go-cmp/cmp"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
@@ -138,13 +139,18 @@ func deleteOrganizationMembers(ctx context.Context, data *schema.ResourceData, m
 
 func guardAgainstErasingUnwantedMembers(
 	organizationID string,
-	alreadyMemberIDs []string,
+	alreadyMembers []*management.OrganizationMember,
 	memberIDsToAdd []string,
 ) diag.Diagnostics {
-	if len(alreadyMemberIDs) == 0 {
+	if len(alreadyMembers) == 0 {
 		return nil
 	}
 
+	alreadyMemberIDs := make([]string, 0)
+	for _, member := range alreadyMembers {
+		alreadyMemberIDs = append(alreadyMemberIDs, member.GetUserID())
+	}
+
 	if cmp.Equal(memberIDsToAdd, alreadyMemberIDs) {
 		return nil
 	}