go/oauth2-proxy
1
0
Fork 0
mirror of https://github.com/oauth2-proxy/oauth2-proxy.git synced 2025-12-05 23:08:20 +02:00
Code Issues Releases Activity

Add EnrichSessionState as main post-Redeem session updater

Browse Source
This commit is contained in:
Nick Meves
2020-09-27 11:46:29 -07:00
parent b6061f0803
commit 2b9e1bbba0
6 changed files with 32 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
oauthproxy.go
View File

@@ -360,7 +360,7 @@ func (p *OAuthProxy) redeemCode(ctx context.Context, host, code string) (*sessio
return s, nil
}
func (p *OAuthProxy) enrichSession(ctx context.Context, s *sessionsapi.SessionState) error {
func (p *OAuthProxy) enrichSessionState(ctx context.Context, s *sessionsapi.SessionState) error {
var err error
if s.Email == "" {
s.Email, err = p.provider.GetEmailAddress(ctx, s)
@@ -374,7 +374,8 @@ func (p *OAuthProxy) enrichSession(ctx context.Context, s *sessionsapi.SessionSt
return err
}
}
return nil
return p.provider.EnrichSessionState(ctx, s)
}
// MakeCSRFCookie creates a cookie for CSRF
@@ -831,7 +832,7 @@ func (p *OAuthProxy) OAuthCallback(rw http.ResponseWriter, req *http.Request) {
return
}
err = p.enrichSession(req.Context(), session)
err = p.enrichSessionState(req.Context(), session)
if err != nil {
logger.Errorf("Error creating session during OAuth2 callback: %v", err)
p.ErrorPage(rw, http.StatusInternalServerError, "Internal Server Error", "Internal Error")