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

Merge pull request #610 from liyasthomas/update-proxy-info

Browse Source 
Update proxy information.
This commit is contained in:
Liyas Thomas
2020-03-01 07:55:20 +05:30
committed by GitHub
parent 54ce6aaffa 78ef6e56e0
commit a9fdba83cc
18 changed files with 53 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.md
View File

@@ -342,7 +342,7 @@
- Serialize a request into JSON? [\#4](https://github.com/liyasthomas/postwoman/issues/4) - Serialize a request into JSON? [\#4](https://github.com/liyasthomas/postwoman/issues/4)
- Add brand new logo to the project [\#244](https://github.com/liyasthomas/postwoman/pull/244) ([caneco](https://github.com/caneco)) - Add brand new logo to the project [\#244](https://github.com/liyasthomas/postwoman/pull/244) ([caneco](https://github.com/caneco))
- Feature/pre request script [\#231](https://github.com/liyasthomas/postwoman/pull/231) ([nickpalenchar](https://github.com/nickpalenchar)) - Feature/pre request script [\#231](https://github.com/liyasthomas/postwoman/pull/231) ([nickpalenchar](https://github.com/nickpalenchar))
- Add the ApolloTV proxy server [\#217](https://github.com/liyasthomas/postwoman/pull/217) ([NBTX](https://github.com/NBTX)) - Add the Apollo Software proxy server [\#217](https://github.com/liyasthomas/postwoman/pull/217) ([NBTX](https://github.com/NBTX))
- bug: keeping information on page change [\#211](https://github.com/liyasthomas/postwoman/pull/211) ([breno-pereira](https://github.com/breno-pereira)) - bug: keeping information on page change [\#211](https://github.com/liyasthomas/postwoman/pull/211) ([breno-pereira](https://github.com/breno-pereira))
- Work in Progress: feature/allow-collections-importing [\#209](https://github.com/liyasthomas/postwoman/pull/209) ([vlad0337187](https://github.com/vlad0337187)) - Work in Progress: feature/allow-collections-importing [\#209](https://github.com/liyasthomas/postwoman/pull/209) ([vlad0337187](https://github.com/vlad0337187))
- Feature/log errors [\#207](https://github.com/liyasthomas/postwoman/pull/207) ([nickpalenchar](https://github.com/nickpalenchar)) - Feature/log errors [\#207](https://github.com/liyasthomas/postwoman/pull/207) ([nickpalenchar](https://github.com/nickpalenchar))

2
README.md
View File

@@ -161,7 +161,7 @@ _Collections are synced with local session storage_
- Access APIs served in non-HTTPS (`http://`) - Access APIs served in non-HTTPS (`http://`)
- Use custom Proxy URL - Use custom Proxy URL
_Official Postwoman Proxy is hosted by ApolloTV - **[Privacy policy](https://apollotv.xyz/legal)**_ _Official Postwoman Proxy is hosted by Apollo Software - **[Privacy Policy](https://apollosoftware.xyz/legal/postwoman)**_
📜 **Pre-Request Scripts β**: Snippets of code associated with a request that are executed before the request is sent. 📜 **Pre-Request Scripts β**: Snippets of code associated with a request that are executed before the request is sent.

2
functions/strategies/AxiosStrategy.js
View File

@@ -2,7 +2,7 @@ import axios from "axios"
const axiosWithProxy = async (req, { state }) => { const axiosWithProxy = async (req, { state }) => {
const { data } = await axios.post( const { data } = await axios.post(
state.postwoman.settings.PROXY_URL || "https://postwoman.apollotv.xyz/", state.postwoman.settings.PROXY_URL || "https://postwoman.apollosoftware.xyz/",
req req
) )
return data return data

10
functions/strategies/ChromeStrategy.js
View File

@@ -35,10 +35,12 @@ const chromeWithProxy = (req, { state }) =>
data: { data: {
config: { config: {
method: "post", method: "post",
url: state.postwoman.settings.PROXY_URL || "https://postwoman.apollotv.xyz/", url:
data: req, state.postwoman.settings.PROXY_URL ||
}, "https://postwoman.apollosoftware.xyz/",
}, data: req
}
}
}, },
({ data }) => { ({ data }) => {
if (data.error) { if (data.error) {

11
functions/strategies/ExtensionStrategy.js
View File

@@ -4,11 +4,12 @@ export const hasExtensionInstalled = () =>
const extensionWithProxy = async (req, { state }) => { const extensionWithProxy = async (req, { state }) => {
const { data } = await window.__POSTWOMAN_EXTENSION_HOOK__.sendRequest({ const { data } = await window.__POSTWOMAN_EXTENSION_HOOK__.sendRequest({
method: "post", method: "post",
url: state.postwoman.settings.PROXY_URL || "https://postwoman.apollotv.xyz/", url:
data: req, state.postwoman.settings.PROXY_URL || "https://postwoman.apollosoftware.xyz/",
}) data: req
return data });
} return data;
};
const extensionWithoutProxy = async (req, _store) => { const extensionWithoutProxy = async (req, _store) => {
const res = await window.__POSTWOMAN_EXTENSION_HOOK__.sendRequest(req) const res = await window.__POSTWOMAN_EXTENSION_HOOK__.sendRequest(req)

9
functions/strategies/FirefoxStrategy.js
View File

@@ -14,10 +14,11 @@ const firefoxWithProxy = (req, { state }) =>
window.firefoxExtSendRequest({ window.firefoxExtSendRequest({
method: "post", method: "post",
url: state.postwoman.settings.PROXY_URL || "https://postwoman.apollotv.xyz/", url:
data: req, state.postwoman.settings.PROXY_URL || "https://postwoman.apollosoftware.xyz/",
}) data: req
}) });
});
const firefoxWithoutProxy = (req, _store) => const firefoxWithoutProxy = (req, _store) =>
new Promise((resolve, reject) => { new Promise((resolve, reject) => {

4
lang/de-DE.js
View File

@@ -79,9 +79,9 @@ export default {
disabled: "Deaktiviert", disabled: "Deaktiviert",
proxy: "Proxy", proxy: "Proxy",
postwoman_official_proxy_hosting: postwoman_official_proxy_hosting:
"Postwomans offizieller Proxy wird durch ApolloTV bereitgestellt.", "Postwomans offizieller Proxy wird durch Apollo Software bereitgestellt.",
read_the: "Lies die", read_the: "Lies die",
apollotv_privacy_policy: "ApolloTV Datenschutzerklärung", apollosw_privacy_policy: "Apollo Software Datenschutzerklärung",
contact_us: "Kontaktiere uns", contact_us: "Kontaktiere uns",
connect: "Verbinden", connect: "Verbinden",
disconnect: "Trennen", disconnect: "Trennen",

4
lang/en-US.js
View File

@@ -85,9 +85,9 @@ export default {
enabled: "Enabled", enabled: "Enabled",
disabled: "Disabled", disabled: "Disabled",
proxy: "Proxy", proxy: "Proxy",
postwoman_official_proxy_hosting: "Postwoman's Official Proxy is hosted by ApolloTV.", postwoman_official_proxy_hosting: "Postwoman's Official Proxy is hosted by Apollo Software.",
read_the: "Read the", read_the: "Read the",
apollotv_privacy_policy: "ApolloTV privacy policy", apollosw_privacy_policy: "Apollo Software privacy policy",
contact_us: "Contact us", contact_us: "Contact us",
connect: "Connect", connect: "Connect",
disconnect: "Disconnect", disconnect: "Disconnect",

4
lang/es-ES.js
View File

@@ -78,9 +78,9 @@ export default {
enabled: "Habilitado", enabled: "Habilitado",
disabled: "Deshabilitado", disabled: "Deshabilitado",
proxy: "Proxy", proxy: "Proxy",
postwoman_official_proxy_hosting: "Proxy Oficial de Postwoman está hospedado en ApolloTV.", postwoman_official_proxy_hosting: "Proxy Oficial de Postwoman está hospedado en Apollo Software.",
read_the: "Leer la", read_the: "Leer la",
apollotv_privacy_policy: "Política de Privacidad de ApolloTV", apollosw_privacy_policy: "Política de Privacidad de Apollo Software",
contact_us: "Contáctenos", contact_us: "Contáctenos",
connect: "Conectar", connect: "Conectar",
disconnect: "Desconectar", disconnect: "Desconectar",

4
lang/fa-IR.js
View File

@@ -78,9 +78,9 @@ export default {
enabled: "فعال", enabled: "فعال",
disabled: "غیر فعال", disabled: "غیر فعال",
proxy: "پراکسی", proxy: "پراکسی",
postwoman_official_proxy_hosting: "پراکسی Postwoman برروی هاست ApolloTV قرار دارد.", postwoman_official_proxy_hosting: "پراکسی Postwoman برروی هاست Apollo Software قرار دارد.",
read_the: "بخوانید", read_the: "بخوانید",
apollotv_privacy_policy: "خط مشی رازداری ApolloTV", apollosw_privacy_policy: "خط مشی رازداری Apollo Software",
contact_us: "Contact us", contact_us: "Contact us",
connect: "Connect", connect: "Connect",
disconnect: "Disconnect", disconnect: "Disconnect",

4
lang/fr-FR.js
View File

@@ -78,9 +78,9 @@ export default {
enabled: "Activé", enabled: "Activé",
disabled: "Désactivé", disabled: "Désactivé",
proxy: "Proxy", proxy: "Proxy",
postwoman_official_proxy_hosting: "Le proxy officiel de Postwoman est hébergé par ApolloTV.", postwoman_official_proxy_hosting: "Le proxy officiel de Postwoman est hébergé par Apollo Software.",
read_the: "Lire la", read_the: "Lire la",
apollotv_privacy_policy: "politique de confidentialité ApolloTV", apollosw_privacy_policy: "politique de confidentialité Apollo Software",
contact_us: "Contactez nous", contact_us: "Contactez nous",
connect: "Relier", connect: "Relier",
disconnect: "Déconnecter", disconnect: "Déconnecter",

4
lang/id-ID.js
View File

@@ -78,9 +78,9 @@ export default {
enabled: "diaktifkan", enabled: "diaktifkan",
disabled: "dinonaktifkan", disabled: "dinonaktifkan",
proxy: "Proksi", proxy: "Proksi",
postwoman_official_proxy_hosting: "Proksi Resmi Postwoman dalam penginangan ApolloTV.", postwoman_official_proxy_hosting: "Proksi Resmi Postwoman dalam penginangan Apollo Software.",
read_the: "Bacalah", read_the: "Bacalah",
apollotv_privacy_policy: "kebijakan privasi ApolloTV", apollosw_privacy_policy: "kebijakan privasi Apollo Software",
contact_us: "Hubungi kami", contact_us: "Hubungi kami",
connect: "Menghubungkan", connect: "Menghubungkan",
disconnect: "Memutuskan", disconnect: "Memutuskan",

8
lang/ja-JP.js
View File

@@ -78,9 +78,9 @@ export default {
enabled: "有効", enabled: "有効",
disabled: "無効", disabled: "無効",
proxy: "プロキシ", proxy: "プロキシ",
postwoman_official_proxy_hosting: "Postwomanの公式プロキシは、Apollo TVがホストしています。", postwoman_official_proxy_hosting: "Postwomanの公式プロキシは、Apollo Softwareがホストしています。",
read_the: "プライバシーポリシー", read_the: "プライバシーポリシー",
apollotv_privacy_policy: "を読む", apollosw_privacy_policy: "を読む",
contact_us: "お問い合わせ", contact_us: "お問い合わせ",
connect: "接続", connect: "接続",
disconnect: "切断", disconnect: "切断",
@@ -241,5 +241,5 @@ export default {
go_home: "ホームに戻る", go_home: "ホームに戻る",
reload: "リロード", reload: "リロード",
enter_curl: "cURLを入力", enter_curl: "cURLを入力",
empty: "空", empty: "空"
} };

2
lang/pt-BR.js
View File

@@ -80,7 +80,7 @@ export default {
proxy: "Proxy", proxy: "Proxy",
postwoman_official_proxy_hosting: "Postwoman's alojamento proxy oficial", postwoman_official_proxy_hosting: "Postwoman's alojamento proxy oficial",
read_the: "Leia o", read_the: "Leia o",
apollotv_privacy_policy: "ApolloTV Política de Privacidade", apollosw_privacy_policy: "Apollo Software Política de Privacidade",
contact_us: "Contate-Nos", contact_us: "Contate-Nos",
connect: "Conectar", connect: "Conectar",
disconnect: "Desconectar", disconnect: "Desconectar",

4
lang/tr-TR.js
View File

@@ -78,9 +78,9 @@ export default {
enabled: "Aktif", enabled: "Aktif",
disabled: "Aktif değil", disabled: "Aktif değil",
proxy: "Proxy", proxy: "Proxy",
postwoman_official_proxy_hosting: "Proxy Oficial de Postwoman está hospedado en ApolloTV.", postwoman_official_proxy_hosting: "Proxy Oficial de Postwoman está hospedado en Apollo Software.",
read_the: "Leer la", read_the: "Leer la",
apollotv_privacy_policy: "ApolloTV gizlilik politikaları", apollosw_privacy_policy: "Apollo Software gizlilik politikaları",
contact_us: "Bizimle iletişime geçin", contact_us: "Bizimle iletişime geçin",
connect: "Bağlan", connect: "Bağlan",
disconnect: "Kesmek", disconnect: "Kesmek",

4
lang/zh-CN.js
View File

@@ -78,9 +78,9 @@ export default {
enabled: "已启用", enabled: "已启用",
disabled: "已禁用", disabled: "已禁用",
proxy: "代理", proxy: "代理",
postwoman_official_proxy_hosting: "Postwoman的官方代理由ApolloTV托管", postwoman_official_proxy_hosting: "Postwoman的官方代理由Apollo Software托管",
read_the: "阅读", read_the: "阅读",
apollotv_privacy_policy: "ApolloTV隐私政策", apollosw_privacy_policy: "Apollo Software隐私政策",
contact_us: "联系我们", contact_us: "联系我们",
connect: "连接", connect: "连接",
disconnect: "断开", disconnect: "断开",

5
pages/graphql.vue
View File

@@ -591,8 +591,9 @@ export default {
? { ? {
method: "post", method: "post",
url: url:
this.$store.state.postwoman.settings.PROXY_URL || `https://postwoman.apollotv.xyz/`, this.$store.state.postwoman.settings.PROXY_URL ||
data: reqOptions, `https://postwoman.apollosoftware.xyz/`,
data: reqOptions
} }
: reqOptions : reqOptions

16
pages/settings.vue
View File

@@ -207,9 +207,12 @@
{{ $t("postwoman_official_proxy_hosting") }} {{ $t("postwoman_official_proxy_hosting") }}
<br /> <br />
{{ $t("read_the") }} {{ $t("read_the") }}
<a class="link" href="https://apollotv.xyz/legal" target="_blank" rel="noopener"> <a
{{ $t("apollotv_privacy_policy") }} </a class="link"
>. href="https://apollosoftware.xyz/legal/postwoman"
target="_blank"
rel="noopener">
{{ $t("apollosw_privacy_policy") }} </a>.
</p> </p>
</li> </li>
</ul> </ul>
@@ -338,8 +341,7 @@ export default {
FRAME_COLORS_ENABLED: this.$store.state.postwoman.settings.FRAME_COLORS_ENABLED || false, FRAME_COLORS_ENABLED: this.$store.state.postwoman.settings.FRAME_COLORS_ENABLED || false,
PROXY_ENABLED: this.$store.state.postwoman.settings.PROXY_ENABLED || false, PROXY_ENABLED: this.$store.state.postwoman.settings.PROXY_ENABLED || false,
PROXY_URL: PROXY_URL: this.$store.state.postwoman.settings.PROXY_URL || "https://postwoman.apollosoftware.xyz/",
this.$store.state.postwoman.settings.PROXY_URL || "https://postwoman.apollotv.xyz/",
PROXY_KEY: this.$store.state.postwoman.settings.PROXY_KEY || "", PROXY_KEY: this.$store.state.postwoman.settings.PROXY_KEY || "",
EXTENSIONS_ENABLED: EXTENSIONS_ENABLED:
@@ -639,8 +641,8 @@ export default {
fb.writeSettings("syncEnvironments", true) fb.writeSettings("syncEnvironments", true)
}, },
resetProxy({ target }) { resetProxy({ target }) {
this.settings.PROXY_URL = `https://postwoman.apollotv.xyz/` this.settings.PROXY_URL = `https://postwoman.apollosoftware.xyz/`;
target.innerHTML = this.doneButton target.innerHTML = this.doneButton;
this.$toast.info(this.$t("cleared"), { this.$toast.info(this.$t("cleared"), {
icon: "clear_all", icon: "clear_all",
}) })