From 6029e213600b474de9acc4a1dfbc89d74d20502e Mon Sep 17 00:00:00 2001 From: jkoberg Date: Wed, 25 Jan 2023 10:43:56 +0100 Subject: [PATCH] allow SpaceMembershipGroup share type Signed-off-by: jkoberg --- changelog/unreleased/space-group-member-sharetype.md | 5 +++++ internal/http/services/owncloud/ocs/conversions/main.go | 7 +++++-- .../owncloud/ocs/handlers/apps/sharing/shares/shares.go | 2 +- 3 files changed, 11 insertions(+), 3 deletions(-) create mode 100644 changelog/unreleased/space-group-member-sharetype.md diff --git a/changelog/unreleased/space-group-member-sharetype.md b/changelog/unreleased/space-group-member-sharetype.md new file mode 100644 index 0000000000..59f3be7a10 --- /dev/null +++ b/changelog/unreleased/space-group-member-sharetype.md @@ -0,0 +1,5 @@ +Enhancement: Allow a new ShareType `SpaceMembershipGroup` + +Added a new sharetype for groups that are members of spaces + +https://github.com/cs3org/reva/pull/3620 diff --git a/internal/http/services/owncloud/ocs/conversions/main.go b/internal/http/services/owncloud/ocs/conversions/main.go index 2efa4673e5..cdfbbc4a74 100644 --- a/internal/http/services/owncloud/ocs/conversions/main.go +++ b/internal/http/services/owncloud/ocs/conversions/main.go @@ -52,8 +52,11 @@ const ( // ShareTypeFederatedCloudShare represents a federated share ShareTypeFederatedCloudShare ShareType = 6 - // ShareTypeSpaceMembership represents an action regarding space members - ShareTypeSpaceMembership ShareType = 7 + // ShareTypeSpaceMembershipUser represents an action regarding user type space members + ShareTypeSpaceMembershipUser ShareType = 7 + + // ShareTypeSpaceMembershipGroup represents an action regarding group type space members + ShareTypeSpaceMembershipGroup ShareType = 8 // ShareWithUserTypeUser represents a normal user ShareWithUserTypeUser ShareWithUserType = 0 diff --git a/internal/http/services/owncloud/ocs/handlers/apps/sharing/shares/shares.go b/internal/http/services/owncloud/ocs/handlers/apps/sharing/shares/shares.go index 66be6ad059..2a8778a121 100644 --- a/internal/http/services/owncloud/ocs/handlers/apps/sharing/shares/shares.go +++ b/internal/http/services/owncloud/ocs/handlers/apps/sharing/shares/shares.go @@ -309,7 +309,7 @@ func (h *Handler) CreateShare(w http.ResponseWriter, r *http.Request) { if role, val, err := h.extractPermissions(reqRole, reqPermissions, statRes.Info, conversions.NewViewerRole()); err == nil { h.createFederatedCloudShare(w, r, statRes.Info, role, val) } - case int(conversions.ShareTypeSpaceMembership): + case int(conversions.ShareTypeSpaceMembershipUser), int(conversions.ShareTypeSpaceMembershipGroup): switch reqRole { // Note: we convert viewer and editor roles to spaceviewer and spaceditor to keep backwards compatibility // we can remove this switch when this behaviour is no longer wanted.