Skip to content

[OCISDEV-569] Fix Sharing-Roles #11898

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

Merged
kobergj merged 2 commits into from
Jan 22, 2026
+328 −303
Merged

[OCISDEV-569] Fix Sharing-Roles #11898

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e72de16
fix: fix sharing roles
Jan 8, 2026
20a831f
fix: adjust test to new wording
Jan 9, 2026
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
4 changes: 2 additions & 2 deletions .drone.env
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
# The test runner source for UI tests
WEB_COMMITID=fa082b721d8ef0186e25fd5cd8c6bbb7a097f567
WEB_BRANCH=stable-12.2
WEB_COMMITID=d3b0b0c216f26d6c40a02469481f807e1f4fd63e
WEB_BRANCH=FixTestSharingRoles
5 changes: 5 additions & 0 deletions changelog/unreleased/fix-sharing-roles.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
Bugfix: Fix Sharingroles

Sharing roles were inconsistent, now they are fixed.

https://github.com/owncloud/ocis/pull/11898
422 changes: 221 additions & 201 deletions services/graph/pkg/unifiedrole/roles.go
View file
Open in desktop

Large diffs are not rendered by default.

16 changes: 8 additions & 8 deletions tests/acceptance/features/apiGraph/roleManagementEndpoint.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,7 @@ Feature: permissions role definitions
"const": "View, download, upload, edit, add and delete."
},
"displayName": {
"const": "Can edit without versions"
"const": "Can edit with trashbin"
},
"id": {
"const": "fb6c3e19-e378-47e5-b277-9732f9de6e21"
Expand Down Expand Up @@ -296,10 +296,10 @@ Feature: permissions role definitions
"const": 0
},
"description": {
"const": "View, download, upload, edit, add, delete including the history."
"const": "View, download, upload, edit, add, show all versions and delete."
},
"displayName": {
"const": "Can edit"
"const": "Can edit with versions and trashbin"
},
"id": {
"const": "58c63c02-1d89-4572-916a-870abc5a1b7d"
Expand Down Expand Up @@ -356,10 +356,10 @@ Feature: permissions role definitions
"const": 0
},
"description": {
"const": "View, download and edit."
"const": "View, download, upload and edit."
},
"displayName": {
"const": "Can edit without versions"
"const": "Can edit"
},
"id": {
"const": "2d00ce52-1fc2-4dbc-8b95-a73b73395f5a"
Expand Down Expand Up @@ -438,10 +438,10 @@ Feature: permissions role definitions
"const": 0
},
"description": {
"const": "View, download and upload."
"const": "View, download, upload, edit and add."
},
"displayName": {
"const": "Can upload"
"const": "Can edit"
},
"id": {
"const": "1c996275-f1c9-4e71-abdf-a42f6495e960"
Expand Down Expand Up @@ -491,7 +491,7 @@ Feature: permissions role definitions
"const": 0
},
"description": {
"const": "View, download, upload, edit, add, delete and manage members."
"const": "View, download, upload, edit, add, show all versions, delete and manage members."
},
"displayName": {
"const": "Can manage"
Expand Down
24 changes: 12 additions & 12 deletions tests/acceptance/features/apiSharingNgAdditionalShareRole/editorWithVersions.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,16 +214,16 @@ Feature: an user shares resources
"required": ["@libre.graph.weight", "description", "displayName", "id" ],
"properties": {
"@libre.graph.weight": { "const": 2 },
"description": { "const": "View, download and edit." },
"displayName": { "const": "Can edit without versions" },
"description": { "const": "View, download, upload and edit." },
"displayName": { "const": "Can edit" },
"id": { "const": "2d00ce52-1fc2-4dbc-8b95-a73b73395f5a" }
}
},
{
"type": "object",
"required": ["@libre.graph.weight", "description", "displayName", "id"],
"properties": {
"displayName": { "const": "Can edit" }
"displayName": { "const": "Can edit with versions and show invitees" }
}
}
]
Expand Down Expand Up @@ -275,16 +275,16 @@ Feature: an user shares resources
"required": ["@libre.graph.weight", "description", "displayName", "id"],
"properties": {
"@libre.graph.weight": { "const": 2 },
"description": { "const": "View, download and edit." },
"displayName": { "const": "Can edit without versions" },
"description": { "const": "View, download, upload and edit." },
"displayName": { "const": "Can edit" },
"id": { "const": "2d00ce52-1fc2-4dbc-8b95-a73b73395f5a" }
}
},
{
"type": "object",
"required": ["@libre.graph.weight", "description", "displayName", "id"],
"properties": {
"displayName": { "const": "Can edit" }
"displayName": { "const": "Can edit with versions and show invitees" }
}
}
]
Expand Down Expand Up @@ -332,7 +332,7 @@ Feature: an user shares resources
"type": "object",
"required": ["@libre.graph.weight", "description", "displayName", "id"],
"properties": {
"displayName": { "const": "Can upload" }
"displayName": { "const": "Can edit" }
}
},
{
Expand All @@ -341,15 +341,15 @@ Feature: an user shares resources
"properties": {
"@libre.graph.weight": { "const": 3 },
"description": { "const": "View, download, upload, edit, add and delete." },
"displayName": { "const": "Can edit without versions" },
"displayName": { "const": "Can edit with trashbin" },
"id": { "const": "fb6c3e19-e378-47e5-b277-9732f9de6e21" }
}
},
{
"type": "object",
"required": ["@libre.graph.weight", "description", "displayName", "id"],
"properties": {
"displayName": { "const": "Can edit" }
"displayName": { "const": "Can edit with trashbin, versions and show invitees" }
}
}
]
Expand Down Expand Up @@ -400,7 +400,7 @@ Feature: an user shares resources
"type": "object",
"required": ["@libre.graph.weight", "description", "displayName", "id"],
"properties": {
"displayName": { "const": "Can upload" }
"displayName": { "const": "Can edit" }
}
},
{
Expand All @@ -409,15 +409,15 @@ Feature: an user shares resources
"properties": {
"@libre.graph.weight": { "const": 3 },
"description": { "const": "View, download, upload, edit, add and delete." },
"displayName": { "const": "Can edit without versions" },
"displayName": { "const": "Can edit with trashbin" },
"id": { "const": "fb6c3e19-e378-47e5-b277-9732f9de6e21" }
}
},
{
"type": "object",
"required": ["@libre.graph.weight", "description", "displayName", "id"],
"properties": {
"displayName": { "const": "Can edit" }
"displayName": { "const": "Can edit with trashbin, versions and show invitees" }
}
}
]
Expand Down
12 changes: 6 additions & 6 deletions tests/acceptance/features/apiSharingNgAdditionalShareRole/listGrantsShareRole.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1179,22 +1179,22 @@ Feature: ListGrants role
"properties": {
"@libre.graph.weight": {"const": 2},
"description": {"const": "View, download and show all invited people."},
"displayName": {"const": "Can view"},
"displayName": {"const": "Can view and show invitees"},
"id": {"const": "d5041006-ebb3-4b4a-b6a4-7c180ecfb17d"}
}
},
{
"type": "object",
"required": ["@libre.graph.weight","description","displayName","id"],
"properties": {
"displayName": {"const": "Can upload"}
"displayName": {"const": "Can edit with trashbin"}
}
},
{
"type": "object",
"required": ["@libre.graph.weight","description","displayName","id"],
"properties": {
"displayName": {"const": "Can edit without versions"}
"displayName": {"const": "Can edit"}
}
}
]
Expand Down Expand Up @@ -1242,7 +1242,7 @@ Feature: ListGrants role
"required": ["@libre.graph.weight","description","displayName","id"],
"properties": {
"@libre.graph.weight": {"const": 2},
"displayName": {"const": "Can edit without versions"},
"displayName": {"const": "Can edit"},
"id": {"const": "2d00ce52-1fc2-4dbc-8b95-a73b73395f5a"}
}
},
Expand All @@ -1251,8 +1251,8 @@ Feature: ListGrants role
"required": ["@libre.graph.weight","description","displayName","id"],
"properties": {
"@libre.graph.weight": {"const": 3},
"description": {"const": "View, download, edit and show all invited people."},
"displayName": {"const": "Can edit without versions"},
"description": {"const": "View, download, upload, edit and show all invited people."},
"displayName": {"const": "Can edit and show invitees"},
"id": {"const": "c1235aea-d106-42db-8458-7d5610fb0a67"}
}
}
Expand Down
Loading