Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add Spaces to Capabilities #2015

Merged
merged 8 commits into from
Sep 13, 2021
Merged

Add Spaces to Capabilities #2015

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
bf0f8e0
capabilities: add spaces
refs Aug 24, 2021
1f7712c
Merge branch 'master' into spaces-capabilities
refs Sep 2, 2021
a155eb6
disable hardcoded capabilities
refs Sep 3, 2021
3ab7e42
move Spaces to its own key in capabilities
refs Sep 8, 2021
3c9a26e
add comment to exported function
refs Sep 8, 2021
f3cb9b7
copy paste error...
refs Sep 8, 2021
fbe6e62
remove duplicate spaces keiy
refs Sep 8, 2021
a81a901
Update spaces-capabilities.md
refs Sep 9, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Empty file added changelog/unreleased/.keep
View file
Open in desktop
Empty file.
5 changes: 5 additions & 0 deletions changelog/unreleased/spaces-capabilities.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
Enhancement: Add spaces to the list of capabilities

In order for clients to be aware of the new spaces feature we need to enable the `spaces` flag on the capabilities' endpoint. As we currently do, the capabilities endpoints remains a hardcoded set of capabilities, and it will default to true.

https://github.com/cs3org/reva/pull/2015
18 changes: 13 additions & 5 deletions internal/http/services/owncloud/ocs/data/capabilities.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,14 +50,22 @@ type CapabilitiesData struct {

// Capabilities groups several capability aspects
type Capabilities struct {
Core *CapabilitiesCore `json:"core" xml:"core"`
Checksums *CapabilitiesChecksums `json:"checksums" xml:"checksums"`
Files *CapabilitiesFiles `json:"files" xml:"files" mapstructure:"files"`
Dav *CapabilitiesDav `json:"dav" xml:"dav"`
FilesSharing *CapabilitiesFilesSharing `json:"files_sharing" xml:"files_sharing" mapstructure:"files_sharing"`
Core *CapabilitiesCore `json:"core" xml:"core"`
Checksums *CapabilitiesChecksums `json:"checksums" xml:"checksums"`
Files *CapabilitiesFiles `json:"files" xml:"files" mapstructure:"files"`
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"`

Notifications *CapabilitiesNotifications `json:"notifications,omitempty" xml:"notifications,omitempty"`
}

// Spaces lets a service configure its advertised options related to Storage Spaces.
type Spaces struct {
Version string `json:"version" xml:"version" mapstructure:"version"`
Enabled bool `json:"enabled" xml:"enabled" mapstructure:"enabled"`
}

// CapabilitiesCore holds webdav config
type CapabilitiesCore struct {
PollInterval int `json:"pollinterval" xml:"pollinterval" mapstructure:"poll_interval"`
Expand Down