OAuth: Restore debug log behavior (#51244) (#51247)

(cherry picked from commit d2ab3556fa)

Co-authored-by: Jguer <joao.guerreiro@grafana.com>
This commit is contained in:
Grot (@grafanabot)
2022-06-22 15:44:55 +02:00
committed by GitHub
co-authored by Jguer
parent 1dcd9939a5
commit a8401fc8e8
2 changed files with 3 additions and 3 deletions
+2 -2
View File
@@ -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 == "" {
+1 -1
View File
@@ -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
}