Merge pull request #55 from ConductorOne/lauren/use-group-member-all-endpoint

use group member all endpoint to get members and pending invites

Author: laurenleach

pkg/connector/client/client.go

@@ -190,6 +190,21 @@ func (c *GitlabClient) GetGroup(ctx context.Context, groupID string) (*Group, *v
 	return &group, rateLimitDesc, nil
 }
 
+// ListAllGroupMembers retrieves members and pending invites of a specific group.
+func (c *GitlabClient) ListAllGroupMembers(ctx context.Context, groupID string, nextPageToken string) ([]*GroupMember, string, *v2.RateLimitDescription, error) {
+	var members []*GroupMember
+
+	apiURL, _ := url.Parse(fmt.Sprintf("/api/v4/groups/%s/members/all", PathEscape(groupID)))
+	WithOffsetPagination(apiURL, nextPageToken)
+	headers, rateLimitDesc, err := c.doRequest(ctx, http.MethodGet, apiURL.String(), &members, nil)
+	if err != nil {
+		return nil, "", rateLimitDesc, err
+	}
+
+	nextToken := headers.Get("X-Next-Page")
+	return members, nextToken, rateLimitDesc, nil
+}
+
 // ListGroupMembers retrieves members of a specific group.
 func (c *GitlabClient) ListGroupMembers(ctx context.Context, groupID string, nextPageToken string) ([]*GroupMember, string, *v2.RateLimitDescription, error) {
 	var members []*GroupMember

pkg/connector/helpers.go

@@ -32,10 +32,3 @@ func parseAccessLevelFromEntitlementID(entitlementID string) (int, error) {
 	}
 	return int(levelValue), nil
 }
-
-func getNextTokenState(currentType, nextPageFromAPI, nextTypeOnFinish string) cloudListToken {
-	if nextPageFromAPI != "" {
-		return cloudListToken{Type: currentType, Token: nextPageFromAPI}
-	}
-	return cloudListToken{Type: nextTypeOnFinish, Token: ""}
-}

pkg/connector/users.go

@@ -2,7 +2,6 @@ package connector
 
 import (
 	"context"
-	"encoding/json"
 	"errors"
 	"fmt"
 	"strconv"
@@ -20,15 +19,8 @@ import (
 
 const (
 	pendingInvitationUser = "pending-invite-"
-	resourceTypeMembers   = "members"
-	resourceTypeInvites   = "invites"
 )
 
-type cloudListToken struct {
-	Type  string `json:"type"`
-	Token string `json:"token"`
-}
-
 type userBuilder struct {
 	client *client.GitlabClient
 }
@@ -100,61 +92,28 @@ func (u *userBuilder) listCloudVersion(ctx context.Context, parentResourceID *v2
 	var nextPageToken string
 	var outputAnnotations = annotations.New()
 
-	tokenState := cloudListToken{
-		Type: resourceTypeMembers,
-	}
-	if pToken != nil && pToken.Token != "" {
-		err := json.Unmarshal([]byte(pToken.Token), &tokenState)
-		if err != nil {
-			return nil, "", nil, fmt.Errorf("invalid pagination token: %w", err)
-		}
-	}
-
 	switch parentResourceID.ResourceType {
 	case groupResourceType.Id:
 		groupId, err := fromGroupResourceId(parentResourceID.Resource)
 		if err != nil {
 			return nil, "", nil, fmt.Errorf("error parsing group resource id: %w", err)
 		}
-
-		switch tokenState.Type {
-		case resourceTypeMembers:
-			var groupMembers []*client.GroupMember
-			var rateLimitDescGroupMembers *v2.RateLimitDescription
-			groupMembers, nextPageToken, rateLimitDescGroupMembers, err = u.client.ListGroupMembers(ctx, groupId, tokenState.Token)
-			if rateLimitDescGroupMembers != nil {
-				outputAnnotations.WithRateLimiting(rateLimitDescGroupMembers)
-			}
-			if err != nil {
-				return nil, "", outputAnnotations, err
-			}
-			for _, member := range groupMembers {
-				users = append(users, member)
-			}
-
-			tokenState = getNextTokenState(resourceTypeMembers, nextPageToken, resourceTypeInvites)
-
-		case resourceTypeInvites:
-			var pendingInvites []*client.PendingInviteUser
-			var rateLimitDescInvites *v2.RateLimitDescription
-			pendingInvites, nextPageToken, rateLimitDescInvites, err = u.client.ListPendingGroupInvitations(ctx, groupId, tokenState.Token)
-			if rateLimitDescInvites != nil {
-				outputAnnotations.WithRateLimiting(rateLimitDescInvites)
-			}
-			if err != nil {
-				return nil, "", outputAnnotations, err
-			}
-			for _, invite := range pendingInvites {
-				users = append(users, invite)
-			}
-
-			tokenState = getNextTokenState(resourceTypeInvites, nextPageToken, "")
+		var groupMembers []*client.GroupMember
+		var rateLimitDescGroupMembers *v2.RateLimitDescription
+		groupMembers, nextPageToken, rateLimitDescGroupMembers, err = u.client.ListAllGroupMembers(ctx, groupId, pToken.Token)
+		if rateLimitDescGroupMembers != nil {
+			outputAnnotations.WithRateLimiting(rateLimitDescGroupMembers)
+		}
+		if err != nil {
+			return nil, "", outputAnnotations, err
+		}
+		for _, member := range groupMembers {
+			users = append(users, member)
 		}
-
 	case projectResourceType.Id:
 		var projectMembers []*client.ProjectMember
 		var rateLimitDescProjectMembers *v2.RateLimitDescription
-		projectMembers, nextPageToken, rateLimitDescProjectMembers, err = u.client.ListProjectMembers(ctx, parentResourceID.Resource, tokenState.Token)
+		projectMembers, nextPageToken, rateLimitDescProjectMembers, err = u.client.ListProjectMembers(ctx, parentResourceID.Resource, pToken.Token)
 		if rateLimitDescProjectMembers != nil {
 			outputAnnotations.WithRateLimiting(rateLimitDescProjectMembers)
 		}
@@ -164,20 +123,9 @@ func (u *userBuilder) listCloudVersion(ctx context.Context, parentResourceID *v2
 		for _, member := range projectMembers {
 			users = append(users, member)
 		}
-
-		tokenState = getNextTokenState(resourceTypeMembers, nextPageToken, "")
-	}
-
-	var finalNextPageToken string
-	if tokenState.Type != "" || tokenState.Token != "" {
-		nextTokenBytes, err := json.Marshal(tokenState)
-		if err != nil {
-			return nil, "", nil, fmt.Errorf("failed to marshal pagination token: %w", err)
-		}
-		finalNextPageToken = string(nextTokenBytes)
 	}
 
-	return users, finalNextPageToken, outputAnnotations, nil
+	return users, nextPageToken, outputAnnotations, nil
 }
 
 // Entitlements always returns an empty slice for users.
@@ -500,6 +448,7 @@ func userResource(user any) (*v2.Resource, error) {
 		userStatus = v2.UserTrait_Status_STATUS_DISABLED
 	case "pending":
 		userStatus = v2.UserTrait_Status_STATUS_UNSPECIFIED
+		name = pendingInvitationUser + strings.ToLower(email)
 	}
 
 	profile := map[string]interface{}{