Merge pull request #10730 from rhafer/issue/10689

fix(graph): Don't return OCM shares in the drives list

changelog/unreleased/me_drives_ocm_shares.md

@@ -0,0 +1,7 @@
+Bugfix: Fix graph drives response for federated shares
+
+Federated shares where erroneously showing up in the /me/drives response
+on the graph API.
+
+https://github.com/owncloud/ocis/pull/10730
+https://github.com/owncloud/ocis/issues/10689

services/graph/pkg/service/v0/drives.go

@@ -645,6 +645,10 @@ func (g Graph) formatDrives(ctx context.Context, baseURL *url.URL, storageSpaces
 	for i := 0; i < numWorkers; i++ {
 		errg.Go(func() error {
 			for storageSpace := range work {
+				if storageSpace.GetRoot().GetStorageId() == utils.OCMStorageProviderID {
+					// skip OCM shares they are no supposed to show up in the drives list
+					continue
+				}
 				res, err := g.cs3StorageSpaceToDrive(ctx, baseURL, storageSpace, apiVersion)
 				if err != nil {
 					return err
@@ -679,11 +683,9 @@ func (g Graph) formatDrives(ctx context.Context, baseURL *url.URL, storageSpaces
 		close(results)
 	}()
 
-	responses := make([]*libregraph.Drive, len(storageSpaces))
-	i := 0
+	responses := make([]*libregraph.Drive, 0, len(storageSpaces))
 	for r := range results {
-		responses[i] = r
-		i++
+		responses = append(responses, r)
 	}
 
 	if err := errg.Wait(); err != nil {