Fix charset encoding header

holidayextras · Nov 29, 2019 · f32dd98 · f32dd98
1 parent 924db75
commit f32dd98
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/lib/router.js b/lib/router.js
@@ -55,8 +55,12 @@ router.applyMiddleware = () => {
     if (req.headers.accept) {
       // 406 Not Acceptable
       let matchingTypes = req.headers.accept.split(/, ?/)
-      matchingTypes = matchingTypes.filter(mediaType => // Accept application/*, */vnd.api+json, */* and the correct JSON:API type.
-        mediaType.match(/^(\*|application)\/(\*|json|vnd\.api\+json)$/) || mediaType.match(/\*\/\*/))
+      matchingTypes = matchingTypes.filter(mediaType => {
+        // Remove charset encoding
+        const type = mediaType.split(';')[0]
+        // Accept application/*, */vnd.api+json, */* and the correct JSON:API type.
+        return type.match(/^(\*|application)\/(\*|json|vnd\.api\+json)$/) || type.match(/\*\/\*/)
+      })
 
       if (matchingTypes.length === 0) {
         return res.status(406).end()