Skip to content

feat: [CDS-69341]: add find user email api for github in go-scm #256

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
May 15, 2023
Merged

feat: [CDS-69341]: add find user email api for github in go-scm #256

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0a341f2
feat: [CDS-69341]: add find user email api for github in go-scm
shalini-agr May 12, 2023
a31861f
fix unit test
shalini-agr May 12, 2023
7f55573
re-using ListEmail function
shalini-agr May 12, 2023
f4bba67
use emails.json in test
shalini-agr May 12, 2023
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
13 changes: 11 additions & 2 deletions scm/driver/github/user.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@ func (s *userService) FindLogin(ctx context.Context, login string) (*scm.User, *
}

func (s *userService) FindEmail(ctx context.Context) (string, *scm.Response, error) {
user, res, err := s.Find(ctx)
return user.Email, res, err
Copy link
Contributor

@bradrydzewski bradrydzewski May 12, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

you can re-use the ListEmail function here:

func (s *userService) FindEmail(ctx context.Context) (string, *scm.Response, error) {
	out, res, err := s.ListEmails(ctx, scm.ListOptions{})
	return returnPrimaryEmail(out), res, err
}

Copy link
Contributor Author

@shalini-agr shalini-agr May 12, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done

out, res, err := s.ListEmail(ctx, scm.ListOptions{})
return returnPrimaryEmail(out), res, err
}

func (s *userService) ListEmail(ctx context.Context, opts scm.ListOptions) ([]*scm.Email, *scm.Response, error) {
Expand Down Expand Up @@ -69,6 +69,15 @@ func convertUser(from *user) *scm.User {
}
}

func returnPrimaryEmail(from []*scm.Email) string {
for _, v := range from {
if v.Primary == true {
return v.Value
}
}
return ""
}

// helper function to convert from the github email list to
// the common email structure.
func convertEmailList(from []*email) []*scm.Email {
Expand Down
4 changes: 2 additions & 2 deletions scm/driver/github/user_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,14 +87,14 @@ func TestUserEmailFind(t *testing.T) {
defer gock.Off()

gock.New("https://api.github.com").
Get("/user").
Get("/user/emails").
Reply(200).
Type("application/json").
SetHeader("X-GitHub-Request-Id", "DD0E:6011:12F21A8:1926790:5A2064E2").
SetHeader("X-RateLimit-Limit", "60").
SetHeader("X-RateLimit-Remaining", "59").
SetHeader("X-RateLimit-Reset", "1512076018").
File("testdata/user.json")
File("testdata/emails.json")

client := NewDefault()
result, res, err := client.Users.FindEmail(context.Background())
Expand Down