-
-
Notifications
You must be signed in to change notification settings - Fork 4.2k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #500 from AndrewBastin/refactor/strategy-proxy-han…
…dling Refactoring proxy handling to be done in strategies
- Loading branch information
Showing
4 changed files
with
50 additions
and
21 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,8 +1,24 @@ | ||
import axios from "axios"; | ||
|
||
const axiosStrategy = async (req, _store) => { | ||
const axiosWithProxy = async (req, store) => { | ||
const { data } = await axios.post( | ||
store.state.postwoman.settings.PROXY_URL || | ||
"https://postwoman.apollotv.xyz/", | ||
req | ||
); | ||
return data; | ||
} | ||
|
||
const axiosWithoutProxy = async (req, _store) => { | ||
const res = await axios(req); | ||
return res; | ||
}; | ||
|
||
const axiosStrategy = (req, store) => { | ||
if (store.state.postwoman.settings.PROXY_ENABLED) { | ||
return axiosWithProxy(req, store); | ||
} | ||
return axiosWithoutProxy(req, store); | ||
} | ||
|
||
export default axiosStrategy; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,15 +1,45 @@ | ||
const firefoxStrategy = (req, _store) => new Promise((resolve, reject) => { | ||
|
||
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)); | ||
} | ||
}; | ||
|
||
window.addEventListener("firefoxExtSendRequestComplete", eventListener); | ||
|
||
window.firefoxExtSendRequest({ | ||
method: "post", | ||
url: store.state.postwoman.settings.PROXY_URL || "https://postwoman.apollotv.xyz/", | ||
data: req | ||
}); | ||
}); | ||
|
||
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); | ||
|
||
window.firefoxExtSendRequest(req); | ||
}); | ||
|
||
const firefoxStrategy = (req, store) => { | ||
if (store.state.postwoman.settings.PROXY_ENABLED) { | ||
return firefoxWithProxy(req, store); | ||
} | ||
return firefoxWithoutProxy(req, store); | ||
} | ||
|
||
export default firefoxStrategy; |
This file was deleted.
Oops, something went wrong.