feat: add uppy companion url config

owncloud · Jun 6, 2023 · e79ca75 · e79ca75
1 parent fdb4d6e
commit e79ca75
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/changelog/unreleased/enhancement-add-companion-url-config.md b/changelog/unreleased/enhancement-add-companion-url-config.md
@@ -0,0 +1,5 @@
+Enhancement: Add companion URL config
+
+Introduce a config to set the Uppy Companion URL via `WEB_OPTION_UPLOAD_COMPANION_URL`.
+
+https://github.com/owncloud/ocis/pull/6453
diff --git a/services/web/pkg/config/defaults/defaultconfig.go b/services/web/pkg/config/defaults/defaultconfig.go
@@ -194,7 +194,7 @@ func Sanitize(cfg *config.Config) {
 		cfg.Web.Config.Options.FeedbackLink = nil
 	}
 	// remove Upload parent if no value is set
-	if cfg.Web.Config.Options.Upload.XHR.Timeout == 0 {
+	if cfg.Web.Config.Options.Upload.XHR.Timeout == 0 && cfg.Web.Config.Options.Upload.CompanionUrl == "" {
 		cfg.Web.Config.Options.Upload = nil
 	}
 }
diff --git a/services/web/pkg/config/options.go b/services/web/pkg/config/options.go
@@ -51,7 +51,8 @@ type Routing struct {
 
 // Upload are the upload options
 type Upload struct {
-	XHR XHR `json:"xhr,omitempty" yaml:"xhr"`
+	XHR          XHR    `json:"xhr,omitempty" yaml:"xhr"`
+	CompanionUrl string `json:"companionUrl,omitempty" yaml:"companionUrl" env:"WEB_OPTION_UPLOAD_COMPANION_URL" desc:"Sets the URL of Uppy Companion which is needed for the cloud import."`
 }
 
 // XHR are the XHR options