From 3de4dc5848dc00c1c23e9df84af65a5cab51e8a8 Mon Sep 17 00:00:00 2001
From: Daniel Hritzkiv <daniel.hritzkiv@gmail.com>
Date: Tue, 29 May 2018 12:06:18 -0400
Subject: [PATCH 1/4] Add sameSite property to SessionOptions

---
 types/express-session/index.d.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/types/express-session/index.d.ts b/types/express-session/index.d.ts
index 29d2b4fbbc..0728ff7624 100644
--- a/types/express-session/index.d.ts
+++ b/types/express-session/index.d.ts
@@ -64,6 +64,7 @@ declare namespace session {
     proxy?: boolean;
     saveUninitialized?: boolean;
     unset?: string;
+    sameSite?: boolean | string;
   }
 
   interface BaseMemoryStore {

From 3c1900606e34e738a83370434544a2451dd26ff3 Mon Sep 17 00:00:00 2001
From: Daniel Hritzkiv <daniel.hritzkiv@gmail.com>
Date: Tue, 29 May 2018 12:07:48 -0400
Subject: [PATCH 2/4] Add sameSite property to tests

---
 types/express-session/express-session-tests.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/types/express-session/express-session-tests.ts b/types/express-session/express-session-tests.ts
index dc57e88f0d..37718f7f69 100644
--- a/types/express-session/express-session-tests.ts
+++ b/types/express-session/express-session-tests.ts
@@ -17,7 +17,8 @@ app.use(session({
   resave: true,
   proxy: true,
   saveUninitialized: true,
-  unset: 'keep'
+  unset: 'keep',
+  sameSite: true
 }));
 
 interface MySession extends Express.Session {

From 2b125bc3057582e4d002b1631cf2f0a765064af6 Mon Sep 17 00:00:00 2001
From: Daniel Hritzkiv <daniel.hritzkiv@gmail.com>
Date: Tue, 5 Jun 2018 21:18:31 -0400
Subject: [PATCH 3/4] Fix sameSite parent interface

---
 types/express-session/index.d.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/types/express-session/index.d.ts b/types/express-session/index.d.ts
index 0728ff7624..fdceafeeea 100644
--- a/types/express-session/index.d.ts
+++ b/types/express-session/index.d.ts
@@ -32,6 +32,7 @@ declare global {
       httpOnly: boolean;
       domain?: string;
       expires: Date | boolean;
+      sameSite?: boolean | string;
     }
 
     interface SessionCookie extends SessionCookieData {
@@ -64,7 +65,6 @@ declare namespace session {
     proxy?: boolean;
     saveUninitialized?: boolean;
     unset?: string;
-    sameSite?: boolean | string;
   }
 
   interface BaseMemoryStore {

From 51eb68205a37fb1cc2de4e72bb411313114a5b9c Mon Sep 17 00:00:00 2001
From: Daniel Hritzkiv <daniel.hritzkiv@gmail.com>
Date: Tue, 5 Jun 2018 21:18:59 -0400
Subject: [PATCH 4/4] Fix test for sameSite option

---
 types/express-session/express-session-tests.ts | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/types/express-session/express-session-tests.ts b/types/express-session/express-session-tests.ts
index 37718f7f69..9189db1dfb 100644
--- a/types/express-session/express-session-tests.ts
+++ b/types/express-session/express-session-tests.ts
@@ -11,14 +11,13 @@ app.use(session({
   secret: 'keyboard cat',
   name: 'connect.sid',
   store: new session.MemoryStore(),
-  cookie: { path: '/', httpOnly: true, secure: false },
+  cookie: { path: '/', httpOnly: true, secure: false, sameSite: true },
   genid: (req: express.Request): string => '',
   rolling: false,
   resave: true,
   proxy: true,
   saveUninitialized: true,
-  unset: 'keep',
-  sameSite: true
+  unset: 'keep'
 }));
 
 interface MySession extends Express.Session {