From be86e3bf25009a463c84929110b1ef562720fd1a Mon Sep 17 00:00:00 2001
From: Alex Guerrieri <ag@sequence.xyz>
Date: Tue, 14 Oct 2025 14:25:14 +0200
Subject: [PATCH] fix: skip set project id from access key when already set by
 project jwt

---
 middleware.go | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/middleware.go b/middleware.go
index 338a3f6..668dc66 100644
--- a/middleware.go
+++ b/middleware.go
@@ -250,8 +250,9 @@ func Session(cfg Options) func(next http.Handler) http.Handler {
 					sessionType = max(sessionType, proto.SessionType_AccessKey)
 
 					ctx = WithAccessKey(ctx, accessKey)
-
-					projectID, _ = GetProjectIDFromAccessKey(accessKey)
+					if projectID == 0 {
+						projectID, _ = GetProjectIDFromAccessKey(accessKey)
+					}
 					ctx = withProjectID(ctx, projectID)
 					httplog.SetAttrs(ctx, slog.Uint64("projectId", projectID))
 					break