From 98f6a217d3fcfc94ecb64a667a4c6e8203dda5df Mon Sep 17 00:00:00 2001 From: Chien Huey Date: Thu, 17 Aug 2017 17:26:10 -0400 Subject: [PATCH 1/2] When connecting to GitHub Enterprise, force email verified field to true --- connector/github/github.go | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/connector/github/github.go b/connector/github/github.go index c3111cbe..2a8b216e 100644 --- a/connector/github/github.go +++ b/connector/github/github.go @@ -503,6 +503,11 @@ func (c *githubConnector) userEmail(ctx context.Context, client *http.Client) (s } for _, email := range emails { + // if GitHub Enterprise, set email.Verified to true + if c.hostName != "" { + email.Verified = true + } + if email.Verified && email.Primary { return email.Email, nil } From 99370b588031a653200c96f13f6ca0ebe07039c1 Mon Sep 17 00:00:00 2001 From: Chien Huey Date: Fri, 18 Aug 2017 11:46:05 -0400 Subject: [PATCH 2/2] Updated comment to include reference to GitHub Enterprise not supporting verified emails --- connector/github/github.go | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/connector/github/github.go b/connector/github/github.go index 2a8b216e..c08240fa 100644 --- a/connector/github/github.go +++ b/connector/github/github.go @@ -503,7 +503,16 @@ func (c *githubConnector) userEmail(ctx context.Context, client *http.Client) (s } for _, email := range emails { - // if GitHub Enterprise, set email.Verified to true + /* + if GitHub Enterprise, set email.Verified to true + This change being made because GitHub Enterprise does not + support email verification. CircleCI indicated that GitHub + advised them not to check for verified emails + (https://circleci.com/enterprise/changelog/#1-47-1). + In addition, GitHub Enterprise support replied to a support + ticket with "There is no way to verify an email address in + GitHub Enterprise." + */ if c.hostName != "" { email.Verified = true }