From: Simon Brandhof <simon.brandhof@sonarsource.com>
Date: Sun, 2 Dec 2018 14:53:17 +0000 (+0100)
Subject: SONARCLOUD-220 add WS api/autoscan/github_repository
X-Git-Tag: 7.5~20
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=888b5bc305ac0483d4691e0dcd0c8c82a24b2eea;p=sonarqube.git

SONARCLOUD-220 add WS api/autoscan/github_repository
---

diff --git a/server/sonar-db-dao/src/main/java/org/sonar/db/alm/AlmAppInstallDao.java b/server/sonar-db-dao/src/main/java/org/sonar/db/alm/AlmAppInstallDao.java
index 63a6846f8a4..6629c36a226 100644
--- a/server/sonar-db-dao/src/main/java/org/sonar/db/alm/AlmAppInstallDao.java
+++ b/server/sonar-db-dao/src/main/java/org/sonar/db/alm/AlmAppInstallDao.java
@@ -26,6 +26,7 @@ import org.sonar.api.utils.System2;
 import org.sonar.core.util.UuidFactory;
 import org.sonar.db.Dao;
 import org.sonar.db.DbSession;
+import org.sonar.db.organization.OrganizationDto;
 
 import static com.google.common.base.Preconditions.checkArgument;
 import static java.util.Objects.requireNonNull;
@@ -62,6 +63,12 @@ public class AlmAppInstallDao implements Dao {
     return Optional.ofNullable(mapper.selectByInstallationId(alm.getId(), installationId));
   }
 
+  public Optional<AlmAppInstallDto> selectByOrganization(DbSession dbSession, ALM alm, OrganizationDto organization) {
+    AlmAppInstallMapper mapper = getMapper(dbSession);
+    return Optional.ofNullable(mapper.selectByOrganizationUuid(alm.getId(), organization.getUuid()));
+  }
+
+
   public List<AlmAppInstallDto> selectUnboundByUserExternalId(DbSession dbSession, String userExternalId) {
     return getMapper(dbSession).selectUnboundByUserExternalId(userExternalId);
   }
