fix: make intercept method receive body as parameter (#21)

* fix: make intercept method receive body as parameter

* style: update package to version 1.0.5

Author: jlenon7

README.md

@@ -168,7 +168,14 @@ export class Middleware implements MiddlewareContract {
     ctx.body.intercepted = true
     ctx.response.status(304)
 
-    ctx.next()
+    // Example
+    if ('intercept method logic changes the body') {
+      // In intercept method, next function needs to receive the new body payload as parameter.
+      ctx.next({ hello: 'intercepted', ...ctx.body })
+    } else {
+      // If your logic does not change the body you can just do like this
+      ctx.next(ctx.body)
+    }
   }
 
   // Terminate method will be executed after the response goes to client

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@secjs/http",
-  "version": "1.0.4",
+  "version": "1.0.5",
   "description": "",
   "license": "MIT",
   "author": "João Lenon",
@@ -26,7 +26,7 @@
     "@secjs/env": "1.2.8",
     "@secjs/exceptions": "1.0.4",
     "@secjs/ioc": "1.0.8",
-    "@secjs/utils": "1.6.5",
+    "@secjs/utils": "1.6.7",
     "@types/jest": "27.0.1",
     "@types/node": "14.14.37",
     "@types/supertest": "^2.0.11",

package.json

@@ -7,9 +7,9 @@
  * file that was distributed with this source code.
  */
 
-import { NextContract } from '../../NextContract'
 import { RequestContract } from '../../RequestContract'
 import { ResponseContract } from '../../ResponseContract'
+import { NextInterceptContract } from './NextInterceptContract'
 
 export interface InterceptContextContract {
   request: RequestContract
@@ -18,5 +18,5 @@ export interface InterceptContextContract {
   queries: Record<string, string>
   body: Record<string, any>
   data?: Record<string, any>
-  next: NextContract
+  next: NextInterceptContract
 }

src/Contracts/Context/Middlewares/Intercept/InterceptContextContract.ts

@@ -0,0 +1,12 @@
+/**
+ * @secjs/http
+ *
+ * (c) João Lenon <lenon@secjs.com.br>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+export interface NextInterceptContract {
+  (body: Record<string, any>, error?: any): Promise<void> | void
+}

src/Contracts/Context/Middlewares/Intercept/NextInterceptContract.ts

@@ -16,6 +16,7 @@ import { HandlerContract } from '../Contracts/Context/HandlerContract'
 import { ErrorHandlerContract } from '../Contracts/Context/Error/ErrorHandlerContract'
 import { HandleHandlerContract } from '../Contracts/Context/Middlewares/Handle/HandleHandlerContract'
 import { InterceptHandlerContract } from '../Contracts/Context/Middlewares/Intercept/InterceptHandlerContract'
+import { Is } from '@secjs/utils'
 
 declare module 'fastify' {
   interface FastifyRequest {
@@ -33,7 +34,11 @@ export class FastifyHandler {
       if (!req.query) req.query = {}
       if (!req.params) req.params = {}
 
-      const body = JSON.parse(payload)
+      let body = payload
+
+      if (Is.Json(payload)) {
+        body = JSON.parse(body)
+      }
 
       return handler({
         request,
@@ -42,7 +47,14 @@ export class FastifyHandler {
         params: req.params as Record<string, string>,
         queries: req.query as Record<string, string>,
         data: req.data,
-        next: () => done(null, JSON.stringify(body)),
+        next: (
+          body: string | Buffer | Record<string, any> | null,
+          error = null,
+        ) => {
+          if (Is.Object(body)) body = JSON.stringify(body)
+
+          done(error, body)
+        },
       })
     }
   }

src/Utils/FastifyHandler.ts

@@ -101,7 +101,7 @@ describe('\n Http Class', () => {
     await middlewareHttp.use(ctx => {
       ctx.body.hello = ctx.body.hello.replace('world', 'world-intercepted')
 
-      ctx.next()
+      ctx.next(ctx.body)
     }, 'intercept')
 
     middlewareHttp.get('/test', handler)

tests/http.spec.ts

@@ -16,6 +16,6 @@ export class InterceptMiddleware implements MiddlewareContract {
 
     ctx.body.middlewares.push('intercept')
 
-    ctx.next()
+    ctx.next(ctx.body)
   }
 }

tests/stubs/InterceptMiddleware.ts

@@ -24,7 +24,7 @@ export class TestMiddleware implements MiddlewareContract {
     ctx.data.param = 'param'
     ctx.request.queries.test = 'middleware'
 
-    ctx.next()
+    ctx.next(ctx.body)
   }
 
   async terminate(ctx: TerminateContextContract) {