[fix] Server-side fetch request should have headers (#696)

packages/kit/src/runtime/server/page/load_node.js

@@ -94,6 +94,15 @@ export async function load_node({
 
 				opts.headers = new Headers(opts.headers);
 
+				// merge headers from request
+				for (const [key, value] of event.request.headers) {
+					if (opts.headers.has(key)) continue;
+					if (key === 'cookie' || key === 'authorization' || key === 'if-none-match') continue;
+					opts.headers.set(key, value);
+				}
+
+				opts.headers.set('referer', event.url.href);
+
 				const resolved = resolve(event.url.pathname, requested.split('?')[0]);
 
 				/** @type {Response} */
@@ -209,10 +218,10 @@ export async function load_node({
 							if (!opts.body || typeof opts.body === 'string') {
 								// prettier-ignore
 								fetched.push({
-										url: requested,
-										body: /** @type {string} */ (opts.body),
-										json: `{"status":${response.status},"statusText":${s(response.statusText)},"headers":${s(headers)},"body":"${escape_json_string_in_html(body)}"}`
-									});
+									url: requested,
+									body: /** @type {string} */ (opts.body),
+									json: `{"status":${response.status},"statusText":${s(response.statusText)},"headers":${s(headers)},"body":"${escape_json_string_in_html(body)}"}`
+								});
 							}
 
 							if (dependency) {

packages/kit/test/apps/basics/src/routes/load/fetch-headers.json.js

@@ -0,0 +1,6 @@
+/** @type {import('@sveltejs/kit').RequestHandler} */
+export function get({ request }) {
+	return {
+		body: Object.fromEntries(request.headers)
+	};
+}

packages/kit/test/apps/basics/src/routes/load/fetch-headers.svelte

@@ -0,0 +1,26 @@
+<script context="module">
+	/** @type {import('@sveltejs/kit').Load} */
+	export async function load({ fetch }) {
+		const res = await fetch('/load/fetch-headers.json');
+
+		return {
+			props: {
+				headers: await res.json()
+			}
+		};
+	}
+</script>
+
+<script>
+	/** @type {Record<string, string>} */
+	export let headers;
+
+	const json = JSON.stringify({
+		'sec-fetch-dest': headers['sec-fetch-dest'],
+		'sec-fetch-mode': headers['sec-fetch-mode'],
+		'if-none-match': headers['if-none-match'],
+		referer: headers['referer']
+	});
+</script>
+
+<pre>{json}</pre>

packages/kit/test/apps/basics/src/routes/load/index.svelte

@@ -22,6 +22,7 @@
 
 <a href="/load/fetch-request">fetch request</a>
 <a href="/load/fetch-credentialed">fetch credentialed</a>
+<a href="/load/fetch-headers">fetch headers</a>
 <a href="/load/large-response">large response</a>
 <a href="/load/raw-body">raw body</a>
 <a href="/load/server-fetch-request">server fetch request</a>

packages/kit/test/apps/basics/test/test.js

@@ -1036,6 +1036,25 @@ test.describe.parallel('Load', () => {
 		expect(await page.textContent('h1')).toBe('Hello SvelteKit!');
 	});
 
+	test('includes correct page request headers', async ({
+		baseURL,
+		page,
+		clicknav,
+		javaScriptEnabled
+	}) => {
+		await page.goto('/load');
+		await clicknav('[href="/load/fetch-headers"]');
+
+		const json = /** @type {string} */ (await page.textContent('pre'));
+		expect(JSON.parse(json)).toEqual({
+			referer: `${baseURL}/load/fetch-headers`,
+			// these headers aren't particularly useful, but they allow us to verify
+			// that page headers are being forwarded
+			'sec-fetch-dest': javaScriptEnabled ? 'empty' : 'document',
+			'sec-fetch-mode': javaScriptEnabled ? 'cors' : 'navigate'
+		});
+	});
+
 	test('exposes rawBody to endpoints', async ({ page, clicknav }) => {
 		await page.goto('/load');
 		await clicknav('[href="/load/raw-body"]');