SONAR-7762 Remove remaing property definition

diff --git a/it/it-tests/src/test/java/it/user/LocalAuthenticationTest.java b/it/it-tests/src/test/java/it/user/LocalAuthenticationTest.java
index 7dff2a847cee758681e01a9e8769399391d7204f..491896a10199e55bd774c2b8908dff0740d3827c 100644 (file)
--- a/it/it-tests/src/test/java/it/user/LocalAuthenticationTest.java
+++ b/it/it-tests/src/test/java/it/user/LocalAuthenticationTest.java
@@ -22,7 +22,6 @@ package it.user;
 import com.codeborne.selenide.Condition;
 import com.sonar.orchestrator.Orchestrator;
 import it.Category4Suite;
-import java.io.IOException;
 import java.util.UUID;
 import org.junit.After;
 import org.junit.AfterClass;
@@ -179,18 +178,6 @@ public class LocalAuthenticationTest {
     assertThat(checkAuthenticationWithAuthenticateWebService("jo", "password")).isTrue();
   }
 
-  @Test
-  @Ignore("signing up will be dropped: SONAR-7762")
-  public void allow_users_to_sign_up() throws IOException {
-    setServerProperty(ORCHESTRATOR, "sonar.allowUsersToSignUp", "true");
-
-    runSelenese(ORCHESTRATOR, "/user/LocalAuthenticationTest/allow_users_to_sign_up.html");
-
-    // This check is failing because signup doesn't refresh the users ES index !
-    // Will be fixed by SONAR-7308
-    // userRule.verifyUserExists("signuplogin", "SignUpName", null);
-  }
-
   @Test
   public void authentication_through_ui() {
     runSelenese(ORCHESTRATOR,

diff --git a/server/sonar-ce/src/test/java/org/sonar/ce/container/ComputeEngineContainerImplTest.java b/server/sonar-ce/src/test/java/org/sonar/ce/container/ComputeEngineContainerImplTest.java
index 5a09fc50825b36601789e28620cbbe0570d1432f..b2329a2c1b8c6191757df2236eacedf58386e1df 100644 (file)
--- a/server/sonar-ce/src/test/java/org/sonar/ce/container/ComputeEngineContainerImplTest.java
+++ b/server/sonar-ce/src/test/java/org/sonar/ce/container/ComputeEngineContainerImplTest.java
@@ -109,7 +109,7 @@ public class ComputeEngineContainerImplTest {
         + 25 // level 1
         + 47 // content of DaoModule
         + 3 // content of EsSearchModule
-        + 62 // content of CorePropertyDefinitions
+        + 61 // content of CorePropertyDefinitions
         + 1 // content of CePropertyDefinitions
     );
     assertThat(picoContainer.getParent().getParent().getParent().getParent()).isNull();

diff --git a/server/sonar-server/src/main/java/org/sonar/server/platform/monitoring/SonarQubeMonitor.java b/server/sonar-server/src/main/java/org/sonar/server/platform/monitoring/SonarQubeMonitor.java
index 324159c72ab502b7a9d20c7c8b67542ba22d5da3..a9c2bf37104188482257d7c97641a54002b4fb9b 100644 (file)
--- a/server/sonar-server/src/main/java/org/sonar/server/platform/monitoring/SonarQubeMonitor.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/platform/monitoring/SonarQubeMonitor.java
@@ -106,10 +106,6 @@ public class SonarQubeMonitor extends BaseMonitorMBean implements SonarQubeMonit
     return settings.getBoolean(CoreProperties.CORE_AUTHENTICATOR_CREATE_USERS);
   }
 
-  private boolean getAllowUsersToSignUp() {
-    return settings.getBoolean(CoreProperties.CORE_ALLOW_USERS_TO_SIGNUP_PROPERTY);
-  }
-
   private boolean getForceAuthentication() {
     return settings.getBoolean(CoreProperties.CORE_FORCE_AUTHENTICATION_PROPERTY);
   }
@@ -136,7 +132,6 @@ public class SonarQubeMonitor extends BaseMonitorMBean implements SonarQubeMonit
     addIfNotEmpty("Accepted external identity providers", getEnabledIdentityProviders(), attributes);
     addIfNotEmpty("External identity providers whose users are allowed to sign themselves up", getAllowsToSignUpEnabledIdentityProviders(), attributes);
     attributes.put("Automatic User Creation", getAutomaticUserCreation());
-    attributes.put("Allow Users to Sign Up", getAllowUsersToSignUp());
     attributes.put("Force authentication", getForceAuthentication());
     attributes.put("Official Distribution", isOfficialDistribution());
     attributes.put("Home Dir", settings.getString(ProcessProperties.PATH_HOME));

diff --git a/server/sonar-server/src/test/java/org/sonar/server/ui/ws/GlobalActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/ui/ws/GlobalActionTest.java
index 1bcd3f4f3fcc042746dd2ff47d05ff167e661fb3..932da2056ace6b4d4a33923762b53e167a184a30 100644 (file)
--- a/server/sonar-server/src/test/java/org/sonar/server/ui/ws/GlobalActionTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/ui/ws/GlobalActionTest.java
@@ -164,7 +164,6 @@ public class GlobalActionTest {
     settings.setProperty("sonar.lf.enableGravatar", true);
     settings.setProperty("sonar.updatecenter.activate", false);
     settings.setProperty("sonar.technicalDebt.ratingGrid", "0.05,0.1,0.2,0.5");
-    settings.setProperty("sonar.allowUsersToSignUp", true);
     when(server.getVersion()).thenReturn("6.2");
     when(database.getDialect()).thenReturn(new MySql());
 

diff --git a/sonar-core/src/main/java/org/sonar/core/config/SecurityProperties.java b/sonar-core/src/main/java/org/sonar/core/config/SecurityProperties.java
index aaf797760ae18cc968c9242427655284ed9b30e5..4c340bdaa4413dda5ac78f98683219ffd5e24274 100644 (file)
--- a/sonar-core/src/main/java/org/sonar/core/config/SecurityProperties.java
+++ b/sonar-core/src/main/java/org/sonar/core/config/SecurityProperties.java
@@ -33,15 +33,6 @@ class SecurityProperties {
 
   static List<PropertyDefinition> all() {
     return ImmutableList.of(
-
-      PropertyDefinition.builder(CoreProperties.CORE_ALLOW_USERS_TO_SIGNUP_PROPERTY)
-        .defaultValue(Boolean.toString(CoreProperties.CORE_ALLOW_USERS_TO_SIGNUP_DEAULT_VALUE))
-        .name("Activate sign up for local account")
-        .description("Allow users to sign up online for a local account. For that purpose, a \"Sign Up\" link will be available in the \"Login\" page.")
-        .type(PropertyType.BOOLEAN)
-        .category(CoreProperties.CATEGORY_SECURITY)
-        .build(),
-
       PropertyDefinition.builder(CoreProperties.CORE_DEFAULT_GROUP)
         .defaultValue(CoreProperties.CORE_DEFAULT_GROUP_DEFAULT_VALUE)
         .name("Default user group")
@@ -55,8 +46,7 @@ class SecurityProperties {
         .description("Forcing user authentication stops un-logged users to access SonarQube.")
         .type(PropertyType.BOOLEAN)
         .category(CoreProperties.CATEGORY_SECURITY)
-        .build()
-      );
+        .build());
 
   }
 }

diff --git a/sonar-core/src/test/java/org/sonar/core/config/CorePropertyDefinitionsTest.java b/sonar-core/src/test/java/org/sonar/core/config/CorePropertyDefinitionsTest.java
index bf9d2501497eb5f27d889b81f3d83b9904fd6a41..b1198a6ef83c888220a0e2801114ebf9e64812a2 100644 (file)
--- a/sonar-core/src/test/java/org/sonar/core/config/CorePropertyDefinitionsTest.java
+++ b/sonar-core/src/test/java/org/sonar/core/config/CorePropertyDefinitionsTest.java
@@ -35,7 +35,7 @@ public class CorePropertyDefinitionsTest {
   @Test
   public void all() {
     List<PropertyDefinition> defs = CorePropertyDefinitions.all();
-    assertThat(defs).hasSize(64);
+    assertThat(defs).hasSize(63);
   }
 
   @Test