Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 2 commits into from
Mar 15, 2024
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b1f481f
fix(http): Make proxy work with Request objects
jcesarmobile Mar 14, 2024
ee0787c
Merge branch 'main' into proxy-request
giralte-ionic Mar 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions android/capacitor/src/main/assets/native-bridge.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
19 changes: 12 additions & 7 deletions core/native-bridge.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}`;
Expand Down
10 changes: 7 additions & 3 deletions ios/Capacitor/Capacitor/assets/native-bridge.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down