opendev/gerrit
Code Issues Proposed changes

Refine finding by nameOrEmail

Browse Source 
Currently finding all users by email relies on the fact that the
email address is unique. Since this is not the case (yet) finding
users by email can fail when the same email is added to a user
via SSH command create-account.

Refine the search and return the user that is most likely to be
the user we are searching for by first filtering by email and
later by full name.

Change-Id: I65e77cdbefd7ba607b2ad23282a61aabe41c3e49
This commit is contained in:
Deniz Türkoglu
2012-06-18 19:06:43 +02:00
committed by Shawn O. Pearce
parent 8a82f35157
commit 070531d874
1 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
gerrit-server/src/main/java/com/google/gerrit/server/account/AccountResolver.java
View File

@@ -14,6 +14,7 @@
package com.google.gerrit.server.account; package com.google.gerrit.server.account;
import com.google.common.collect.Sets;
import com.google.gerrit.reviewdb.client.Account; import com.google.gerrit.reviewdb.client.Account;
import com.google.gerrit.reviewdb.client.AccountExternalId; import com.google.gerrit.reviewdb.client.AccountExternalId;
import com.google.gerrit.reviewdb.server.ReviewDb; import com.google.gerrit.reviewdb.server.ReviewDb;
@@ -115,7 +116,21 @@ public class AccountResolver {
final int lt = nameOrEmail.indexOf('<'); final int lt = nameOrEmail.indexOf('<');
final int gt = nameOrEmail.indexOf('>'); final int gt = nameOrEmail.indexOf('>');
if (lt >= 0 && gt > lt && nameOrEmail.contains("@")) { if (lt >= 0 && gt > lt && nameOrEmail.contains("@")) {
return byEmail.get(nameOrEmail.substring(lt + 1, gt)); Set<Account.Id> ids = byEmail.get(nameOrEmail.substring(lt + 1, gt));
if (ids.isEmpty() || ids.size() == 1) {
return ids;
}
// more than one match, try to return the best one
String name = nameOrEmail.substring(0, lt - 1);
Set<Account.Id> nameMatches = Sets.newHashSet();
for (Account.Id id : ids) {
Account a = byId.get(id).getAccount();
if (name.equals(a.getFullName())) {
nameMatches.add(id);
}
}
return nameMatches.isEmpty() ? ids : nameMatches;
} }
if (nameOrEmail.contains("@")) { if (nameOrEmail.contains("@")) {