From: Simon Brandhof <simon.brandhof@sonarsource.com>
Date: Thu, 2 Feb 2017 07:41:06 +0000 (+0100)
Subject: SONAR-8676 add response field "canProvisionProjects" to api/navigation/organization
X-Git-Tag: 6.3-RC1~240
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=dfa5d18941ccaec7f56cf748661ecea7b0a29f0e;p=sonarqube.git

SONAR-8676 add response field "canProvisionProjects" to 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 eb7c62c6856..a6cff8ee594 100644
--- 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
@@ -23,7 +23,7 @@ import org.sonar.api.server.ws.Request;
 import org.sonar.api.server.ws.Response;
 import org.sonar.api.server.ws.WebService;
 import org.sonar.api.utils.text.JsonWriter;
-import org.sonar.api.web.UserRole;
+import org.sonar.core.permission.GlobalPermissions;
 import org.sonar.db.DbClient;
 import org.sonar.db.DbSession;
 import org.sonar.db.organization.OrganizationDto;
@@ -82,7 +82,8 @@ public class OrganizationAction implements NavigationWsAction {
     json.name("organization")
       .beginObject()
       .prop("isDefault", organization.getKey().equals(defaultOrganizationProvider.get().getKey()))
-      .prop("canAdmin", userSession.hasOrganizationPermission(organization.getUuid(), UserRole.ADMIN))
+      .prop("canAdmin", userSession.hasOrganizationPermission(organization.getUuid(), GlobalPermissions.SYSTEM_ADMIN))
+      .prop("canProvisionProjects", userSession.hasOrganizationPermission(organization.getUuid(), GlobalPermissions.PROVISIONING))
       .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 16b45a6dc72..cc5fc4dcdc8 100644
--- 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,6 +1,7 @@
 {
   "organization": {
     "isDefault": true,
-    "canAdmin": true
+    "canAdmin": true,
+    "canProvisionProjects": true
   }
 }
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 3db1e030d01..ce182385a3b 100644
--- 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
@@ -76,9 +76,10 @@ public class OrganizationActionTest {
 
   @Test
   public void verify_example() {
-
     OrganizationDto defaultOrganization = dbTester.getDefaultOrganization();
-    userSession.logIn().addOrganizationPermission(defaultOrganization.getUuid(), "admin");
+    userSession.logIn()
+      .addOrganizationPermission(defaultOrganization, "admin")
+      .addOrganizationPermission(defaultOrganization, "provisioning");
 
     TestResponse response = executeRequest(defaultOrganization);
 
@@ -90,7 +91,7 @@ public class OrganizationActionTest {
   public void returns_non_admin_and_default_true_when_user_not_logged_in_and_key_is_the_default_organization() {
     TestResponse response = executeRequest(dbTester.getDefaultOrganization());
 
-    verifyResponse(response, true, false);
+    verifyResponse(response, true, false, false);
   }
 
   @Test
@@ -99,7 +100,7 @@ public class OrganizationActionTest {
 
     TestResponse response = executeRequest(dbTester.getDefaultOrganization());
 
-    verifyResponse(response, true, false);
+    verifyResponse(response, true, false, false);
   }
 
   @Test
@@ -109,7 +110,7 @@ public class OrganizationActionTest {
 
     TestResponse response = executeRequest(defaultOrganization);
 
-    verifyResponse(response, true, true);
+    verifyResponse(response, true, true, false);
   }
 
   @Test
@@ -117,7 +118,7 @@ public class OrganizationActionTest {
     OrganizationDto organization = dbTester.organizations().insert();
     TestResponse response = executeRequest(organization);
 
-    verifyResponse(response, false, false);
+    verifyResponse(response, false, false, false);
   }
 
   @Test
@@ -126,7 +127,7 @@ public class OrganizationActionTest {
 
     TestResponse response = executeRequest(organization);
 
-    verifyResponse(response, false, false);
+    verifyResponse(response, false, false, false);
   }
 
   @Test
@@ -136,7 +137,7 @@ public class OrganizationActionTest {
 
     TestResponse response = executeRequest(organization);
 
-    verifyResponse(response, false, false);
+    verifyResponse(response, false, false, false);
   }
 
   @Test
@@ -146,7 +147,18 @@ public class OrganizationActionTest {
 
     TestResponse response = executeRequest(organization);
 
-    verifyResponse(response, false, true);
+    verifyResponse(response, false, true, false);
+  }
+
+  @Test
+  public void returns_provisioning_true_when_user_can_provision_projects_in_organization() {
+    // user can provision projects in org2 but not in org1
+    OrganizationDto org1 = dbTester.organizations().insert();
+    OrganizationDto org2 = dbTester.organizations().insert();
+    userSession.logIn().addOrganizationPermission(org2, "provisioning");
+
+    verifyResponse(executeRequest(org1), false, false, false);
+    verifyResponse(executeRequest(org2), false, false, true);
   }
 
   private TestResponse executeRequest(@Nullable OrganizationDto organization) {
@@ -157,12 +169,13 @@ public class OrganizationActionTest {
     return request.execute();
   }
 
-  private static void verifyResponse(TestResponse response, boolean isDefault, boolean canAdmin) {
+  private static void verifyResponse(TestResponse response, boolean isDefault, boolean canAdmin, boolean canProvisionProjects) {
     assertJson(response.getInput())
       .isSimilarTo("{" +
         "  \"organization\": {" +
         "    \"isDefault\": " + isDefault + "," +
-        "    \"canAdmin\": " + canAdmin +
+        "    \"canAdmin\": " + canAdmin + "," +
+        "    \"canProvisionProjects\": " + canProvisionProjects +
         "  }" +
         "}");
   }