github/wonderwall
1
0
Fork 0
mirror of https://github.com/nais/wonderwall.git synced 2026-05-08 09:27:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor(handler): use logger with request context

Browse Source
This commit is contained in:
Trong Huu Nguyen
2022-05-05 09:15:59 +02:00
parent cd57e72d56
commit f10bb80f9e
2 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
pkg/router/handler_callback.go
View File

@@ -12,6 +12,7 @@ import (
"github.com/nais/wonderwall/pkg/jwt"
"github.com/nais/wonderwall/pkg/openid"
logentry "github.com/nais/wonderwall/pkg/router/middleware"
)
func (h *Handler) Callback(w http.ResponseWriter, r *http.Request) {
@@ -86,7 +87,7 @@ func (h *Handler) Callback(w http.ResponseWriter, r *http.Request) {
log.Info("callback: successfully fetched loginstatus token")
}
logSuccessfulLogin(tokens, loginCookie.Referer)
logSuccessfulLogin(r, tokens, loginCookie.Referer)
http.Redirect(w, r, loginCookie.Referer, http.StatusTemporaryRedirect)
}
@@ -110,11 +111,12 @@ func (h *Handler) codeExchangeForToken(ctx context.Context, loginCookie *openid.
return tokens, nil
}
func logSuccessfulLogin(tokens *jwt.Tokens, referer string) {
fields := log.Fields{
func logSuccessfulLogin(r *http.Request, tokens *jwt.Tokens, referer string) {
fields := map[string]interface{}{
"redirect_to": referer,
"claims": tokens.Claims(),
}
log.WithFields(fields).Info("callback: successful login")
logger := logentry.LogEntry(r.Context()).With().Fields(fields).Logger()
logger.Info().Msg("callback: successful login")
}

10
pkg/router/handler_login.go
View File

@@ -49,14 +49,20 @@ func (h *Handler) Login(w http.ResponseWriter, r *http.Request) {
return
}
fields := map[string]interface{}{
"redirect_to": redirect,
}
logger := logentry.LogEntry(r.Context()).With().Fields(fields).Logger()
logger.Info().Msg("login: redirecting to identity provider")
http.Redirect(w, r, loginURL, http.StatusTemporaryRedirect)
}
func (h *Handler) getLoginCookie(r *http.Request) (*openid.LoginCookie, error) {
loginCookieJson, err := h.getDecryptedCookie(r, LoginCookieName)
if err != nil {
log := logentry.LogEntry(r.Context())
log.Info().Msgf("failed to fetch login cookie: %+v; falling back to legacy cookie", err)
logger := logentry.LogEntry(r.Context())
logger.Info().Msgf("failed to fetch login cookie: %+v; falling back to legacy cookie", err)
loginCookieJson, err = h.getDecryptedCookie(r, LoginLegacyCookieName)
if err != nil {