fix(http): Make proxy work with Request objects (#7348)

ionic-team · Mar 15, 2024 · 7e68725 · 7e68725
1 parent 0c8d69b
commit 7e68725
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 13 deletions.
diff --git a/android/capacitor/src/main/assets/native-bridge.js b/android/capacitor/src/main/assets/native-bridge.js
@@ -500,9 +500,13 @@ var nativeBridge = (function (exports) {
                             options.method.toLocaleUpperCase() === 'HEAD' ||
                             options.method.toLocaleUpperCase() === 'OPTIONS' ||
                             options.method.toLocaleUpperCase() === 'TRACE') {
-                            const modifiedResource = createProxyUrl(resource.toString(), win);
-                            const response = await win.CapacitorWebFetch(modifiedResource, options);
-                            return response;
+                            if (typeof resource === 'string') {
+                                return await win.CapacitorWebFetch(createProxyUrl(resource, win), options);
+                            }
+                            else if (resource instanceof Request) {
+                                const modifiedRequest = new Request(createProxyUrl(resource.url, win), resource);
+                                return await win.CapacitorWebFetch(modifiedRequest, options);
+                            }
                         }
                         const tag = `CapacitorHttp fetch ${Date.now()} ${resource}`;
                         console.time(tag);

diff --git a/core/native-bridge.ts b/core/native-bridge.ts
@@ -554,13 +554,18 @@ const initBridge = (w: any): void => {
             options.method.toLocaleUpperCase() === 'OPTIONS' ||
             options.method.toLocaleUpperCase() === 'TRACE'
           ) {
-            const modifiedResource = createProxyUrl(resource.toString(), win);
-            const response = await win.CapacitorWebFetch(
-              modifiedResource,
-              options,
-            );
-
-            return response;
+            if (typeof resource === 'string') {
+              return await win.CapacitorWebFetch(
+                createProxyUrl(resource, win),
+                options,
+              );
+            } else if (resource instanceof Request) {
+              const modifiedRequest = new Request(
+                createProxyUrl(resource.url, win),
+                resource,
+              );
+              return await win.CapacitorWebFetch(modifiedRequest, options);
+            }
           }
 
           const tag = `CapacitorHttp fetch ${Date.now()} ${resource}`;

diff --git a/ios/Capacitor/Capacitor/assets/native-bridge.js b/ios/Capacitor/Capacitor/assets/native-bridge.js
@@ -500,9 +500,13 @@ var nativeBridge = (function (exports) {
                             options.method.toLocaleUpperCase() === 'HEAD' ||
                             options.method.toLocaleUpperCase() === 'OPTIONS' ||
                             options.method.toLocaleUpperCase() === 'TRACE') {
-                            const modifiedResource = createProxyUrl(resource.toString(), win);
-                            const response = await win.CapacitorWebFetch(modifiedResource, options);
-                            return response;
+                            if (typeof resource === 'string') {
+                                return await win.CapacitorWebFetch(createProxyUrl(resource, win), options);
+                            }
+                            else if (resource instanceof Request) {
+                                const modifiedRequest = new Request(createProxyUrl(resource.url, win), resource);
+                                return await win.CapacitorWebFetch(modifiedRequest, options);
+                            }
                         }
                         const tag = `CapacitorHttp fetch ${Date.now()} ${resource}`;
                         console.time(tag);