btwedutech/hoppscotch
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 6 Wiki Activity

Make James happy by doing proper code refactors

Browse Source
This commit is contained in:
Andrew Bastin
2020-01-18 04:30:24 -05:00
parent 8e86e4c8e8
commit 3b96f85c55
1 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
functions/strategies/FirefoxStrategy.js
View File

@@ -3,8 +3,11 @@ const firefoxWithProxy = (req, store) => new Promise((resolve, reject) => {
const eventListener = (event) => { const eventListener = (event) => {
window.removeEventListener("firefoxExtSendRequestComplete", event); window.removeEventListener("firefoxExtSendRequestComplete", event);
if (event.detail.error) reject(JSON.parse(event.detail.error)); if (event.detail.error) {
else resolve(JSON.parse(event.detail.response)); reject(JSON.parse(event.detail.error));
} else {
resolve(JSON.parse(event.detail.response));
}
}; };
window.addEventListener("firefoxExtSendRequestComplete", eventListener); window.addEventListener("firefoxExtSendRequestComplete", eventListener);
@@ -20,8 +23,11 @@ const firefoxWithoutProxy = (req, _store) => new Promise((resolve, reject) => {
const eventListener = (event) => { const eventListener = (event) => {
window.removeEventListener("firefoxExtSendRequestComplete", eventListener); window.removeEventListener("firefoxExtSendRequestComplete", eventListener);
if (event.detail.error) reject(JSON.parse(event.detail.error)); if (event.detail.error) {
else resolve(JSON.parse(event.detail.response)); reject(JSON.parse(event.detail.error));
} else {
resolve(JSON.parse(event.detail.response));
}
}; };
window.addEventListener("firefoxExtSendRequestComplete", eventListener); window.addEventListener("firefoxExtSendRequestComplete", eventListener);
@@ -32,8 +38,9 @@ const firefoxWithoutProxy = (req, _store) => new Promise((resolve, reject) => {
const firefoxStrategy = (req, store) => { const firefoxStrategy = (req, store) => {
if (store.state.postwoman.settings.PROXY_ENABLED) { if (store.state.postwoman.settings.PROXY_ENABLED) {
return firefoxWithProxy(req, store); return firefoxWithProxy(req, store);
} } else {
return firefoxWithoutProxy(req, store); return firefoxWithoutProxy(req, store);
} }
}
export default firefoxStrategy; export default firefoxStrategy;