From 35dc1fd9d1f1c304781d300dadab2b61e811062f Mon Sep 17 00:00:00 2001
From: Gianmaria Del Monte <39946305+gmgigi96@users.noreply.github.com>
Date: Wed, 10 May 2023 14:12:38 +0200
Subject: [PATCH] Fix parsing of grappa response (#3873)

* Fix parsing of grappa response

* add changelog
---
 changelog/unreleased/fix-parsing-grappa-response.md | 3 +++
 pkg/cbox/group/rest/rest.go                         | 2 +-
 pkg/cbox/user/rest/rest.go                          | 2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)
 create mode 100644 changelog/unreleased/fix-parsing-grappa-response.md

diff --git a/changelog/unreleased/fix-parsing-grappa-response.md b/changelog/unreleased/fix-parsing-grappa-response.md
new file mode 100644
index 00000000000..fda81c3d94c
--- /dev/null
+++ 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
\ No newline at end of file
diff --git a/pkg/cbox/group/rest/rest.go b/pkg/cbox/group/rest/rest.go
index e7a8cc8bc2d..3466af8b551 100644
--- 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
index a3e1de1a23a..d25790844b4 100644
--- 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
 		}