Fix useFastifyRequestId handling when useHeader is in use

puzpuzpuz · Jun 10, 2020 · b6ce62f · b6ce62f
1 parent 1089901
commit b6ce62f
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 2 deletions.
diff --git a/src/middleware.js b/src/middleware.js
@@ -60,7 +60,7 @@ const fastifyPlugin = ({
         requestId = request.headers[headerName.toLowerCase()]
       }
       if (useFastifyRequestId) {
-        requestId = request.id
+        requestId = requestId || request.id
       }
       requestId = requestId || uuidv1()
 

diff --git a/tests/fastify.test.js b/tests/fastify.test.js
@@ -176,12 +176,34 @@ for (const type of types) {
         })
 
         return app.ready()
-          .then(() => request(app.server).get('/test').set('X-Request-Id', ''))
+          .then(() => request(app.server).get('/test'))
           .then(res => {
             expect(res.statusCode).toBe(200)
             expect(res.body.id).toEqual(1)
           })
       })
+
+      test('uses header instead of fastify id in case of override', () => {
+        const app = Fastify()
+        register(type, app, {
+          useHeader: true,
+          useFastifyRequestId: true
+        })
+
+        const idInHead = 'id-from-header'
+
+        app.get('/test', async (_, reply) => {
+          const id = rTracer.id()
+          reply.send({ id })
+        })
+
+        return app.ready()
+          .then(() => request(app.server).get('/test').set('X-Request-Id', idInHead))
+          .then(res => {
+            expect(res.statusCode).toBe(200)
+            expect(res.body.id).toEqual(idInHead)
+          })
+      })
     }
 
     test('generates id for request with callback', () => {