git.iko.soy/typeable/oauth2-proxy
on master help sign in
Remove GetUserName method from Provider
commitd9c141ae7c88af6e095c513dfcebeede52e95c27 authorNick Meves <nick.meves@greenhouse.io> dateSun 27 Sep 2020, 15:18 (6 years ago) parent0da45e9
3 files changed−14
compare with master
unifiedsplit
oauthproxy.go−6 providers/provider_default.go−6 providers/providers.go−2
oauthproxy.go−6
@@ -368,12 +368,6 @@ func (p *OAuthProxy) enrichSessionState(ctx context.Context, s *sessionsapi.Sess
368368 return err
369369 }
370370 }
371− if s.User == "" {
372− s.User, err = p.provider.GetUserName(ctx, s)
373− if err != nil && !errors.Is(err, providers.ErrNotImplemented) {
374− return err
375− }
376− }
377371
378372 return p.provider.EnrichSessionState(ctx, s)
379373}
providers/provider_default.go−6
@@ -92,12 +92,6 @@ func (p *ProviderData) GetEmailAddress(_ context.Context, _ *sessions.SessionSta
9292 return "", ErrNotImplemented
9393}
9494
95−// GetUserName returns the Account username
96−// DEPRECATED: Migrate to EnrichSessionState
97−func (p *ProviderData) GetUserName(_ context.Context, _ *sessions.SessionState) (string, error) {
98− return "", ErrNotImplemented
99−}
100−
10195// ValidateGroup validates that the provided email exists in the configured provider
10296// email group(s).
10397func (p *ProviderData) ValidateGroup(_ string) bool {
providers/providers.go−2
@@ -12,8 +12,6 @@ type Provider interface {
1212 Data() *ProviderData
1313 // DEPRECATED: Migrate to EnrichSessionState
1414 GetEmailAddress(ctx context.Context, s *sessions.SessionState) (string, error)
15− // DEPRECATED: Migrate to EnrichSessionState
16− GetUserName(ctx context.Context, s *sessions.SessionState) (string, error)
1715 Redeem(ctx context.Context, redirectURI, code string) (*sessions.SessionState, error)
1816 ValidateGroup(string) bool
1917 EnrichSessionState(ctx context.Context, s *sessions.SessionState) error