mirror/opencloud
1
0
Fork 0
mirror of https://github.com/opencloud-eu/opencloud.git synced 2026-02-21 21:19:01 -06:00
Code Issues Packages Projects Releases Wiki Activity

fix update and reset the logo

Browse Source
This commit is contained in:
Roman Perekhod
2024-01-16 13:00:03 +01:00
parent 81e000b987
commit 03f302227f
2 changed files with 22 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
changelog/unreleased/fix-upload-reset-logo.md Normal file
View File

@@ -0,0 +1,6 @@
Bugfix: Updating and reset logo failed
We fixed a bug when admin tried to update or reset the logo.
https://github.com/owncloud/ocis/pull/8211
https://github.com/owncloud/ocis/issues/8101

29
services/web/pkg/service/v0/branding.go
View File

@@ -145,12 +145,7 @@ func (p Web) getLogoPath(r io.Reader) (string, error) {
var m map[string]interface{}
_ = json.NewDecoder(r).Decode(&m)
webCfg, ok := m["clients"].(map[string]interface{})["web"].(map[string]interface{})
if !ok {
return "", errInvalidThemeConfig
}
logoCfg, ok := webCfg["defaults"].(map[string]interface{})["logo"].(map[string]interface{})
logoCfg, ok := extractMap(m, "clients", "web", "defaults", "logo")
if !ok {
return "", errInvalidThemeConfig
}
@@ -175,18 +170,13 @@ func (p Web) updateLogoThemeConfig(logoPath string) error {
_ = json.NewDecoder(f).Decode(&m)
// change logo in common part
commonCfg, ok := m["common"].(map[string]interface{})
commonCfg, ok := extractMap(m, "common")
if !ok {
return errInvalidThemeConfig
}
commonCfg["logo"] = logoPath
webCfg, ok := m["clients"].(map[string]interface{})["web"].(map[string]interface{})
if !ok {
return errInvalidThemeConfig
}
logoCfg, ok := webCfg["defaults"].(map[string]interface{})["logo"].(map[string]interface{})
logoCfg, ok := extractMap(m, "clients", "web", "defaults", "logo")
if !ok {
return errInvalidThemeConfig
}
@@ -209,3 +199,16 @@ func allowedFiletype(filename, mediatype string) bool {
mt, ok := _allowedExtensionMediatypes[ext]
return ok && mt == mediatype
}
// extractMap extracts embedded map[string]interface{} by the keys chain
func extractMap(data map[string]interface{}, keys ...string) (map[string]interface{}, bool) {
last := data
var ok bool
for _, key := range keys {
last, ok = last[key].(map[string]interface{})
if !ok {
return nil, false
}
}
return last, true
}