Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions plugin.js
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ function fastifyCookieSetCookie (reply, name, value, options) {

if (reply[kReplySetCookiesHookRan]) {
setCookies(reply)
reply[kReplySetCookies].clear()
}

return reply
Expand Down Expand Up @@ -71,14 +70,17 @@ function onReqHandlerWrapper (fastify, hook) {

function setCookies (reply) {
let setCookie = reply.getHeader('Set-Cookie')
const setCookieIsUndefined = setCookie === undefined

/* istanbul ignore else */
if (setCookie === undefined) {
if (setCookieIsUndefined) {
if (reply[kReplySetCookies].size === 1) {
for (const c of reply[kReplySetCookies].values()) {
reply.header('Set-Cookie', cookie.serialize(c.name, c.value, c.opts))
}

reply[kReplySetCookies].clear()

return
}

Expand All @@ -91,14 +93,14 @@ function setCookies (reply) {
setCookie.push(cookie.serialize(c.name, c.value, c.opts))
}

reply.removeHeader('Set-Cookie')
if (!setCookieIsUndefined) reply.removeHeader('Set-Cookie')
reply.header('Set-Cookie', setCookie)
reply[kReplySetCookies].clear()
}

function fastifyCookieOnSendHandler (fastifyReq, fastifyRes, payload, done) {
if (fastifyRes[kReplySetCookies].size) {
setCookies(fastifyRes)
fastifyRes[kReplySetCookies].clear()
}

fastifyRes[kReplySetCookiesHookRan] = true
Expand Down