diff options
| author | Julien Lancelot <julien.lancelot@sonarsource.com> | 2015-01-12 16:43:48 +0100 |
|---|---|---|
| committer | Julien Lancelot <julien.lancelot@sonarsource.com> | 2015-01-12 17:39:46 +0100 |
| commit | c173a87a511c1242e3c5c7ac6d0f637c7c2ad66b (patch) | |
| tree | 54ee25ef8e7c38a248696d48f731735012335a50 /sonar-core | |
| parent | dc4873dec54dc3e6bbccf1c0840aa11f69e61056 (diff) | |
| download | sonarqube-c173a87a511c1242e3c5c7ac6d0f637c7c2ad66b.tar.gz sonarqube-c173a87a511c1242e3c5c7ac6d0f637c7c2ad66b.zip | |
SONAR-5830 Fix issue when same email is used by multiple users
Diffstat (limited to 'sonar-core')
3 files changed, 7 insertions, 3 deletions
diff --git a/sonar-core/src/main/java/org/sonar/core/user/UserMapper.java b/sonar-core/src/main/java/org/sonar/core/user/UserMapper.java index 48fda4f8dc8..80c44052ea9 100644 --- a/sonar-core/src/main/java/org/sonar/core/user/UserMapper.java +++ b/sonar-core/src/main/java/org/sonar/core/user/UserMapper.java @@ -31,8 +31,12 @@ public interface UserMapper { @CheckForNull UserDto selectByLogin(String login); + /** + * Search for a user by SCM account, login or email. + * Can return multiple results if an email is used by many users (For instance, technical account can use the same email as a none technical account) + */ @CheckForNull - UserDto selectNullableByScmAccountOrLoginOrName(String scmAccount); + List<UserDto> selectNullableByScmAccountOrLoginOrEmail(String scmAccountOrLoginOrEmail); @CheckForNull UserDto selectUser(long userId); diff --git a/sonar-core/src/main/resources/org/sonar/core/user/UserMapper.xml b/sonar-core/src/main/resources/org/sonar/core/user/UserMapper.xml index a50be05abc9..16b370594d7 100644 --- a/sonar-core/src/main/resources/org/sonar/core/user/UserMapper.xml +++ b/sonar-core/src/main/resources/org/sonar/core/user/UserMapper.xml @@ -23,7 +23,7 @@ WHERE u.login=#{login} </select> - <select id="selectNullableByScmAccountOrLoginOrName" parameterType="String" resultType="User"> + <select id="selectNullableByScmAccountOrLoginOrEmail" parameterType="String" resultType="User"> SELECT <include refid="userColumns"/> FROM users u diff --git a/sonar-core/src/main/resources/org/sonar/l10n/core.properties b/sonar-core/src/main/resources/org/sonar/l10n/core.properties index 964a145b46a..ef44688c9c8 100644 --- a/sonar-core/src/main/resources/org/sonar/l10n/core.properties +++ b/sonar-core/src/main/resources/org/sonar/l10n/core.properties @@ -1991,7 +1991,7 @@ user.bad_login=Use only letters, numbers, and .-_@ please. user.password_doesnt_match_confirmation=Password doesn't match confirmation. user.reactivated=The user '{0}' has been reactivated. user.add_scm_account=Add SCM account -user.scm_account_already_used=The scm account '{0}' is already used by user '{1} ({2})' +user.scm_account_already_used=The scm account '{0}' is already used by user(s) : '{1}' user.login_or_email_used_as_scm_account=Login and email are automatically considered as SCM accounts |