Skip to content
This repository has been archived by the owner on Nov 23, 2023. It is now read-only.

Fix JMH-66: Improve username resolution #1

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix JMH-66: Improve username resolution #1

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
14d2f53
Fix JMH-66: Improve username resolution
May 29, 2020
45cc982
Replace maxResults=0 with maxResults=-1 and allow alternate emails
Sep 21, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 12 additions & 3 deletions ...cator/src/main/java/cern/enice/jira/amh/jira_rest_communicator/RestOperationsService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,8 +111,17 @@ else if (responseStatus < 200 || responseStatus >= 300 || content == null)
Map<String, Object> getUserIfOneIsFound(String username, Object content) {
if (username.contains("@")) {
List<Map<String, Object>> foundUsers = ((List<Map<String, Object>>) content);
if (foundUsers.isEmpty()) return null;
return foundUsers.get(0);
// If only one user is found, don't try to match the email to allow users
// using their alternative email addresses
if (foundUsers.size() == 1) {
return foundUsers.get(0);
}

for (Map<String, Object> cUser: foundUsers) {
if (((String)cUser.get("emailAddress")).equals(username))
return cUser;
}
return null;
} else {
return (Map<String, Object>)content;
}
Expand All @@ -121,7 +130,7 @@ Map<String, Object> getUserIfOneIsFound(String username, Object content) {
String getUserSearchUrl(String username) {
if (username.contains("@"))
return String.format(
"%s/rest/api/latest/user/search?maxResults=1&username=%s",
"%s/rest/api/latest/user/search?maxResults=-1&username=%s",
configuration.getJiraBaseUrl(), username);
else
return String.format(
Expand Down