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

Fixed broken if statement

Browse Source
This commit is contained in:
Erik Sundell
2018-09-05 14:13:47 +02:00
committed by Daniel Lee
parent 7197a4c17f
commit 350bcf4f56
1 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/api/pluginproxy/ds_proxy.go
View File

@@ -164,7 +164,6 @@ func (proxy *DataSourceProxy) getDirector() func(req *http.Request) {
} else {
req.URL.Path = util.JoinUrlFragments(proxy.targetUrl.Path, proxy.proxyPath)
}
if proxy.ds.BasicAuth {
req.Header.Del("Authorization")
req.Header.Add("Authorization", util.GetBasicAuthHeader(proxy.ds.BasicAuthUser, proxy.ds.BasicAuthPassword))
@@ -352,7 +351,6 @@ func (proxy *DataSourceProxy) applyRoute(req *http.Request) {
}
if proxy.route.JwtTokenAuth != nil {
logger.Info("getJwtAccessToken", "JwtAccessToken", proxy.route.JwtTokenAuth)
if token, err := proxy.getJwtAccessToken(data); err != nil {
logger.Error("Failed to get access token", "error", err)
} else {
@@ -433,7 +431,7 @@ func (proxy *DataSourceProxy) getJwtAccessToken(data templateData) (string, erro
ctx := context.Background()
tokenSrc := conf.TokenSource(ctx)
token, err := tokenSrc.Token()
if err == nil {
if err != nil {
return "", err
}
return token.AccessToken, nil