From 7916dc9c052aeba67a27f3053ca1b02fcfb25300 Mon Sep 17 00:00:00 2001 From: Marcus Davies <55892693+marcus-j-davies@users.noreply.github.com> Date: Tue, 14 Nov 2023 22:31:25 +0000 Subject: [PATCH] Slightly cleaner fasly checks --- .../@node-red/nodes/core/network/22-websocket.js | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/packages/node_modules/@node-red/nodes/core/network/22-websocket.js b/packages/node_modules/@node-red/nodes/core/network/22-websocket.js index acceabda0..3c2509a8e 100644 --- a/packages/node_modules/@node-red/nodes/core/network/22-websocket.js +++ b/packages/node_modules/@node-red/nodes/core/network/22-websocket.js @@ -108,11 +108,10 @@ module.exports = function(RED) { const keyValue = header.keyValue; const valueType = header.valueType; const valueValue = header.valueValue; - + const headerName = keyType === 'other' ? keyValue : keyType; let headerValue; - let result; - + switch(valueType){ case 'other': headerValue = valueValue; @@ -120,11 +119,7 @@ module.exports = function(RED) { case 'env': case 'global': - result = RED.util.evaluateNodeProperty(valueValue,valueType,node); - if(!result){ - continue; - } - headerValue = result + headerValue = RED.util.evaluateNodeProperty(valueValue,valueType,node); break; default: @@ -132,7 +127,9 @@ module.exports = function(RED) { break; } - options.headers[headerName] = headerValue + if(headerName && headerValue){ + options.headers[headerName] = headerValue + } } }