Fix parsing of grappa response (cs3org#3873)

* Fix parsing of grappa response * add changelog
gmgigi96 · Jun 5, 2023 · 0222bff · 0222bff
1 parent dcfa962
commit 0222bff
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/changelog/unreleased/fix-parsing-grappa-response.md b/changelog/unreleased/fix-parsing-grappa-response.md
@@ -0,0 +1,3 @@
+Bugfix: Fix parsing of grappa response
+
+https://github.com/cs3org/reva/pull/3873
diff --git a/pkg/cbox/group/rest/rest.go b/pkg/cbox/group/rest/rest.go
@@ -170,8 +170,8 @@ type GroupsResponse struct {
 func (m *manager) fetchAllGroupAccounts(ctx context.Context) error {
 	url := fmt.Sprintf("%s/api/v1.0/Group?field=groupIdentifier&field=displayName&field=gid&field=isComputingGroup", m.conf.APIBaseURL)
 
-	var r GroupsResponse
 	for {
+		var r GroupsResponse
 		if err := m.apiTokenManager.SendAPIGetRequest(ctx, url, false, &r); err != nil {
 			return err
 		}

diff --git a/pkg/cbox/user/rest/rest.go b/pkg/cbox/user/rest/rest.go
@@ -198,8 +198,8 @@ func (i *Identity) UserType() userpb.UserType {
 func (m *manager) fetchAllUserAccounts(ctx context.Context) error {
 	url := fmt.Sprintf("%s/api/v1.0/Identity?field=upn&field=primaryAccountEmail&field=displayName&field=uid&field=gid&field=type&field=source", m.conf.APIBaseURL)
 
-	var r IdentitiesResponse
 	for {
+		var r IdentitiesResponse
 		if err := m.apiTokenManager.SendAPIGetRequest(ctx, url, false, &r); err != nil {
 			return err
 		}