@vue-storefront/middleware
Advanced tools
Comparing version 2.5.12-c.4 to 2.5.12-c.5
@@ -194,6 +194,10 @@ 'use strict'; | ||
consola__default["default"].info('Middleware starting....'); | ||
var options = __assign({ contentSecurityPolicy: false, crossOriginOpenerPolicy: false, permittedCrossDomainPolicies: { | ||
var options = __assign({ contentSecurityPolicy: false, crossOriginOpenerPolicy: false, crossOriginEmbedderPolicy: false, permittedCrossDomainPolicies: { | ||
permittedPolicies: 'none' | ||
} }, config.helmet); | ||
app.use(helmet__default["default"](options)); | ||
} }, (config.helmet || {})); | ||
var isHelmetEnabled = config.helmet || (config.helmet && Object.keys(config.helmet).length > 0) || false; | ||
if (isHelmetEnabled) { | ||
app.use(helmet__default["default"](options)); | ||
consola__default["default"].info('VSF `Helmet` middleware added'); | ||
} | ||
consola__default["default"].info('Loading integrations...'); | ||
@@ -200,0 +204,0 @@ var integrations = registerIntegrations(app, config.integrations); |
@@ -182,6 +182,10 @@ import express from 'express'; | ||
consola.info('Middleware starting....'); | ||
var options = __assign({ contentSecurityPolicy: false, crossOriginOpenerPolicy: false, permittedCrossDomainPolicies: { | ||
var options = __assign({ contentSecurityPolicy: false, crossOriginOpenerPolicy: false, crossOriginEmbedderPolicy: false, permittedCrossDomainPolicies: { | ||
permittedPolicies: 'none' | ||
} }, config.helmet); | ||
app.use(helmet(options)); | ||
} }, (config.helmet || {})); | ||
var isHelmetEnabled = config.helmet || (config.helmet && Object.keys(config.helmet).length > 0) || false; | ||
if (isHelmetEnabled) { | ||
app.use(helmet(options)); | ||
consola.info('VSF `Helmet` middleware added'); | ||
} | ||
consola.info('Loading integrations...'); | ||
@@ -188,0 +192,0 @@ var integrations = registerIntegrations(app, config.integrations); |
@@ -11,6 +11,7 @@ const { createServer } = require('@vue-storefront/middleware'); | ||
crossOriginOpenerPolicy: false, | ||
crossOriginEmbedderPolicy: false, | ||
permittedCrossDomainPolicies: { | ||
permittedPolicies: 'none' | ||
}, | ||
...moduleOptions | ||
...(moduleOptions.helmet || {}) | ||
}; | ||
@@ -20,4 +21,3 @@ // validate security setup with Helmet | ||
app.use(cors()); | ||
const hasHelmetKey = Object.prototype.hasOwnProperty.call(options, 'enableHelmet'); | ||
const isHelmetEnabled = hasHelmetKey ? options.enableHelmet : true; | ||
const isHelmetEnabled = moduleOptions.helmet || (moduleOptions.helmet && Object.keys(moduleOptions.helmet).length > 0) || false; | ||
if (isHelmetEnabled) { | ||
@@ -24,0 +24,0 @@ app.use(helmet(options)); |
{ | ||
"name": "@vue-storefront/middleware", | ||
"version": "2.5.12-c.4", | ||
"version": "2.5.12-c.5", | ||
"description": "", | ||
@@ -5,0 +5,0 @@ "main": "lib/index.cjs.js", |
@@ -21,3 +21,2 @@ import express, { Request, Response, Express } from 'express'; | ||
} | ||
interface RequestParams { | ||
@@ -27,2 +26,5 @@ integrationName: string; | ||
} | ||
interface Helmet extends HelmetOptions { | ||
helmet?: boolean | HelmetOptions | ||
} | ||
@@ -32,11 +34,16 @@ function createServer (config: MiddlewareConfig): Express { | ||
const options = { | ||
const options: Helmet = { | ||
contentSecurityPolicy: false, | ||
crossOriginOpenerPolicy: false, | ||
crossOriginEmbedderPolicy: false, | ||
permittedCrossDomainPolicies: { | ||
permittedPolicies: 'none' | ||
}, | ||
...(config as MiddlewareConfig & { helmet: HelmetOptions }).helmet | ||
...(config.helmet || {}) | ||
}; | ||
app.use(helmet(options)); | ||
const isHelmetEnabled = config.helmet || (config.helmet && Object.keys(config.helmet).length > 0) || false; | ||
if (isHelmetEnabled) { | ||
app.use(helmet(options)); | ||
consola.info('VSF `Helmet` middleware added'); | ||
} | ||
@@ -43,0 +50,0 @@ consola.info('Loading integrations...'); |
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
4981471
50
4181