From 0a7e7a6e62388b4d4b54f5c6467b58800608c8de Mon Sep 17 00:00:00 2001 From: Siddharth Suresh Date: Mon, 3 Mar 2025 14:23:41 +0530 Subject: [PATCH 1/3] fix: null cookies being set --- packages/blitz-auth/src/server/auth-sessions.ts | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/packages/blitz-auth/src/server/auth-sessions.ts b/packages/blitz-auth/src/server/auth-sessions.ts index bae488cd9d..69c74b21a1 100644 --- a/packages/blitz-auth/src/server/auth-sessions.ts +++ b/packages/blitz-auth/src/server/auth-sessions.ts @@ -465,10 +465,12 @@ export class SessionContextClass implements SessionContext { return } const cookieHeaders = this._headers.get("set-cookie") - if (response instanceof Response) { - response.headers.append("Set-Cookie", cookieHeaders!) - } else { - append(response, "Set-Cookie", splitCookiesString(cookieHeaders!)) + if (cookieHeaders) { + if (response instanceof Response) { + response.headers.append("Set-Cookie", cookieHeaders) + } else { + append(response, "Set-Cookie", splitCookiesString(cookieHeaders)) + } } const headers = this._headers.entries() From 5366222c348ab7fdca3b053972da8b72de0c25de Mon Sep 17 00:00:00 2001 From: Siddharth Suresh Date: Mon, 3 Mar 2025 18:19:37 +0530 Subject: [PATCH 2/3] fixes --- packages/blitz-auth/src/server/auth-sessions.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/blitz-auth/src/server/auth-sessions.ts b/packages/blitz-auth/src/server/auth-sessions.ts index 69c74b21a1..dcb13ca2f8 100644 --- a/packages/blitz-auth/src/server/auth-sessions.ts +++ b/packages/blitz-auth/src/server/auth-sessions.ts @@ -1283,7 +1283,7 @@ export function append(res: ServerResponse, field: string, val: string | string[ : [prev, val] } - value = Array.isArray(value) ? value.map(String) : String(value) + value = Array.isArray(value) ? value.filter(Boolean).map(String) : String(value) res.setHeader(field, value) return res } From 5a546d4c72da969ce8653a449d3e68942c604453 Mon Sep 17 00:00:00 2001 From: Siddharth Suresh Date: Mon, 3 Mar 2025 18:22:07 +0530 Subject: [PATCH 3/3] Create proud-experts-collect.md --- .changeset/proud-experts-collect.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .changeset/proud-experts-collect.md diff --git a/.changeset/proud-experts-collect.md b/.changeset/proud-experts-collect.md new file mode 100644 index 0000000000..0385d2aaef --- /dev/null +++ b/.changeset/proud-experts-collect.md @@ -0,0 +1,5 @@ +--- +"@blitzjs/auth": patch +--- + +fix: TODO: Optimise cookie setting flow