SONAR-4930 Add login

diff --git a/sonar-core/src/main/java/org/sonar/core/permission/UserWithPermission.java b/sonar-core/src/main/java/org/sonar/core/permission/UserWithPermission.java
index 8d82d0f85105806565782c44760a7a64ac56a26b..0c0c58bf7a541016e772a551448083a2a9ad8097 100644 (file)
--- a/sonar-core/src/main/java/org/sonar/core/permission/UserWithPermission.java
+++ b/sonar-core/src/main/java/org/sonar/core/permission/UserWithPermission.java
@@ -24,9 +24,19 @@ import org.apache.commons.lang.builder.ToStringStyle;
 
 public class UserWithPermission {
 
+  private String login;
   private String name;
   private boolean hasPermission;
 
+  public String login() {
+    return login;
+  }
+
+  public UserWithPermission setLogin(String login) {
+    this.login = login;
+    return this;
+  }
+
   public String name() {
     return name;
   }

diff --git a/sonar-core/src/main/java/org/sonar/core/permission/UserWithPermissionDto.java b/sonar-core/src/main/java/org/sonar/core/permission/UserWithPermissionDto.java
index fec8a0b30dbd3cbb62d297128b81cdfad835be79..6342327ee6828a255176902e95dcd9f1fb6de4bb 100644 (file)
--- a/sonar-core/src/main/java/org/sonar/core/permission/UserWithPermissionDto.java
+++ b/sonar-core/src/main/java/org/sonar/core/permission/UserWithPermissionDto.java
@@ -25,9 +25,18 @@ import javax.annotation.Nullable;
 
 public class UserWithPermissionDto {
 
+  private String login;
   private String name;
   private String permission;
 
+  public String getLogin() {
+    return login;
+  }
+
+  public void setLogin(String login) {
+    this.login = login;
+  }
+
   public String getName() {
     return name;
   }
@@ -49,6 +58,7 @@ public class UserWithPermissionDto {
 
   public UserWithPermission toUserWithPermission() {
     return new UserWithPermission()
+      .setLogin(login)
       .setName(name)
       .hasPermission(permission != null);
   }

diff --git a/sonar-core/src/main/resources/org/sonar/core/permission/PermissionMapper.xml b/sonar-core/src/main/resources/org/sonar/core/permission/PermissionMapper.xml
index 766ca69a68e22797bb7eaa27d87bfc8565a3df4b..e2353e99ae5f60b52bd2a93ede0d72d3da336456 100644 (file)
--- a/sonar-core/src/main/resources/org/sonar/core/permission/PermissionMapper.xml
+++ b/sonar-core/src/main/resources/org/sonar/core/permission/PermissionMapper.xml
@@ -4,6 +4,7 @@
 <mapper namespace="org.sonar.core.permission.PermissionMapper">
 
   <sql id="userColumns">
+    u.login as login,
     u.name as name,
     user_role.role as permission
   </sql>

diff --git a/sonar-core/src/test/java/org/sonar/core/permission/PermissionDaoTest.java b/sonar-core/src/test/java/org/sonar/core/permission/PermissionDaoTest.java
index af34b0b6acecf11d0aff2771e5ab8ec51677e6f6..d5ba198c0929b2b00a053828c7fc0891f2c1ada0 100644 (file)
--- a/sonar-core/src/test/java/org/sonar/core/permission/PermissionDaoTest.java
+++ b/sonar-core/src/test/java/org/sonar/core/permission/PermissionDaoTest.java
@@ -48,15 +48,18 @@ public class PermissionDaoTest extends AbstractDaoTestCase {
     assertThat(result).hasSize(3);
 
     UserWithPermissionDto user1 = result.get(0);
-    assertThat(user1.getName()).isEqualTo("user1");
+    assertThat(user1.getLogin()).isEqualTo("user1");
+    assertThat(user1.getName()).isEqualTo("User1");
     assertThat(user1.getPermission()).isNotNull();
 
     UserWithPermissionDto user2 = result.get(1);
-    assertThat(user2.getName()).isEqualTo("user2");
+    assertThat(user2.getLogin()).isEqualTo("user2");
+    assertThat(user2.getName()).isEqualTo("User2");
     assertThat(user2.getPermission()).isNotNull();
 
     UserWithPermissionDto user3 = result.get(2);
-    assertThat(user3.getName()).isEqualTo("user3");
+    assertThat(user3.getLogin()).isEqualTo("user3");
+    assertThat(user3.getName()).isEqualTo("User3");
     assertThat(user3.getPermission()).isNull();
   }
 
@@ -69,15 +72,15 @@ public class PermissionDaoTest extends AbstractDaoTestCase {
     assertThat(result).hasSize(3);
 
     UserWithPermissionDto user1 = result.get(0);
-    assertThat(user1.getName()).isEqualTo("user1");
+    assertThat(user1.getName()).isEqualTo("User1");
     assertThat(user1.getPermission()).isNotNull();
 
     UserWithPermissionDto user2 = result.get(1);
-    assertThat(user2.getName()).isEqualTo("user2");
+    assertThat(user2.getName()).isEqualTo("User2");
     assertThat(user2.getPermission()).isNull();
 
     UserWithPermissionDto user3 = result.get(2);
-    assertThat(user3.getName()).isEqualTo("user3");
+    assertThat(user3.getName()).isEqualTo("User3");
     assertThat(user3.getPermission()).isNull();
   }
 
@@ -103,7 +106,7 @@ public class PermissionDaoTest extends AbstractDaoTestCase {
 
     List<UserWithPermissionDto> result = dao.selectUsers(WithPermissionQuery.builder().permission("user").search("SEr1").build(), COMPONENT_ID);
     assertThat(result).hasSize(1);
-    assertThat(result.get(0).getName()).isEqualTo("user1");
+    assertThat(result.get(0).getName()).isEqualTo("User1");
 
     result = dao.selectUsers(WithPermissionQuery.builder().permission("user").search("user").build(), COMPONENT_ID);
     assertThat(result).hasSize(3);
@@ -115,9 +118,9 @@ public class PermissionDaoTest extends AbstractDaoTestCase {
 
     List<UserWithPermissionDto> result = dao.selectUsers(WithPermissionQuery.builder().permission("user").build(), COMPONENT_ID);
     assertThat(result).hasSize(3);
-    assertThat(result.get(0).getName()).isEqualTo("user1");
-    assertThat(result.get(1).getName()).isEqualTo("user2");
-    assertThat(result.get(2).getName()).isEqualTo("user3");
+    assertThat(result.get(0).getName()).isEqualTo("User1");
+    assertThat(result.get(1).getName()).isEqualTo("User2");
+    assertThat(result.get(2).getName()).isEqualTo("User3");
   }
 
   @Test
@@ -126,17 +129,17 @@ public class PermissionDaoTest extends AbstractDaoTestCase {
 
     List<UserWithPermissionDto> result = dao.selectUsers(WithPermissionQuery.builder().permission("user").build(), COMPONENT_ID, 0, 2);
     assertThat(result).hasSize(2);
-    assertThat(result.get(0).getName()).isEqualTo("user1");
-    assertThat(result.get(1).getName()).isEqualTo("user2");
+    assertThat(result.get(0).getName()).isEqualTo("User1");
+    assertThat(result.get(1).getName()).isEqualTo("User2");
 
     result = dao.selectUsers(WithPermissionQuery.builder().permission("user").build(), COMPONENT_ID, 1, 2);
     assertThat(result).hasSize(2);
-    assertThat(result.get(0).getName()).isEqualTo("user2");
-    assertThat(result.get(1).getName()).isEqualTo("user3");
+    assertThat(result.get(0).getName()).isEqualTo("User2");
+    assertThat(result.get(1).getName()).isEqualTo("User3");
 
     result = dao.selectUsers(WithPermissionQuery.builder().permission("user").build(), COMPONENT_ID, 2, 1);
     assertThat(result).hasSize(1);
-    assertThat(result.get(0).getName()).isEqualTo("user3");
+    assertThat(result.get(0).getName()).isEqualTo("User3");
   }
 
 }

diff --git a/sonar-core/src/test/resources/org/sonar/core/permission/PermissionDaoTest/shared.xml b/sonar-core/src/test/resources/org/sonar/core/permission/PermissionDaoTest/shared.xml
index 31ced06a1a76392b792007db21aa020270a03e58..c67ff39f25b22b71f70d5cd9031812560bc6eb5e 100644 (file)
--- a/sonar-core/src/test/resources/org/sonar/core/permission/PermissionDaoTest/shared.xml
+++ b/sonar-core/src/test/resources/org/sonar/core/permission/PermissionDaoTest/shared.xml
@@ -1,8 +1,8 @@
 <dataset>
 
-  <users id="200" login="user1" name="user1"/>
-  <users id="201" login="user2" name="user2"/>
-  <users id="202" login="user3" name="user3"/>
+  <users id="200" login="user1" name="User1"/>
+  <users id="201" login="user2" name="User2"/>
+  <users id="202" login="user3" name="User3"/>
 
   <!-- Project permissions -->
   <user_roles id="1" user_id="200" resource_id="100" role="user"/>

diff --git a/sonar-core/src/test/resources/org/sonar/core/permission/PermissionDaoTest/should_be_sorted_by_user_name.xml b/sonar-core/src/test/resources/org/sonar/core/permission/PermissionDaoTest/should_be_sorted_by_user_name.xml
index 7eeb2ab653b53d5a718965d600586bfa3589599f..3bb7487923cf7972e5bcc17fc5d6ebbfedf090a4 100644 (file)
--- a/sonar-core/src/test/resources/org/sonar/core/permission/PermissionDaoTest/should_be_sorted_by_user_name.xml
+++ b/sonar-core/src/test/resources/org/sonar/core/permission/PermissionDaoTest/should_be_sorted_by_user_name.xml
@@ -1,8 +1,8 @@
 <dataset>
 
-  <users id="200" login="user3" name="user3"/>
-  <users id="201" login="user1" name="user1"/>
-  <users id="202" login="user2" name="user2"/>
+  <users id="200" login="user3" name="User3"/>
+  <users id="201" login="user1" name="User1"/>
+  <users id="202" login="user2" name="User2"/>
 
   <user_roles id="1" user_id="200" resource_id="100" role="user"/>
   <user_roles id="2" user_id="200" resource_id="100" role="admin"/>

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/controllers/permissions_controller.rb b/sonar-server/src/main/webapp/WEB-INF/app/controllers/permissions_controller.rb
index 1b62ffd43bb46639345cc6b826d161186d525c35..e7d9fc8ca1d9570ba474160639562755e23e5596 100644 (file)
--- a/sonar-server/src/main/webapp/WEB-INF/app/controllers/permissions_controller.rb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/controllers/permissions_controller.rb
@@ -33,6 +33,7 @@ class PermissionsController < ApplicationController
         render :json => {
             :more => more,
             :results => users.map { |user| {
+                :login => user.login(),
                 :name => user.name(),
                 :selected => user.hasPermission()
             }}