Live: Fix live streaming with live-service-web-worker feature flag …

…enabled (#55528)
grafana · Sep 21, 2022 · 5a1f004 · 5a1f004
1 parent c184329
commit 5a1f004
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/public/app/features/live/centrifuge/service.ts b/public/app/features/live/centrifuge/service.ts
@@ -18,14 +18,14 @@ import {
   StreamingFrameOptions,
 } from '@grafana/runtime/src/services/live';
 import { BackendDataSourceResponse } from '@grafana/runtime/src/utils/queryResponse';
-import { loadUrlToken } from 'app/core/utils/urlToken';
 
 import { StreamingResponseData } from '../data/utils';
 
 import { LiveDataStream } from './LiveDataStream';
 import { CentrifugeLiveChannel } from './channel';
 
 export type CentrifugeSrvDeps = {
+  grafanaAuthToken: string | null;
   appUrl: string;
   orgId: number;
   orgRole: string;
@@ -70,7 +70,7 @@ export class CentrifugeService implements CentrifugeSrv {
 
     let liveUrl = `${deps.appUrl.replace(/^http/, 'ws')}/api/live/ws`;
 
-    const token = loadUrlToken();
+    const token = deps.grafanaAuthToken;
     if (token !== null && token !== '') {
       liveUrl += '?auth_token=' + token;
     }

diff --git a/public/app/features/live/index.ts b/public/app/features/live/index.ts
@@ -2,6 +2,7 @@ import { config, getBackendSrv, getGrafanaLiveSrv, setGrafanaLiveSrv } from '@gr
 import { liveTimer } from 'app/features/dashboard/dashgrid/liveTimer';
 
 import { contextSrv } from '../../core/services/context_srv';
+import { loadUrlToken } from '../../core/utils/urlToken';
 
 import { CentrifugeService } from './centrifuge/service';
 import { CentrifugeServiceWorkerProxy } from './centrifuge/serviceWorkerProxy';
@@ -22,6 +23,7 @@ export function initGrafanaLive() {
     liveEnabled: config.liveEnabled,
     sessionId,
     dataStreamSubscriberReadiness: liveTimer.ok.asObservable(),
+    grafanaAuthToken: loadUrlToken(),
   };
 
   const centrifugeSrv = config.featureToggles['live-service-web-worker']