fix(http): change proxy url generation (#7354)

ionic-team · Mar 20, 2024 · 318c316 · 318c316
1 parent 3c7b333
commit 318c316
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 22 deletions.
diff --git a/android/capacitor/src/main/assets/native-bridge.js b/android/capacitor/src/main/assets/native-bridge.js
@@ -141,13 +141,10 @@ var nativeBridge = (function (exports) {
         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 = bridgeUrl.protocol;
-        proxyUrl.hostname = bridgeUrl.hostname;
-        proxyUrl.port = bridgeUrl.port;
-        proxyUrl.pathname = `${isHttps ? CAPACITOR_HTTPS_INTERCEPTOR : CAPACITOR_HTTP_INTERCEPTOR}/${originalHost}${originalPathname}`;
-        return proxyUrl.toString();
+        bridgeUrl.search = proxyUrl.search;
+        bridgeUrl.hash = proxyUrl.hash;
+        bridgeUrl.pathname = `${isHttps ? CAPACITOR_HTTPS_INTERCEPTOR : CAPACITOR_HTTP_INTERCEPTOR}/${encodeURIComponent(proxyUrl.host)}${proxyUrl.pathname}`;
+        return bridgeUrl.toString();
     };
     const initBridge = (w) => {
         const getPlatformId = (win) => {

diff --git a/core/native-bridge.ts b/core/native-bridge.ts
@@ -131,15 +131,12 @@ const createProxyUrl = (url: string, win: WindowCapacitor): string => {
   const proxyUrl = new URL(url);
   const bridgeUrl = new URL(win.Capacitor?.getServerUrl() ?? '');
   const isHttps = proxyUrl.protocol === 'https:';
-  const originalHost = encodeURIComponent(proxyUrl.host);
-  const originalPathname = proxyUrl.pathname;
-  proxyUrl.protocol = bridgeUrl.protocol;
-  proxyUrl.hostname = bridgeUrl.hostname;
-  proxyUrl.port = bridgeUrl.port;
-  proxyUrl.pathname = `${
+  bridgeUrl.search = proxyUrl.search;
+  bridgeUrl.hash = proxyUrl.hash;
+  bridgeUrl.pathname = `${
     isHttps ? CAPACITOR_HTTPS_INTERCEPTOR : CAPACITOR_HTTP_INTERCEPTOR
-  }/${originalHost}${originalPathname}`;
-  return proxyUrl.toString();
+  }/${encodeURIComponent(proxyUrl.host)}${proxyUrl.pathname}`;
+  return bridgeUrl.toString();
 };
 
 const initBridge = (w: any): void => {

diff --git a/ios/Capacitor/Capacitor/assets/native-bridge.js b/ios/Capacitor/Capacitor/assets/native-bridge.js
@@ -141,13 +141,10 @@ var nativeBridge = (function (exports) {
         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 = bridgeUrl.protocol;
-        proxyUrl.hostname = bridgeUrl.hostname;
-        proxyUrl.port = bridgeUrl.port;
-        proxyUrl.pathname = `${isHttps ? CAPACITOR_HTTPS_INTERCEPTOR : CAPACITOR_HTTP_INTERCEPTOR}/${originalHost}${originalPathname}`;
-        return proxyUrl.toString();
+        bridgeUrl.search = proxyUrl.search;
+        bridgeUrl.hash = proxyUrl.hash;
+        bridgeUrl.pathname = `${isHttps ? CAPACITOR_HTTPS_INTERCEPTOR : CAPACITOR_HTTP_INTERCEPTOR}/${encodeURIComponent(proxyUrl.host)}${proxyUrl.pathname}`;
+        return bridgeUrl.toString();
     };
     const initBridge = (w) => {
         const getPlatformId = (win) => {