SONAR-8676 add canDelete and remove isDefault

from response of WS api/navigation/organization

diff --git a/server/sonar-server/src/main/java/org/sonar/server/ui/ws/OrganizationAction.java b/server/sonar-server/src/main/java/org/sonar/server/ui/ws/OrganizationAction.java
index eb8ac89e6e73004bf0cff8df4189a94ad811c0a8..47cc9146e5cd5f8bb36a4f0e16f3cb8159d08682 100644 (file)
--- a/server/sonar-server/src/main/java/org/sonar/server/ui/ws/OrganizationAction.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/ui/ws/OrganizationAction.java
@@ -27,9 +27,9 @@ import org.sonar.core.permission.GlobalPermissions;
 import org.sonar.db.DbClient;
 import org.sonar.db.DbSession;
 import org.sonar.db.organization.OrganizationDto;
-import org.sonar.server.organization.DefaultOrganizationProvider;
 import org.sonar.server.user.UserSession;
 
+import static org.sonar.core.permission.GlobalPermissions.SYSTEM_ADMIN;
 import static org.sonar.server.ws.WsUtils.checkFoundWithOptional;
 
 public class OrganizationAction implements NavigationWsAction {
@@ -38,12 +38,10 @@ public class OrganizationAction implements NavigationWsAction {
   private static final String PARAM_ORGANIZATION = "organization";
 
   private final DbClient dbClient;
-  private final DefaultOrganizationProvider defaultOrganizationProvider;
   private final UserSession userSession;
 
-  public OrganizationAction(DbClient dbClient, DefaultOrganizationProvider defaultOrganizationProvider, UserSession userSession) {
+  public OrganizationAction(DbClient dbClient, UserSession userSession) {
     this.dbClient = dbClient;
-    this.defaultOrganizationProvider = defaultOrganizationProvider;
     this.userSession = userSession;
   }
 
@@ -79,11 +77,12 @@ public class OrganizationAction implements NavigationWsAction {
   }
 
   private void writeOrganization(JsonWriter json, OrganizationDto organization) {
+    String organizationUuid = organization.getUuid();
     json.name("organization")
       .beginObject()
-      .prop("isDefault", organization.getKey().equals(defaultOrganizationProvider.get().getKey()))
-      .prop("canAdmin", userSession.hasOrganizationPermission(organization.getUuid(), GlobalPermissions.SYSTEM_ADMIN))
-      .prop("canProvisionProjects", userSession.hasOrganizationPermission(organization.getUuid(), GlobalPermissions.PROVISIONING))
+      .prop("canAdmin", userSession.hasOrganizationPermission(organizationUuid, SYSTEM_ADMIN))
+      .prop("canProvisionProjects", userSession.hasOrganizationPermission(organizationUuid, GlobalPermissions.PROVISIONING))
+      .prop("canDelete", organization.isGuarded() ? userSession.isSystemAdministrator() : userSession.hasOrganizationPermission(organizationUuid, SYSTEM_ADMIN))
       .endObject();
   }
 }

diff --git a/server/sonar-server/src/main/resources/org/sonar/server/ui/ws/organization-example.json b/server/sonar-server/src/main/resources/org/sonar/server/ui/ws/organization-example.json
index cc5fc4dcdc8afaab474d337cb171a1b74c2da688..0c69c7e81f51b27380d36cde74d7bd6751b06a6b 100644 (file)
--- a/server/sonar-server/src/main/resources/org/sonar/server/ui/ws/organization-example.json
+++ b/server/sonar-server/src/main/resources/org/sonar/server/ui/ws/organization-example.json
@@ -1,7 +1,7 @@
 {
   "organization": {
-    "isDefault": true,
     "canAdmin": true,
-    "canProvisionProjects": true
+    "canProvisionProjects": true,
+    "canDelete": false
   }
 }

diff --git a/server/sonar-server/src/test/java/org/sonar/server/ui/ws/OrganizationActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/ui/ws/OrganizationActionTest.java
index beb024bbc9db8c077d96a1ac78a28b57921e3fb4..47193174de5c266d9eb77fa72912b69fdbfeda27 100644 (file)
--- a/server/sonar-server/src/test/java/org/sonar/server/ui/ws/OrganizationActionTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/ui/ws/OrganizationActionTest.java
@@ -28,14 +28,13 @@ import org.sonar.api.utils.System2;
 import org.sonar.db.DbClient;
 import org.sonar.db.DbTester;
 import org.sonar.db.organization.OrganizationDto;
-import org.sonar.server.organization.DefaultOrganizationProvider;
-import org.sonar.server.organization.TestDefaultOrganizationProvider;
 import org.sonar.server.tester.UserSessionRule;
 import org.sonar.server.ws.TestRequest;
 import org.sonar.server.ws.TestResponse;
 import org.sonar.server.ws.WsActionTester;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.sonar.core.permission.GlobalPermissions.SYSTEM_ADMIN;
 import static org.sonar.test.JsonAssert.assertJson;
 
 public class OrganizationActionTest {
@@ -47,9 +46,8 @@ public class OrganizationActionTest {
   public ExpectedException expectedException = ExpectedException.none();
 
   private DbClient dbClient = dbTester.getDbClient();
-  private DefaultOrganizationProvider defaultOrganizationProvider = TestDefaultOrganizationProvider.from(dbTester);
 
-  private WsActionTester underTest = new WsActionTester(new OrganizationAction(dbClient, defaultOrganizationProvider, userSession));
+  private WsActionTester underTest = new WsActionTester(new OrganizationAction(dbClient, userSession));
 
   @Test
   public void verify_definition() {
@@ -76,45 +74,45 @@ public class OrganizationActionTest {
 
   @Test
   public void verify_example() {
-    OrganizationDto defaultOrganization = dbTester.getDefaultOrganization();
+    OrganizationDto organization = dbTester.organizations().insert(dto -> dto.setGuarded(true));
     userSession.logIn()
-      .addOrganizationPermission(defaultOrganization, "admin")
-      .addOrganizationPermission(defaultOrganization, "provisioning");
+      .addOrganizationPermission(organization, "admin")
+      .addOrganizationPermission(organization, "provisioning");
 
-    TestResponse response = executeRequest(defaultOrganization);
+    TestResponse response = executeRequest(organization);
 
     assertJson(response.getInput())
       .isSimilarTo(underTest.getDef().responseExampleAsString());
   }
 
   @Test
-  public void returns_non_admin_and_default_true_when_user_not_logged_in_and_key_is_the_default_organization() {
+  public void returns_non_admin_and_canDelete_false_when_user_not_logged_in_and_key_is_the_default_organization() {
     TestResponse response = executeRequest(dbTester.getDefaultOrganization());
 
-    verifyResponse(response, true, false, false);
+    verifyResponse(response, false, false, false);
   }
 
   @Test
-  public void returns_non_admin_and_default_true_when_user_logged_in_but_not_admin_and_key_is_the_default_organization() {
+  public void returns_non_admin_and_canDelete_false_when_user_logged_in_but_not_admin_and_key_is_the_default_organization() {
     userSession.logIn();
 
     TestResponse response = executeRequest(dbTester.getDefaultOrganization());
 
-    verifyResponse(response, true, false, false);
+    verifyResponse(response, false, false, false);
   }
 
   @Test
-  public void returns_admin_and_default_true_when_user_logged_in_and_admin_and_key_is_the_default_organization() {
+  public void returns_admin_and_canDelete_true_when_user_logged_in_and_admin_and_key_is_the_default_organization() {
     OrganizationDto defaultOrganization = dbTester.getDefaultOrganization();
     userSession.logIn().addOrganizationPermission(defaultOrganization.getUuid(), "admin");
 
     TestResponse response = executeRequest(defaultOrganization);
 
-    verifyResponse(response, true, true, false);
+    verifyResponse(response, true, false, true);
   }
 
   @Test
-  public void returns_non_admin_and_default_true_when_user_not_logged_in_and_key_is_not_the_default_organization() {
+  public void returns_non_admin_and_canDelete_false_when_user_not_logged_in_and_key_is_not_the_default_organization() {
     OrganizationDto organization = dbTester.organizations().insert();
     TestResponse response = executeRequest(organization);
 
@@ -122,8 +120,9 @@ public class OrganizationActionTest {
   }
 
   @Test
-  public void returns_non_admin_and_default_false_when_user_not_logged_in_and_key_is_not_the_default_organization() {
+  public void returns_non_admin_and_canDelete_false_when_user_logged_in_but_not_admin_and_key_is_not_the_default_organization() {
     OrganizationDto organization = dbTester.organizations().insert();
+    userSession.logIn();
 
     TestResponse response = executeRequest(organization);
 
@@ -131,23 +130,33 @@ public class OrganizationActionTest {
   }
 
   @Test
-  public void returns_non_admin_and_default_false_when_user_logged_in_but_not_admin_and_key_is_not_the_default_organization() {
+  public void returns_admin_and_canDelete_true_when_user_logged_in_and_admin_and_key_is_not_the_default_organization() {
     OrganizationDto organization = dbTester.organizations().insert();
-    userSession.logIn();
+    userSession.logIn().addOrganizationPermission(organization.getUuid(), "admin");
 
     TestResponse response = executeRequest(organization);
 
-    verifyResponse(response, false, false, false);
+    verifyResponse(response, true, false, true);
   }
 
   @Test
-  public void returns_admin_and_default_false_when_user_logged_in_and_admin_and_key_is_not_the_default_organization() {
-    OrganizationDto organization = dbTester.organizations().insert();
-    userSession.logIn().addOrganizationPermission(organization.getUuid(), "admin");
+  public void returns_admin_and_canDelete_false_when_user_logged_in_and_admin_and_key_is_guarded_organization() {
+    OrganizationDto organization = dbTester.organizations().insert(dto -> dto.setGuarded(true));
+    userSession.logIn().addOrganizationPermission(organization.getUuid(), SYSTEM_ADMIN);
+
+    TestResponse response = executeRequest(organization);
+
+    verifyResponse(response, true, false, false);
+  }
+
+  @Test
+  public void returns_only_canDelete_true_when_user_is_system_administrator_and_key_is_guarded_organization() {
+    OrganizationDto organization = dbTester.organizations().insert(dto -> dto.setGuarded(true));
+    userSession.logIn().setSystemAdministrator();
 
     TestResponse response = executeRequest(organization);
 
-    verifyResponse(response, false, true, false);
+    verifyResponse(response, false, false, true);
   }
 
   @Test
@@ -158,7 +167,7 @@ public class OrganizationActionTest {
     userSession.logIn().addOrganizationPermission(org2, "provisioning");
 
     verifyResponse(executeRequest(org1), false, false, false);
-    verifyResponse(executeRequest(org2), false, false, true);
+    verifyResponse(executeRequest(org2), false, true, false);
   }
 
   private TestResponse executeRequest(@Nullable OrganizationDto organization) {
@@ -169,13 +178,13 @@ public class OrganizationActionTest {
     return request.execute();
   }
 
-  private static void verifyResponse(TestResponse response, boolean isDefault, boolean canAdmin, boolean canProvisionProjects) {
+  private static void verifyResponse(TestResponse response, boolean canAdmin, boolean canProvisionProjects, boolean canDelete) {
     assertJson(response.getInput())
       .isSimilarTo("{" +
         "  \"organization\": {" +
-        "    \"isDefault\": " + isDefault + "," +
         "    \"canAdmin\": " + canAdmin + "," +
-        "    \"canProvisionProjects\": " + canProvisionProjects +
+        "    \"canProvisionProjects\": " + canProvisionProjects + "," +
+        "    \"canDelete\": " + canDelete +
         "  }" +
         "}");
   }