From 1b624b2505908c3e58117ae7ce22d77b2fc11642 Mon Sep 17 00:00:00 2001 From: Deluan Date: Mon, 9 Nov 2020 15:59:21 -0500 Subject: [PATCH] Do not create the EventStream if unauthenticated --- ui/src/eventStream.js | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/ui/src/eventStream.js b/ui/src/eventStream.js index 28983b5d..1af52359 100644 --- a/ui/src/eventStream.js +++ b/ui/src/eventStream.js @@ -20,13 +20,20 @@ const setTimeout = () => { window.clearTimeout(timeOut) } timeOut = window.setTimeout(() => { - es.close() + if (es != null) { + es.close() + } es = null startEventStream(onMessageHandler) }, 20000) } export const startEventStream = (messageHandler) => { + setTimeout() + if (!localStorage.getItem('token')) { + console.log('Cannot create a unauthenticated EventSource') + return + } const es = getEventStream() onMessageHandler = messageHandler es.onmessage = throttle( @@ -40,5 +47,4 @@ export const startEventStream = (messageHandler) => { 100, { trailing: true } ) - setTimeout() }