sevenhill/QSfera
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(graph): Fix tests after Uploader Role changes

Browse Source
This commit is contained in:
Ralf Haferkamp
2024-05-21 16:48:17 +02:00
parent f931da5f29
commit 72a6ea3cfa
3 changed files with 26 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
services/graph/pkg/unifiedrole/unifiedrole.go
+9 -9
View File
@@ -23,8 +23,8 @@ const (
UnifiedRoleSpaceEditorID = "58c63c02-1d89-4572-916a-870abc5a1b7d" UnifiedRoleSpaceEditorID = "58c63c02-1d89-4572-916a-870abc5a1b7d"
// UnifiedRoleFileEditorID Unified role file editor id. // UnifiedRoleFileEditorID Unified role file editor id.
UnifiedRoleFileEditorID = "2d00ce52-1fc2-4dbc-8b95-a73b73395f5a" UnifiedRoleFileEditorID = "2d00ce52-1fc2-4dbc-8b95-a73b73395f5a"
// UnifiedRoleUploaderID Unified role uploader id. // UnifiedRoleEditorLiteID Unified role editor-lite id.
UnifiedRoleUploaderID = "1c996275-f1c9-4e71-abdf-a42f6495e960" UnifiedRoleEditorLiteID = "1c996275-f1c9-4e71-abdf-a42f6495e960"
// UnifiedRoleManagerID Unified role manager id. // UnifiedRoleManagerID Unified role manager id.
UnifiedRoleManagerID = "312c0871-5ef7-4b3a-85b6-0e4074c64049" UnifiedRoleManagerID = "312c0871-5ef7-4b3a-85b6-0e4074c64049"
// UnifiedRoleSecureViewerID Unified role secure viewer id. // UnifiedRoleSecureViewerID Unified role secure viewer id.
@@ -66,7 +66,7 @@ var legacyNames map[string]string = map[string]string{
UnifiedRoleSpaceEditorID: "editor", UnifiedRoleSpaceEditorID: "editor",
UnifiedRoleEditorID: conversions.RoleEditor, UnifiedRoleEditorID: conversions.RoleEditor,
UnifiedRoleFileEditorID: conversions.RoleFileEditor, UnifiedRoleFileEditorID: conversions.RoleFileEditor,
UnifiedRoleUploaderID: conversions.RoleUploader, UnifiedRoleEditorLiteID: conversions.RoleEditorLite,
UnifiedRoleManagerID: conversions.RoleManager, UnifiedRoleManagerID: conversions.RoleManager,
UnifiedRoleSecureViewerID: conversions.RoleSecureViewer, UnifiedRoleSecureViewerID: conversions.RoleSecureViewer,
} }
@@ -160,11 +160,11 @@ func NewFileEditorUnifiedRole() *libregraph.UnifiedRoleDefinition {
} }
} }
// NewUploaderUnifiedRole creates an uploader role // NewEditorLiteUnifiedRole creates an editor-lite role
func NewUploaderUnifiedRole() *libregraph.UnifiedRoleDefinition { func NewEditorLiteUnifiedRole() *libregraph.UnifiedRoleDefinition {
r := conversions.NewUploaderRole() r := conversions.NewEditorLiteRole()
return &libregraph.UnifiedRoleDefinition{ return &libregraph.UnifiedRoleDefinition{
Id: proto.String(UnifiedRoleUploaderID), Id: proto.String(UnifiedRoleEditorLiteID),
Description: proto.String("View, download and upload."), Description: proto.String("View, download and upload."),
DisplayName: displayName(r), DisplayName: displayName(r),
RolePermissions: []libregraph.UnifiedRolePermission{ RolePermissions: []libregraph.UnifiedRolePermission{
@@ -239,7 +239,7 @@ func GetBuiltinRoleDefinitionList() []*libregraph.UnifiedRoleDefinition {
NewEditorUnifiedRole(), NewEditorUnifiedRole(),
NewSpaceEditorUnifiedRole(), NewSpaceEditorUnifiedRole(),
NewFileEditorUnifiedRole(), NewFileEditorUnifiedRole(),
NewUploaderUnifiedRole(), NewEditorLiteUnifiedRole(),
NewManagerUnifiedRole(), NewManagerUnifiedRole(),
NewSecureViewerUnifiedRole(), NewSecureViewerUnifiedRole(),
} }
@@ -501,7 +501,7 @@ func displayName(role *conversions.Role) *string {
displayName = canEdit displayName = canEdit
case conversions.RoleFileEditor: case conversions.RoleFileEditor:
displayName = canEdit displayName = canEdit
case conversions.RoleUploader: case conversions.RoleEditorLite:
displayName = "Can upload" displayName = "Can upload"
case conversions.RoleManager: case conversions.RoleManager:
displayName = "Can manage" displayName = "Can manage"
services/graph/pkg/unifiedrole/unifiedrole_test.go
+5 -4
View File
@@ -171,8 +171,8 @@ var _ = Describe("unifiedroles", func() {
unifiedrole.UnifiedRoleConditionFolder, unifiedrole.UnifiedRoleConditionFolder,
[]*libregraph.UnifiedRoleDefinition{ []*libregraph.UnifiedRoleDefinition{
unifiedrole.NewSecureViewerUnifiedRole(), unifiedrole.NewSecureViewerUnifiedRole(),
unifiedrole.NewUploaderUnifiedRole(),
unifiedrole.NewViewerUnifiedRole(), unifiedrole.NewViewerUnifiedRole(),
unifiedrole.NewEditorLiteUnifiedRole(),
unifiedrole.NewEditorUnifiedRole(), unifiedrole.NewEditorUnifiedRole(),
}, },
), ),
@@ -194,8 +194,8 @@ var _ = Describe("unifiedroles", func() {
unifiedrole.UnifiedRoleConditionFolder, unifiedrole.UnifiedRoleConditionFolder,
[]*libregraph.UnifiedRoleDefinition{ []*libregraph.UnifiedRoleDefinition{
unifiedrole.NewSecureViewerUnifiedRole(), unifiedrole.NewSecureViewerUnifiedRole(),
unifiedrole.NewUploaderUnifiedRole(),
unifiedrole.NewViewerUnifiedRole(), unifiedrole.NewViewerUnifiedRole(),
unifiedrole.NewEditorLiteUnifiedRole(),
unifiedrole.NewEditorUnifiedRole(), unifiedrole.NewEditorUnifiedRole(),
}, },
), ),
@@ -221,10 +221,11 @@ var _ = Describe("unifiedroles", func() {
Entry( Entry(
"mixed", "mixed",
append(rolesToAction(unifiedrole.NewUploaderUnifiedRole()), unifiedrole.DriveItemQuotaRead), append(rolesToAction(unifiedrole.NewEditorLiteUnifiedRole()), unifiedrole.DriveItemQuotaRead),
unifiedrole.UnifiedRoleConditionFolder, unifiedrole.UnifiedRoleConditionFolder,
[]*libregraph.UnifiedRoleDefinition{ []*libregraph.UnifiedRoleDefinition{
unifiedrole.NewUploaderUnifiedRole(), unifiedrole.NewSecureViewerUnifiedRole(),
unifiedrole.NewEditorLiteUnifiedRole(),
}, },
), ),
) )
tests/acceptance/features/apiSharingNg/listPermissions.feature
+12 -12
View File
@@ -106,19 +106,19 @@ Feature: List a sharing permissions
"description": { "description": {
"type": "string", "type": "string",
"enum": [ "enum": [
"View, download and upload." "View and download."
] ]
}, },
"displayName": { "displayName": {
"type": "string", "type": "string",
"enum": [ "enum": [
"Can upload" "Can view"
] ]
}, },
"id": { "id": {
"type": "string", "type": "string",
"enum": [ "enum": [
"1c996275-f1c9-4e71-abdf-a42f6495e960" "b1e2218d-eef8-4d4c-b82d-0f1a1b48f3b5"
] ]
} }
} }
@@ -141,19 +141,19 @@ Feature: List a sharing permissions
"description": { "description": {
"type": "string", "type": "string",
"enum": [ "enum": [
"View and download." "View, download and upload."
] ]
}, },
"displayName": { "displayName": {
"type": "string", "type": "string",
"enum": [ "enum": [
"Can view" "Can upload"
] ]
}, },
"id": { "id": {
"type": "string", "type": "string",
"enum": [ "enum": [
"b1e2218d-eef8-4d4c-b82d-0f1a1b48f3b5" "1c996275-f1c9-4e71-abdf-a42f6495e960"
] ]
} }
} }
@@ -855,13 +855,13 @@ Feature: List a sharing permissions
"const": 2 "const": 2
}, },
"description": { "description": {
"const": "View, download and upload." "const": "View and download."
}, },
"displayName": { "displayName": {
"const": "Can upload" "const": "Can view"
}, },
"id": { "id": {
"const": "1c996275-f1c9-4e71-abdf-a42f6495e960" "const": "b1e2218d-eef8-4d4c-b82d-0f1a1b48f3b5"
} }
} }
}, },
@@ -878,13 +878,13 @@ Feature: List a sharing permissions
"const": 3 "const": 3
}, },
"description": { "description": {
"const": "View and download." "const": "View, download and upload."
}, },
"displayName": { "displayName": {
"const": "Can view" "const": "Can upload"
}, },
"id": { "id": {
"const": "b1e2218d-eef8-4d4c-b82d-0f1a1b48f3b5" "const": "1c996275-f1c9-4e71-abdf-a42f6495e960"
} }
} }
}, },