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 <[email protected]> * fix tests --------- Co-authored-by: Uzlopak <[email protected]> Co-authored-by: Gürgün Dayıoğlu <[email protected]>
fastify · Sep 17, 2023 · 52a7246 · 52a7246
1 parent d36b175
commit 52a7246
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git 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
@@ -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) {