@fastify/cookie 9.0.2 → 9.0.4

package/package.json

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

package/plugin.js

@@ -9,6 +9,8 @@ const kReplySetCookies = Symbol('fastify.reply.setCookies')
 const kReplySetCookiesHookRan = Symbol('fastify.reply.setCookiesHookRan')
 
 function fastifyCookieSetCookie (reply, name, value, options) {
+  parseCookies(reply.context.server, reply.request, reply)
+
   const opts = Object.assign({}, options)
 
   if (opts.expires && Number.isInteger(opts.expires)) {
@@ -46,24 +48,25 @@ 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()
     }
 }
@@ -99,6 +102,11 @@ function setCookies (reply) {
 }
 
 function fastifyCookieOnSendHandler (fastifyReq, fastifyRes, payload, done) {
+  if (!fastifyRes[kReplySetCookies]) {
+    done()
+    return
+  }
+
   if (fastifyRes[kReplySetCookies].size) {
     setCookies(fastifyRes)
   }

package/test/cookie.test.js

@@ -1226,3 +1226,51 @@ test('cookies get set correctly if set inside multiple onSends', (t) => {
     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, '/')
+  })
+})
+
+test('do not crash if the onRequest hook is not run', (t) => {
+  t.plan(3)
+  const fastify = Fastify()
+  fastify.addHook('onRequest', async (req, reply) => {
+    return reply.send({ hello: 'world' })
+  })
+
+  fastify.register(plugin)
+
+  fastify.inject({
+    method: 'GET',
+    url: '/test1',
+    headers: {
+      cookie: 'foo=foo'
+    }
+  }, (err, res) => {
+    t.error(err)
+    t.equal(res.statusCode, 200)
+    t.same(JSON.parse(res.body), { hello: 'world' })
+  })
+})