From 0acbf16c020d59ab2fb7f4f75d8a2238d1389b4e Mon Sep 17 00:00:00 2001
From: Julien Oculi <xdrz.jot.sr@gmail.com>
Date: Tue, 9 Jul 2024 11:07:23 +0200
Subject: [PATCH] refactor(backend): :recycle: move sessions middleware to own
 file to redure main middleware complexity

---
 routes/_middleware.ts     | 45 ++-------------------------------
 src/session/middleware.ts | 53 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 55 insertions(+), 43 deletions(-)
 create mode 100644 src/session/middleware.ts

diff --git a/routes/_middleware.ts b/routes/_middleware.ts
index 21dd97b..ca93b0b 100644
--- a/routes/_middleware.ts
+++ b/routes/_middleware.ts
@@ -1,7 +1,7 @@
 import { FreshContext } from '$fresh/server.ts'
 import { useCsp } from ':src/csp/middleware.ts'
 import { SessionStore } from ':src/session/mod.ts'
-import { getCookies, setCookie } from '@std/http/cookie'
+import { useSession } from ':src/session/middleware.ts'
 
 export async function handler(request: Request, ctx: FreshContext) {
 	// Update fresh context state with session
@@ -28,53 +28,12 @@ export async function handler(request: Request, ctx: FreshContext) {
 	//? fresh useCSP https://fresh.deno.dev/docs/examples/using-csp
 
 	await useCsp(request, response, ctx)
+	useSession(request, response, ctx)
 
 	// Allow service worker to serve root scope
 	if (ctx.url.pathname.endsWith('island-startserviceworker.js')) {
 		response.headers.set('Service-Worker-Allowed', '/')
 	}
 
-	// Start session
-	if (SessionStore.getFromRequest(request) === undefined) {
-		// Clear outdated cookies
-		for (const cookie in getCookies(request.headers)) {
-			setCookie(response.headers, {
-				name: cookie,
-				value: '',
-				path: '/',
-				expires: 0,
-			})
-		}
-
-		// Create new session
-		const session = SessionStore.createSession()
-		ctx.state = { ...ctx.state, session }
-
-		// Set session cookie
-		setCookie(response.headers, {
-			name: '__Secure-SESSION',
-			value: session.uuid,
-			httpOnly: true,
-			sameSite: 'Strict',
-			secure: true,
-			path: '/',
-			expires: SessionStore.maxAge,
-		})
-
-		// Set csrf
-		const csrf = crypto.randomUUID()
-		session.set('_csrf', csrf)
-
-		setCookie(response.headers, {
-			name: '__Host-CSRF',
-			value: csrf,
-			httpOnly: false,
-			sameSite: 'Strict',
-			secure: true,
-			path: '/',
-			expires: SessionStore.maxAge,
-		})
-	}
-
 	return response
 }
diff --git a/src/session/middleware.ts b/src/session/middleware.ts
new file mode 100644
index 0000000..6b4ec3f
--- /dev/null
+++ b/src/session/middleware.ts
@@ -0,0 +1,53 @@
+import { FreshContext } from '$fresh/server.ts'
+import { SessionStore } from ':src/session/mod.ts'
+import { getCookies, setCookie } from 'jsr:@std/http@^0.224.4/cookie'
+
+export function useSession(
+    request: Request,
+    response: Response,
+    ctx: FreshContext,
+) {
+    // Check if session already started
+    if (SessionStore.getFromRequest(request) !== undefined) {
+        return
+    }
+
+    // Clear outdated cookies
+    for (const cookie in getCookies(request.headers)) {
+        setCookie(response.headers, {
+            name: cookie,
+            value: '',
+            path: '/',
+            expires: 0,
+        })
+    }
+
+    // Create new session
+    const session = SessionStore.createSession()
+    ctx.state = { ...ctx.state, session }
+
+    // Set session cookie
+    setCookie(response.headers, {
+        name: '__Secure-SESSION',
+        value: session.uuid,
+        httpOnly: true,
+        sameSite: 'Strict',
+        secure: true,
+        path: '/',
+        expires: SessionStore.maxAge,
+    })
+
+    // Set csrf
+    const csrf = crypto.randomUUID()
+    session.set('_csrf', csrf)
+
+    setCookie(response.headers, {
+        name: '__Host-CSRF',
+        value: csrf,
+        httpOnly: false,
+        sameSite: 'Strict',
+        secure: true,
+        path: '/',
+        expires: SessionStore.maxAge,
+    })
+}