IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2024-11-27 11:20:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

stackdriver: wip - temp remove jwt token auth

Browse Source
This commit is contained in:
Erik Sundell 2018-10-08 08:39:58 +02:00
parent b2de0d8c3e
commit 3f9ed2efaa
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkg/api/pluginproxy/ds_auth_provider.go
View File

@ -64,11 +64,7 @@ func ApplyRoute(ctx context.Context, req *http.Request, proxyPath string, route
// }
if ds.Type == "stackdriver" {
defaultCredentials, err := google.FindDefaultCredentials(ctx, "https://www.googleapis.com/auth/monitoring.read")
projectName := ds.JsonData.Get("defaultProject").MustString()
if projectName == "" {
ds.JsonData.Set("defaultProject", defaultCredentials.ProjectID)
}
defaultCredentials, err := google.FindDefaultCredentials(ctx, route.JwtTokenAuth.Scopes...)
if err != nil {
logger.Error("Failed to get default credentials", "error", err)
} else {
@ -76,6 +72,7 @@ func ApplyRoute(ctx context.Context, req *http.Request, proxyPath string, route
if err != nil {
logger.Error("Failed to get default access token", "error", err)
} else {
ds.JsonData.Set("defaultProject", defaultCredentials.ProjectID)
req.Header.Add("Authorization", fmt.Sprintf("Bearer %s", token.AccessToken))
}
}