git.iko.soy/typeable/oauth2-proxy
on master help sign in
Remove GetUserName method from Provider
d9c141aNick Meves
oauthproxy.go−6
compare with master
unifiedsplit
@@ -368,12 +368,6 @@ func (p *OAuthProxy) enrichSessionState(ctx context.Context, s *sessionsapi.Sess
368 return err
368 return err
369 }
369 }
370 }
370 }
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− }
377
371
378 return p.provider.EnrichSessionState(ctx, s)
372 return p.provider.EnrichSessionState(ctx, s)
379}
373}
providers/provider_default.go−6
@@ -92,12 +92,6 @@ func (p *ProviderData) GetEmailAddress(_ context.Context, _ *sessions.SessionSta
92 return "", ErrNotImplemented
92 return "", ErrNotImplemented
93}
93}
94
94
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−
101// ValidateGroup validates that the provided email exists in the configured provider
95// ValidateGroup validates that the provided email exists in the configured provider
102// email group(s).
96// email group(s).
103func (p *ProviderData) ValidateGroup(_ string) bool {
97func (p *ProviderData) ValidateGroup(_ string) bool {
providers/providers.go−2
@@ -12,8 +12,6 @@ type Provider interface {
12 Data() *ProviderData
12 Data() *ProviderData
13 // DEPRECATED: Migrate to EnrichSessionState
13 // DEPRECATED: Migrate to EnrichSessionState
14 GetEmailAddress(ctx context.Context, s *sessions.SessionState) (string, error)
14 GetEmailAddress(ctx context.Context, s *sessions.SessionState) (string, error)
15− // DEPRECATED: Migrate to EnrichSessionState
16− GetUserName(ctx context.Context, s *sessions.SessionState) (string, error)
17 Redeem(ctx context.Context, redirectURI, code string) (*sessions.SessionState, error)
15 Redeem(ctx context.Context, redirectURI, code string) (*sessions.SessionState, error)
18 ValidateGroup(string) bool
16 ValidateGroup(string) bool
19 EnrichSessionState(ctx context.Context, s *sessions.SessionState) error
17 EnrichSessionState(ctx context.Context, s *sessions.SessionState) error