Skip to content
This repository was archived by the owner on Jan 31, 2024. It is now read-only.

Commit 16b2d26

Browse files
committed
Fix parsing of grappa response (cs3org#3873)
* Fix parsing of grappa response * add changelog
1 parent 61ce61b commit 16b2d26

File tree

3 files changed

+5
-2
lines changed

3 files changed

+5
-2
lines changed
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
Bugfix: Fix parsing of grappa response
2+
3+
https://github.com/cs3org/reva/pull/3873

pkg/cbox/group/rest/rest.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -170,8 +170,8 @@ type GroupsResponse struct {
170170
func (m *manager) fetchAllGroupAccounts(ctx context.Context) error {
171171
url := fmt.Sprintf("%s/api/v1.0/Group?field=groupIdentifier&field=displayName&field=gid&field=isComputingGroup", m.conf.APIBaseURL)
172172

173-
var r GroupsResponse
174173
for {
174+
var r GroupsResponse
175175
if err := m.apiTokenManager.SendAPIGetRequest(ctx, url, false, &r); err != nil {
176176
return err
177177
}

pkg/cbox/user/rest/rest.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -198,8 +198,8 @@ func (i *Identity) UserType() userpb.UserType {
198198
func (m *manager) fetchAllUserAccounts(ctx context.Context) error {
199199
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)
200200

201-
var r IdentitiesResponse
202201
for {
202+
var r IdentitiesResponse
203203
if err := m.apiTokenManager.SendAPIGetRequest(ctx, url, false, &r); err != nil {
204204
return err
205205
}

0 commit comments

Comments
 (0)