From eb1e84d4dbdb7dc0454f2574541766aba3bc018f Mon Sep 17 00:00:00 2001 From: jkoberg Date: Fri, 31 Mar 2023 10:38:05 +0200 Subject: [PATCH 1/2] add capability for personal data export Signed-off-by: jkoberg --- changelog/unreleased/personal-data-export-capability.md | 5 +++++ internal/http/services/owncloud/ocs/data/capabilities.go | 9 +++++---- 2 files changed, 10 insertions(+), 4 deletions(-) create mode 100644 changelog/unreleased/personal-data-export-capability.md diff --git a/changelog/unreleased/personal-data-export-capability.md b/changelog/unreleased/personal-data-export-capability.md new file mode 100644 index 0000000000..48d5a4bdd8 --- /dev/null +++ b/changelog/unreleased/personal-data-export-capability.md @@ -0,0 +1,5 @@ +Enhancement: Add a capability for personal data export + +Personal data export needs to be hidden behind a capability + +https://github.com/cs3org/reva/pull/3763 diff --git a/internal/http/services/owncloud/ocs/data/capabilities.go b/internal/http/services/owncloud/ocs/data/capabilities.go index 33547fe9f3..3314620058 100644 --- a/internal/http/services/owncloud/ocs/data/capabilities.go +++ b/internal/http/services/owncloud/ocs/data/capabilities.go @@ -71,10 +71,11 @@ type Spaces struct { // CapabilitiesCore holds webdav config type CapabilitiesCore struct { - PollInterval int `json:"pollinterval" xml:"pollinterval" mapstructure:"poll_interval"` - WebdavRoot string `json:"webdav-root,omitempty" xml:"webdav-root,omitempty" mapstructure:"webdav_root"` - Status *Status `json:"status" xml:"status"` - SupportURLSigning ocsBool `json:"support-url-signing" xml:"support-url-signing" mapstructure:"support_url_signing"` + PollInterval int `json:"pollinterval" xml:"pollinterval" mapstructure:"poll_interval"` + WebdavRoot string `json:"webdav-root,omitempty" xml:"webdav-root,omitempty" mapstructure:"webdav_root"` + Status *Status `json:"status" xml:"status"` + SupportURLSigning ocsBool `json:"support-url-signing" xml:"support-url-signing" mapstructure:"support_url_signing"` + PersonalDataExport ocsBool `json:"personal-data-export" xml:"personal-data-export" mapstructure:"personal_data_export"` } // Status holds basic status information From 8dbb2d57f0a700212290e66bd021fcb0fce702a5 Mon Sep 17 00:00:00 2001 From: jkoberg Date: Fri, 31 Mar 2023 12:31:42 +0200 Subject: [PATCH 2/2] add new graph capability container Signed-off-by: jkoberg --- .../http/services/owncloud/ocs/data/capabilities.go | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/internal/http/services/owncloud/ocs/data/capabilities.go b/internal/http/services/owncloud/ocs/data/capabilities.go index 3314620058..83d4e495a4 100644 --- a/internal/http/services/owncloud/ocs/data/capabilities.go +++ b/internal/http/services/owncloud/ocs/data/capabilities.go @@ -56,6 +56,7 @@ type Capabilities struct { Dav *CapabilitiesDav `json:"dav" xml:"dav"` FilesSharing *CapabilitiesFilesSharing `json:"files_sharing" xml:"files_sharing" mapstructure:"files_sharing"` Spaces *Spaces `json:"spaces,omitempty" xml:"spaces,omitempty" mapstructure:"spaces"` + Graph *CapabilitiesGraph `json:"graph,omitempty" xml:"graph,omitempty" mapstructure:"graph"` Notifications *CapabilitiesNotifications `json:"notifications,omitempty" xml:"notifications,omitempty"` } @@ -71,10 +72,14 @@ type Spaces struct { // CapabilitiesCore holds webdav config type CapabilitiesCore struct { - PollInterval int `json:"pollinterval" xml:"pollinterval" mapstructure:"poll_interval"` - WebdavRoot string `json:"webdav-root,omitempty" xml:"webdav-root,omitempty" mapstructure:"webdav_root"` - Status *Status `json:"status" xml:"status"` - SupportURLSigning ocsBool `json:"support-url-signing" xml:"support-url-signing" mapstructure:"support_url_signing"` + PollInterval int `json:"pollinterval" xml:"pollinterval" mapstructure:"poll_interval"` + WebdavRoot string `json:"webdav-root,omitempty" xml:"webdav-root,omitempty" mapstructure:"webdav_root"` + Status *Status `json:"status" xml:"status"` + SupportURLSigning ocsBool `json:"support-url-signing" xml:"support-url-signing" mapstructure:"support_url_signing"` +} + +// CapabilitiesGraph holds the graph capabilities +type CapabilitiesGraph struct { PersonalDataExport ocsBool `json:"personal-data-export" xml:"personal-data-export" mapstructure:"personal_data_export"` }