Merge pull request #9277 from owncloud/add-providerinfo-secure-view-flag

add secureview flag when listing apps via http

services/collaboration/pkg/config/defaults/defaultconfig.go

@@ -21,8 +21,8 @@ func DefaultConfig() *config.Config {
 			Name: "collaboration",
 		},
 		App: config.App{
-			Name:        "WOPI app",
-			Description: "Open office documents with a WOPI app",
+			Name:        "Collabora Online",
+			Description: "Open office documents with Collabora Online",
 			Icon:        "image-edit",
 			LockName:    "com.github.owncloud.collaboration",
 		},

services/frontend/pkg/config/config.go

@@ -107,8 +107,9 @@ type Auth struct {
 }
 
 type AppHandler struct {
-	Prefix   string `yaml:"-"`
-	Insecure bool   `yaml:"insecure" env:"OCIS_INSECURE;FRONTEND_APP_HANDLER_INSECURE" desc:"Allow insecure connections to the frontend." introductionVersion:"pre5.0"`
+	Prefix        string `yaml:"-"`
+	Insecure      bool   `yaml:"insecure" env:"OCIS_INSECURE;FRONTEND_APP_HANDLER_INSECURE" desc:"Allow insecure connections to the frontend." introductionVersion:"pre5.0"`
+	SecureViewApp string `yaml:"secure_view_app" env:"FRONTEND_APP_HANDLER_SECURE_VIEW_APP" desc:"Name of the app to use for secure view. Should match COLLABORATION_APP_NAME, the name configured for the CS3 app provider." introductionVersion:"5.1"`
 }
 
 type Archiver struct {

services/frontend/pkg/config/defaults/defaultconfig.go

@@ -93,7 +93,8 @@ func DefaultConfig() *config.Config {
 			PreferredUploadType: "sha1",
 		},
 		AppHandler: config.AppHandler{
-			Prefix: "app",
+			Prefix:        "app",
+			SecureViewApp: "Collabora Online",
 		},
 		Archiver: config.Archiver{
 			Insecure:    false,

services/frontend/pkg/revaconfig/config.go

@@ -137,6 +137,7 @@ func FrontendConfigFromStruct(cfg *config.Config, logger log.Logger) (map[string
 							"contextRouteName": "files-spaces-personal", // TODO: remove when https://github.com/owncloud/web/pull/7437 arrived in oCIS
 						},
 					},
+					"secure_view_app": cfg.AppHandler.SecureViewApp,
 				},
 				"archiver": map[string]interface{}{
 					"prefix":        cfg.Archiver.Prefix,