Skip to content

Fix CORS on navigation #65

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

Merged
dajinchu merged 1 commit into from
Jan 30, 2026
Merged

Fix CORS on navigation #65

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions bifrost/renderer/bifrost/onAfterRenderClient.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ import { PageContextClient } from "vike/types";
import "../../lib/type";
import { Turbolinks } from "../../lib/turbolinks";

export default async function bifrostOnAfterRenderClient(
export default function bifrostOnAfterRenderClient(
pageContext: PageContextClient
) {
if (!pageContext.isHydration && !pageContext.errorWhileRendering) {
await Turbolinks._vikeAfterRender(pageContext._turbolinksVisit, false);
Turbolinks._vikeAfterRender(pageContext._turbolinksVisit, false);
}
}
10 changes: 9 additions & 1 deletion bifrost/renderer/wrapped/onBeforeRender.client.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,15 @@ export default async function wrappedOnBeforeRender(
*/
const resp = await fetch(pageContext.urlParsed.href, {
headers: { ...pageContext.config.proxyHeaders, accept: "text/html" },
});
}).catch(() => {});

if (!resp) {
// hard reload. can happen on cors errors when redirected to external page
window.location.href = pageContext.urlParsed.href;
Copy link
Collaborator Author

@dajinchu dajinchu Jan 30, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this will go through redirects again. it would be nice to go straight to the redirect location but it is not possible to get the location

// stop vike rendering to let navigation happen
await new Promise(() => {});
return;
}

if (resp.redirected) {
const parsedUrl = new URL(resp.url);
Expand Down
1 change: 1 addition & 0 deletions tests/alb/index.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ const BIFROST_PATHS = [
"/redirect-page",
"/auto-navigate",
"/proxy-to",
"/cors-test",
"/",
];

Expand Down
54 changes: 42 additions & 12 deletions tests/e2e/specs/e2e.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -436,6 +436,30 @@ test.describe("redirects", () => {
await customProxy.goBack();
});

test("on client navigation, redirect to external url", async ({ page }) => {
const externalUrl = "http://localhost:5555/cors-test";
ensureAllNetworkSucceeds(page);
const customProxy = new CustomProxyPage(page, {
title: "first page",
links: [
{
redirectTo: {
url: externalUrl,
title: "external",
},
},
],
});
await customProxy.goto();
await customProxy.clickLink("external", {
browserReload: true,
waitFor: 0,
});

// back button works as expected
await customProxy.goBack();
});

test("sets cookies along the way", async ({ page, context, baseURL }) => {
ensureAllNetworkSucceeds(page);
const customProxy = new CustomProxyPage(page, {
Expand Down Expand Up @@ -1042,12 +1066,15 @@ test.describe("back button restoration", () => {
await customProxy.goto();
const edit = page.getByRole("link").first();

await page.evaluate((rRoot: any) => {
rRoot.appendChild(document.createTextNode("edit1"));
document.addEventListener("turbolinks:before-cache", () => {
rRoot.appendChild(document.createTextNode("edit2"));
});
}, await edit.elementHandle());
await page.evaluate(
(rRoot: any) => {
rRoot.appendChild(document.createTextNode("edit1"));
document.addEventListener("turbolinks:before-cache", () => {
rRoot.appendChild(document.createTextNode("edit2"));
});
},
await edit.elementHandle()
);
await expect(edit).toContainText("edit1");
await expect(edit).not.toContainText("edit2");

Expand All @@ -1065,12 +1092,15 @@ test.describe("back button restoration", () => {
await page.goto("./vite-page");
await waitForTurbolinksInit(page);
const edit = page.getByRole("link").first();
await page.evaluate((rRoot: any) => {
rRoot.appendChild(document.createTextNode("edit1"));
document.addEventListener("turbolinks:before-cache", () => {
rRoot.appendChild(document.createTextNode("edit2"));
});
}, await edit.elementHandle());
await page.evaluate(
(rRoot: any) => {
rRoot.appendChild(document.createTextNode("edit1"));
document.addEventListener("turbolinks:before-cache", () => {
rRoot.appendChild(document.createTextNode("edit2"));
});
},
await edit.elementHandle()
);

await expect(edit).toContainText("edit1");
await expect(edit).not.toContainText("edit2");
Expand Down
12 changes: 10 additions & 2 deletions tests/fake-backend/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,12 @@ app.get(["/custom", "/custom-:id"], async (req, res) => {
}
if ("redirectTo" in data) {
res.status(302);
res.setHeader("location", `${publicUrl}${toPath(data.redirectTo)}`);

res.setHeader(
"location",
("url" in data.redirectTo && data.redirectTo.url) ||
`${publicUrl}${toPath(data.redirectTo)}`
);
if (data.cookies) {
for (const [key, val] of Object.entries(data.cookies)) {
res.setHeader("set-cookie", key + "=" + val);
Expand Down Expand Up @@ -80,7 +85,10 @@ app.get("/script-wrapped", async (req, res) => {
res.setHeader("X-REACT-LAYOUT", "no_layout");
}
res.setHeader("Content-Type", "text/html");
res.status(200).type("text/html").send("<script>console.log('script-only')</script>");
res
.status(200)
.type("text/html")
.send("<script>console.log('script-only')</script>");
});

app.get("/json-wrapped", async (req, res) => {
Expand Down
3 changes: 2 additions & 1 deletion tests/fake-backend/page-builder.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ type LinkOptions = {
};
export type PageDataOk = {
endpoint?: string;
url?: string;
title: string;
bodyAttrs?: string;
layout?: string;
Expand All @@ -29,7 +30,7 @@ export function toPath(data: PageData) {
}
return (
`/${"endpoint" in data ? data!.endpoint : "custom"}?page=` +
encodeURI(JSON.stringify(data))
encodeURIComponent(JSON.stringify(data))
);
}
export enum Turbolinks {
Expand Down
11 changes: 11 additions & 0 deletions tests/vite/server/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,17 @@ async function startServer() {
);
});

app.get("/cors-test", async (req, res) => {
res.header("Access-Control-Allow-Origin", "http://localhost:5555");
res.header("Access-Control-Allow-Credentials", "true");
res
.status(200)
.type("text/html")
.send(
"<html><head><title>external</title></head><body>CORS test page from Vite server</body></html>"
);
});

app.register(viteProxyPlugin, {
upstream: UPSTREAM,
host: HOST,
Expand Down