From aa3a46272fd33f19f99ceed8d0a176083163bee3 Mon Sep 17 00:00:00 2001 From: Fabrice Date: Tue, 20 Jul 2021 08:05:12 -0700 Subject: [PATCH] Fix: Handle withCredentials option properly for loki datasource (#36914) The loki datasource was not passing the credentials info to the fetch() API when loki was in Browser access mode. This is similar to: https://github.com/grafana/grafana/pull/23380 --- public/app/plugins/datasource/loki/datasource.ts | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/public/app/plugins/datasource/loki/datasource.ts b/public/app/plugins/datasource/loki/datasource.ts index 8c4be28a7a9..d428bdbdd81 100644 --- a/public/app/plugins/datasource/loki/datasource.ts +++ b/public/app/plugins/datasource/loki/datasource.ts @@ -87,6 +87,12 @@ export class LokiDatasource extends DataSourceApi { const baseUrl = this.instanceSettings.url; const params = data ? serializeParams(data) : ''; const url = `${baseUrl}${apiUrl}${params.length ? `?${params}` : ''}`; + if (this.instanceSettings.withCredentials || this.instanceSettings.basicAuth) { + options = { ...options, withCredentials: true }; + if (this.instanceSettings.basicAuth) { + options.headers = { ...options.headers, Authorization: this.instanceSettings.basicAuth }; + } + } const req = { ...options, url,