From 4a52bfdc81ad0f82b142b226bc6026d67e56b5c6 Mon Sep 17 00:00:00 2001
From: Alexander Lichter <manniL@gmx.net>
Date: Thu, 8 Nov 2018 09:17:46 +0000
Subject: [PATCH] fix: correctly ignore brotli encoding on server-side (#180)

---
 lib/plugin.template.js     |  9 +++++----
 test/axios.test.js         | 13 +++++++++++++
 test/fixture/pages/ssr.vue | 36 +++++++++++++++++++++---------------
 3 files changed, 39 insertions(+), 19 deletions(-)

diff --git a/lib/plugin.template.js b/lib/plugin.template.js
index 4dc46d6..448065e 100755
--- a/lib/plugin.template.js
+++ b/lib/plugin.template.js
@@ -168,10 +168,6 @@ export default (ctx, inject) => {
     patch: {}
   }
 
-  if (process.server) {
-    headers.common['Accept-Encoding'] = 'gzip, deflate'
-  }
-                             
   const axiosOptions = {
     baseURL,
     headers
@@ -183,6 +179,11 @@ export default (ctx, inject) => {
   <% for (let h of options.proxyHeadersIgnore) { %>delete axiosOptions.headers.common['<%= h %>']
   <% } %><% } %>
 
+  if (process.server) {
+    // Don't accept brotli encoding because Node can't parse it
+    axiosOptions.headers.common['Accept-Encoding'] = 'gzip, deflate'
+  }
+
   // Create new axios instance
   const axios = Axios.create(axiosOptions)
 
diff --git a/test/axios.test.js b/test/axios.test.js
index 9e884f2..f04464a 100644
--- a/test/axios.test.js
+++ b/test/axios.test.js
@@ -76,4 +76,17 @@ describe('axios module', () => {
     expect(d).not.toBeNull()
     expect(b).not.toBe(d)
   })
+
+  test('ssr no brotli', async () => {
+    const makeReq = login =>
+      axios
+        .get(url('/ssr' + (login ? '?login' : '')))
+        .then(r => r.data)
+        .then(h => /encoding-\$(.*)\$/.exec(h))
+        .then(m => (m && m[1] ? m[1] : null))
+
+    const result = await makeReq()
+
+    expect(result).toBe('gzip, deflate')
+  })
 })
diff --git a/test/fixture/pages/ssr.vue b/test/fixture/pages/ssr.vue
index 13e822d..9658799 100644
--- a/test/fixture/pages/ssr.vue
+++ b/test/fixture/pages/ssr.vue
@@ -1,22 +1,28 @@
 <template>
-  <div>session-{{ axiosSessionId }}</div>
+  <div>
+    <div>session-{{ axiosSessionId }}</div>
+    <div>encoding-${{ axiosEncoding }}$</div>
+  </div>
 </template>
 
 <script>
-// This will be intentially shared across requests
-let reqCtr = 1
+  // This will be intentically shared across requests
+  let reqCtr = 1
 
-export default {
-  async fetch ({ app, route }) {
-    let doLogin = route.query.login !== undefined
-    if (doLogin) {
-      app.$axios.setHeader('sessionId', reqCtr++)
-    }
-  },
-  computed: {
-    axiosSessionId () {
-      return this.$axios.defaults.headers.common.sessionId
+  export default {
+    async fetch ({app, route}) {
+      let doLogin = route.query.login !== undefined
+      if (doLogin) {
+        app.$axios.setHeader('sessionId', reqCtr++)
+      }
+    },
+    computed: {
+      axiosSessionId () {
+        return this.$axios.defaults.headers.common.sessionId
+      },
+      axiosEncoding () {
+        return this.$axios.defaults.headers.common['Accept-Encoding']
+      }
     }
   }
-}
-</script>
\ No newline at end of file
+</script>