Interop for github provider and EmailDomains

options.go

@@ -212,10 +212,11 @@ func (o *Options) Validate() error {
 
 func parseProviderInfo(o *Options, msgs []string) []string {
 	p := &providers.ProviderData{
-		Scope:          o.Scope,
-		ClientID:       o.ClientID,
-		ClientSecret:   o.ClientSecret,
-		ApprovalPrompt: o.ApprovalPrompt,
+		Scope:                 o.Scope,
+		ClientID:              o.ClientID,
+		ClientSecret:          o.ClientSecret,
+		ApprovalPrompt:        o.ApprovalPrompt,
+		PreferredEmailDomains: o.EmailDomains,
 	}
 	p.LoginURL, msgs = parseURL(o.LoginURL, "login", msgs)
 	p.RedeemURL, msgs = parseURL(o.RedeemURL, "redeem", msgs)

providers/github.go

@@ -179,7 +179,6 @@ func (p *GitHubProvider) hasOrgAndTeam(accessToken string) (bool, error) {
 }
 
 func (p *GitHubProvider) GetEmailAddress(s *SessionState) (string, error) {
-
 	var emails []struct {
 		Email   string `json:"email"`
 		Primary bool   `json:"primary"`
@@ -229,6 +228,16 @@ func (p *GitHubProvider) GetEmailAddress(s *SessionState) (string, error) {
 		return "", fmt.Errorf("%s unmarshaling %s", err, body)
 	}
 
+	for _, domain := range p.PreferredEmailDomains {
+		if domain == "*" {
+			break
+		}
+		for _, email := range emails {
+			if strings.HasSuffix(email.Email, domain) {
+				return email.Email, nil
+			}
+		}
+	}
 	for _, email := range emails {
 		if email.Primary {
 			return email.Email, nil

providers/provider_data.go

@@ -5,16 +5,17 @@ import (
 )
 
 type ProviderData struct {
-	ProviderName      string
-	ClientID          string
-	ClientSecret      string
-	LoginURL          *url.URL
-	RedeemURL         *url.URL
-	ProfileURL        *url.URL
-	ProtectedResource *url.URL
-	ValidateURL       *url.URL
-	Scope             string
-	ApprovalPrompt    string
+	ProviderName          string
+	ClientID              string
+	ClientSecret          string
+	LoginURL              *url.URL
+	RedeemURL             *url.URL
+	ProfileURL            *url.URL
+	ProtectedResource     *url.URL
+	ValidateURL           *url.URL
+	Scope                 string
+	ApprovalPrompt        string
+	PreferredEmailDomains []string
 }
 
 func (p *ProviderData) Data() *ProviderData { return p }