From ed19f623b523fab3e5dd69925a0a58fd5e0ce980 Mon Sep 17 00:00:00 2001
From: Manuel Alonso <manuelalonso@invisionapp.com>
Date: Mon, 27 Nov 2017 18:25:08 +0100
Subject: [PATCH 1/2] finding users by email, username or name

---
 user.go      | 19 +++++++++++++++++++
 user_test.go | 23 +++++++++++++++++++++++
 2 files changed, 42 insertions(+)

diff --git a/user.go b/user.go
index 7a9762c..58fa8cb 100644
--- a/user.go
+++ b/user.go
@@ -72,3 +72,22 @@ func (s *UserService) Create(user *User) (*User, *Response, error) {
 	}
 	return responseUser, resp, nil
 }
+
+// Finds user info from JIRA:
+//  it can find users by email,username or name
+//
+// JIRA API docs: https://docs.atlassian.com/jira/REST/cloud/#api/2/user-findUsers
+func (s *UserService) Find(property string) ([]User, *Response, error) {
+	apiEndpoint := fmt.Sprintf("/rest/api/2/user/search?username=%s", property)
+	req, err := s.client.NewRequest("GET", apiEndpoint, nil)
+	if err != nil {
+		return nil, nil, err
+	}
+
+	users := []User{}
+	resp, err := s.client.Do(req, &users)
+	if err != nil {
+		return nil, resp, err
+	}
+	return users, resp, nil
+}
diff --git a/user_test.go b/user_test.go
index 24b086b..4998425 100644
--- a/user_test.go
+++ b/user_test.go
@@ -55,3 +55,26 @@ func TestUserService_Create(t *testing.T) {
 		t.Error("Expected user. User is nil")
 	}
 }
+
+func TestUserService_Find_Success(t *testing.T) {
+	setup()
+	defer teardown()
+	testMux.HandleFunc("/rest/api/2/user/search", func(w http.ResponseWriter, r *http.Request) {
+		testMethod(t, r, "GET")
+		testRequestURL(t, r, "/rest/api/2/user/search?username=fred@example.com")
+
+		fmt.Fprint(w, `[{"self":"http://www.example.com/jira/rest/api/2/user?username=fred","key":"fred",
+        "name":"fred","emailAddress":"fred@example.com","avatarUrls":{"48x48":"http://www.example.com/jira/secure/useravatar?size=large&ownerId=fred",
+        "24x24":"http://www.example.com/jira/secure/useravatar?size=small&ownerId=fred","16x16":"http://www.example.com/jira/secure/useravatar?size=xsmall&ownerId=fred",
+        "32x32":"http://www.example.com/jira/secure/useravatar?size=medium&ownerId=fred"},"displayName":"Fred F. User","active":true,"timeZone":"Australia/Sydney","groups":{"size":3,"items":[
+        {"name":"jira-user","self":"http://www.example.com/jira/rest/api/2/group?groupname=jira-user"},{"name":"jira-admin",
+        "self":"http://www.example.com/jira/rest/api/2/group?groupname=jira-admin"},{"name":"important","self":"http://www.example.com/jira/rest/api/2/group?groupname=important"
+        }]},"applicationRoles":{"size":1,"items":[]},"expand":"groups,applicationRoles"}]`)
+	})
+
+	if user, _, err := testClient.User.Find("fred@example.com"); err != nil {
+		t.Errorf("Error given: %s", err)
+	} else if user == nil {
+		t.Error("Expected user. User is nil")
+	}
+}

From 5ac13b726c0a3510c801227997a781cb8f8e3eac Mon Sep 17 00:00:00 2001
From: Andy Grunwald <andygrunwald@gmail.com>
Date: Sun, 10 Dec 2017 19:56:03 +0100
Subject: [PATCH 2/2] Applied NewJiraError for user api endpoints

---
 user.go | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/user.go b/user.go
index 82c8364..e3bebee 100644
--- a/user.go
+++ b/user.go
@@ -46,7 +46,7 @@ func (s *UserService) Get(username string) (*User, *Response, error) {
 	user := new(User)
 	resp, err := s.client.Do(req, user)
 	if err != nil {
-		return nil, resp, err
+		return nil, resp, NewJiraError(resp, err)
 	}
 	return user, resp, nil
 }
@@ -70,11 +70,13 @@ func (s *UserService) Create(user *User) (*User, *Response, error) {
 	defer resp.Body.Close()
 	data, err := ioutil.ReadAll(resp.Body)
 	if err != nil {
-		return nil, resp, fmt.Errorf("Could not read the returned data")
+		e := fmt.Errorf("Could not read the returned data")
+		return nil, resp, NewJiraError(resp, e)
 	}
 	err = json.Unmarshal(data, responseUser)
 	if err != nil {
-		return nil, resp, fmt.Errorf("Could not unmarshall the data into struct")
+		e := fmt.Errorf("Could not unmarshall the data into struct")
+		return nil, resp, NewJiraError(resp, e)
 	}
 	return responseUser, resp, nil
 }
@@ -92,7 +94,7 @@ func (s *UserService) GetGroups(username string) (*[]UserGroup, *Response, error
 	userGroups := new([]UserGroup)
 	resp, err := s.client.Do(req, userGroups)
 	if err != nil {
-		return nil, resp, err
+		return nil, resp, NewJiraError(resp, err)
 	}
 	return userGroups, resp, nil
 }
@@ -111,7 +113,7 @@ func (s *UserService) Find(property string) ([]User, *Response, error) {
 	users := []User{}
 	resp, err := s.client.Do(req, &users)
 	if err != nil {
-		return nil, resp, err
+		return nil, resp, NewJiraError(resp, err)
 	}
 	return users, resp, nil
 }