public_git/oauth2-proxy
1
0
Fork 0
mirror of https://github.com/oauth2-proxy/oauth2-proxy.git synced 2026-10-18 22:41:04 +02:00
Code Issues Projects Releases Wiki Activity

Stop shadowing GetEmailAddress errors in redeemCode

Browse Source
This commit is contained in:
Nick Meves
2020-09-24 10:50:18 -07:00
parent 3371284a36
commit e0d915cc03
2 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
oauthproxy.go
+10 -6
View File
@@ -296,27 +296,31 @@ func (p *OAuthProxy) GetRedirectURI(host string) string {
return u.String()
}
func (p *OAuthProxy) redeemCode(ctx context.Context, host, code string) (s *sessionsapi.SessionState, err error) {
func (p *OAuthProxy) redeemCode(ctx context.Context, host, code string) (*sessionsapi.SessionState, error) {
if code == "" {
return nil, errors.New("missing code")
}
redirectURI := p.GetRedirectURI(host)
s, err = p.provider.Redeem(ctx, redirectURI, code)
s, err := p.provider.Redeem(ctx, redirectURI, code)
if err != nil {
return
return nil, err
}
if s.Email == "" {
s.Email, err = p.provider.GetEmailAddress(ctx, s)
if err != nil && err.Error() != "not implemented" {
return nil, err
}
}
if s.User == "" {
s.User, err = p.provider.GetUserName(ctx, s)
if err != nil && err.Error() == "not implemented" {
err = nil
if err != nil && err.Error() != "not implemented" {
return nil, err
}
}
return
return s, nil
}
// MakeCSRFCookie creates a cookie for CSRF