Advertise product in capabilities, version and status

cs3org · Mar 15, 2022 · f5f0c13 · f5f0c13
1 parent 43f3c7e
commit f5f0c13
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 0 deletions.
diff --git a/internal/http/services/owncloud/ocdav/status.go b/internal/http/services/owncloud/ocdav/status.go
@@ -36,6 +36,7 @@ func (s *svc) doStatus(w http.ResponseWriter, r *http.Request) {
 		VersionString:  "10.0.11",
 		Edition:        "community",
 		ProductName:    "reva",
+		Product:        "reva",
 	}
 
 	statusJSON, err := json.MarshalIndent(status, "", "    ")

diff --git a/internal/http/services/owncloud/ocs/data/capabilities.go b/internal/http/services/owncloud/ocs/data/capabilities.go
@@ -83,6 +83,7 @@ type Status struct {
 	VersionString  string  `json:"versionstring" xml:"versionstring"`
 	Edition        string  `json:"edition" xml:"edition"`
 	ProductName    string  `json:"productname" xml:"productname"`
+	Product        string  `json:"product" xml:"product"`
 	Hostname       string  `json:"hostname,omitempty" xml:"hostname,omitempty"`
 }
 

diff --git a/internal/http/services/owncloud/ocs/handlers/cloud/capabilities/capabilities.go b/internal/http/services/owncloud/ocs/handlers/cloud/capabilities/capabilities.go
@@ -75,6 +75,9 @@ func (h *Handler) Init(c *config.Config) {
 	if h.c.Capabilities.Core.Status.ProductName == "" {
 		h.c.Capabilities.Core.Status.ProductName = "reva" // TODO make build determined
 	}
+	if h.c.Capabilities.Core.Status.Product == "" {
+		h.c.Capabilities.Core.Status.Product = "reva" // TODO make build determined
+	}
 	if h.c.Capabilities.Core.Status.Hostname == "" {
 		h.c.Capabilities.Core.Status.Hostname = "" // TODO get from context?
 	}
@@ -216,6 +219,7 @@ func (h *Handler) Init(c *config.Config) {
 			Micro:   11,
 			String:  "10.0.11",
 			Edition: "community",
+			Product: "reva",
 		}
 	}