Skip to content

Commit 52a7246

Browse files
KrainovSDUzlopakgurgunday
authored
fix nestjs fastify platform warn (#231)
* fix nestjs fastify platform warn * Apply suggestions from code review Co-authored-by: Gürgün Dayıoğlu <gurgun.dayioglu@icloud.com> * fix tests --------- Co-authored-by: Uzlopak <aras.abbasi@googlemail.com> Co-authored-by: Gürgün Dayıoğlu <gurgun.dayioglu@icloud.com>
1 parent d36b175 commit 52a7246

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

index.js

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,8 @@ async function fastifyHelmet (fastify, options) {
3535

3636
fastify.addHook('onRequest', async (request, reply) => {
3737
/* istanbul ignore next */
38-
const { helmet: routeOptions } = request.routeOptions.config || request.context.config
38+
const { helmet: routeOptions } = request.routeOptions?.config ||
39+
request.routeConfig
3940

4041
if (typeof routeOptions !== 'undefined') {
4142
const { enableCSPNonces: enableRouteCSPNonces, skipRoute, ...helmetRouteConfiguration } = routeOptions
@@ -52,7 +53,8 @@ async function fastifyHelmet (fastify, options) {
5253

5354
fastify.addHook('onRequest', (request, reply, next) => {
5455
/* istanbul ignore next */
55-
const { helmet: routeOptions } = request.routeOptions.config || request.context.config
56+
const { helmet: routeOptions } = request.routeOptions?.config ||
57+
request.routeConfig
5658

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

test/global.test.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -685,7 +685,7 @@ test('It should not return a fastify `FST_ERR_REP_ALREADY_SENT - Reply already s
685685
}
686686

687687
// We want to crash in the scope of this test
688-
const crash = request.routeOptions.config.fail
688+
const crash = request.routeOptions?.config?.fail || request.routeConfig.fail
689689

690690
Promise.resolve(crash).then((fail) => {
691691
if (fail === true) {

0 commit comments

Comments
 (0)