[full-ci] fix space unlock

owncloud · Nov 14, 2023 · c7f993e · c7f993e
1 parent 5eff669
commit c7f993e
Show file tree

Hide file tree

Showing 11 changed files with 108 additions and 285 deletions.
diff --git a/changelog/unreleased/fix-space-unlock.md b/changelog/unreleased/fix-space-unlock.md
@@ -0,0 +1,7 @@
+Bugfix: Fix unlock via space API
+
+We fixed a bug that caused Error 500 when user try to unlock file using fileid
+The handleSpaceUnlock has been added
+
+https://github.com/owncloud/ocis/pull/7726
+https://github.com/owncloud/ocis/issues/7708
diff --git a/go.mod b/go.mod
@@ -13,7 +13,7 @@ require (
 	github.com/coreos/go-oidc v2.2.1+incompatible
 	github.com/coreos/go-oidc/v3 v3.7.0
 	github.com/cs3org/go-cs3apis v0.0.0-20231023073225-7748710e0781
-	github.com/cs3org/reva/v2 v2.16.1-0.20231113153113-e258a7c4dfb0
+	github.com/cs3org/reva/v2 v2.16.1-0.20231114155535-d3790d2db4b8
 	github.com/dhowden/tag v0.0.0-20230630033851-978a0926ee25
 	github.com/disintegration/imaging v1.6.2
 	github.com/dutchcoders/go-clamd v0.0.0-20170520113014-b970184f4d9e

diff --git a/go.sum b/go.sum
@@ -1013,8 +1013,8 @@ github.com/crewjam/saml v0.4.14 h1:g9FBNx62osKusnFzs3QTN5L9CVA/Egfgm+stJShzw/c=
 github.com/crewjam/saml v0.4.14/go.mod h1:UVSZCf18jJkk6GpWNVqcyQJMD5HsRugBPf4I1nl2mME=
 github.com/cs3org/go-cs3apis v0.0.0-20231023073225-7748710e0781 h1:BUdwkIlf8IS2FasrrPg8gGPHQPOrQ18MS1Oew2tmGtY=
 github.com/cs3org/go-cs3apis v0.0.0-20231023073225-7748710e0781/go.mod h1:UXha4TguuB52H14EMoSsCqDj7k8a/t7g4gVP+bgY5LY=
-github.com/cs3org/reva/v2 v2.16.1-0.20231113153113-e258a7c4dfb0 h1:k7WdgewYRI5sWqfnyV3GG+nPCxyAZfh1YEkqZep1Nf8=
-github.com/cs3org/reva/v2 v2.16.1-0.20231113153113-e258a7c4dfb0/go.mod h1:utPCNSrWDdAwz2biLrKvzO6nDH9L7vRVGNzof13r8Kw=
+github.com/cs3org/reva/v2 v2.16.1-0.20231114155535-d3790d2db4b8 h1:VwBPBd45fLwyOjTes0DnQJKRoBKN3J64sxd19aehGPw=
+github.com/cs3org/reva/v2 v2.16.1-0.20231114155535-d3790d2db4b8/go.mod h1:utPCNSrWDdAwz2biLrKvzO6nDH9L7vRVGNzof13r8Kw=
 github.com/cyberdelia/templates v0.0.0-20141128023046-ca7fffd4298c/go.mod h1:GyV+0YP4qX0UQ7r2MoYZ+AvYDp12OF5yg4q8rGnyNh4=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=

diff --git a/...thub.com/cs3org/reva/v2/internal/grpc/services/publicshareprovider/publicshareprovider.go b/...thub.com/cs3org/reva/v2/internal/grpc/services/publicshareprovider/publicshareprovider.go
diff --git a/...r/github.com/cs3org/reva/v2/internal/grpc/services/usershareprovider/usershareprovider.go b/...r/github.com/cs3org/reva/v2/internal/grpc/services/usershareprovider/usershareprovider.go
diff --git a/vendor/github.com/cs3org/reva/v2/internal/http/services/owncloud/ocdav/locks.go b/vendor/github.com/cs3org/reva/v2/internal/http/services/owncloud/ocdav/locks.go
diff --git a/vendor/github.com/cs3org/reva/v2/internal/http/services/owncloud/ocdav/spaces.go b/vendor/github.com/cs3org/reva/v2/internal/http/services/owncloud/ocdav/spaces.go
diff --git a/vendor/github.com/cs3org/reva/v2/pkg/cbox/utils/conversions.go b/vendor/github.com/cs3org/reva/v2/pkg/cbox/utils/conversions.go
diff --git a/vendor/github.com/cs3org/reva/v2/pkg/conversions/role.go b/vendor/github.com/cs3org/reva/v2/pkg/conversions/role.go