From 3b96f85c55490f5f5312b43a6dec9f84cf8040fa Mon Sep 17 00:00:00 2001 From: Andrew Bastin Date: Sat, 18 Jan 2020 04:30:24 -0500 Subject: [PATCH] Make James happy by doing proper code refactors --- functions/strategies/FirefoxStrategy.js | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/functions/strategies/FirefoxStrategy.js b/functions/strategies/FirefoxStrategy.js index aeda4c14..1e12ba11 100644 --- a/functions/strategies/FirefoxStrategy.js +++ b/functions/strategies/FirefoxStrategy.js @@ -3,8 +3,11 @@ const firefoxWithProxy = (req, store) => new Promise((resolve, reject) => { const eventListener = (event) => { window.removeEventListener("firefoxExtSendRequestComplete", event); - if (event.detail.error) reject(JSON.parse(event.detail.error)); - else resolve(JSON.parse(event.detail.response)); + if (event.detail.error) { + reject(JSON.parse(event.detail.error)); + } else { + resolve(JSON.parse(event.detail.response)); + } }; window.addEventListener("firefoxExtSendRequestComplete", eventListener); @@ -20,8 +23,11 @@ const firefoxWithoutProxy = (req, _store) => new Promise((resolve, reject) => { const eventListener = (event) => { window.removeEventListener("firefoxExtSendRequestComplete", eventListener); - if (event.detail.error) reject(JSON.parse(event.detail.error)); - else resolve(JSON.parse(event.detail.response)); + if (event.detail.error) { + reject(JSON.parse(event.detail.error)); + } else { + resolve(JSON.parse(event.detail.response)); + } }; window.addEventListener("firefoxExtSendRequestComplete", eventListener); @@ -32,8 +38,9 @@ const firefoxWithoutProxy = (req, _store) => new Promise((resolve, reject) => { const firefoxStrategy = (req, store) => { if (store.state.postwoman.settings.PROXY_ENABLED) { return firefoxWithProxy(req, store); + } else { + return firefoxWithoutProxy(req, store); } - return firefoxWithoutProxy(req, store); } export default firefoxStrategy;