added the UserWasRemoved flag to make api aware of what happened to return correct message to UI

pkg/api/org_users.go

@@ -125,5 +125,9 @@ func removeOrgUserHelper(cmd *m.RemoveOrgUserCommand) Response {
 		return Error(500, "Failed to remove user from organization", err)
 	}
 
+	if cmd.UserWasRemoved {
+		return Success("User deleted")
+	}
+
 	return Success("User removed from organization")
 }

pkg/models/org_user.go

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

pkg/services/sqlstore/org_users.go

@@ -194,6 +194,8 @@ func RemoveOrgUser(cmd *m.RemoveOrgUserCommand) error {
 			if err := deleteUserInTransaction(sess, &m.DeleteUserCommand{UserId: user.Id}); err != nil {
 				return err
 			}
+
+			cmd.UserWasRemoved = true
 		}
 
 		return nil