get user when username includes @

Author: bradrydzewski

scm/driver/stash/testdata/user_search.json

@@ -0,0 +1,17 @@
+{
+    "size": 2,
+    "limit": 25,
+    "isLastPage": true,
+    "values": [
+        {
+            "name": "jane@example",
+            "emailAddress": "[email protected]",
+            "id": 1,
+            "displayName": "Jane Citizen",
+            "active": true,
+            "slug": "jane_example",
+            "type": "NORMAL"
+        }
+    ],
+    "start": 0
+}

scm/driver/stash/testdata/user_search.json.golden

@@ -0,0 +1,6 @@
+{
+    "Login": "jane_example",
+    "Name": "Jane Citizen",
+    "Email": "[email protected]",
+    "Avatar": "https://www.gravatar.com/avatar/9e26471d35a78862c17e467d87cddedf.jpg"
+}

scm/driver/stash/user.go

@@ -35,7 +35,38 @@ func (s *userService) FindLogin(ctx context.Context, login string) (*scm.User, *
 	path := fmt.Sprintf("rest/api/1.0/users/%s", login)
 	out := new(user)
 	res, err := s.client.do(ctx, "GET", path, nil, out)
-	return convertUser(out), res, err
+	if err == nil {
+		return convertUser(out), res, err
+	}
+
+	// HACK: the below code is a hack to account for the
+	// fact that the above API call requires the slug,
+	// but "plugins/servlet/applinks/whoami" may not return
+	// the slug. When this happens we need to search
+	// and find the matching user.
+
+	// HACK: only use the below special logic for usernames
+	// that contain an @ symbol.
+	if !strings.Contains(login, "@") {
+		return nil, res, err
+	}
+
+	path = fmt.Sprintf("/rest/api/1.0/users?filter=%s", login)
+	filter := new(userFilter)
+	res, err = s.client.do(ctx, "GET", path, nil, filter)
+	if err != nil {
+		return nil, res, err
+	}
+
+	// iterate through the search results and find
+	// the username that is an exact match.
+	for _, item := range filter.Values {
+		// must be an exact match
+		if item.Name == login {
+			return convertUser(item), res, err
+		}
+	}
+	return nil, res, scm.ErrNotFound
 }
 
 func (s *userService) FindEmail(ctx context.Context) (string, *scm.Response, error) {
@@ -62,6 +93,10 @@ type user struct {
 	} `json:"links"`
 }
 
+type userFilter struct {
+	Values []*user `json:"values"`
+}
+
 func convertUser(from *user) *scm.User {
 	return &scm.User{
 		Avatar: avatarLink(from.EmailAddress),

scm/driver/stash/user_test.go

@@ -47,6 +47,24 @@ func TestUserFind(t *testing.T) {
 	}
 }
 
+func TestUserLoginFind_ViaSearch_NotFound(t *testing.T) {
+	defer gock.Off()
+
+	gock.New("https://bitbucket.example.com").
+		Get("rest/api/1.0/users/jcitizen").
+		Reply(404)
+
+	client, _ := New("https://bitbucket.example.com")
+	_, _, err := client.Users.FindLogin(context.Background(), "jcitizen")
+	if err == nil {
+		t.Errorf("Want ErrNotFound got nil error")
+	}
+
+	if !gock.IsDone() {
+		t.Errorf("Pending mocks")
+	}
+}
+
 func TestUserLoginFind(t *testing.T) {
 	defer gock.Off()
 
@@ -70,6 +88,70 @@ func TestUserLoginFind(t *testing.T) {
 		t.Errorf("Unexpected Results")
 		t.Log(diff)
 	}
+
+	if !gock.IsDone() {
+		t.Errorf("Pending mocks")
+	}
+}
+
+func TestUserLoginFind_ViaSearch(t *testing.T) {
+	defer gock.Off()
+
+	gock.New("https://bitbucket.example.com").
+		Get("rest/api/1.0/users/jane@example").
+		Reply(404)
+
+	gock.New("https://bitbucket.example.com").
+		Get("/rest/api/1.0/users").
+		MatchParam("filter", "jane@example").
+		Reply(200).
+		Type("application/json").
+		File("testdata/user_search.json")
+
+	client, _ := New("https://bitbucket.example.com")
+	got, _, err := client.Users.FindLogin(context.Background(), "jane@example")
+	if err != nil {
+		t.Error(err)
+		return
+	}
+
+	want := new(scm.User)
+	raw, _ := ioutil.ReadFile("testdata/user_search.json.golden")
+	json.Unmarshal(raw, &want)
+
+	if diff := cmp.Diff(got, want); diff != "" {
+		t.Errorf("Unexpected Results")
+		t.Log(diff)
+	}
+
+	if !gock.IsDone() {
+		t.Errorf("Pending mocks")
+	}
+}
+
+func TestUserLoginFind_ViaSearch_NoMatch(t *testing.T) {
+	defer gock.Off()
+
+	gock.New("https://bitbucket.example.com").
+		Get("rest/api/1.0/users/john@example").
+		Reply(404)
+
+	gock.New("https://bitbucket.example.com").
+		Get("/rest/api/1.0/users").
+		MatchParam("filter", "john@example").
+		Reply(200).
+		Type("application/json").
+		File("testdata/user_search.json")
+
+	client, _ := New("https://bitbucket.example.com")
+	_, _, err := client.Users.FindLogin(context.Background(), "john@example")
+	if err == nil {
+		t.Errorf("Want ErrNotFound got nil error")
+	}
+
+	if !gock.IsDone() {
+		t.Errorf("Pending mocks")
+	}
 }
 
 func TestUserFindEmail(t *testing.T) {