Ensure DeleteUser is not allowed to Delete Orgs and visa versa

models/org.go

@@ -256,6 +256,10 @@ func CountOrganizations() int64 {
 
 // DeleteOrganization completely and permanently deletes everything of organization.
 func DeleteOrganization(org *User) (err error) {
+ if !org.IsOrganization() {
+ return fmt.Errorf("%s is a user not an organization", org.Name)
+ }
+
  sess := x.NewSession()
  defer sess.Close()
 
@@ -275,10 +279,6 @@ func DeleteOrganization(org *User) (err error) {
 }
 
 func deleteOrg(e *xorm.Session, u *User) error {
- if !u.IsOrganization() {
- return fmt.Errorf("You can't delete none organization user: %s", u.Name)
- }
-
  // Check ownership of repository.
  count, err := getRepositoryCount(e, u)
  if err != nil {

models/org_test.go

@@ -272,8 +272,8 @@ func TestDeleteOrganization(t *testing.T) {
  assert.Error(t, err)
  assert.True(t, IsErrUserOwnRepos(err))
 
- nonOrg := AssertExistsAndLoadBean(t, &User{ID: 5}).(*User)
- assert.Error(t, DeleteOrganization(nonOrg))
+ user := AssertExistsAndLoadBean(t, &User{ID: 5}).(*User)
+ assert.Error(t, DeleteOrganization(user))
  CheckConsistencyFor(t, &User{}, &Team{})
 }
 

models/user.go

@@ -1244,6 +1244,10 @@ func deleteUser(e *xorm.Session, u *User) error {
 // DeleteUser completely and permanently deletes everything of a user,
 // but issues/comments/pulls will be kept and shown as someone has been deleted.
 func DeleteUser(u *User) (err error) {
+ if u.IsOrganization() {
+ return fmt.Errorf("%s is an organization not a user", u.Name)
+ }
+
  sess := x.NewSession()
  defer sess.Close()
  if err = sess.Begin(); err != nil {

models/user_test.go

@@ -199,6 +199,9 @@ func TestDeleteUser(t *testing.T) {
  test(4)
  test(8)
  test(11)
+
+ org := AssertExistsAndLoadBean(t, &User{ID: 3}).(*User)
+ assert.Error(t, DeleteUser(org))
 }
 
 func TestEmailNotificationPreferences(t *testing.T) {