@@ -296,34 +296,31 @@ func (p *OAuthProxy) GetRedirectURI(host string) string {
296296 return u.String()
297297}
298298
299−func (p *OAuthProxy) redeemCode(ctx context.Context, host, code string) (s *sessionsapi.SessionState, err error) {
299+func (p *OAuthProxy) redeemCode(ctx context.Context, host, code string) (*sessionsapi.SessionState, error) {
300300 if code == "" {
301301 return nil, errors.New("missing code")
302302 }
303303 redirectURI := p.GetRedirectURI(host)
304− s, err = p.provider.Redeem(ctx, redirectURI, code)
304+ s, err := p.provider.Redeem(ctx, redirectURI, code)
305305 if err != nil {
306− return
306+ return nil, err
307307 }
308308
309309 if s.Email == "" {
310310 s.Email, err = p.provider.GetEmailAddress(ctx, s)
311− }
312−
313− if s.PreferredUsername == "" {
314− s.PreferredUsername, err = p.provider.GetPreferredUsername(ctx, s)
315− if err != nil && err.Error() == "not implemented" {
316− err = nil
311+ if err != nil && err.Error() != "not implemented" {
312+ return nil, err
317313 }
318314 }
319315
320316 if s.User == "" {
321317 s.User, err = p.provider.GetUserName(ctx, s)
322− if err != nil && err.Error() == "not implemented" {
323− err = nil
318+ if err != nil && err.Error() != "not implemented" {
319+ return nil, err
324320 }
325321 }
326− return
322+
323+ return s, nil
327324}
328325
329326// MakeCSRFCookie creates a cookie for CSRF