From c61392138c0ea00747690ead9877b18114c80630 Mon Sep 17 00:00:00 2001 From: Benedikt Kulmann Date: Thu, 26 Jun 2025 11:40:46 +0200 Subject: [PATCH] feat: re-enable Save As and Export in collabora --- .../collaboration/pkg/connector/fileconnector.go | 2 -- .../pkg/connector/fileconnector_test.go | 4 ++-- .../pkg/connector/fileinfo/collabora.go | 2 +- .../features/apiCollaboration/checkFileInfo.feature | 12 ++++++------ 4 files changed, 9 insertions(+), 11 deletions(-) diff --git a/services/collaboration/pkg/connector/fileconnector.go b/services/collaboration/pkg/connector/fileconnector.go index 9a0d990924..e07f2c3041 100644 --- a/services/collaboration/pkg/connector/fileconnector.go +++ b/services/collaboration/pkg/connector/fileconnector.go @@ -1273,8 +1273,6 @@ func (f *FileConnector) CheckFileInfo(ctx context.Context) (*ConnectorResponse, fileinfo.KeyPostMessageOrigin: f.cfg.Commons.OpenCloudURL, fileinfo.KeyLicenseCheckForEditIsEnabled: f.cfg.App.LicenseCheckEnable, - // set to true for Collabora until we have a web embed mode for "Save As" and "Export As" - // see the FIXME in ./fileinfo/collabora.go and https://github.com/opencloud-eu/web/issues/422 fileinfo.KeyUserCanNotWriteRelative: false, } diff --git a/services/collaboration/pkg/connector/fileconnector_test.go b/services/collaboration/pkg/connector/fileconnector_test.go index 906e8f560c..49f6ff92dd 100644 --- a/services/collaboration/pkg/connector/fileconnector_test.go +++ b/services/collaboration/pkg/connector/fileconnector_test.go @@ -1780,7 +1780,7 @@ var _ = Describe("FileConnector", func() { OwnerID: "61616262636340637573746f6d496470", // hex of aabbcc@customIdp Size: int64(998877), BaseFileName: "test.txt", - UserCanNotWriteRelative: true, + UserCanNotWriteRelative: false, DisableExport: true, DisableCopy: true, DisablePrint: true, @@ -1962,7 +1962,7 @@ var _ = Describe("FileConnector", func() { OwnerID: "61616262636340637573746f6d496470", // hex of aabbcc@customIdp Size: int64(998877), BaseFileName: "test.txt", - UserCanNotWriteRelative: true, + UserCanNotWriteRelative: false, DisableExport: true, DisableCopy: true, DisablePrint: true, diff --git a/services/collaboration/pkg/connector/fileinfo/collabora.go b/services/collaboration/pkg/connector/fileinfo/collabora.go index 592ca2b46e..82b1573616 100644 --- a/services/collaboration/pkg/connector/fileinfo/collabora.go +++ b/services/collaboration/pkg/connector/fileinfo/collabora.go @@ -99,7 +99,7 @@ func (cinfo *Collabora) SetProperties(props map[string]interface{}) { case KeyUserCanWrite: cinfo.UserCanWrite = value.(bool) case KeyUserCanNotWriteRelative: - cinfo.UserCanNotWriteRelative = true // FIXME: set to `value.(bool)` again for https://github.com/opencloud-eu/web/issues/422 + cinfo.UserCanNotWriteRelative = value.(bool) case KeyUserID: cinfo.UserID = value.(string) case KeyUserFriendlyName: diff --git a/tests/acceptance/features/apiCollaboration/checkFileInfo.feature b/tests/acceptance/features/apiCollaboration/checkFileInfo.feature index f073188343..ee0eb9a938 100644 --- a/tests/acceptance/features/apiCollaboration/checkFileInfo.feature +++ b/tests/acceptance/features/apiCollaboration/checkFileInfo.feature @@ -183,7 +183,7 @@ Feature: check file info with different wopi apps "const": true }, "UserCanNotWriteRelative": { - "const": true + "const": false }, "EnableOwnerTermination": { "const": true @@ -581,7 +581,7 @@ Feature: check file info with different wopi apps "const": }, "UserCanNotWriteRelative": { - "const": true + "const": false }, "EnableOwnerTermination": { "const": true @@ -691,7 +691,7 @@ Feature: check file info with different wopi apps "const": true }, "UserCanNotWriteRelative": { - "const": true + "const": false }, "EnableOwnerTermination": { "const": true @@ -1077,7 +1077,7 @@ Feature: check file info with different wopi apps "const": true }, "UserCanNotWriteRelative": { - "const": true + "const": false }, "EnableOwnerTermination": { "const": true @@ -1424,7 +1424,7 @@ Feature: check file info with different wopi apps "const": true }, "UserCanNotWriteRelative": { - "const": true + "const": false }, "EnableOwnerTermination": { "const": true @@ -1810,7 +1810,7 @@ Feature: check file info with different wopi apps "const": }, "UserCanNotWriteRelative": { - "const": true + "const": false }, "EnableOwnerTermination": { "const": true