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

Chore: Delete duplicate models for user (#60906)

Browse Source 
* Delete duplicate models for user

* Use new models in some tests

* Add auth model conversion back
This commit is contained in:
idafurjes
2023-01-03 15:25:35 +01:00
committed by GitHub
parent 355f513718
commit 325f7a789e
7 changed files with 24 additions and 175 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
pkg/services/org/orgimpl/store.go
View File

@@ -767,7 +767,7 @@ func (ss *sqlStore) RemoveOrgUser(ctx context.Context, cmd *org.RemoveOrgUserCom
}
} else if cmd.ShouldDeleteOrphanedUser {
// no other orgs, delete the full user
if err := ss.deleteUserInTransaction(sess, &models.DeleteUserCommand{UserId: usr.ID}); err != nil {
if err := ss.deleteUserInTransaction(sess, &user.DeleteUserCommand{UserID: usr.ID}); err != nil {
return err
}
@@ -784,9 +784,9 @@ func (ss *sqlStore) RemoveOrgUser(ctx context.Context, cmd *org.RemoveOrgUserCom
})
}
func (ss *sqlStore) deleteUserInTransaction(sess *db.Session, cmd *models.DeleteUserCommand) error {
func (ss *sqlStore) deleteUserInTransaction(sess *db.Session, cmd *user.DeleteUserCommand) error {
// Check if user exists
usr := user.User{ID: cmd.UserId}
usr := user.User{ID: cmd.UserID}
has, err := sess.Where(ss.notServiceAccountFilter()).Get(&usr)
if err != nil {
return err
@@ -795,13 +795,13 @@ func (ss *sqlStore) deleteUserInTransaction(sess *db.Session, cmd *models.Delete
return user.ErrUserNotFound
}
for _, sql := range ss.userDeletions() {
_, err := sess.Exec(sql, cmd.UserId)
_, err := sess.Exec(sql, cmd.UserID)
if err != nil {
return err
}
}
return deleteUserAccessControl(sess, cmd.UserId)
return deleteUserAccessControl(sess, cmd.UserID)
}
func deleteUserAccessControl(sess *db.Session, userID int64) error {