From 489c2324ff5ea92e47a9f7728152c97e7d8a24d7 Mon Sep 17 00:00:00 2001
From: Julien Lancelot <julien.lancelot@sonarsource.com>
Date: Mon, 24 Sep 2018 18:19:12 +0200
Subject: [PATCH] SONARCLOUD-128 Migrate microsoft user logins

---
 .../src/main/java/org/sonar/db/user/UserDao.java           | 4 ++++
 .../src/main/java/org/sonar/db/user/UserMapper.java        | 2 ++
 .../src/main/resources/org/sonar/db/user/UserMapper.xml    | 7 +++++++
 3 files changed, 13 insertions(+)

diff --git a/server/sonar-db-dao/src/main/java/org/sonar/db/user/UserDao.java b/server/sonar-db-dao/src/main/java/org/sonar/db/user/UserDao.java
index 93fe5bab021..29ee56dd5e0 100644
--- a/server/sonar-db-dao/src/main/java/org/sonar/db/user/UserDao.java
+++ b/server/sonar-db-dao/src/main/java/org/sonar/db/user/UserDao.java
@@ -205,6 +205,10 @@ public class UserDao implements Dao {
     return mapper(dbSession).selectByExternalIdAndIdentityProvider(externalId, externalIdentityProvider);
   }
 
+  public List<UserDto> selectByExternalIdentityProvider(DbSession dbSession, String externalIdentityProvider) {
+    return mapper(dbSession).selectByExternalIdentityProvider(externalIdentityProvider);
+  }
+
   public void scrollByUuids(DbSession dbSession, Collection<String> uuids, Consumer<UserDto> consumer) {
     UserMapper mapper = mapper(dbSession);
 
diff --git a/server/sonar-db-dao/src/main/java/org/sonar/db/user/UserMapper.java b/server/sonar-db-dao/src/main/java/org/sonar/db/user/UserMapper.java
index 671f8755bd7..6a5e8802d9a 100644
--- a/server/sonar-db-dao/src/main/java/org/sonar/db/user/UserMapper.java
+++ b/server/sonar-db-dao/src/main/java/org/sonar/db/user/UserMapper.java
@@ -63,6 +63,8 @@ public interface UserMapper {
   @CheckForNull
   UserDto selectByExternalIdAndIdentityProvider(@Param("externalId") String externalId, @Param("externalIdentityProvider") String externalExternalIdentityProvider);
 
+  List<UserDto> selectByExternalIdentityProvider(@Param("externalIdentityProvider") String externalExternalIdentityProvider);
+
   void scrollAll(ResultHandler<UserDto> handler);
 
   /**
diff --git a/server/sonar-db-dao/src/main/resources/org/sonar/db/user/UserMapper.xml b/server/sonar-db-dao/src/main/resources/org/sonar/db/user/UserMapper.xml
index 1ae92c9f941..193dbf4e6ce 100644
--- a/server/sonar-db-dao/src/main/resources/org/sonar/db/user/UserMapper.xml
+++ b/server/sonar-db-dao/src/main/resources/org/sonar/db/user/UserMapper.xml
@@ -143,6 +143,13 @@
         WHERE u.external_id=#{externalId} AND u.external_identity_provider=#{externalIdentityProvider}
     </select>
 
+    <select id="selectByExternalIdentityProvider" parameterType="map" resultType="User">
+        SELECT
+        <include refid="userColumns"/>
+        FROM users u
+        WHERE u.external_identity_provider=#{externalIdentityProvider}
+    </select>
+
     <select id="countRootUsersButLogin" parameterType="String" resultType="long">
         select
         count(1)
-- 
2.39.5