IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6584 from tomkozlowski/bugfix/oauth-login-bearer-token

Browse Source 
explicitly set oauth2 token to Bearer Type
This commit is contained in:
Dan Cech
2016-11-16 10:35:32 -05:00
committed by GitHub
parent e7a30ac464 a353c8d1bb
commit eacb7c8aba
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/api/login_oauth.go
View File

@@ -96,7 +96,7 @@ func OAuthLogin(ctx *middleware.Context) {
} }
sslcli := &http.Client{Transport: tr} sslcli := &http.Client{Transport: tr}
oauthCtx = context.TODO() oauthCtx = context.Background()
oauthCtx = context.WithValue(oauthCtx, oauth2.HTTPClient, sslcli) oauthCtx = context.WithValue(oauthCtx, oauth2.HTTPClient, sslcli)
} }
@@ -106,6 +106,8 @@ func OAuthLogin(ctx *middleware.Context) {
ctx.Handle(500, "login.OAuthLogin(NewTransportWithCode)", err) ctx.Handle(500, "login.OAuthLogin(NewTransportWithCode)", err)
return return
} }
// token.TokenType was defaulting to "bearer", which is out of spec, so we explicitly set to "Bearer"
token.TokenType = "Bearer"
ctx.Logger.Debug("OAuthLogin Got token") ctx.Logger.Debug("OAuthLogin Got token")