Skip to content
Snippets Groups Projects
Unverified Commit fb20f3fa authored by Mathew Wicks's avatar Mathew Wicks Committed by GitHub
Browse files

fix: always retrieve github emails when `preferredEmailDomain` is set (#3584)

parent bd73825e
No related branches found
No related tags found
No related merge requests found
......@@ -531,9 +531,10 @@ func (c *githubConnector) user(ctx context.Context, client *http.Client) (user,
return u, err
}
// Only public user emails are returned by 'GET /user'. u.Email will be empty
// if a users' email is private. We must retrieve private emails explicitly.
if u.Email == "" {
// Only public user emails are returned by 'GET /user'.
// If a user has no public email, we must retrieve private emails explicitly.
// If preferredEmailDomain is set, we always need to retrieve all emails.
if u.Email == "" || c.preferredEmailDomain != "" {
var err error
if u.Email, err = c.userEmail(ctx, client); err != nil {
return u, err
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment