diff --git a/index.js b/index.js index 671db56..c196e69 100644 --- a/index.js +++ b/index.js @@ -35,7 +35,8 @@ async function fastifyHelmet (fastify, options) { fastify.addHook('onRequest', async (request, reply) => { /* istanbul ignore next */ - const { helmet: routeOptions } = request.routeOptions.config || request.context.config + const { helmet: routeOptions } = request.routeOptions?.config || + request.routeConfig if (typeof routeOptions !== 'undefined') { const { enableCSPNonces: enableRouteCSPNonces, skipRoute, ...helmetRouteConfiguration } = routeOptions @@ -52,7 +53,8 @@ async function fastifyHelmet (fastify, options) { fastify.addHook('onRequest', (request, reply, next) => { /* istanbul ignore next */ - const { helmet: routeOptions } = request.routeOptions.config || request.context.config + const { helmet: routeOptions } = request.routeOptions?.config || + request.routeConfig if (typeof routeOptions !== 'undefined') { const { enableCSPNonces: enableRouteCSPNonces, skipRoute, ...helmetRouteConfiguration } = routeOptions diff --git a/test/global.test.js b/test/global.test.js index ce99417..8d494dd 100644 --- a/test/global.test.js +++ b/test/global.test.js @@ -685,7 +685,7 @@ test('It should not return a fastify `FST_ERR_REP_ALREADY_SENT - Reply already s } // We want to crash in the scope of this test - const crash = request.routeOptions.config.fail + const crash = request.routeOptions?.config?.fail || request.routeConfig.fail Promise.resolve(crash).then((fail) => { if (fail === true) {