SONAR-5306 Component App WS need Browse permission, not code viewer

diff --git a/sonar-server/src/main/java/org/sonar/server/component/ws/ComponentAppAction.java b/sonar-server/src/main/java/org/sonar/server/component/ws/ComponentAppAction.java
index 64ac401cabdb9ecb3147e37a0b7576a42610c6ea..6b9ae2ff38ed930a1a78eb08ae25ff8c23e73300 100644 (file)
--- a/sonar-server/src/main/java/org/sonar/server/component/ws/ComponentAppAction.java
+++ b/sonar-server/src/main/java/org/sonar/server/component/ws/ComponentAppAction.java
@@ -117,7 +117,7 @@ public class ComponentAppAction implements RequestHandler {
       if (component == null) {
         throw new NotFoundException(String.format("Component '%s' does not exists.", fileKey));
       }
-      userSession.checkComponentPermission(UserRole.CODEVIEWER, fileKey);
+      userSession.checkComponentPermission(UserRole.USER, fileKey);
 
       appendComponent(json, component, userSession, session);
       appendPermissions(json, component, userSession);
@@ -162,7 +162,7 @@ public class ComponentAppAction implements RequestHandler {
   }
 
   private void appendPermissions(JsonWriter json, ComponentDto component, UserSession userSession) {
-    json.prop("canMarkAsFavourite", userSession.isLoggedIn() && userSession.hasComponentPermission(UserRole.CODEVIEWER, component.key()));
+    json.prop("canMarkAsFavourite", userSession.isLoggedIn() && userSession.hasComponentPermission(UserRole.USER, component.key()));
     json.prop("canBulkChange", userSession.isLoggedIn());
   }
 

diff --git a/sonar-server/src/test/java/org/sonar/server/component/ws/ComponentAppActionTest.java b/sonar-server/src/test/java/org/sonar/server/component/ws/ComponentAppActionTest.java
index e48477078b9f607c3064e58466ceae9d73551a93..5cc36e08b2be6f0c852b377a2a7f1cc14b54c3b8 100644 (file)
--- a/sonar-server/src/test/java/org/sonar/server/component/ws/ComponentAppActionTest.java
+++ b/sonar-server/src/test/java/org/sonar/server/component/ws/ComponentAppActionTest.java
@@ -136,7 +136,7 @@ public class ComponentAppActionTest {
 
   @Test
   public void app() throws Exception {
-    MockUserSession.set().setLogin("john").addComponentPermission(UserRole.CODEVIEWER, PROJECT_KEY, COMPONENT_KEY);
+    MockUserSession.set().setLogin("john").addComponentPermission(UserRole.USER, PROJECT_KEY, COMPONENT_KEY);
 
     ComponentDto file = new ComponentDto().setId(10L).setQualifier("FIL").setKey(COMPONENT_KEY).setName("Plugin.java")
       .setPath("src/main/java/org/sonar/api/Plugin.java").setSubProjectId(5L).setProjectId(1L);
@@ -153,7 +153,7 @@ public class ComponentAppActionTest {
   @Test
   public void app_without_sub_project() throws Exception {
     String componentKey = "org.codehaus.sonar:sonar";
-    MockUserSession.set().setLogin("john").addComponentPermission(UserRole.CODEVIEWER, componentKey, componentKey);
+    MockUserSession.set().setLogin("john").addComponentPermission(UserRole.USER, componentKey, componentKey);
 
     ComponentDto file = new ComponentDto().setId(1L).setQualifier("TRK").setKey(componentKey).setName("SonarQube").setProjectId(1L);
     when(componentDao.getNullableByKey(session, componentKey)).thenReturn(file);
@@ -166,7 +166,7 @@ public class ComponentAppActionTest {
 
   @Test
   public void app_with_sub_project_equals_to_project() throws Exception {
-    MockUserSession.set().setLogin("john").addComponentPermission(UserRole.CODEVIEWER, PROJECT_KEY, COMPONENT_KEY);
+    MockUserSession.set().setLogin("john").addComponentPermission(UserRole.USER, PROJECT_KEY, COMPONENT_KEY);
 
     ComponentDto file = new ComponentDto().setId(10L).setQualifier("FIL").setKey(COMPONENT_KEY).setName("Plugin.java")
       .setPath("src/main/java/org/sonar/api/Plugin.java").setSubProjectId(1L).setProjectId(1L);
@@ -181,7 +181,7 @@ public class ComponentAppActionTest {
 
   @Test
   public void app_with_measures() throws Exception {
-    MockUserSession.set().addComponentPermission(UserRole.CODEVIEWER, PROJECT_KEY, COMPONENT_KEY);
+    MockUserSession.set().addComponentPermission(UserRole.USER, PROJECT_KEY, COMPONENT_KEY);
 
     addComponent();
 
@@ -210,7 +210,7 @@ public class ComponentAppActionTest {
   @Test
   public void app_with_tests_measure() throws Exception {
     String componentKey = "org.codehaus.sonar:sonar-server:src/test/java/org/sonar/server/issue/PlanActionTest.java";
-    MockUserSession.set().addComponentPermission(UserRole.CODEVIEWER, PROJECT_KEY, componentKey);
+    MockUserSession.set().addComponentPermission(UserRole.USER, PROJECT_KEY, componentKey);
 
     ComponentDto file = new ComponentDto().setId(10L).setQualifier("UTS").setKey(componentKey).setName("PlanActionTest.java")
       .setPath("src/test/java/org/sonar/server/issue/PlanActionTest.java").setSubProjectId(5L).setProjectId(1L);
@@ -229,7 +229,7 @@ public class ComponentAppActionTest {
 
   @Test
   public void app_with_periods() throws Exception {
-    MockUserSession.set().addComponentPermission(UserRole.CODEVIEWER, PROJECT_KEY, COMPONENT_KEY);
+    MockUserSession.set().addComponentPermission(UserRole.USER, PROJECT_KEY, COMPONENT_KEY);
 
     addComponent();
 
@@ -244,7 +244,7 @@ public class ComponentAppActionTest {
 
   @Test
   public void app_with_severities() throws Exception {
-    MockUserSession.set().addComponentPermission(UserRole.CODEVIEWER, PROJECT_KEY, COMPONENT_KEY);
+    MockUserSession.set().addComponentPermission(UserRole.USER, PROJECT_KEY, COMPONENT_KEY);
 
     addComponent();
 
@@ -259,7 +259,7 @@ public class ComponentAppActionTest {
 
   @Test
   public void app_with_rules() throws Exception {
-    MockUserSession.set().addComponentPermission(UserRole.CODEVIEWER, PROJECT_KEY, COMPONENT_KEY);
+    MockUserSession.set().addComponentPermission(UserRole.USER, PROJECT_KEY, COMPONENT_KEY);
 
     addComponent();
     when(issueService.findRulesByComponent(COMPONENT_KEY, session)).thenReturn(
@@ -272,7 +272,7 @@ public class ComponentAppActionTest {
 
   @Test
   public void app_with_extension() throws Exception {
-    MockUserSession.set().addComponentPermission(UserRole.CODEVIEWER, PROJECT_KEY, COMPONENT_KEY);
+    MockUserSession.set().addComponentPermission(UserRole.USER, PROJECT_KEY, COMPONENT_KEY);
     addComponent();
 
     when(views.getPages(anyString(), anyString(), anyString(), anyString(), any(String[].class))).thenReturn(
@@ -285,7 +285,7 @@ public class ComponentAppActionTest {
 
   @Test
   public void app_with_extension_having_permission() throws Exception {
-    MockUserSession.set().addComponentPermission(UserRole.CODEVIEWER, PROJECT_KEY, COMPONENT_KEY);
+    MockUserSession.set().addComponentPermission(UserRole.USER, PROJECT_KEY, COMPONENT_KEY);
     addComponent();
 
     when(views.getPages(anyString(), anyString(), anyString(), anyString(), any(String[].class))).thenReturn(
@@ -325,7 +325,7 @@ public class ComponentAppActionTest {
   }
 
   @NavigationSection(NavigationSection.RESOURCE_TAB)
-  @UserRole(UserRole.CODEVIEWER)
+  @UserRole(UserRole.USER)
   private static class MyExtensionWithRole implements Page {
     public String getId() {
       return "my-extension-with-permission";