From a8401fc8e888f3b4f796ffd6ed7c0312b2224abd Mon Sep 17 00:00:00 2001 From: "Grot (@grafanabot)" <43478413+grafanabot@users.noreply.github.com> Date: Wed, 22 Jun 2022 09:44:55 -0400 Subject: [PATCH] OAuth: Restore debug log behavior (#51244) (#51247) (cherry picked from commit d2ab3556fa0babba43598a303e2f9f37970c7172) Co-authored-by: Jguer --- pkg/api/login_oauth.go | 4 ++-- pkg/login/social/azuread_oauth.go | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkg/api/login_oauth.go b/pkg/api/login_oauth.go index 62c0d6e966d..4a586c77b6b 100644 --- a/pkg/api/login_oauth.go +++ b/pkg/api/login_oauth.go @@ -192,7 +192,7 @@ func (hs *HTTPServer) OAuthLogin(ctx *models.ReqContext) { // token.TokenType was defaulting to "bearer", which is out of spec, so we explicitly set to "Bearer" token.TokenType = "Bearer" - oauthLogger.Debug("OAuthLogin Got token", "token", token) + oauthLogger.Debug("OAuthLogin: got token", "token", fmt.Sprintf("%v", token)) // set up oauth2 client client := connect.Client(oauthCtx, token) @@ -213,7 +213,7 @@ func (hs *HTTPServer) OAuthLogin(ctx *models.ReqContext) { return } - oauthLogger.Debug("OAuthLogin got user info", "userInfo", userInfo) + oauthLogger.Debug("OAuthLogin got user info", "userInfo", fmt.Sprintf("%v", userInfo)) // validate that we got at least an email address if userInfo.Email == "" { diff --git a/pkg/login/social/azuread_oauth.go b/pkg/login/social/azuread_oauth.go index 7296a90ce58..2ffb399a40b 100644 --- a/pkg/login/social/azuread_oauth.go +++ b/pkg/login/social/azuread_oauth.go @@ -82,7 +82,7 @@ func (s *SocialAzureAD) UserInfo(client *http.Client, token *oauth2.Token) (*Bas return nil, fmt.Errorf("failed to extract groups: %w", err) } - logger.Debug("AzureAD OAuth: extracted groups", "email", email, "groups", groups) + logger.Debug("AzureAD OAuth: extracted groups", "email", email, "groups", fmt.Sprintf("%v", groups)) if !s.IsGroupMember(groups) { return nil, errMissingGroupMembership }