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

changed property name to UserWasDeleted and added an assert for it

Browse Source
This commit is contained in:
Torkel Ödegaard 2018-10-11 12:20:53 -07:00
parent 9585dc7825
commit b671b9704f
4 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/api/org_users.go
View File

@ -103,8 +103,8 @@ func updateOrgUserHelper(cmd m.UpdateOrgUserCommand) Response {
// DELETE /api/org/users/:userId // DELETE /api/org/users/:userId
func RemoveOrgUserForCurrentOrg(c *m.ReqContext) Response { func RemoveOrgUserForCurrentOrg(c *m.ReqContext) Response {
return removeOrgUserHelper(&m.RemoveOrgUserCommand{ return removeOrgUserHelper(&m.RemoveOrgUserCommand{
UserId: c.ParamsInt64(":userId"), UserId: c.ParamsInt64(":userId"),
OrgId: c.OrgId, OrgId: c.OrgId,
ShouldDeleteOrphanedUser: true, ShouldDeleteOrphanedUser: true,
}) })
} }
@ -125,7 +125,7 @@ func removeOrgUserHelper(cmd *m.RemoveOrgUserCommand) Response {
return Error(500, "Failed to remove user from organization", err) return Error(500, "Failed to remove user from organization", err)
} }
if cmd.UserWasRemoved { if cmd.UserWasDeleted {
return Success("User deleted") return Success("User deleted")
} }

2
pkg/models/org_user.go
View File

@ -75,7 +75,7 @@ type RemoveOrgUserCommand struct {
UserId int64 UserId int64
OrgId int64 OrgId int64
ShouldDeleteOrphanedUser bool ShouldDeleteOrphanedUser bool
UserWasRemoved bool UserWasDeleted bool
} }
type AddOrgUserCommand struct { type AddOrgUserCommand struct {

1
pkg/services/sqlstore/org_test.go
View File

@ -191,6 +191,7 @@ func TestAccountDataAccess(t *testing.T) {
remCmd := m.RemoveOrgUserCommand{OrgId: ac1.OrgId, UserId: ac2.Id, ShouldDeleteOrphanedUser: true} remCmd := m.RemoveOrgUserCommand{OrgId: ac1.OrgId, UserId: ac2.Id, ShouldDeleteOrphanedUser: true}
err = RemoveOrgUser(&remCmd) err = RemoveOrgUser(&remCmd)
So(err, ShouldBeNil) So(err, ShouldBeNil)
So(remCmd.UserWasDeleted, ShouldBeTrue)
err = GetSignedInUser(&m.GetSignedInUserQuery{UserId: ac2.Id}) err = GetSignedInUser(&m.GetSignedInUserQuery{UserId: ac2.Id})
So(err, ShouldEqual, m.ErrUserNotFound) So(err, ShouldEqual, m.ErrUserNotFound)

2
pkg/services/sqlstore/org_users.go
View File

@ -195,7 +195,7 @@ func RemoveOrgUser(cmd *m.RemoveOrgUserCommand) error {
return err return err
} }
cmd.UserWasRemoved = true cmd.UserWasDeleted = true
} }
return nil return nil