@fastify/cookie 9.0.1 → 9.0.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fastify/cookie",
-  "version": "9.0.1",
+  "version": "9.0.3",
   "description": "Plugin for fastify to add support for cookies",
   "main": "plugin.js",
   "types": "types/plugin.d.ts",

package/plugin.js

@@ -6,13 +6,11 @@ const cookie = require('cookie')
 const { Signer, sign, unsign } = require('./signer')
 
 const kReplySetCookies = Symbol('fastify.reply.setCookies')
+const kReplySetCookiesHookRan = Symbol('fastify.reply.setCookiesHookRan')
 
 function fastifyCookieSetCookie (reply, name, value, options) {
-  let sendHeaders = false
-  if (reply[kReplySetCookies] === null) {
-    sendHeaders = true
-    reply[kReplySetCookies] = new Map()
-  }
+  parseCookies(reply.context.server, reply.request, reply)
+
   const opts = Object.assign({}, options)
 
   if (opts.expires && Number.isInteger(opts.expires)) {
@@ -34,7 +32,7 @@ function fastifyCookieSetCookie (reply, name, value, options) {
 
   reply[kReplySetCookies].set(`${name};${opts.domain};${opts.path || '/'}`, { name, value, opts })
 
-  if (sendHeaders) {
+  if (reply[kReplySetCookiesHookRan]) {
     setCookies(reply)
   }
 
@@ -50,38 +48,42 @@ function fastifyCookieClearCookie (reply, name, options) {
   return fastifyCookieSetCookie(reply, name, '', opts)
 }
 
+function parseCookies (fastify, request, reply) {
+  if (reply[kReplySetCookies]) return
+
+  request.cookies = {} // New container per request. Issue #53
+  const cookieHeader = request.raw.headers.cookie
+  if (cookieHeader) {
+    request.cookies = fastify.parseCookie(cookieHeader)
+  }
+  reply[kReplySetCookies] = new Map()
+}
+
 function onReqHandlerWrapper (fastify, hook) {
   return hook === 'preParsing'
     ? function fastifyCookieHandler (fastifyReq, fastifyRes, payload, done) {
-      fastifyReq.cookies = {} // New container per request. Issue #53
-      const cookieHeader = fastifyReq.raw.headers.cookie
-      if (cookieHeader) {
-        fastifyReq.cookies = fastify.parseCookie(cookieHeader)
-      }
-      fastifyRes[kReplySetCookies] = new Map()
+      parseCookies(fastify, fastifyReq, fastifyRes)
       done()
     }
     : function fastifyCookieHandler (fastifyReq, fastifyRes, done) {
-      fastifyReq.cookies = {} // New container per request. Issue #53
-      const cookieHeader = fastifyReq.raw.headers.cookie
-      if (cookieHeader) {
-        fastifyReq.cookies = fastify.parseCookie(cookieHeader)
-      }
-      fastifyRes[kReplySetCookies] = new Map()
+      parseCookies(fastify, fastifyReq, fastifyRes)
       done()
     }
 }
 
 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
     }
 
@@ -94,8 +96,9 @@ 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) {
@@ -103,9 +106,7 @@ function fastifyCookieOnSendHandler (fastifyReq, fastifyRes, payload, done) {
     setCookies(fastifyRes)
   }
 
-  // Explicitly set the property to null so that we can
-  // check if the header was already set
-  fastifyRes[kReplySetCookies] = null
+  fastifyRes[kReplySetCookiesHookRan] = true
 
   done()
 }
@@ -147,6 +148,7 @@ function plugin (fastify, options, next) {
 
   fastify.decorateRequest('cookies', null)
   fastify.decorateReply(kReplySetCookies, null)
+  fastify.decorateReply(kReplySetCookiesHookRan, false)
 
   fastify.decorateReply('cookie', setCookie)
   fastify.decorateReply('setCookie', setCookie)

package/signer.js

@@ -24,7 +24,8 @@ function Signer (secrets, algorithm = 'sha256') {
 }
 
 function validateSecrets (secrets) {
-  for (const secret of secrets) {
+  for (let i = 0; i < secrets.length; ++i) {
+    const secret = secrets[i]
     if (typeof secret !== 'string' && Buffer.isBuffer(secret) === false) {
       throw new TypeError('Secret key must be a string or Buffer.')
     }
@@ -59,7 +60,8 @@ function _unsign (signedValue, secrets, algorithm) {
   const value = signedValue.slice(0, signedValue.lastIndexOf('.'))
   const actual = Buffer.from(signedValue.slice(signedValue.lastIndexOf('.') + 1))
 
-  for (const secret of secrets) {
+  for (let i = 0; i < secrets.length; ++i) {
+    const secret = secrets[i]
     const expected = Buffer.from(crypto
       .createHmac(algorithm, secret)
       .update(value)

package/test/cookie.test.js

@@ -1187,3 +1187,68 @@ test('cookies get set correctly if set inside onSend', (t) => {
     t.equal(cookies[0].path, '/')
   })
 })
+
+test('cookies get set correctly if set inside multiple onSends', (t) => {
+  t.plan(10)
+  const fastify = Fastify()
+  fastify.register(plugin)
+
+  fastify.addHook('onSend', async (req, reply, payload) => {
+    reply.setCookie('foo', 'foo', { path: '/' })
+  })
+
+  fastify.addHook('onSend', async (req, reply, payload) => {
+    reply.setCookie('foo', 'foos', { path: '/' })
+    return payload
+  })
+
+  fastify.get('/test1', (req, reply) => {
+    reply
+      .send({ hello: 'world' })
+  })
+
+  fastify.inject({
+    method: 'GET',
+    url: '/test1'
+  }, (err, res) => {
+    t.error(err)
+    t.equal(res.statusCode, 200)
+    t.same(JSON.parse(res.body), { hello: 'world' })
+
+    const cookies = res.cookies
+    t.equal(cookies.length, 2)
+    t.equal(cookies[0].name, 'foo')
+    t.equal(cookies[0].value, 'foo')
+    t.equal(cookies[0].path, '/')
+
+    t.equal(cookies[1].name, 'foo')
+    t.equal(cookies[1].value, 'foos')
+    t.equal(cookies[1].path, '/')
+  })
+})
+
+test('cookies get set correctly if set inside onRequest', (t) => {
+  t.plan(7)
+  const fastify = Fastify()
+  fastify.addHook('onRequest', async (req, reply) => {
+    reply.setCookie('foo', 'foo', { path: '/' })
+    return reply.send({ hello: 'world' })
+  })
+
+  fastify.register(plugin)
+
+  fastify.inject({
+    method: 'GET',
+    url: '/test1'
+  }, (err, res) => {
+    t.error(err)
+    t.equal(res.statusCode, 200)
+    t.same(JSON.parse(res.body), { hello: 'world' })
+
+    const cookies = res.cookies
+    t.equal(cookies.length, 1)
+    t.equal(cookies[0].name, 'foo')
+    t.equal(cookies[0].value, 'foo')
+    t.equal(cookies[0].path, '/')
+  })
+})