SONAR-21121 Add POST /dop-translation/gitlab-configurations/

2 files changed, 7 insertions, 6 deletions

diff --git a/server/sonar-auth-gitlab/src/main/java/org/sonar/auth/gitlab/GitLabSettings.java b/server/sonar-auth-gitlab/src/main/java/org/sonar/auth/gitlab/GitLabSettings.java
index d81e75e3f82..ff9ea68ee67 100644
--- a/server/sonar-auth-gitlab/src/main/java/org/sonar/auth/gitlab/GitLabSettings.java
+++ b/server/sonar-auth-gitlab/src/main/java/org/sonar/auth/gitlab/GitLabSettings.java
@@ -19,6 +19,7 @@
  */
 package org.sonar.auth.gitlab;
 
+import com.google.common.base.Strings;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Set;
@@ -88,7 +89,7 @@ public class GitLabSettings implements DevOpsPlatformSettings {
   }
 
   public String provisioningToken() {
-    return configuration.get(GITLAB_AUTH_PROVISIONING_TOKEN).orElse(null);
+    return configuration.get(GITLAB_AUTH_PROVISIONING_TOKEN).map(Strings::emptyToNull).orElse(null);
   }
 
   public Set<String> provisioningGroups() {
diff --git a/server/sonar-auth-gitlab/src/test/java/org/sonar/auth/gitlab/GitLabSettingsTest.java b/server/sonar-auth-gitlab/src/test/java/org/sonar/auth/gitlab/GitLabSettingsTest.java
index ca98c7e8072..85548241db2 100644
--- a/server/sonar-auth-gitlab/src/test/java/org/sonar/auth/gitlab/GitLabSettingsTest.java
+++ b/server/sonar-auth-gitlab/src/test/java/org/sonar/auth/gitlab/GitLabSettingsTest.java
@@ -41,6 +41,7 @@ public class GitLabSettingsTest {
   private MapSettings settings;
   private GitLabSettings config;
 
+
   @Before
   public void prepare() {
     settings = new MapSettings(new PropertyDefinitions(System2.INSTANCE, GitLabSettings.definitions()));
@@ -92,13 +93,13 @@ public class GitLabSettingsTest {
 
   @Test
   public void isProvisioningEnabled_whenNotSet_returnsFalse() {
-    enableGithubAuthentication();
+    enableGitlabAuthentication();
     assertThat(config.isProvisioningEnabled()).isFalse();
   }
 
   @Test
   public void isProvisioningEnabled_ifProvisioningDisabled_returnsFalse() {
-    enableGithubAuthentication();
+    enableGitlabAuthentication();
     settings.setProperty(GITLAB_AUTH_PROVISIONING_ENABLED, false);
     assertThat(config.isProvisioningEnabled()).isFalse();
   }
@@ -111,16 +112,15 @@ public class GitLabSettingsTest {
 
   @Test
   public void isProvisioningEnabled_ifProvisioningEnabledAndGithubAuthEnabled_returnsTrue() {
-    enableGithubAuthentication();
+    enableGitlabAuthentication();
     settings.setProperty(GITLAB_AUTH_PROVISIONING_ENABLED, true);
     assertThat(config.isProvisioningEnabled()).isTrue();
   }
 
-  private void enableGithubAuthentication() {
+  private void enableGitlabAuthentication() {
     settings.setProperty(GITLAB_AUTH_ENABLED, true);
     settings.setProperty(GITLAB_AUTH_APPLICATION_ID, "on");
     settings.setProperty(GITLAB_AUTH_SECRET, "on");
   }
 
 }
-