From 3371284a3698378147eff32e073b350218b586da Mon Sep 17 00:00:00 2001
From: Nick Meves <nick.meves@greenhouse.io>
Date: Wed, 23 Sep 2020 15:55:22 -0700
Subject: [PATCH] Remove GetPreferredUsername method from Provider interface

It isn't used in any providers and we have future plans
to remove the specialness of PreferredUsername and make it
an optional field in the session.

User, Email & Groups will eventually be the only first class
fields on the session that are always set.
---
 oauthproxy.go                 | 7 -------
 providers/provider_default.go | 5 -----
 providers/providers.go        | 1 -
 3 files changed, 13 deletions(-)

diff --git a/oauthproxy.go b/oauthproxy.go
index 17d106d5..b3b3cbe6 100644
--- a/oauthproxy.go
+++ b/oauthproxy.go
@@ -310,13 +310,6 @@ func (p *OAuthProxy) redeemCode(ctx context.Context, host, code string) (s *sess
 		s.Email, err = p.provider.GetEmailAddress(ctx, s)
 	}
 
-	if s.PreferredUsername == "" {
-		s.PreferredUsername, err = p.provider.GetPreferredUsername(ctx, s)
-		if err != nil && err.Error() == "not implemented" {
-			err = nil
-		}
-	}
-
 	if s.User == "" {
 		s.User, err = p.provider.GetUserName(ctx, s)
 		if err != nil && err.Error() == "not implemented" {
diff --git a/providers/provider_default.go b/providers/provider_default.go
index 58e1b4fc..ba05a96c 100644
--- a/providers/provider_default.go
+++ b/providers/provider_default.go
@@ -104,11 +104,6 @@ func (p *ProviderData) GetUserName(ctx context.Context, s *sessions.SessionState
 	return "", errors.New("not implemented")
 }
 
-// GetPreferredUsername returns the Account preferred username
-func (p *ProviderData) GetPreferredUsername(ctx context.Context, s *sessions.SessionState) (string, error) {
-	return "", errors.New("not implemented")
-}
-
 // ValidateGroup validates that the provided email exists in the configured provider
 // email group(s).
 func (p *ProviderData) ValidateGroup(email string) bool {
diff --git a/providers/providers.go b/providers/providers.go
index a52eff90..eefc5994 100644
--- a/providers/providers.go
+++ b/providers/providers.go
@@ -12,7 +12,6 @@ type Provider interface {
 	Data() *ProviderData
 	GetEmailAddress(ctx context.Context, s *sessions.SessionState) (string, error)
 	GetUserName(ctx context.Context, s *sessions.SessionState) (string, error)
-	GetPreferredUsername(ctx context.Context, s *sessions.SessionState) (string, error)
 	Redeem(ctx context.Context, redirectURI, code string) (*sessions.SessionState, error)
 	ValidateGroup(string) bool
 	ValidateSessionState(ctx context.Context, s *sessions.SessionState) bool