2 files changed, 2 insertions, 35 deletions
diff --git a/server/sonar-server/src/main/java/org/sonar/server/user/ws/CurrentAction.java b/server/sonar-server/src/main/java/org/sonar/server/user/ws/CurrentAction.java
index ef02dee90f6..627ef9234e9 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/user/ws/CurrentAction.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/user/ws/CurrentAction.java
@@ -114,7 +114,6 @@ public class CurrentAction implements UsersWsAction {
     UserDto user = dbClient.userDao().selectActiveUserByLogin(dbSession, userLogin);
     checkState(user != null, "User login '%s' cannot be found", userLogin);
     Collection<String> groups = dbClient.groupMembershipDao().selectGroupsByLogins(dbSession, singletonList(userLogin)).get(userLogin);
-    Optional<OrganizationDto> personalOrganization = getPersonalOrganization(dbSession, user);
 
     CurrentWsResponse.Builder builder = newBuilder()
       .setIsLoggedIn(true)
@@ -131,7 +130,6 @@ public class CurrentAction implements UsersWsAction {
     ofNullable(emptyToNull(user.getEmail())).ifPresent(u -> builder.setAvatar(avatarResolver.create(user)));
     ofNullable(user.getExternalLogin()).ifPresent(builder::setExternalIdentity);
     ofNullable(user.getExternalIdentityProvider()).ifPresent(builder::setExternalProvider);
-    personalOrganization.ifPresent(org -> builder.setPersonalOrganization(org.getKey()));
     return builder.build();
   }
 
@@ -143,15 +141,6 @@ public class CurrentAction implements UsersWsAction {
       .collect(toList());
   }
 
-  private Optional<OrganizationDto> getPersonalOrganization(DbSession dbSession, UserDto user) {
-    String personalOrganizationUuid = user.getOrganizationUuid();
-    if (personalOrganizationUuid == null) {
-      return Optional.empty();
-    }
-    return Optional.of(dbClient.organizationDao().selectByUuid(dbSession, personalOrganizationUuid)
-      .orElseThrow(() -> new IllegalStateException(format("Organization uuid '%s' does not exist", personalOrganizationUuid))));
-  }
-
   private CurrentWsResponse.Homepage buildHomepage(DbSession dbSession, UserDto user) {
     if (noHomepageSet(user)) {
       return defaultHomepage();
diff --git a/server/sonar-server/src/test/java/org/sonar/server/user/ws/CurrentActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/user/ws/CurrentActionTest.java
index f547ed2d506..fc3c15eae83 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/user/ws/CurrentActionTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/user/ws/CurrentActionTest.java
@@ -113,8 +113,8 @@ public class CurrentActionTest {
 
     assertThat(response)
       .extracting(CurrentWsResponse::getIsLoggedIn, CurrentWsResponse::getLogin, CurrentWsResponse::getName, CurrentWsResponse::hasAvatar, CurrentWsResponse::getLocal,
-        CurrentWsResponse::getExternalIdentity, CurrentWsResponse::getExternalProvider, CurrentWsResponse::hasPersonalOrganization, CurrentWsResponse::getSettingsList)
-      .containsExactly(true, "obiwan.kenobi", "Obiwan Kenobi", false, true, "obiwan", "sonarqube", false, Collections.emptyList());
+        CurrentWsResponse::getExternalIdentity, CurrentWsResponse::getExternalProvider, CurrentWsResponse::getSettingsList)
+      .containsExactly(true, "obiwan.kenobi", "Obiwan Kenobi", false, true, "obiwan", "sonarqube", Collections.emptyList());
     assertThat(response.hasEmail()).isFalse();
     assertThat(response.getScmAccountsList()).isEmpty();
     assertThat(response.getGroupsList()).isEmpty();
@@ -162,17 +162,6 @@ public class CurrentActionTest {
   }
 
   @Test
-  public void return_personal_organization() {
-    OrganizationDto organization = db.organizations().insert();
-    UserDto user = db.users().insertUser(u -> u.setOrganizationUuid(organization.getUuid()));
-    userSession.logIn(user);
-
-    CurrentWsResponse response = call();
-
-    assertThat(response.getPersonalOrganization()).isEqualTo(organization.getKey());
-  }
-
-  @Test
   public void return_user_settings() {
     UserDto user = db.users().insertUser();
     db.users().insertUserSetting(user, userSetting -> userSetting
@@ -205,17 +194,6 @@ public class CurrentActionTest {
   }
 
   @Test
-  public void fail_with_ISE_when_personal_organization_does_not_exist() {
-    UserDto user = db.users().insertUser(u -> u.setOrganizationUuid("Unknown"));
-    userSession.logIn(user);
-
-    expectedException.expect(IllegalStateException.class);
-    expectedException.expectMessage("Organization uuid 'Unknown' does not exist");
-
-    call();
-  }
-
-  @Test
   public void anonymous() {
     userSession
       .anonymous()