Updated to include the entire original request in platform

sveltejs · Dec 15, 2022 · 42ffef8 · 42ffef8
1 parent f0a843f
commit 42ffef8
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 25 deletions.
diff --git a/.changeset/fast-nails-attack.md b/.changeset/fast-nails-attack.md
@@ -2,4 +2,4 @@
 '@sveltejs/adapter-node': minor
 ---
 
-Allow preserving specific keys from the original request object for use during SSR
+Include the original request within the Platform object.
diff --git a/packages/adapter-node/README.md b/packages/adapter-node/README.md
@@ -116,8 +116,7 @@ export default {
       // default options are shown
       out: 'build',
       precompress: false,
-      envPrefix: '',
-      preservedRequestKeys: []
+      envPrefix: ''
     })
   }
 };
@@ -146,16 +145,6 @@ MY_CUSTOM_ORIGIN=https://my.site \
 node build
 ```
 
-### preservedRequestKeys
-
-Allows preserving specific keys (such as custom keys set by Express middleware) from the original request object which was supplied to SvelteKit.
-
-This is will allow access to these keys within server hooks and handlers.
-
-```js
-preservedRequestKeys: ['sessionID'],
-```
-
 ## Custom server
 
 The adapter creates two files in your build directory — `index.js` and `handler.js`. Running `index.js` — e.g. `node build`, if you use the default build directory — will start a server on the configured port.

diff --git a/packages/adapter-node/index.d.ts b/packages/adapter-node/index.d.ts
@@ -4,6 +4,12 @@ declare global {
 	const ENV_PREFIX: string;
 }
 
+declare namespace App {
+	export interface Platform {
+		originalReq: Request;
+	}
+}
+
 interface AdapterOptions {
 	out?: string;
 	precompress?: boolean;

diff --git a/packages/adapter-node/index.js b/packages/adapter-node/index.js
@@ -9,7 +9,7 @@ const files = fileURLToPath(new URL('./files', import.meta.url).href);
 
 /** @type {import('.').default} */
 export default function (opts = {}) {
-	const { out = 'build', precompress, envPrefix = '', preservedRequestKeys = [] } = opts;
+	const { out = 'build', precompress, envPrefix = '' } = opts;
 
 	return {
 		name: '@sveltejs/adapter-node',
@@ -72,8 +72,7 @@ export default function (opts = {}) {
 					HANDLER: './handler.js',
 					MANIFEST: './server/manifest.js',
 					SERVER: `./server/index.js`,
-					ENV_PREFIX: JSON.stringify(envPrefix),
-					PRESERVED_REQUEST_KEYS: JSON.stringify(preservedRequestKeys)
+					ENV_PREFIX: JSON.stringify(envPrefix)
 				}
 			});
 		}

diff --git a/packages/adapter-node/src/handler.js b/packages/adapter-node/src/handler.js
@@ -21,8 +21,6 @@ const body_size_limit = parseInt(env('BODY_SIZE_LIMIT', '524288'));
 
 const dir = path.dirname(fileURLToPath(import.meta.url));
 
-const preservedRequestKeys = JSON.parse('PRESERVED_REQUEST_KEYS');
-
 /**
  * @param {string} path
  * @param {boolean} client
@@ -49,19 +47,13 @@ function serve(path, client = false) {
 /** @type {import('polka').Middleware} */
 const ssr = async (req, res) => {
 	let request;
-	const platform = {}
 
 	try {
 		request = await getRequest({
 			base: origin || get_origin(req.headers),
 			request: req,
 			bodySizeLimit: body_size_limit
 		});
-
-		for (const key of preservedRequestKeys) {
-			// @ts-expect-error
-			platform[key] = req[key];
-		}
 	} catch (err) {
 		res.statusCode = err.status || 400;
 		res.end('Invalid request body');
@@ -79,7 +71,7 @@ const ssr = async (req, res) => {
 	setResponse(
 		res,
 		await server.respond(request, {
-			platform,
+			platform: { originalReq: req },
 			getClientAddress: () => {
 				if (address_header) {
 					const value = /** @type {string} */ (req.headers[address_header]) || '';