From a6310e9c3a3289b83ec75b9e27a5de36c716279a Mon Sep 17 00:00:00 2001
From: Joe Haddad <joe.haddad@zeit.co>
Date: Fri, 21 Feb 2020 15:54:44 -0500
Subject: [PATCH] Fix Cookie Expiration

---
 packages/next/next-server/server/api-utils.ts         | 10 ++++++++--
 test/integration/prerender-preview/test/index.test.js |  7 +++++--
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/packages/next/next-server/server/api-utils.ts b/packages/next/next-server/server/api-utils.ts
index 17c3332bcb83c..340d4babd71f2 100644
--- a/packages/next/next-server/server/api-utils.ts
+++ b/packages/next/next-server/server/api-utils.ts
@@ -414,13 +414,19 @@ function clearPreviewData<T>(res: NextApiResponse<T>): NextApiResponse<T> {
       ? previous
       : []),
     serialize(COOKIE_NAME_PRERENDER_BYPASS, '', {
-      maxAge: 0,
+      // To delete a cookie, set `expires` to a date in the past:
+      // https://tools.ietf.org/html/rfc6265#section-4.1.1
+      // `Max-Age: 0` is not valid, thus ignored, and the cookie is persisted.
+      expires: new Date(0),
       httpOnly: true,
       sameSite: 'strict',
       path: '/',
     }),
     serialize(COOKIE_NAME_PRERENDER_DATA, '', {
-      maxAge: 0,
+      // To delete a cookie, set `expires` to a date in the past:
+      // https://tools.ietf.org/html/rfc6265#section-4.1.1
+      // `Max-Age: 0` is not valid, thus ignored, and the cookie is persisted.
+      expires: new Date(0),
       httpOnly: true,
       sameSite: 'strict',
       path: '/',
diff --git a/test/integration/prerender-preview/test/index.test.js b/test/integration/prerender-preview/test/index.test.js
index 120be2cef3c59..c7f7058d02557 100644
--- a/test/integration/prerender-preview/test/index.test.js
+++ b/test/integration/prerender-preview/test/index.test.js
@@ -106,6 +106,7 @@ function runTests() {
 
     const cookies = res.headers
       .get('set-cookie')
+      .replace(/(=\w{3}),/g, '$1')
       .split(',')
       .map(cookie.parse)
 
@@ -113,15 +114,17 @@ function runTests() {
     expect(cookies[0]).toMatchObject({
       Path: '/',
       SameSite: 'Strict',
-      'Max-Age': '0',
+      Expires: 'Thu 01 Jan 1970 00:00:00 GMT',
     })
     expect(cookies[0]).toHaveProperty('__prerender_bypass')
+    expect(cookies[0]).not.toHaveProperty('Max-Age')
     expect(cookies[1]).toMatchObject({
       Path: '/',
       SameSite: 'Strict',
-      'Max-Age': '0',
+      Expires: 'Thu 01 Jan 1970 00:00:00 GMT',
     })
     expect(cookies[1]).toHaveProperty('__next_preview_data')
+    expect(cookies[1]).not.toHaveProperty('Max-Age')
   })
 
   /** @type import('next-webdriver').Chain */