ApiUser: Fix response when enabling, disabling or deleting a nonexistent user (#21391)

* ApiUser: Fix response when enabling, disabling or deleting a nonexistent user
This commit is contained in:
Pavlos Daoglou
2020-01-10 11:43:44 +01:00
committed by Arve Knudsen
parent bb649489c8
commit 53007e07e3
3 changed files with 102 additions and 1 deletions
+14 -1
View File
@@ -480,8 +480,11 @@ func SearchUsers(query *models.SearchUsersQuery) error {
func DisableUser(cmd *models.DisableUserCommand) error {
user := models.User{}
sess := x.Table("user")
if _, err := sess.ID(cmd.UserId).Get(&user); err != nil {
if has, err := sess.ID(cmd.UserId).Get(&user); err != nil {
return err
} else if !has {
return models.ErrUserNotFound
}
user.IsDisabled = cmd.IsDisabled
@@ -523,6 +526,16 @@ func DeleteUser(cmd *models.DeleteUserCommand) error {
}
func deleteUserInTransaction(sess *DBSession, cmd *models.DeleteUserCommand) error {
//Check if user exists
user := models.User{Id: cmd.UserId}
has, err := sess.Get(&user)
if err != nil {
return err
}
if !has {
return models.ErrUserNotFound
}
deletes := []string{
"DELETE FROM star WHERE user_id = ?",
"DELETE FROM " + dialect.Quote("user") + " WHERE id = ?",