skip ocm calls if listing ocm is disabled

Signed-off-by: Jörn Friedrich Dreyer <[email protected]>
butonic · Apr 23, 2024 · 6562481 · 6562481
1 parent 1f0602f
commit 6562481
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/changelog/unreleased/fix-deleting-shares.md b/changelog/unreleased/fix-deleting-shares.md
@@ -0,0 +1,5 @@
+Bugfix: Fix deleting space shares
+
+We no longer check if a share is an ocm sharee if listng ocm shares has been disabled anyway. This allows unsharing space shares.
+
+https://github.com/cs3org/reva/pull/4651
diff --git a/internal/http/services/owncloud/ocs/handlers/apps/sharing/shares/shares.go b/internal/http/services/owncloud/ocs/handlers/apps/sharing/shares/shares.go
@@ -633,7 +633,7 @@ func (h *Handler) GetShare(w http.ResponseWriter, r *http.Request) {
 		}
 	}
 
-	if share == nil {
+	if h.listOCMShares && share == nil {
 		// check if we have a federated share
 		req := &ocm.GetOCMShareRequest{
 			Ref: &ocm.ShareReference{
@@ -661,7 +661,7 @@ func (h *Handler) GetShare(w http.ResponseWriter, r *http.Request) {
 		}
 	}
 
-	if share == nil {
+	if h.listOCMShares && share == nil {
 		// check if we have an incoming federated share
 		req := &ocm.GetReceivedOCMShareRequest{
 			Ref: &ocm.ShareReference{
@@ -908,7 +908,7 @@ func (h *Handler) RemoveShare(w http.ResponseWriter, r *http.Request) {
 		h.removeUserShare(w, r, share)
 		return
 	}
-	if h.isFederatedShare(r, shareID) {
+	if h.listOCMShares && h.isFederatedShare(r, shareID) {
 		h.removeFederatedShare(w, r, shareID)
 		return
 	}