From 3b8a93f21c29fbf9054798a2ba6f1071fc89b2ce Mon Sep 17 00:00:00 2001 From: jcesarmobile Date: Mon, 11 Mar 2024 15:47:11 +0100 Subject: [PATCH 1/2] fix(http): keep original URL properties on proxy --- android/capacitor/src/main/assets/native-bridge.js | 4 +++- core/native-bridge.ts | 7 ++++--- ios/Capacitor/Capacitor/assets/native-bridge.js | 4 +++- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/android/capacitor/src/main/assets/native-bridge.js b/android/capacitor/src/main/assets/native-bridge.js index 6a9227f031..3a4c0e1926 100644 --- a/android/capacitor/src/main/assets/native-bridge.js +++ b/android/capacitor/src/main/assets/native-bridge.js @@ -143,10 +143,12 @@ var nativeBridge = (function (exports) { if (isRelativeOrProxyUrl(url)) return url; let proxyUrl = new URL(url); + const brigeUrl = new URL((_b = (_a = win.Capacitor) === null || _a === void 0 ? void 0 : _a.getServerUrl()) !== null && _b !== void 0 ? _b : ''); const isHttps = proxyUrl.protocol === 'https:'; const originalHost = encodeURIComponent(proxyUrl.host); const originalPathname = proxyUrl.pathname; - proxyUrl = new URL((_b = (_a = win.Capacitor) === null || _a === void 0 ? void 0 : _a.getServerUrl()) !== null && _b !== void 0 ? _b : ''); + proxyUrl.protocol = brigeUrl.protocol; + proxyUrl.host = brigeUrl.host; proxyUrl.pathname = `${isHttps ? CAPACITOR_HTTPS_INTERCEPTOR : CAPACITOR_HTTP_INTERCEPTOR}/${originalHost}${originalPathname}`; return proxyUrl.toString(); }; diff --git a/core/native-bridge.ts b/core/native-bridge.ts index 6660875590..c26d6acbb0 100644 --- a/core/native-bridge.ts +++ b/core/native-bridge.ts @@ -132,12 +132,13 @@ const isRelativeOrProxyUrl = (url: string | undefined): boolean => const createProxyUrl = (url: string, win: WindowCapacitor): string => { if (isRelativeOrProxyUrl(url)) return url; - let proxyUrl = new URL(url); + const proxyUrl = new URL(url); + const brigeUrl = new URL(win.Capacitor?.getServerUrl() ?? ''); const isHttps = proxyUrl.protocol === 'https:'; const originalHost = encodeURIComponent(proxyUrl.host); const originalPathname = proxyUrl.pathname; - proxyUrl = new URL(win.Capacitor?.getServerUrl() ?? ''); - + proxyUrl.protocol = brigeUrl.protocol; + proxyUrl.host = brigeUrl.host; proxyUrl.pathname = `${ isHttps ? CAPACITOR_HTTPS_INTERCEPTOR : CAPACITOR_HTTP_INTERCEPTOR }/${originalHost}${originalPathname}`; diff --git a/ios/Capacitor/Capacitor/assets/native-bridge.js b/ios/Capacitor/Capacitor/assets/native-bridge.js index 6a9227f031..3a4c0e1926 100644 --- a/ios/Capacitor/Capacitor/assets/native-bridge.js +++ b/ios/Capacitor/Capacitor/assets/native-bridge.js @@ -143,10 +143,12 @@ var nativeBridge = (function (exports) { if (isRelativeOrProxyUrl(url)) return url; let proxyUrl = new URL(url); + const brigeUrl = new URL((_b = (_a = win.Capacitor) === null || _a === void 0 ? void 0 : _a.getServerUrl()) !== null && _b !== void 0 ? _b : ''); const isHttps = proxyUrl.protocol === 'https:'; const originalHost = encodeURIComponent(proxyUrl.host); const originalPathname = proxyUrl.pathname; - proxyUrl = new URL((_b = (_a = win.Capacitor) === null || _a === void 0 ? void 0 : _a.getServerUrl()) !== null && _b !== void 0 ? _b : ''); + proxyUrl.protocol = brigeUrl.protocol; + proxyUrl.host = brigeUrl.host; proxyUrl.pathname = `${isHttps ? CAPACITOR_HTTPS_INTERCEPTOR : CAPACITOR_HTTP_INTERCEPTOR}/${originalHost}${originalPathname}`; return proxyUrl.toString(); }; From 1c8d645f84b29814ce62e72b9286bbe29afde986 Mon Sep 17 00:00:00 2001 From: jcesarmobile Date: Tue, 12 Mar 2024 17:49:41 +0100 Subject: [PATCH 2/2] typo --- android/capacitor/src/main/assets/native-bridge.js | 8 ++++---- core/native-bridge.ts | 6 +++--- ios/Capacitor/Capacitor/assets/native-bridge.js | 8 ++++---- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/android/capacitor/src/main/assets/native-bridge.js b/android/capacitor/src/main/assets/native-bridge.js index 3a4c0e1926..dc29bb28f1 100644 --- a/android/capacitor/src/main/assets/native-bridge.js +++ b/android/capacitor/src/main/assets/native-bridge.js @@ -142,13 +142,13 @@ var nativeBridge = (function (exports) { var _a, _b; if (isRelativeOrProxyUrl(url)) return url; - let proxyUrl = new URL(url); - const brigeUrl = new URL((_b = (_a = win.Capacitor) === null || _a === void 0 ? void 0 : _a.getServerUrl()) !== null && _b !== void 0 ? _b : ''); + const proxyUrl = new URL(url); + const bridgeUrl = new URL((_b = (_a = win.Capacitor) === null || _a === void 0 ? void 0 : _a.getServerUrl()) !== null && _b !== void 0 ? _b : ''); const isHttps = proxyUrl.protocol === 'https:'; const originalHost = encodeURIComponent(proxyUrl.host); const originalPathname = proxyUrl.pathname; - proxyUrl.protocol = brigeUrl.protocol; - proxyUrl.host = brigeUrl.host; + proxyUrl.protocol = bridgeUrl.protocol; + proxyUrl.host = bridgeUrl.host; proxyUrl.pathname = `${isHttps ? CAPACITOR_HTTPS_INTERCEPTOR : CAPACITOR_HTTP_INTERCEPTOR}/${originalHost}${originalPathname}`; return proxyUrl.toString(); }; diff --git a/core/native-bridge.ts b/core/native-bridge.ts index c26d6acbb0..a557fed405 100644 --- a/core/native-bridge.ts +++ b/core/native-bridge.ts @@ -133,12 +133,12 @@ const createProxyUrl = (url: string, win: WindowCapacitor): string => { if (isRelativeOrProxyUrl(url)) return url; const proxyUrl = new URL(url); - const brigeUrl = new URL(win.Capacitor?.getServerUrl() ?? ''); + const bridgeUrl = new URL(win.Capacitor?.getServerUrl() ?? ''); const isHttps = proxyUrl.protocol === 'https:'; const originalHost = encodeURIComponent(proxyUrl.host); const originalPathname = proxyUrl.pathname; - proxyUrl.protocol = brigeUrl.protocol; - proxyUrl.host = brigeUrl.host; + proxyUrl.protocol = bridgeUrl.protocol; + proxyUrl.host = bridgeUrl.host; proxyUrl.pathname = `${ isHttps ? CAPACITOR_HTTPS_INTERCEPTOR : CAPACITOR_HTTP_INTERCEPTOR }/${originalHost}${originalPathname}`; diff --git a/ios/Capacitor/Capacitor/assets/native-bridge.js b/ios/Capacitor/Capacitor/assets/native-bridge.js index 3a4c0e1926..dc29bb28f1 100644 --- a/ios/Capacitor/Capacitor/assets/native-bridge.js +++ b/ios/Capacitor/Capacitor/assets/native-bridge.js @@ -142,13 +142,13 @@ var nativeBridge = (function (exports) { var _a, _b; if (isRelativeOrProxyUrl(url)) return url; - let proxyUrl = new URL(url); - const brigeUrl = new URL((_b = (_a = win.Capacitor) === null || _a === void 0 ? void 0 : _a.getServerUrl()) !== null && _b !== void 0 ? _b : ''); + const proxyUrl = new URL(url); + const bridgeUrl = new URL((_b = (_a = win.Capacitor) === null || _a === void 0 ? void 0 : _a.getServerUrl()) !== null && _b !== void 0 ? _b : ''); const isHttps = proxyUrl.protocol === 'https:'; const originalHost = encodeURIComponent(proxyUrl.host); const originalPathname = proxyUrl.pathname; - proxyUrl.protocol = brigeUrl.protocol; - proxyUrl.host = brigeUrl.host; + proxyUrl.protocol = bridgeUrl.protocol; + proxyUrl.host = bridgeUrl.host; proxyUrl.pathname = `${isHttps ? CAPACITOR_HTTPS_INTERCEPTOR : CAPACITOR_HTTP_INTERCEPTOR}/${originalHost}${originalPathname}`; return proxyUrl.toString(); };