From 371d15d84a7502bc011ee9677451eb76ef1c04bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rn=20Friedrich=20Dreyer?= Date: Thu, 14 Jul 2022 09:57:16 +0000 Subject: [PATCH] send storage provider and space id to wopi server MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jörn Friedrich Dreyer --- changelog/unreleased/send-provider-and-space-to-wopi.md | 5 +++++ pkg/app/provider/wopi/wopi.go | 4 +++- 2 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 changelog/unreleased/send-provider-and-space-to-wopi.md diff --git a/changelog/unreleased/send-provider-and-space-to-wopi.md b/changelog/unreleased/send-provider-and-space-to-wopi.md new file mode 100644 index 0000000000..7a462c94d5 --- /dev/null +++ b/changelog/unreleased/send-provider-and-space-to-wopi.md @@ -0,0 +1,5 @@ +Bugfix: Send storage provider and space id to wopi server + +We are now concatenating storage provider id and space id into the endpoint that is sent to the wopiserver + +https://github.com/cs3org/reva/issues/3074 diff --git a/pkg/app/provider/wopi/wopi.go b/pkg/app/provider/wopi/wopi.go index d24561c68e..d6495abe8b 100644 --- a/pkg/app/provider/wopi/wopi.go +++ b/pkg/app/provider/wopi/wopi.go @@ -46,6 +46,7 @@ import ( "github.com/cs3org/reva/v2/pkg/mime" "github.com/cs3org/reva/v2/pkg/rhttp" "github.com/cs3org/reva/v2/pkg/sharedconf" + "github.com/cs3org/reva/v2/pkg/storagespace" "github.com/golang-jwt/jwt" "github.com/mitchellh/mapstructure" "github.com/pkg/errors" @@ -134,8 +135,9 @@ func (p *wopiProvider) GetAppURL(ctx context.Context, resource *provider.Resourc } q := httpReq.URL.Query() + + q.Add("endpoint", storagespace.FormatStorageID(resource.GetId().GetStorageId(), resource.GetId().GetSpaceId())) q.Add("fileid", resource.GetId().OpaqueId) - q.Add("endpoint", resource.GetId().SpaceId) q.Add("viewmode", viewMode.String()) u, ok := ctxpkg.ContextGetUser(ctx)