From 52ab432fd1cabae13d8f5a15ba0638a7fb64b180 Mon Sep 17 00:00:00 2001 From: Gianmaria Del Monte Date: Wed, 10 May 2023 13:42:19 +0200 Subject: [PATCH 1/2] Fix parsing of grappa response --- pkg/cbox/group/rest/rest.go | 2 +- pkg/cbox/user/rest/rest.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/cbox/group/rest/rest.go b/pkg/cbox/group/rest/rest.go index e7a8cc8bc2..3466af8b55 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 a3e1de1a23..d25790844b 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 } From cd4ac2217ea9e05062029d445af4a3b733cc3ac7 Mon Sep 17 00:00:00 2001 From: Gianmaria Del Monte Date: Wed, 10 May 2023 13:43:43 +0200 Subject: [PATCH 2/2] add changelog --- changelog/unreleased/fix-parsing-grappa-response.md | 3 +++ 1 file changed, 3 insertions(+) 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 0000000000..fda81c3d94 --- /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