Merge pull request #3741 from butonic/fix-listing-shares-to-multiple-…

…groups

Fix listing shares to multiple groups

changelog/unreleased/fix-listing-shares-to-multiple-groups.md

@@ -0,0 +1,5 @@
+Bugfix: Fix listing shares to multiple groups
+
+Users can now see the shares to all groups they are a member of.
+
+https://github.com/cs3org/reva/pull/3741

pkg/share/manager/jsoncs3/jsoncs3.go

@@ -716,17 +716,21 @@ func (m *Manager) ListReceivedShares(ctx context.Context, filters []*collaborati
 		for ssid, spaceShareIDs := range m.GroupReceivedCache.List(group) {
 			// add a pending entry, the state will be updated
 			// when reading the received shares below if they have already been accepted or denied
-			rs := receivedsharecache.Space{
-				Mtime:  spaceShareIDs.Mtime,
-				States: make(map[string]*receivedsharecache.State, len(spaceShareIDs.IDs)),
+			var rs *receivedsharecache.Space
+			var ok bool
+			if rs, ok = ssids[ssid]; !ok {
+				rs = &receivedsharecache.Space{
+					Mtime:  spaceShareIDs.Mtime,
+					States: make(map[string]*receivedsharecache.State, len(spaceShareIDs.IDs)),
+				}
+				ssids[ssid] = rs
 			}
 
 			for shareid := range spaceShareIDs.IDs {
 				rs.States[shareid] = &receivedsharecache.State{
 					State: collaboration.ShareState_SHARE_STATE_PENDING,
 				}
 			}
-			ssids[ssid] = &rs
 		}
 	}