SONAR-8031 Allow authentication with a login having only 2 characters

diff --git a/server/sonar-server/src/main/java/org/sonar/server/user/UserUpdater.java b/server/sonar-server/src/main/java/org/sonar/server/user/UserUpdater.java
index 25836f1d272dd610fb14b30ede877ccdf9477603..b5a7cfb722944214b9efeebb9d7201b0a2c140f7 100644 (file)
--- a/server/sonar-server/src/main/java/org/sonar/server/user/UserUpdater.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/user/UserUpdater.java
@@ -61,7 +61,7 @@ public class UserUpdater {
   private static final String NAME_PARAM = "Name";
   private static final String EMAIL_PARAM = "Email";
 
-  private static final int LOGIN_MIN_LENGTH = 3;
+  private static final int LOGIN_MIN_LENGTH = 2;
   private static final int LOGIN_MAX_LENGTH = 255;
   private static final int EMAIL_MAX_LENGTH = 100;
   private static final int NAME_MAX_LENGTH = 200;

diff --git a/server/sonar-server/src/test/java/org/sonar/server/user/UserUpdaterTest.java b/server/sonar-server/src/test/java/org/sonar/server/user/UserUpdaterTest.java
index dfc007a22d9fe318b15f15827efb412ec68a8245..fbb906739e6389f9700e09a7d24d0f4e1414c60b 100644 (file)
--- a/server/sonar-server/src/test/java/org/sonar/server/user/UserUpdaterTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/user/UserUpdaterTest.java
@@ -26,8 +26,8 @@ import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
 import org.mockito.ArgumentCaptor;
-import org.sonar.api.config.Settings;
 import org.sonar.api.config.MapSettings;
+import org.sonar.api.config.Settings;
 import org.sonar.api.platform.NewUserHandler;
 import org.sonar.api.utils.System2;
 import org.sonar.db.DbClient;
@@ -169,12 +169,12 @@ public class UserUpdaterTest {
     createDefaultGroup();
 
     userUpdater.create(NewUser.create()
-      .setLogin("user")
+      .setLogin("us")
       .setName("User"));
 
-    UserDto dto = userDao.selectByLogin(session, "user");
+    UserDto dto = userDao.selectByLogin(session, "us");
     assertThat(dto.getId()).isNotNull();
-    assertThat(dto.getLogin()).isEqualTo("user");
+    assertThat(dto.getLogin()).isEqualTo("us");
     assertThat(dto.getName()).isEqualTo("User");
     assertThat(dto.getEmail()).isNull();
     assertThat(dto.getScmAccounts()).isNull();
@@ -269,13 +269,13 @@ public class UserUpdaterTest {
   public void fail_to_create_user_with_too_short_login() {
     try {
       userUpdater.create(NewUser.create()
-        .setLogin("ma")
+        .setLogin("m")
         .setName("Marius")
         .setEmail("marius@mail.com")
         .setPassword("password"));
       fail();
     } catch (BadRequestException e) {
-      assertThat(e.errors().messages()).containsOnly(Message.of(Validation.IS_TOO_SHORT_MESSAGE, "Login", 3));
+      assertThat(e.errors().messages()).containsOnly(Message.of(Validation.IS_TOO_SHORT_MESSAGE, "Login", 2));
     }
   }