added the watermark text for the Secure View mode

owncloud · May 13, 2024 · dfd2941 · dfd2941
1 parent f74dfaa
commit dfd2941
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 0 deletions.
diff --git a/changelog/unreleased/enhancement-add-watermark-text.md b/changelog/unreleased/enhancement-add-watermark-text.md
@@ -0,0 +1,5 @@
+Enhancement: Add watermark text
+
+We've added the watermark text for the Secure View mode.
+
+https://github.com/owncloud/ocis/pull/9144
diff --git a/services/collaboration/pkg/connector/fileconnector.go b/services/collaboration/pkg/connector/fileconnector.go
@@ -5,6 +5,7 @@ import (
 	"encoding/hex"
 	"path"
 	"strconv"
+	"strings"
 	"time"
 
 	appproviderv1beta1 "github.com/cs3org/go-cs3apis/cs3/app/provider/v1beta1"
@@ -533,6 +534,7 @@ func (f *FileConnector) CheckFileInfo(ctx context.Context) (FileInfo, error) {
 		fileInfo.DisableExport = true
 		fileInfo.DisableCopy = true
 		fileInfo.DisablePrint = true
+		fileInfo.WatermarkText = f.ensureWatermarkText(wopiContext.User)
 	}
 
 	// user logic from reva wopi driver #TODO: refactor
@@ -565,3 +567,19 @@ func (f *FileConnector) CheckFileInfo(ctx context.Context) (FileInfo, error) {
 	logger.Debug().Msg("CheckFileInfo: success")
 	return fileInfo, nil
 }
+
+func (f *FileConnector) ensureWatermarkText(user *userv1beta1.User) (watermarkText string) {
+	if f.cfg.Commons != nil {
+		watermarkText = f.cfg.Commons.OcisURL
+	}
+	if user != nil {
+		text := user.GetUsername() + " " + user.GetMail()
+		if strings.TrimSpace(text) != "" {
+			watermarkText = strings.TrimSpace(text)
+		}
+	}
+	if watermarkText == "" {
+		watermarkText = "Watermark"
+	}
+	return
+}
diff --git a/services/collaboration/pkg/connector/fileconnector_test.go b/services/collaboration/pkg/connector/fileconnector_test.go
@@ -13,6 +13,7 @@ import (
 	cs3mocks "github.com/cs3org/reva/v2/tests/cs3mocks/mocks"
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
+	"github.com/owncloud/ocis/v2/ocis-pkg/shared"
 	"github.com/owncloud/ocis/v2/services/collaboration/pkg/config"
 	"github.com/owncloud/ocis/v2/services/collaboration/pkg/connector"
 	"github.com/owncloud/ocis/v2/services/collaboration/pkg/middleware"
@@ -32,6 +33,7 @@ var _ = Describe("FileConnector", func() {
 			App: config.App{
 				LockName: "testName_for_unittests", // Only the LockName is used
 			},
+			Commons: &shared.Commons{OcisURL: "https://ocis.com"},
 		}
 		gatewayClient = &cs3mocks.GatewayAPIClient{}
 		fc = connector.NewFileConnector(gatewayClient, cfg)
@@ -856,6 +858,7 @@ var _ = Describe("FileConnector", func() {
 				IsAnonymousUser:            true,
 				UserId:                     "guest-zzz000",
 				UserFriendlyName:           "guest zzz000",
+				WatermarkText:              "Pet Shaft",
 			}
 
 			newFileInfo, err := fc.CheckFileInfo(ctx)