split theme configuration flags

owncloud · Oct 12, 2021 · 03e60fe · 03e60fe
1 parent d17b13a
commit 03e60fe
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 5 deletions.
diff --git a/web/pkg/config/config.go b/web/pkg/config/config.go
@@ -43,6 +43,8 @@ type Asset struct {
 // WebConfig defines the available web configuration for a dynamically rendered config.json.
 type WebConfig struct {
 	Server        string                 `json:"server,omitempty"`
+	ThemeServer   string                 `json:"omit"` // only used to build Theme
+	ThemePath     string                 `json:"omit"` // only used to build Theme
 	Theme         string                 `json:"theme,omitempty"`
 	Version       string                 `json:"version,omitempty"` // TODO what is version used for?
 	OpenIDConnect OIDC                   `json:"openIdConnect,omitempty"`

diff --git a/web/pkg/flagset/flagset.go b/web/pkg/flagset/flagset.go
@@ -164,16 +164,23 @@ func ServerWithConfig(cfg *config.Config) []cli.Flag {
 		&cli.StringFlag{
 			Name:        "web-config-server",
 			Value:       flags.OverrideDefaultString(cfg.Web.Config.Server, "https://localhost:9200"),
-			Usage:       "Server URL",
+			Usage:       "Configuration server URL",
 			EnvVars:     []string{"WEB_UI_CONFIG_SERVER", "OCIS_URL"}, // WEB_UI_CONFIG_SERVER takes precedence over OCIS_URL
 			Destination: &cfg.Web.Config.Server,
 		},
+		&cli.StringFlag{
+			Name:        "web-theme-server",
+			Value:       flags.OverrideDefaultString(cfg.Web.Config.ThemeServer, "https://localhost:9200"),
+			Usage:       "Theme server URL",
+			EnvVars:     []string{"WEB_UI_THEME_SERVER", "OCIS_URL"}, // WEB_UI_CONFIG_SERVER takes precedence over OCIS_URL
+			Destination: &cfg.Web.Config.ThemeServer,
+		},
 		&cli.StringFlag{
 			Name:        "web-config-theme",
-			Value:       flags.OverrideDefaultString(cfg.Web.Config.Theme, "https://localhost:9200/themes/owncloud/theme.json"),
-			Usage:       "Theme",
-			EnvVars:     []string{"WEB_UI_CONFIG_THEME"},
-			Destination: &cfg.Web.Config.Theme,
+			Value:       flags.OverrideDefaultString(cfg.Web.Config.ThemePath, "/themes/owncloud/theme.json"),
+			Usage:       "Theme path on the theme server",
+			EnvVars:     []string{"WEB_UI_THEME_PATH"},
+			Destination: &cfg.Web.Config.ThemePath,
 		},
 		&cli.StringFlag{
 			Name:        "web-config-version",

diff --git a/web/pkg/service/v0/service.go b/web/pkg/service/v0/service.go
@@ -4,6 +4,7 @@ import (
 	"encoding/json"
 	"io/ioutil"
 	"net/http"
+	"net/url"
 	"os"
 	"strings"
 	"time"
@@ -69,6 +70,13 @@ func (p Web) getPayload() (payload []byte, err error) {
 			p.config.Web.Config.Options["hideSearchBar"] = true
 		}
 
+		// build theme url
+		if themeServer, err := url.Parse(p.config.Web.Config.ThemeServer); err == nil {
+			p.config.Web.Config.Theme = themeServer.String() + p.config.Web.Config.ThemePath
+		} else {
+			p.config.Web.Config.Theme = p.config.Web.Config.ThemePath
+		}
+
 		if p.config.Web.Config.ExternalApps == nil {
 			p.config.Web.Config.ExternalApps = []config.ExternalApp{
 				{