diff --git a/server/sonar-db-dao/src/main/java/org/sonar/db/alm/AlmAppInstallMapper.java b/server/sonar-db-dao/src/main/java/org/sonar/db/alm/AlmAppInstallMapper.java
index 11668864c4e..637626a24f9 100644
--- a/server/sonar-db-dao/src/main/java/org/sonar/db/alm/AlmAppInstallMapper.java
+++ b/server/sonar-db-dao/src/main/java/org/sonar/db/alm/AlmAppInstallMapper.java
@@ -35,6 +35,9 @@ public interface AlmAppInstallMapper {
   @CheckForNull
   AlmAppInstallDto selectByUuid(@Param("uuid") String uuid);
 
+  @CheckForNull
+  AlmAppInstallDto selectByOrganizationUuid(@Param("almId") String almId, @Param("organizationUuid") String organizationUuid);
+
   List<AlmAppInstallDto> selectUnboundByUserExternalId(@Param("userExternalId") String userExternalId);
 
   void insert(@Param("uuid") String uuid, @Param("almId") String almId, @Param("ownerId") String ownerId,
diff --git a/server/sonar-db-dao/src/main/resources/org/sonar/db/alm/AlmAppInstallMapper.xml b/server/sonar-db-dao/src/main/resources/org/sonar/db/alm/AlmAppInstallMapper.xml
index fbfb720b866..b29b7ec7268 100644
--- a/server/sonar-db-dao/src/main/resources/org/sonar/db/alm/AlmAppInstallMapper.xml
+++ b/server/sonar-db-dao/src/main/resources/org/sonar/db/alm/AlmAppInstallMapper.xml
@@ -40,11 +40,21 @@
       uuid = #{uuid, jdbcType=VARCHAR}
   </select>
 
+  <select id="selectByOrganizationUuid" parameterType="Map" resultType="org.sonar.db.alm.AlmAppInstallDto">
+    select <include refid="sqlColumns"/>
+    from
+    alm_app_installs aai
+    inner join organization_alm_bindings oab on oab.alm_app_install_uuid = aai.uuid
+    where
+    oab.alm_id = #{almId, jdbcType=VARCHAR}
+    and oab.organization_uuid = #{organizationUuid, jdbcType=VARCHAR}
+  </select>
+
   <select id="selectUnboundByUserExternalId" parameterType="Map" resultType="org.sonar.db.alm.AlmAppInstallDto">
     select <include refid="sqlColumns" />
     from
     alm_app_installs aai
-    left outer join organization_alm_bindings bind on bind.alm_app_install_uuid =  aai.uuid
+    left outer join organization_alm_bindings bind on bind.alm_app_install_uuid = aai.uuid
     where
     aai.user_external_id = #{userExternalId, jdbcType=VARCHAR}
     and bind.uuid is null
diff --git a/server/sonar-db-dao/src/test/java/org/sonar/db/alm/AlmAppInstallDaoTest.java b/server/sonar-db-dao/src/test/java/org/sonar/db/alm/AlmAppInstallDaoTest.java
index 7cfd08bad92..8b2ce910ec2 100644
--- a/server/sonar-db-dao/src/test/java/org/sonar/db/alm/AlmAppInstallDaoTest.java
+++ b/server/sonar-db-dao/src/test/java/org/sonar/db/alm/AlmAppInstallDaoTest.java
@@ -149,6 +149,20 @@ public class AlmAppInstallDaoTest {
     assertThat(underTest.selectUnboundByUserExternalId(dbSession, user2.getExternalId())).isEmpty();
   }
 
+  @Test
+  public void selectByOrganization() {
+    OrganizationDto organization = db.organizations().insert();
+    db.getDbClient().almAppInstallDao().insertOrUpdate(db.getSession(), ALM.GITHUB, "the-owner", false, "123456", null);
+    // could be improved, insertOrUpdate should return the DTO with its uuid
+    Optional<AlmAppInstallDto> install = db.getDbClient().almAppInstallDao().selectByOwnerId(db.getSession(), ALM.GITHUB, "the-owner");
+    db.getDbClient().organizationAlmBindingDao().insert(db.getSession(), organization, install.get(), "xxx", "xxx");
+    db.commit();
+
+    assertThat(underTest.selectByOrganization(db.getSession(), GITHUB, organization).get().getUuid()).isEqualTo(install.get().getUuid());
+    assertThat(underTest.selectByOrganization(db.getSession(), BITBUCKETCLOUD, organization)).isEmpty();
+    assertThat(underTest.selectByOrganization(db.getSession(), GITHUB, new OrganizationDto().setUuid("other-organization"))).isEmpty();
+  }
+
   @Test
   public void insert_throws_NPE_if_alm_is_null() {
     expectAlmNPE();
diff --git a/server/sonar-server/src/main/java/org/sonar/server/authentication/CredentialsExternalAuthentication.java b/server/sonar-server/src/main/java/org/sonar/server/authentication/CredentialsExternalAuthentication.java
index d6cbd92ca35..97ba8d33aa4 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/authentication/CredentialsExternalAuthentication.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/authentication/CredentialsExternalAuthentication.java
@@ -88,7 +88,7 @@ public class CredentialsExternalAuthentication implements Startable {
     if (realm == null) {
       return Optional.empty();
     }
-    return Optional.of(doAuthenticate(sanitize(credentials), request, method));
+    return Optional.of(doAuthenticate(fixCase(credentials), request, method));
   }
 
   private UserDto doAuthenticate(Credentials credentials, HttpServletRequest request, AuthenticationEvent.Method method) {
@@ -153,7 +153,7 @@ public class CredentialsExternalAuthentication implements Startable {
         .build());
   }
 
-  private Credentials sanitize(Credentials credentials) {
+  private Credentials fixCase(Credentials credentials) {
     if (config.getBoolean("sonar.authenticator.downcase").orElse(false)) {
       return new Credentials(credentials.getLogin().toLowerCase(Locale.ENGLISH), credentials.getPassword());
     }