IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

teams: removed feature toggle as it is already in middleware

Browse Source
This commit is contained in:
Leonard Gram 2019-03-11 11:51:06 +01:00
parent d668550aa2
commit 8e7a8282c1
4 changed files with 7 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/api/api.go
View File

@ -155,7 +155,7 @@ func (hs *HTTPServer) registerRoutes() {
// team (admin permission required)
apiRoute.Group("/teams", func(teamsRoute routing.RouteRegister) {
teamsRoute.Post("/", bind(m.CreateTeamCommand{}), Wrap(hs.CreateTeam))
teamsRoute.Put("/:teamId", bind(m.UpdateTeamCommand{}), Wrap(UpdateTeam))
teamsRoute.Put("/:teamId", bind(m.UpdateTeamCommand{}), Wrap(hs.UpdateTeam))
teamsRoute.Delete("/:teamId", Wrap(DeleteTeamByID))
teamsRoute.Get("/:teamId/members", Wrap(GetTeamMembers))
teamsRoute.Post("/:teamId/members", bind(m.AddTeamMemberCommand{}), Wrap(AddTeamMember))

2
pkg/api/team.go
View File

@ -42,7 +42,7 @@ func (hs *HTTPServer) UpdateTeam(c *m.ReqContext, cmd m.UpdateTeamCommand) Respo
cmd.OrgId = c.OrgId
cmd.Id = c.ParamsInt64(":teamId")
if err := teams.CanUpdateTeam(cmd.OrgId, cmd.Id, c.SignedInUser, hs.Cfg.EditorsCanOwn); err != nil {
if err := teams.CanUpdateTeam(cmd.OrgId, cmd.Id, c.SignedInUser); err != nil {
return Error(403, "User not allowed to update team", err)
}

6
pkg/services/teams/team.go
View File

@ -5,15 +5,11 @@ import (
m "github.com/grafana/grafana/pkg/models"
)
func CanUpdateTeam(orgId int64, teamId int64, user *m.SignedInUser, editorCanOwn bool) error {
func CanUpdateTeam(orgId int64, teamId int64, user *m.SignedInUser) error {
if user.OrgRole == m.ROLE_ADMIN {
return nil
}
if !editorCanOwn {
return m.ErrNotAllowedToUpdateTeam
}
if user.OrgId != orgId {
return m.ErrNotAllowedToUpdateTeamInDifferentOrg
}

16
pkg/services/teams/teams_test.go
View File

@ -33,7 +33,7 @@ func TestUpdateTeam(t *testing.T) {
return nil
})
err := CanUpdateTeam(testTeam.OrgId, testTeam.Id, &editor, true)
err := CanUpdateTeam(testTeam.OrgId, testTeam.Id, &editor)
So(err, ShouldEqual, m.ErrNotAllowedToUpdateTeam)
})
})
@ -50,7 +50,7 @@ func TestUpdateTeam(t *testing.T) {
return nil
})
err := CanUpdateTeam(testTeam.OrgId, testTeam.Id, &editor, true)
err := CanUpdateTeam(testTeam.OrgId, testTeam.Id, &editor)
So(err, ShouldBeNil)
})
})
@ -72,24 +72,16 @@ func TestUpdateTeam(t *testing.T) {
return nil
})
err := CanUpdateTeam(testTeamOtherOrg.OrgId, testTeamOtherOrg.Id, &editor, true)
err := CanUpdateTeam(testTeamOtherOrg.OrgId, testTeamOtherOrg.Id, &editor)
So(err, ShouldEqual, m.ErrNotAllowedToUpdateTeamInDifferentOrg)
})
})
Convey("Given an org admin and a team", func() {
Convey("Should be able to update the team", func() {
err := CanUpdateTeam(testTeam.OrgId, testTeam.Id, &admin, true)
err := CanUpdateTeam(testTeam.OrgId, testTeam.Id, &admin)
So(err, ShouldBeNil)
})
})
Convey("Given that the editorsCanOwn feature toggle is disabled", func() {
Convey("Editors should not be able to update teams", func() {
err := CanUpdateTeam(testTeam.OrgId, testTeam.Id, &editor, false)
So(err, ShouldEqual, m.ErrNotAllowedToUpdateTeam)
})
})
})
}