fix unit tests

Author: jessegeens

cmd/reva/share-create.go

@@ -163,7 +163,7 @@ func getSharePerm(p string) (*provider.ResourcePermissions, error) {
 	case editorPermission:
 		return conversions.NewEditorRole().CS3ResourcePermissions(), nil
 	case collabPermission:
-		return conversions.NewCollaboratorRole().CS3ResourcePermissions(), nil
+		return conversions.NewManagerRole().CS3ResourcePermissions(), nil
 	case denyPermission:
 		return &provider.ResourcePermissions{}, nil
 	default:

internal/http/services/owncloud/ocgraph/unifiedrole.go

@@ -470,13 +470,12 @@ func GetBuiltinRoleDefinitionList() []*libregraph.UnifiedRoleDefinition {
 }
 
 var ocsRoleUnifiedRole = map[string]*libregraph.UnifiedRoleDefinition{
-	conversions.RoleViewer:       NewViewerUnifiedRole(),
-	conversions.RoleReader:       NewViewerUnifiedRole(),
-	conversions.RoleEditor:       NewEditorUnifiedRole(),
-	conversions.RoleFileEditor:   NewFileEditorUnifiedRole(),
-	conversions.RoleCollaborator: NewManagerUnifiedRole(),
-	conversions.RoleUploader:     NewUploaderUnifiedRole(),
-	conversions.RoleManager:      NewManagerUnifiedRole(),
+	conversions.RoleViewer:     NewViewerUnifiedRole(),
+	conversions.RoleReader:     NewViewerUnifiedRole(),
+	conversions.RoleEditor:     NewEditorUnifiedRole(),
+	conversions.RoleFileEditor: NewFileEditorUnifiedRole(),
+	conversions.RoleUploader:   NewUploaderUnifiedRole(),
+	conversions.RoleManager:    NewManagerUnifiedRole(),
 }
 
 func UnifiedRoleIDToDefinition(unifiedRoleID string) (*libregraph.UnifiedRoleDefinition, bool) {

internal/http/services/owncloud/ocs/conversions/permissions_test.go

@@ -145,11 +145,8 @@ func TestPermissions2Role(t *testing.T) {
 	table := map[Permissions]string{
 		PermissionRead: RoleViewer,
 		PermissionRead | PermissionWrite | PermissionCreate | PermissionDelete: RoleEditor,
-		PermissionAll:                     RoleCollaborator,
-		PermissionWrite:                   RoleLegacy,
-		PermissionShare:                   RoleLegacy,
-		PermissionWrite | PermissionShare: RoleLegacy,
-		PermissionNone:                    RoleDenied,
+		PermissionAll:  RoleManager,
+		PermissionNone: RoleDenied,
 	}
 
 	for permissions, role := range table {

internal/http/services/owncloud/ocs/conversions/role.go

@@ -43,8 +43,6 @@ const (
 	RoleEditor = "editor"
 	// RoleFileEditor grants editor permission on a single file.
 	RoleFileEditor = "file-editor"
-	// RoleCollaborator grants editor+resharing permissions on a resource.
-	RoleCollaborator = "coowner"
 	// RoleUploader grants uploader permission to upload onto a resource.
 	RoleUploader = "uploader"
 	// RoleManager grants manager permissions on a resource. Semantically equivalent to co-owner.
@@ -125,8 +123,6 @@ func RoleFromName(name string) *Role {
 		return NewEditorRole()
 	case RoleFileEditor:
 		return NewFileEditorRole()
-	case RoleCollaborator:
-		return NewCollaboratorRole()
 	case RoleUploader:
 		return NewUploaderRole()
 	case RoleManager:
@@ -212,34 +208,6 @@ func NewFileEditorRole() *Role {
 	}
 }
 
-// NewCollaboratorRole creates a collaborator role.
-func NewCollaboratorRole() *Role {
-	return &Role{
-		Name: RoleCollaborator,
-		cS3ResourcePermissions: &provider.ResourcePermissions{
-			GetPath:              true,
-			GetQuota:             true,
-			InitiateFileDownload: true,
-			ListGrants:           true,
-			ListContainer:        true,
-			ListFileVersions:     true,
-			ListRecycle:          true,
-			Stat:                 true,
-			InitiateFileUpload:   true,
-			RestoreFileVersion:   true,
-			RestoreRecycleItem:   true,
-			CreateContainer:      true,
-			Delete:               true,
-			Move:                 true,
-			PurgeRecycle:         true,
-			AddGrant:             true,
-			UpdateGrant:          true,
-			RemoveGrant:          true,
-		},
-		ocsPermissions: PermissionAll,
-	}
-}
-
 // NewUploaderRole creates an uploader role.
 func NewUploaderRole() *Role {
 	return &Role{
@@ -294,7 +262,7 @@ func RoleFromOCSPermissions(p Permissions) *Role {
 	if p.Contain(PermissionRead) {
 		if p.Contain(PermissionWrite) && p.Contain(PermissionCreate) && p.Contain(PermissionDelete) {
 			if p.Contain(PermissionShare) {
-				return NewCollaboratorRole()
+				return NewManagerRole()
 			}
 			return NewEditorRole()
 		}
@@ -361,7 +329,7 @@ func RoleFromResourcePermissions(rp *provider.ResourcePermissions) *Role {
 			if r.ocsPermissions.Contain(PermissionCreate) && r.ocsPermissions.Contain(PermissionDelete) {
 				r.Name = RoleEditor
 				if r.ocsPermissions.Contain(PermissionShare) {
-					r.Name = RoleCollaborator
+					r.Name = RoleManager
 				}
 			}
 			return r // file-editor, editor or collaborator

internal/http/services/owncloud/ocs/handlers/apps/sharing/shares/shares.go

@@ -238,12 +238,12 @@ func (h *Handler) CreateShare(w http.ResponseWriter, r *http.Request) {
 	switch shareType {
 	case int(conversions.ShareTypeUser):
 		// user collaborations default to collab
-		if role, val, err := h.extractPermissions(w, r, statRes.Info, conversions.NewCollaboratorRole()); err == nil {
+		if role, val, err := h.extractPermissions(w, r, statRes.Info, conversions.NewManagerRole()); err == nil {
 			h.createUserShare(w, r, statRes.Info, role, val)
 		}
 	case int(conversions.ShareTypeGroup):
 		// group collaborations default to collab
-		if role, val, err := h.extractPermissions(w, r, statRes.Info, conversions.NewCollaboratorRole()); err == nil {
+		if role, val, err := h.extractPermissions(w, r, statRes.Info, conversions.NewManagerRole()); err == nil {
 			h.createGroupShare(w, r, statRes.Info, role, val)
 		}
 	case int(conversions.ShareTypePublicLink):

pkg/projects/manager/sql/sql_test.go

@@ -97,6 +97,7 @@ func TestListProjects(t *testing.T) {
 						Path:          "/path/to/project",
 						PermissionSet: conversions.NewManagerRole().CS3ResourcePermissions(),
 					},
+					PermissionSet: conversions.NewManagerRole().CS3ResourcePermissions(),
 				},
 			},
 		},
@@ -130,6 +131,7 @@ func TestListProjects(t *testing.T) {
 						Path:          "/path/to/project",
 						PermissionSet: conversions.NewViewerRole().CS3ResourcePermissions(),
 					},
+					PermissionSet: conversions.NewViewerRole().CS3ResourcePermissions(),
 				},
 			},
 		},
@@ -163,6 +165,7 @@ func TestListProjects(t *testing.T) {
 						Path:          "/path/to/project",
 						PermissionSet: conversions.NewEditorRole().CS3ResourcePermissions(),
 					},
+					PermissionSet: conversions.NewEditorRole().CS3ResourcePermissions(),
 				},
 			},
 		},
@@ -196,6 +199,7 @@ func TestListProjects(t *testing.T) {
 						Path:          "/path/to/project",
 						PermissionSet: conversions.NewManagerRole().CS3ResourcePermissions(),
 					},
+					PermissionSet: conversions.NewManagerRole().CS3ResourcePermissions(),
 				},
 			},
 		},
@@ -229,6 +233,7 @@ func TestListProjects(t *testing.T) {
 						Path:          "/path/to/project",
 						PermissionSet: conversions.NewManagerRole().CS3ResourcePermissions(),
 					},
+					PermissionSet: conversions.NewManagerRole().CS3ResourcePermissions(),
 				},
 			},
 		},
@@ -275,7 +280,7 @@ func TestListProjects(t *testing.T) {
 			}
 
 			if !reflect.DeepEqual(got.StorageSpaces, tt.expected) {
-				t.Fatalf("projects' list do not match. got=%#v expected=%#v", got.StorageSpaces, tt.expected)
+				t.Fatalf("projects' list do not match. got=%+v expected=%+v", got.StorageSpaces, tt.expected)
 			}
 
 			err = teardown(t)