fix capabilities decoding

cs3org · Nov 8, 2023 · 6761ac6 · 6761ac6
1 parent acbd11b
commit 6761ac6
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 15 deletions.
diff --git a/changelog/unreleased/fix-capabilities.md b/changelog/unreleased/fix-capabilities.md
@@ -0,0 +1,5 @@
+Bugfix: Fix capabilities decoding
+
+We have fixed a bug when the mapstructure is not able to decode in to the embedded structure
+
+https://github.com/cs3org/reva/pull/4324
diff --git a/internal/http/services/owncloud/ocs/data/capabilities.go b/internal/http/services/owncloud/ocs/data/capabilities.go
@@ -69,25 +69,20 @@ type CapabilitiesSearch struct {
 
 // CapabilitiesSearchProperties holds the search property capabilities
 type CapabilitiesSearchProperties struct {
-	Name     *CapabilitiesSearchProperty         `json:"name" xml:"name" mapstructure:"name"`
-	Mtime    *CapabilitiesSearchPropertyExtended `json:"mtime" xml:"mtime" mapstructure:"mtime"`
-	Size     *CapabilitiesSearchProperty         `json:"size" xml:"size" mapstructure:"size"`
-	Mimetype *CapabilitiesSearchPropertyExtended `json:"mimetype" xml:"mimetype" mapstructure:"mimetype"`
-	Type     *CapabilitiesSearchProperty         `json:"type" xml:"type" mapstructure:"type"`
-	Tag      *CapabilitiesSearchProperty         `json:"tag" xml:"tag" mapstructure:"tag"`
-	Tags     *CapabilitiesSearchProperty         `json:"tags" xml:"tags" mapstructure:"tags"`
-	Content  *CapabilitiesSearchProperty         `json:"content" xml:"content" mapstructure:"content"`
-	Scope    *CapabilitiesSearchProperty         `json:"scope" xml:"scope" mapstructure:"scope"`
+	Name     *CapabilitiesSearchProperty `json:"name" xml:"name" mapstructure:"name"`
+	Mtime    *CapabilitiesSearchProperty `json:"mtime" xml:"mtime" mapstructure:"mtime"`
+	Size     *CapabilitiesSearchProperty `json:"size" xml:"size" mapstructure:"size"`
+	Mimetype *CapabilitiesSearchProperty `json:"mimetype" xml:"mimetype" mapstructure:"mimetype"`
+	Type     *CapabilitiesSearchProperty `json:"type" xml:"type" mapstructure:"type"`
+	Tag      *CapabilitiesSearchProperty `json:"tag" xml:"tag" mapstructure:"tag"`
+	Tags     *CapabilitiesSearchProperty `json:"tags" xml:"tags" mapstructure:"tags"`
+	Content  *CapabilitiesSearchProperty `json:"content" xml:"content" mapstructure:"content"`
+	Scope    *CapabilitiesSearchProperty `json:"scope" xml:"scope" mapstructure:"scope"`
 }
 
 // CapabilitiesSearchProperty represents the default search property
 type CapabilitiesSearchProperty struct {
-	Enabled bool `json:"enabled" xml:"enabled" mapstructure:"enabled"`
-}
-
-// CapabilitiesSearchPropertyExtended represents the extended search property
-type CapabilitiesSearchPropertyExtended struct {
-	CapabilitiesSearchProperty
+	Enabled  bool     `json:"enabled" xml:"enabled" mapstructure:"enabled"`
 	Keywords []string `json:"keywords,omitempty" xml:"keywords,omitempty" mapstructure:"keywords"`
 }