@fastify/cookie 9.0.3 → 9.1.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fastify/cookie",
-  "version": "9.0.3",
+  "version": "9.1.0",
   "description": "Plugin for fastify to add support for cookies",
   "main": "plugin.js",
   "types": "types/plugin.d.ts",
@@ -43,11 +43,11 @@
     "@types/node": "^20.1.0",
     "benchmark": "^2.1.4",
     "fastify": "^4.0.0",
-    "sinon": "^15.0.0",
+    "sinon": "^16.0.0",
     "snazzy": "^9.0.0",
     "standard": "^17.0.0",
     "tap": "^16.0.0",
-    "tsd": "^0.28.0"
+    "tsd": "^0.29.0"
   },
   "dependencies": {
     "cookie": "^0.5.0",

package/plugin.js

@@ -9,7 +9,7 @@ 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)
+  parseCookies(reply.server, reply.request, reply)
 
   const opts = Object.assign({}, options)
 
@@ -51,11 +51,9 @@ function fastifyCookieClearCookie (reply, name, options) {
 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)
-  }
+
+  request.cookies = cookieHeader ? fastify.parseCookie(cookieHeader) : {} // New container per request. Issue #53
   reply[kReplySetCookies] = new Map()
 }
 
@@ -102,6 +100,11 @@ function setCookies (reply) {
 }
 
 function fastifyCookieOnSendHandler (fastifyReq, fastifyRes, payload, done) {
+  if (!fastifyRes[kReplySetCookies]) {
+    done()
+    return
+  }
+
   if (fastifyRes[kReplySetCookies].size) {
     setCookies(fastifyRes)
   }
@@ -111,18 +114,6 @@ function fastifyCookieOnSendHandler (fastifyReq, fastifyRes, payload, done) {
   done()
 }
 
-function getHook (hook = 'onRequest') {
-  const hooks = {
-    onRequest: 'onRequest',
-    preParsing: 'preParsing',
-    preValidation: 'preValidation',
-    preHandler: 'preHandler',
-    [false]: false
-  }
-
-  return hooks[hook]
-}
-
 function plugin (fastify, options, next) {
   const secret = options.secret
   const hook = getHook(options.hook)
@@ -185,6 +176,18 @@ function plugin (fastify, options, next) {
   }
 }
 
+function getHook (hook = 'onRequest') {
+  const hooks = {
+    onRequest: 'onRequest',
+    preParsing: 'preParsing',
+    preValidation: 'preValidation',
+    preHandler: 'preHandler',
+    [false]: false
+  }
+
+  return hooks[hook]
+}
+
 function isConnectionSecure (request) {
   return (
     request.raw.socket?.encrypted === true ||
@@ -207,15 +210,9 @@ const fastifyCookie = fp(plugin, {
  * - `import { fastifyCookie } from 'fastify-cookie'`
  * - `import fastifyCookie from 'fastify-cookie'`
  */
-fastifyCookie.signerFactory = Signer
-fastifyCookie.fastifyCookie = fastifyCookie
-fastifyCookie.default = fastifyCookie
 module.exports = fastifyCookie
-
-fastifyCookie.fastifyCookie.signerFactory = Signer
-fastifyCookie.fastifyCookie.Signer = Signer
-fastifyCookie.fastifyCookie.sign = sign
-fastifyCookie.fastifyCookie.unsign = unsign
+module.exports.default = fastifyCookie // supersedes fastifyCookie.default = fastifyCookie
+module.exports.fastifyCookie = fastifyCookie // supersedes fastifyCookie.fastifyCookie = fastifyCookie
 
 module.exports.signerFactory = Signer
 module.exports.Signer = Signer

package/signer.js

@@ -6,7 +6,7 @@
 // The MIT License
 // Copyright (c) 2012–2022 LearnBoost <tj@learnboost.com> and other contributors;
 
-const crypto = require('crypto')
+const crypto = require('node:crypto')
 
 const base64PaddingRE = /=/g
 

package/test/cookie.test.js

@@ -1,7 +1,6 @@
 'use strict'
 
-const tap = require('tap')
-const test = tap.test
+const { test } = require('tap')
 const Fastify = require('fastify')
 const sinon = require('sinon')
 const { sign, unsign } = require('../signer')
@@ -1252,3 +1251,25 @@ test('cookies get set correctly if set inside onRequest', (t) => {
     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' })
+  })
+})

package/test/signer.test.js

@@ -2,7 +2,7 @@
 
 const { test } = require('tap')
 const sinon = require('sinon')
-const crypto = require('crypto')
+const crypto = require('node:crypto')
 const { Signer, sign, unsign } = require('../signer')
 
 test('default', t => {