From d9c141ae7c88af6e095c513dfcebeede52e95c27 Mon Sep 17 00:00:00 2001
From: Nick Meves <nick.meves@greenhouse.io>
Date: Sun, 27 Sep 2020 15:18:12 -0700
Subject: [PATCH] Remove GetUserName method from Provider

---
 oauthproxy.go                 | 6 ------
 providers/provider_default.go | 6 ------
 providers/providers.go        | 2 --
 3 files changed, 14 deletions(-)

diff --git a/oauthproxy.go b/oauthproxy.go
index db18e660..4fd03a40 100644
--- a/oauthproxy.go
+++ b/oauthproxy.go
@@ -368,12 +368,6 @@ func (p *OAuthProxy) enrichSessionState(ctx context.Context, s *sessionsapi.Sess
 			return err
 		}
 	}
-	if s.User == "" {
-		s.User, err = p.provider.GetUserName(ctx, s)
-		if err != nil && !errors.Is(err, providers.ErrNotImplemented) {
-			return err
-		}
-	}
 
 	return p.provider.EnrichSessionState(ctx, s)
 }
diff --git a/providers/provider_default.go b/providers/provider_default.go
index 87bef08e..479e52c0 100644
--- a/providers/provider_default.go
+++ b/providers/provider_default.go
@@ -92,12 +92,6 @@ func (p *ProviderData) GetEmailAddress(_ context.Context, _ *sessions.SessionSta
 	return "", ErrNotImplemented
 }
 
-// GetUserName returns the Account username
-// DEPRECATED: Migrate to EnrichSessionState
-func (p *ProviderData) GetUserName(_ context.Context, _ *sessions.SessionState) (string, error) {
-	return "", ErrNotImplemented
-}
-
 // ValidateGroup validates that the provided email exists in the configured provider
 // email group(s).
 func (p *ProviderData) ValidateGroup(_ string) bool {
diff --git a/providers/providers.go b/providers/providers.go
index 5e43613e..6987cf6b 100644
--- a/providers/providers.go
+++ b/providers/providers.go
@@ -12,8 +12,6 @@ type Provider interface {
 	Data() *ProviderData
 	// DEPRECATED: Migrate to EnrichSessionState
 	GetEmailAddress(ctx context.Context, s *sessions.SessionState) (string, error)
-	// DEPRECATED: Migrate to EnrichSessionState
-	GetUserName(ctx context.Context, s *sessions.SessionState) (string, error)
 	Redeem(ctx context.Context, redirectURI, code string) (*sessions.SessionState, error)
 	ValidateGroup(string) bool
 	EnrichSessionState(ctx context.Context, s *sessions.SessionState) error