Skip to content
Merged
Show file tree
Hide file tree
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
7 changes: 3 additions & 4 deletions index.js
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,7 @@ async function fastifyHelmet (fastify, options) {
})

fastify.addHook('onRequest', async function helmetConfigureReply (request, reply) {
/* c8 ignore next */
const { helmet: routeOptions } = request.routeOptions?.config || request.routeConfig
const { helmet: routeOptions } = request.routeOptions?.config

if (routeOptions !== undefined) {
const { enableCSPNonces: enableRouteCSPNonces, skipRoute, ...helmetRouteConfiguration } = routeOptions
Expand All @@ -51,8 +50,7 @@ async function fastifyHelmet (fastify, options) {
})

fastify.addHook('onRequest', function helmetApplyHeaders (request, reply, next) {
/* c8 ignore next */
const { helmet: routeOptions } = request.routeOptions?.config || request.routeConfig
const { helmet: routeOptions } = request.routeOptions?.config

if (routeOptions !== undefined) {
const { enableCSPNonces: enableRouteCSPNonces, skipRoute, ...helmetRouteConfiguration } = routeOptions
Expand Down Expand Up @@ -135,6 +133,7 @@ async function buildHelmetOnRoutes (request, reply, configuration, enableCSP) {

// Helmet forward a typeof Error object so we just need to throw it as is.
function done (error) {
/* c8 ignore next */
if (error) throw error
}

Expand Down
3 changes: 1 addition & 2 deletions test/global.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -848,8 +848,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 || request.routeConfig.fail
const crash = request.routeOptions?.config?.fail

Promise.resolve(crash)
.then((fail) => {
Expand Down
Loading