mirror/opencloud
1
0
Fork 0
mirror of https://github.com/opencloud-eu/opencloud.git synced 2026-02-18 11:28:48 -06:00
Code Issues Packages Projects Releases Wiki Activity

enhancement(graph): Remove unneded Coowner Role

Browse Source 
This role was renamed to "Manager" a while ago.
This commit is contained in:
Ralf Haferkamp
2024-03-13 15:53:07 +01:00
committed by Ralf Haferkamp
parent 6631d8cbec
commit 8fdfa1aee7
5 changed files with 4 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/graph/pkg/service/v0/driveitems_test.go
View File

@@ -1027,7 +1027,7 @@ var _ = Describe("Driveitems", func() {
})
It("fails with wrong role", func() {
driveItemInvite.Roles = []string{unifiedrole.NewCoownerUnifiedRole().GetId()}
driveItemInvite.Roles = []string{unifiedrole.NewManagerUnifiedRole().GetId()}
svc.Invite(
rr,
httptest.NewRequest(http.MethodPost, "/", toJSONReader(driveItemInvite)).

22
services/graph/pkg/unifiedrole/unifiedrole.go
View File

@@ -23,8 +23,6 @@ const (
UnifiedRoleSpaceEditorID = "58c63c02-1d89-4572-916a-870abc5a1b7d"
// UnifiedRoleFileEditorID Unified role file editor id.
UnifiedRoleFileEditorID = "2d00ce52-1fc2-4dbc-8b95-a73b73395f5a"
// UnifiedRoleCoownerID Unified role coowner id.
UnifiedRoleCoownerID = "3a4ba8e9-6a0d-4235-9140-0e7a34007abe"
// UnifiedRoleUploaderID Unified role uploader id.
UnifiedRoleUploaderID = "1c996275-f1c9-4e71-abdf-a42f6495e960"
// UnifiedRoleManagerID Unified role manager id.
@@ -143,23 +141,6 @@ func NewFileEditorUnifiedRole(sharing bool) *libregraph.UnifiedRoleDefinition {
}
}
// NewCoownerUnifiedRole creates a coowner role.
func NewCoownerUnifiedRole() *libregraph.UnifiedRoleDefinition {
r := conversions.NewCoownerRole()
return &libregraph.UnifiedRoleDefinition{
Id: proto.String(UnifiedRoleCoownerID),
Description: proto.String("Grants co-owner permissions on a resource"),
DisplayName: displayName(r),
RolePermissions: []libregraph.UnifiedRolePermission{
{
AllowedResourceActions: convert(r),
Condition: proto.String(UnifiedRoleConditionOwner),
},
},
LibreGraphWeight: proto.Int32(0),
}
}
// NewUploaderUnifiedRole creates an uploader role
func NewUploaderUnifiedRole() *libregraph.UnifiedRoleDefinition {
r := conversions.NewUploaderRole()
@@ -214,7 +195,6 @@ func GetBuiltinRoleDefinitionList(resharing bool) []*libregraph.UnifiedRoleDefin
NewEditorUnifiedRole(resharing),
NewSpaceEditorUnifiedRole(),
NewFileEditorUnifiedRole(resharing),
NewCoownerUnifiedRole(),
NewUploaderUnifiedRole(),
NewManagerUnifiedRole(),
}
@@ -463,8 +443,6 @@ func displayName(role *conversions.Role) *string {
displayName = "Space Editor"
case conversions.RoleFileEditor:
displayName = "File Editor"
case conversions.RoleCoowner:
displayName = "Co Owner"
case conversions.RoleUploader:
displayName = "Uploader"
case conversions.RoleManager:

3
services/graph/pkg/unifiedrole/unifiedrole_test.go
View File

@@ -27,7 +27,6 @@ var _ = Describe("unifiedroles", func() {
Entry(rConversions.RoleViewer, rConversions.NewViewerRole(true), unifiedrole.NewViewerUnifiedRole(true), unifiedrole.UnifiedRoleConditionGrantee),
Entry(rConversions.RoleEditor, rConversions.NewEditorRole(true), unifiedrole.NewEditorUnifiedRole(true), unifiedrole.UnifiedRoleConditionGrantee),
Entry(rConversions.RoleFileEditor, rConversions.NewFileEditorRole(true), unifiedrole.NewFileEditorUnifiedRole(true), unifiedrole.UnifiedRoleConditionGrantee),
Entry(rConversions.RoleCoowner, rConversions.NewCoownerRole(), unifiedrole.NewCoownerUnifiedRole(), unifiedrole.UnifiedRoleConditionOwner),
Entry(rConversions.RoleManager, rConversions.NewManagerRole(), unifiedrole.NewManagerUnifiedRole(), unifiedrole.UnifiedRoleConditionOwner),
Entry(rConversions.RoleSpaceViewer, rConversions.NewSpaceViewerRole(), unifiedrole.NewSpaceViewerUnifiedRole(), unifiedrole.UnifiedRoleConditionOwner),
Entry(rConversions.RoleSpaceEditor, rConversions.NewSpaceEditorRole(), unifiedrole.NewSpaceEditorUnifiedRole(), unifiedrole.UnifiedRoleConditionOwner),
@@ -53,7 +52,6 @@ var _ = Describe("unifiedroles", func() {
Entry(rConversions.RoleViewer, rConversions.NewViewerRole(true), unifiedrole.NewViewerUnifiedRole(true), true),
Entry(rConversions.RoleEditor, rConversions.NewEditorRole(true), unifiedrole.NewEditorUnifiedRole(true), true),
Entry(rConversions.RoleFileEditor, rConversions.NewFileEditorRole(true), unifiedrole.NewFileEditorUnifiedRole(true), true),
Entry(rConversions.RoleCoowner, rConversions.NewCoownerRole(), unifiedrole.NewCoownerUnifiedRole(), true),
Entry(rConversions.RoleManager, rConversions.NewManagerRole(), unifiedrole.NewManagerUnifiedRole(), true),
Entry("no match", rConversions.NewFileEditorRole(true), unifiedrole.NewManagerUnifiedRole(), false),
)
@@ -218,7 +216,6 @@ var _ = Describe("unifiedroles", func() {
[]*libregraph.UnifiedRoleDefinition{
unifiedrole.NewSpaceViewerUnifiedRole(),
unifiedrole.NewSpaceEditorUnifiedRole(),
unifiedrole.NewCoownerUnifiedRole(),
unifiedrole.NewManagerUnifiedRole(),
},
),

29
tests/acceptance/features/apiSharingNg/listPermissions.feature
View File

@@ -242,8 +242,8 @@ Feature: List a sharing permissions
},
"@libre.graph.permissions.roles.allowedValues": {
"type": "array",
"minItems": 4,
"maxItems": 4,
"minItems": 3,
"maxItems": 3,
"uniqueItems": true,
"items": {
"oneOf": [
@@ -305,29 +305,6 @@ Feature: List a sharing permissions
"@libre.graph.weight": {
"const": 3
},
"description": {
"const": "Grants co-owner permissions on a resource"
},
"displayName": {
"const": "Co Owner"
},
"id": {
"const": "3a4ba8e9-6a0d-4235-9140-0e7a34007abe"
}
}
},
{
"type": "object",
"required": [
"@libre.graph.weight",
"description",
"displayName",
"id"
],
"properties": {
"@libre.graph.weight": {
"const": 4
},
"description": {
"const": "Grants manager permissions on a resource. Semantically equivalent to co-owner"
},
@@ -344,4 +321,4 @@ Feature: List a sharing permissions
}
}
}
"""
"""

9
tests/acceptance/features/apiSharingNg/shareInvitations.feature
View File

@@ -1037,7 +1037,6 @@ Feature: Send a sharing invitations
| File Editor | /textfile1.txt |
| Viewer | FolderToShare |
| Editor | FolderToShare |
| Co Owner | FolderToShare |
| Uploader | FolderToShare |
| Manager | FolderToShare |
@@ -1546,11 +1545,9 @@ Feature: Send a sharing invitations
"""
Examples:
| permissions-role | path |
| Co Owner | /textfile1.txt |
| Manager | /textfile1.txt |
| Space Viewer | /textfile1.txt |
| Space Editor | /textfile1.txt |
| Co Owner | FolderToShare |
| Manager | FolderToShare |
| Space Viewer | FolderToShare |
| Space Editor | FolderToShare |
@@ -1728,7 +1725,6 @@ Feature: Send a sharing invitations
| permissions-role |
| Space Viewer |
| Space Editor |
| Co Owner |
| Manager |
@@ -1775,7 +1771,6 @@ Feature: Send a sharing invitations
| permissions-role |
| Space Viewer |
| Space Editor |
| Co Owner |
| Manager |
@@ -1823,7 +1818,6 @@ Feature: Send a sharing invitations
| permissions-role |
| Space Viewer |
| Space Editor |
| Co Owner |
| Manager |
@@ -1908,7 +1902,6 @@ Feature: Send a sharing invitations
| permissions-role |
| Space Viewer |
| Space Editor |
| Co Owner |
| Manager |
@@ -1961,7 +1954,6 @@ Feature: Send a sharing invitations
| permissions-role |
| Space Viewer |
| Space Editor |
| Co Owner |
| Manager |
@@ -2015,7 +2007,6 @@ Feature: Send a sharing invitations
| permissions-role |
| Space Viewer |
| Space Editor |
| Co Owner |
| Manager |