Merge pull request #5735 from owncloud/branding-improvements

add common part, make the logic theme name agnostic

changelog/unreleased/branding-api.md

@@ -3,4 +3,5 @@ Enhancement: Add endpoints to upload a custom logo
 Added endpoints to upload and reset custom logos. The files are stored under the `WEB_ASSET_PATH`
 which defaults to `$OCIS_BASE_DATA_PATH/web/assets`.
 
+https://github.com/owncloud/ocis/pull/5735
 https://github.com/owncloud/ocis/pull/5559

services/web/pkg/service/v0/branding.go

@@ -167,37 +167,34 @@ func (p Web) updateLogoThemeConfig(logoPath string) error {
 	var m map[string]interface{}
 	_ = json.NewDecoder(f).Decode(&m)
 
-	webCfg, ok := m["web"].(map[string]interface{})
-	if !ok {
-		return errInvalidThemeConfig
-	}
-
-	defaultCfg, ok := webCfg["default"].(map[string]interface{})
+	// change logo in common part
+	commonCfg, ok := m["common"].(map[string]interface{})
 	if !ok {
 		return errInvalidThemeConfig
 	}
+	commonCfg["logo"] = logoPath
 
-	logoCfg, ok := defaultCfg["logo"].(map[string]interface{})
+	webCfg, ok := m["web"].(map[string]interface{})
 	if !ok {
 		return errInvalidThemeConfig
 	}
 
-	logoCfg["login"] = logoPath
-	logoCfg["topbar"] = logoPath
+	// iterate over all possible themes and replace logo
+	for theme := range webCfg {
+		themeCfg, ok := webCfg[theme].(map[string]interface{})
+		if !ok {
+			return errInvalidThemeConfig
+		}
 
-	defaultDarkCfg, ok := webCfg["default-dark"].(map[string]interface{})
-	if !ok {
-		return errInvalidThemeConfig
-	}
+		logoCfg, ok := themeCfg["logo"].(map[string]interface{})
+		if !ok {
+			return errInvalidThemeConfig
+		}
 
-	logoDarkCfg, ok := defaultDarkCfg["logo"].(map[string]interface{})
-	if !ok {
-		return errInvalidThemeConfig
+		logoCfg["login"] = logoPath
+		logoCfg["topbar"] = logoPath
 	}
 
-	logoDarkCfg["login"] = logoPath
-	logoDarkCfg["topbar"] = logoPath
-
 	dst, err := p.fs.Create(_themesConfigPath)
 	if err != nil {
 		return err