Merge pull request #4539 from owncloud/get-received-share

update reva and jsoncs3 share manager config
owncloud · Sep 8, 2022 · 616e633 · 616e633
2 parents 4402508 + 3640243
commit 616e633
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 6 deletions.
diff --git a/changelog/unreleased/get-received-share.md b/changelog/unreleased/get-received-share.md
@@ -0,0 +1,6 @@
+Enhancement: OCS get share now also handle received shares
+
+Requesting a specific share can now also correctly map the path to the mountpoint if the requested share is a received share.
+
+https://github.com/owncloud/ocis/issues/4322
+https://github.com/owncloud/ocis/pull/4539
diff --git a/go.mod b/go.mod
@@ -11,7 +11,7 @@ require (
 	github.com/blevesearch/bleve_index_api v1.0.3
 	github.com/coreos/go-oidc/v3 v3.3.0
 	github.com/cs3org/go-cs3apis v0.0.0-20220818202316-e92afdddac6d
-	github.com/cs3org/reva/v2 v2.8.1-0.20220907162058-fcb7745ddd89
+	github.com/cs3org/reva/v2 v2.8.1-0.20220908102548-7bea458e3873
 	github.com/disintegration/imaging v1.6.2
 	github.com/ggwhite/go-masker v1.0.9
 	github.com/go-chi/chi/v5 v5.0.7

diff --git a/go.sum b/go.sum
@@ -292,10 +292,8 @@ github.com/crewjam/saml v0.4.6 h1:XCUFPkQSJLvzyl4cW9OvpWUbRf0gE7VUpU8ZnilbeM4=
 github.com/crewjam/saml v0.4.6/go.mod h1:ZBOXnNPFzB3CgOkRm7Nd6IVdkG+l/wF+0ZXLqD96t1A=
 github.com/cs3org/go-cs3apis v0.0.0-20220818202316-e92afdddac6d h1:toyZ7IsXlUdEPZ/IG8fg7hbM8HcLPY0bkX4FKBmgLVI=
 github.com/cs3org/go-cs3apis v0.0.0-20220818202316-e92afdddac6d/go.mod h1:UXha4TguuB52H14EMoSsCqDj7k8a/t7g4gVP+bgY5LY=
-github.com/cs3org/reva/v2 v2.8.1-0.20220907105120-bb524f7a0ea1 h1:ar7HXIBnHU5obKLkLmzYjyLEfaIKLEKglQDllKAIVxY=
-github.com/cs3org/reva/v2 v2.8.1-0.20220907105120-bb524f7a0ea1/go.mod h1:+BYVpRV8g1hL8wF3+3BunL9BKPsXVyJYmH8COxq/V7Y=
-github.com/cs3org/reva/v2 v2.8.1-0.20220907162058-fcb7745ddd89 h1:1TrHa2VWdt0JKq1cAo6d/9XIb4YwSIKf2i08ojcQv6w=
-github.com/cs3org/reva/v2 v2.8.1-0.20220907162058-fcb7745ddd89/go.mod h1:+BYVpRV8g1hL8wF3+3BunL9BKPsXVyJYmH8COxq/V7Y=
+github.com/cs3org/reva/v2 v2.8.1-0.20220908102548-7bea458e3873 h1:XY44uSQQFuRb7xBG47Y9zMKhGuG/++KKxL8GXmol0pI=
+github.com/cs3org/reva/v2 v2.8.1-0.20220908102548-7bea458e3873/go.mod h1:+BYVpRV8g1hL8wF3+3BunL9BKPsXVyJYmH8COxq/V7Y=
 github.com/cubewise-code/go-mime v0.0.0-20200519001935-8c5762b177d8 h1:Z9lwXumT5ACSmJ7WGnFl+OMLLjpz5uR2fyz7dC255FI=
 github.com/cubewise-code/go-mime v0.0.0-20200519001935-8c5762b177d8/go.mod h1:4abs/jPXcmJzYoYGF91JF9Uq9s/KL5n1jvFDix8KcqY=
 github.com/cyberdelia/templates v0.0.0-20141128023046-ca7fffd4298c/go.mod h1:GyV+0YP4qX0UQ7r2MoYZ+AvYDp12OF5yg4q8rGnyNh4=

diff --git a/services/sharing/pkg/revaconfig/config.go b/services/sharing/pkg/revaconfig/config.go
@@ -57,7 +57,7 @@ func SharingConfigFromStruct(cfg *config.Config) map[string]interface{} {
 							"machine_auth_apikey": cfg.UserSharingDrivers.CS3.SystemUserAPIKey,
 						},
 						"jsoncs3": map[string]interface{}{
-							"gateway_addr":        cfg.UserSharingDrivers.JSONCS3.ProviderAddr,
+							"gateway_addr":        cfg.Reva.Address,
 							"provider_addr":       cfg.UserSharingDrivers.JSONCS3.ProviderAddr,
 							"service_user_id":     cfg.UserSharingDrivers.JSONCS3.SystemUserID,
 							"service_user_idp":    cfg.UserSharingDrivers.JSONCS3.SystemUserIDP,