remove resharing

Signed-off-by: jkoberg <jkoberg@owncloud.com>

services/graph/pkg/unifiedrole/unifiedrole.go

@@ -69,8 +69,8 @@ var legacyNames map[string]string = map[string]string{
 }
 
 // NewViewerUnifiedRole creates a viewer role. `sharing` indicates if sharing permission should be added
-func NewViewerUnifiedRole(sharing bool) *libregraph.UnifiedRoleDefinition {
-	r := conversions.NewViewerRole(sharing)
+func NewViewerUnifiedRole() *libregraph.UnifiedRoleDefinition {
+	r := conversions.NewViewerRole()
 	return &libregraph.UnifiedRoleDefinition{
 		Id:          proto.String(UnifiedRoleViewerID),
 		Description: proto.String("View and download."),
@@ -103,8 +103,8 @@ func NewSpaceViewerUnifiedRole() *libregraph.UnifiedRoleDefinition {
 }
 
 // NewEditorUnifiedRole creates an editor role. `sharing` indicates if sharing permission should be added
-func NewEditorUnifiedRole(sharing bool) *libregraph.UnifiedRoleDefinition {
-	r := conversions.NewEditorRole(sharing)
+func NewEditorUnifiedRole() *libregraph.UnifiedRoleDefinition {
+	r := conversions.NewEditorRole()
 	return &libregraph.UnifiedRoleDefinition{
 		Id:          proto.String(UnifiedRoleEditorID),
 		Description: proto.String("View, download, upload, edit, add and delete."),
@@ -137,8 +137,8 @@ func NewSpaceEditorUnifiedRole() *libregraph.UnifiedRoleDefinition {
 }
 
 // NewFileEditorUnifiedRole creates a file-editor role
-func NewFileEditorUnifiedRole(sharing bool) *libregraph.UnifiedRoleDefinition {
-	r := conversions.NewFileEditorRole(sharing)
+func NewFileEditorUnifiedRole() *libregraph.UnifiedRoleDefinition {
+	r := conversions.NewFileEditorRole()
 	return &libregraph.UnifiedRoleDefinition{
 		Id:          proto.String(UnifiedRoleFileEditorID),
 		Description: proto.String("View, download and edit."),
@@ -188,8 +188,8 @@ func NewManagerUnifiedRole() *libregraph.UnifiedRoleDefinition {
 }
 
 // NewUnifiedRoleFromID returns a unified role definition from the provided id
-func NewUnifiedRoleFromID(id string, resharing bool) (*libregraph.UnifiedRoleDefinition, error) {
-	for _, definition := range GetBuiltinRoleDefinitionList(resharing) {
+func NewUnifiedRoleFromID(id string) (*libregraph.UnifiedRoleDefinition, error) {
+	for _, definition := range GetBuiltinRoleDefinitionList() {
 		if definition.GetId() != id {
 			continue
 		}
@@ -200,13 +200,13 @@ func NewUnifiedRoleFromID(id string, resharing bool) (*libregraph.UnifiedRoleDef
 	return nil, errors.New("role not found")
 }
 
-func GetBuiltinRoleDefinitionList(resharing bool) []*libregraph.UnifiedRoleDefinition {
+func GetBuiltinRoleDefinitionList() []*libregraph.UnifiedRoleDefinition {
 	return []*libregraph.UnifiedRoleDefinition{
-		NewViewerUnifiedRole(resharing),
+		NewViewerUnifiedRole(),
 		NewSpaceViewerUnifiedRole(),
-		NewEditorUnifiedRole(resharing),
+		NewEditorUnifiedRole(),
 		NewSpaceEditorUnifiedRole(),
-		NewFileEditorUnifiedRole(resharing),
+		NewFileEditorUnifiedRole(),
 		NewUploaderUnifiedRole(),
 		NewManagerUnifiedRole(),
 	}
@@ -214,8 +214,8 @@ func GetBuiltinRoleDefinitionList(resharing bool) []*libregraph.UnifiedRoleDefin
 
 // GetApplicableRoleDefinitionsForActions returns a list of role definitions
 // that match the provided actions and constraints
-func GetApplicableRoleDefinitionsForActions(actions []string, constraints string, resharing, descending bool) []*libregraph.UnifiedRoleDefinition {
-	builtin := GetBuiltinRoleDefinitionList(resharing)
+func GetApplicableRoleDefinitionsForActions(actions []string, constraints string, descending bool) []*libregraph.UnifiedRoleDefinition {
+	builtin := GetBuiltinRoleDefinitionList()
 	definitions := make([]*libregraph.UnifiedRoleDefinition, 0, len(builtin))
 
 	for _, definition := range builtin {
@@ -402,14 +402,14 @@ func GetLegacyName(role libregraph.UnifiedRoleDefinition) string {
 
 // CS3ResourcePermissionsToUnifiedRole tries to find the UnifiedRoleDefinition that matches the supplied
 // CS3 ResourcePermissions and constraints.
-func CS3ResourcePermissionsToUnifiedRole(p provider.ResourcePermissions, constraints string, resharing bool) *libregraph.UnifiedRoleDefinition {
+func CS3ResourcePermissionsToUnifiedRole(p provider.ResourcePermissions, constraints string) *libregraph.UnifiedRoleDefinition {
 	actionSet := map[string]struct{}{}
 	for _, action := range CS3ResourcePermissionsToLibregraphActions(p) {
 		actionSet[action] = struct{}{}
 	}
 
 	var res *libregraph.UnifiedRoleDefinition
-	for _, uRole := range GetBuiltinRoleDefinitionList(resharing) {
+	for _, uRole := range GetBuiltinRoleDefinitionList() {
 		matchFound := false
 		for _, uPerm := range uRole.GetRolePermissions() {
 			if uPerm.GetCondition() != constraints {
@@ -448,6 +448,10 @@ func displayName(role *conversions.Role) *string {
 	if role == nil {
 		return nil
 	}
+
+	// linter wants this to be a var
+	canEdit := "Can edit"
+
 	var displayName string
 	switch role.Name {
 	case conversions.RoleViewer:
@@ -455,11 +459,11 @@ func displayName(role *conversions.Role) *string {
 	case conversions.RoleSpaceViewer:
 		displayName = "Can view"
 	case conversions.RoleEditor:
-		displayName = "Can edit"
+		displayName = canEdit
 	case conversions.RoleSpaceEditor:
-		displayName = "Can edit"
+		displayName = canEdit
 	case conversions.RoleFileEditor:
-		displayName = "Can edit"
+		displayName = canEdit
 	case conversions.RoleUploader:
 		displayName = "Can upload"
 	case conversions.RoleManager:

services/graph/pkg/unifiedrole/unifiedrole_test.go

@@ -20,13 +20,13 @@ var _ = Describe("unifiedroles", func() {
 		func(legacyRole *rConversions.Role, unifiedRole *libregraph.UnifiedRoleDefinition, constraints string) {
 			cs3perm := legacyRole.CS3ResourcePermissions()
 
-			r := unifiedrole.CS3ResourcePermissionsToUnifiedRole(*cs3perm, constraints, true)
+			r := unifiedrole.CS3ResourcePermissionsToUnifiedRole(*cs3perm, constraints)
 			Expect(r.GetId()).To(Equal(unifiedRole.GetId()))
 
 		},
-		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.RoleViewer, rConversions.NewViewerRole(), unifiedrole.NewViewerUnifiedRole(), unifiedrole.UnifiedRoleConditionGrantee),
+		Entry(rConversions.RoleEditor, rConversions.NewEditorRole(), unifiedrole.NewEditorUnifiedRole(), unifiedrole.UnifiedRoleConditionGrantee),
+		Entry(rConversions.RoleFileEditor, rConversions.NewFileEditorRole(), unifiedrole.NewFileEditorUnifiedRole(), unifiedrole.UnifiedRoleConditionGrantee),
 		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),
@@ -49,11 +49,11 @@ var _ = Describe("unifiedroles", func() {
 
 			Expect(permsFromCS3).To(matcher)
 		},
-		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.RoleViewer, rConversions.NewViewerRole(), unifiedrole.NewViewerUnifiedRole(), true),
+		Entry(rConversions.RoleEditor, rConversions.NewEditorRole(), unifiedrole.NewEditorUnifiedRole(), true),
+		Entry(rConversions.RoleFileEditor, rConversions.NewFileEditorRole(), unifiedrole.NewFileEditorUnifiedRole(), true),
 		Entry(rConversions.RoleManager, rConversions.NewManagerRole(), unifiedrole.NewManagerUnifiedRole(), true),
-		Entry("no match", rConversions.NewFileEditorRole(true), unifiedrole.NewManagerUnifiedRole(), false),
+		Entry("no match", rConversions.NewFileEditorRole(), unifiedrole.NewManagerUnifiedRole(), false),
 	)
 
 	DescribeTable("WeightRoleDefinitions",
@@ -66,25 +66,25 @@ var _ = Describe("unifiedroles", func() {
 
 		Entry("ascending",
 			[]*libregraph.UnifiedRoleDefinition{
-				unifiedrole.NewViewerUnifiedRole(false),
-				unifiedrole.NewFileEditorUnifiedRole(false),
+				unifiedrole.NewViewerUnifiedRole(),
+				unifiedrole.NewFileEditorUnifiedRole(),
 			},
 			false,
 			[]*libregraph.UnifiedRoleDefinition{
-				unifiedrole.NewViewerUnifiedRole(false),
-				unifiedrole.NewFileEditorUnifiedRole(false),
+				unifiedrole.NewViewerUnifiedRole(),
+				unifiedrole.NewFileEditorUnifiedRole(),
 			},
 		),
 
 		Entry("descending",
 			[]*libregraph.UnifiedRoleDefinition{
-				unifiedrole.NewViewerUnifiedRole(false),
-				unifiedrole.NewFileEditorUnifiedRole(false),
+				unifiedrole.NewViewerUnifiedRole(),
+				unifiedrole.NewFileEditorUnifiedRole(),
 			},
 			true,
 			[]*libregraph.UnifiedRoleDefinition{
-				unifiedrole.NewFileEditorUnifiedRole(false),
-				unifiedrole.NewViewerUnifiedRole(false),
+				unifiedrole.NewFileEditorUnifiedRole(),
+				unifiedrole.NewViewerUnifiedRole(),
 			},
 		),
 	)
@@ -108,9 +108,9 @@ var _ = Describe("unifiedroles", func() {
 		}
 
 		DescribeTable("GetApplicableRoleDefinitionsForActions",
-			func(givenActions []string, constraints string, resharing bool, expectedDefinitions []*libregraph.UnifiedRoleDefinition) {
+			func(givenActions []string, constraints string, expectedDefinitions []*libregraph.UnifiedRoleDefinition) {
 
-				generatedDefinitions := unifiedrole.GetApplicableRoleDefinitionsForActions(givenActions, constraints, resharing, false)
+				generatedDefinitions := unifiedrole.GetApplicableRoleDefinitionsForActions(givenActions, constraints, false)
 
 				Expect(len(generatedDefinitions)).To(Equal(len(expectedDefinitions)))
 
@@ -129,90 +129,82 @@ var _ = Describe("unifiedroles", func() {
 
 			Entry(
 				"ViewerUnifiedRole",
-				rolesToAction(unifiedrole.NewViewerUnifiedRole(false)),
+				rolesToAction(unifiedrole.NewViewerUnifiedRole()),
 				unifiedrole.UnifiedRoleConditionGrantee,
-				false,
 				[]*libregraph.UnifiedRoleDefinition{
-					unifiedrole.NewViewerUnifiedRole(false),
+					unifiedrole.NewViewerUnifiedRole(),
 				},
 			),
 
 			Entry(
 				"ViewerUnifiedRole | share",
-				rolesToAction(unifiedrole.NewViewerUnifiedRole(true)),
+				rolesToAction(unifiedrole.NewViewerUnifiedRole()),
 				unifiedrole.UnifiedRoleConditionGrantee,
-				true,
 				[]*libregraph.UnifiedRoleDefinition{
-					unifiedrole.NewViewerUnifiedRole(true),
+					unifiedrole.NewViewerUnifiedRole(),
 				},
 			),
 
 			Entry(
 				"NewFileEditorUnifiedRole",
-				rolesToAction(unifiedrole.NewFileEditorUnifiedRole(false)),
+				rolesToAction(unifiedrole.NewFileEditorUnifiedRole()),
 				unifiedrole.UnifiedRoleConditionGrantee,
-				false,
 				[]*libregraph.UnifiedRoleDefinition{
-					unifiedrole.NewViewerUnifiedRole(false),
-					unifiedrole.NewFileEditorUnifiedRole(false),
+					unifiedrole.NewViewerUnifiedRole(),
+					unifiedrole.NewFileEditorUnifiedRole(),
 				},
 			),
 
 			Entry(
 				"NewFileEditorUnifiedRole - share",
-				rolesToAction(unifiedrole.NewFileEditorUnifiedRole(true)),
+				rolesToAction(unifiedrole.NewFileEditorUnifiedRole()),
 				unifiedrole.UnifiedRoleConditionGrantee,
-				true,
 				[]*libregraph.UnifiedRoleDefinition{
-					unifiedrole.NewViewerUnifiedRole(true),
-					unifiedrole.NewFileEditorUnifiedRole(true),
+					unifiedrole.NewViewerUnifiedRole(),
+					unifiedrole.NewFileEditorUnifiedRole(),
 				},
 			),
 
 			Entry(
 				"NewEditorUnifiedRole",
-				rolesToAction(unifiedrole.NewEditorUnifiedRole(false)),
+				rolesToAction(unifiedrole.NewEditorUnifiedRole()),
 				unifiedrole.UnifiedRoleConditionGrantee,
-				false,
 				[]*libregraph.UnifiedRoleDefinition{
 					unifiedrole.NewUploaderUnifiedRole(),
-					unifiedrole.NewViewerUnifiedRole(false),
-					unifiedrole.NewFileEditorUnifiedRole(false),
-					unifiedrole.NewEditorUnifiedRole(false),
+					unifiedrole.NewViewerUnifiedRole(),
+					unifiedrole.NewFileEditorUnifiedRole(),
+					unifiedrole.NewEditorUnifiedRole(),
 				},
 			),
 
 			Entry(
 				"NewEditorUnifiedRole - share",
-				rolesToAction(unifiedrole.NewEditorUnifiedRole(true)),
+				rolesToAction(unifiedrole.NewEditorUnifiedRole()),
 				unifiedrole.UnifiedRoleConditionGrantee,
-				true,
 				[]*libregraph.UnifiedRoleDefinition{
 					unifiedrole.NewUploaderUnifiedRole(),
-					unifiedrole.NewViewerUnifiedRole(true),
-					unifiedrole.NewFileEditorUnifiedRole(true),
-					unifiedrole.NewEditorUnifiedRole(true),
+					unifiedrole.NewViewerUnifiedRole(),
+					unifiedrole.NewFileEditorUnifiedRole(),
+					unifiedrole.NewEditorUnifiedRole(),
 				},
 			),
 
 			Entry(
 				"GetBuiltinRoleDefinitionList",
-				rolesToAction(unifiedrole.GetBuiltinRoleDefinitionList(false)...),
+				rolesToAction(unifiedrole.GetBuiltinRoleDefinitionList()...),
 				unifiedrole.UnifiedRoleConditionGrantee,
-				false,
 				[]*libregraph.UnifiedRoleDefinition{
 					unifiedrole.NewUploaderUnifiedRole(),
-					unifiedrole.NewViewerUnifiedRole(false),
-					unifiedrole.NewFileEditorUnifiedRole(false),
-					unifiedrole.NewEditorUnifiedRole(false),
+					unifiedrole.NewViewerUnifiedRole(),
+					unifiedrole.NewFileEditorUnifiedRole(),
+					unifiedrole.NewEditorUnifiedRole(),
 				},
 			),
 
 			Entry(
 				"GetBuiltinRoleDefinitionList",
-				rolesToAction(unifiedrole.GetBuiltinRoleDefinitionList(false)...),
+				rolesToAction(unifiedrole.GetBuiltinRoleDefinitionList()...),
 				unifiedrole.UnifiedRoleConditionOwner,
-				false,
 				[]*libregraph.UnifiedRoleDefinition{
 					unifiedrole.NewSpaceViewerUnifiedRole(),
 					unifiedrole.NewSpaceEditorUnifiedRole(),
@@ -222,14 +214,13 @@ var _ = Describe("unifiedroles", func() {
 
 			Entry(
 				"GetBuiltinRoleDefinitionList - share",
-				rolesToAction(unifiedrole.GetBuiltinRoleDefinitionList(true)...),
+				rolesToAction(unifiedrole.GetBuiltinRoleDefinitionList()...),
 				unifiedrole.UnifiedRoleConditionGrantee,
-				true,
 				[]*libregraph.UnifiedRoleDefinition{
 					unifiedrole.NewUploaderUnifiedRole(),
-					unifiedrole.NewViewerUnifiedRole(true),
-					unifiedrole.NewFileEditorUnifiedRole(true),
-					unifiedrole.NewEditorUnifiedRole(true),
+					unifiedrole.NewViewerUnifiedRole(),
+					unifiedrole.NewFileEditorUnifiedRole(),
+					unifiedrole.NewEditorUnifiedRole(),
 				},
 			),
 
@@ -237,7 +228,6 @@ var _ = Describe("unifiedroles", func() {
 				"single",
 				[]string{unifiedrole.DriveItemQuotaRead},
 				unifiedrole.UnifiedRoleConditionGrantee,
-				true,
 				[]*libregraph.UnifiedRoleDefinition{},
 			),
 
@@ -245,7 +235,6 @@ var _ = Describe("unifiedroles", func() {
 				"mixed",
 				append(rolesToAction(unifiedrole.NewUploaderUnifiedRole()), unifiedrole.DriveItemQuotaRead),
 				unifiedrole.UnifiedRoleConditionGrantee,
-				true,
 				[]*libregraph.UnifiedRoleDefinition{
 					unifiedrole.NewUploaderUnifiedRole(),
 				},
@@ -255,29 +244,26 @@ var _ = Describe("unifiedroles", func() {
 
 	{
 		var newUnifiedRoleFromIDEntries []TableEntry
-		for _, resharing := range []bool{true, false} {
-			attachEntry := func(name, id string, definition *libregraph.UnifiedRoleDefinition, errors bool) {
-				e := Entry(
-					fmt.Sprintf("%s - resharing: %t", name, resharing),
-					id,
-					resharing,
-					definition,
-					errors,
-				)
+		attachEntry := func(name, id string, definition *libregraph.UnifiedRoleDefinition, errors bool) {
+			e := Entry(
+				fmt.Sprintf("%s", name),
+				id,
+				definition,
+				errors,
+			)
 
-				newUnifiedRoleFromIDEntries = append(newUnifiedRoleFromIDEntries, e)
-			}
-
-			for _, definition := range unifiedrole.GetBuiltinRoleDefinitionList(resharing) {
-				attachEntry(definition.GetDisplayName(), definition.GetId(), definition, false)
-			}
-
-			attachEntry("unknown", "123", nil, true)
+			newUnifiedRoleFromIDEntries = append(newUnifiedRoleFromIDEntries, e)
 		}
 
+		for _, definition := range unifiedrole.GetBuiltinRoleDefinitionList() {
+			attachEntry(definition.GetDisplayName(), definition.GetId(), definition, false)
+		}
+
+		attachEntry("unknown", "123", nil, true)
+
 		DescribeTable("NewUnifiedRoleFromID",
-			func(id string, resharing bool, expectedRole *libregraph.UnifiedRoleDefinition, expectError bool) {
-				role, err := unifiedrole.NewUnifiedRoleFromID(id, resharing)
+			func(id string, expectedRole *libregraph.UnifiedRoleDefinition, expectError bool) {
+				role, err := unifiedrole.NewUnifiedRoleFromID(id)
 
 				if expectError {
 					Expect(err).To(HaveOccurred())