Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

refactor(index): replace typeof undefined check #238

Merged
merged 1 commit into from
Oct 29, 2023
Merged

refactor(index): replace typeof undefined check #238

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ async function fastifyHelmet (fastify, options) {
}

fastify.addHook('onRoute', (routeOptions) => {
if (typeof routeOptions.helmet !== 'undefined') {
if (routeOptions.helmet !== undefined) {
if (typeof routeOptions.helmet === 'object') {
routeOptions.config = Object.assign(routeOptions.config || Object.create(null), { helmet: routeOptions.helmet })
} else if (routeOptions.helmet === false) {
Expand All @@ -38,7 +38,7 @@ async function fastifyHelmet (fastify, options) {
const { helmet: routeOptions } = request.routeOptions?.config ||
request.routeConfig

if (typeof routeOptions !== 'undefined') {
if (routeOptions !== undefined) {
const { enableCSPNonces: enableRouteCSPNonces, skipRoute, ...helmetRouteConfiguration } = routeOptions
// If route helmet options are set they overwrite the global helmet configuration
const mergedHelmetConfiguration = Object.assign(Object.create(null), globalConfiguration, helmetRouteConfiguration)
Expand All @@ -56,7 +56,7 @@ async function fastifyHelmet (fastify, options) {
const { helmet: routeOptions } = request.routeOptions?.config ||
request.routeConfig

if (typeof routeOptions !== 'undefined') {
if (routeOptions !== undefined) {
const { enableCSPNonces: enableRouteCSPNonces, skipRoute, ...helmetRouteConfiguration } = routeOptions

if (skipRoute === true) {
Expand Down
Loading