Merge pull request #6 from SerayaEryn/allow-no-accept-encoding-header

Allow missing accept-encoding header

Author: delvedor

README.md

@@ -18,7 +18,7 @@ Currently the following headers are supported:
 - `'gzip'`
 - `'br'`
 
-If an unsupported encoding is received, it will automatically return a `406` error, if the `'accept-encoding'` header is missing, it will return a `400` error.
+If an unsupported encoding is received, it will automatically return a `406` error, if the `'accept-encoding'` header is missing, it will not compress the payload.
 
 It automatically defines if a payload should be compressed or not based on its `Content-Type`, if no content type is present, it will assume is `application/json`.
 

index.js

@@ -45,13 +45,7 @@ function compressPlugin (fastify, opts, next) {
 
     var encoding = getEncodingHeader(this.request)
 
-    if (encoding === undefined) {
-      closeStream(payload)
-      this.code(400).send(new Error('Missing `accept encoding` header'))
-      return
-    }
-
-    if (encoding === 'identity') {
+    if (encoding === undefined || encoding === 'identity') {
       return this.send(payload)
     }
 
@@ -96,21 +90,14 @@ function compressPlugin (fastify, opts, next) {
 
     var encoding = getEncodingHeader(req)
 
-    if (encoding === undefined) {
-      closeStream(payload)
-      reply.code(400)
-      next(new Error('Missing `accept encoding` header'))
-      return
-    }
-
     if (encoding === null) {
       closeStream(payload)
       reply.code(406)
       next(new Error('Unsupported encoding'))
       return
     }
 
-    if (encoding === 'identity') {
+    if (encoding === undefined || encoding === 'identity') {
       return next()
     }
 

test.js

@@ -128,7 +128,7 @@ test('Unsupported encoding', t => {
   })
 })
 
-test('Missing header', t => {
+test('should not compress on missing header', t => {
   t.plan(2)
   const fastify = Fastify()
   fastify.register(compressPlugin, { global: false })
@@ -141,13 +141,8 @@ test('Missing header', t => {
     url: '/',
     method: 'GET'
   }, res => {
-    const payload = JSON.parse(res.payload)
-    t.strictEqual(res.statusCode, 400)
-    t.deepEqual({
-      error: 'Bad Request',
-      message: 'Missing `accept encoding` header',
-      statusCode: 400
-    }, payload)
+    t.strictEqual(res.statusCode, 200)
+    t.notOk(res.headers['content-encoding'])
   })
 })
 
@@ -164,14 +159,17 @@ test('Should close the stream', t => {
 
   fastify.inject({
     url: '/',
-    method: 'GET'
+    method: 'GET',
+    headers: {
+      'accept-encoding': 'compress'
+    }
   }, res => {
     const payload = JSON.parse(res.payload)
-    t.strictEqual(res.statusCode, 400)
+    t.strictEqual(res.statusCode, 406)
     t.deepEqual({
-      error: 'Bad Request',
-      message: 'Missing `accept encoding` header',
-      statusCode: 400
+      error: 'Not Acceptable',
+      message: 'Unsupported encoding',
+      statusCode: 406
     }, payload)
   })
 })