prepare 3.2.4 release (#18)

Author: LaunchDarklyCI

src/Requestor.js

@@ -3,7 +3,7 @@ import * as errors from './errors';
 import * as messages from './messages';
 import promiseCoalescer from './promiseCoalescer';
 
-const json = 'application/json';
+const jsonContentType = 'application/json';
 
 function getResponseError(result) {
   if (result.status === 404) {
@@ -33,7 +33,7 @@ export default function Requestor(platform, options, environment) {
     const method = body ? 'REPORT' : 'GET';
     const headers = utils.getLDHeaders(platform, options);
     if (body) {
-      headers['Content-Type'] = 'application/json';
+      headers['Content-Type'] = jsonContentType;
     }
 
     let coalescer = activeRequests[endpoint];
@@ -49,7 +49,7 @@ export default function Requestor(platform, options, environment) {
     const p = req.promise.then(
       result => {
         if (result.status === 200) {
-          if (result.header('content-type') && result.header('content-type').lastIndexOf(json) === 0) {
+          if (result.header('content-type') && result.header('content-type').startsWith(jsonContentType)) {
             return JSON.parse(result.body);
           } else {
             const message = messages.invalidContentType(result.header('content-type') || '');

src/__tests__/Requestor-test.js

@@ -238,6 +238,27 @@ describe('Requestor', () => {
     });
   });
 
+  it('allows JSON content type with charset', async () => {
+    await withServer(async (baseConfig, server) => {
+      server.byDefault(respond(200, { 'content-type': 'application/json; charset=utf-8' }, '{}'));
+      const requestor = Requestor(platform, baseConfig, env);
+
+      const result = await requestor.fetchFlagSettings(user);
+      expect(result).toEqual({});
+    });
+  });
+
+  it('allows extra JSON content type header', async () => {
+    await withServer(async (baseConfig, server) => {
+      // this could happen if a proxy/gateway interpolated its own content-type header; https://github.com/launchdarkly/js-client-sdk/issues/205
+      server.byDefault(respond(200, { 'content-type': 'application/json, application/json; charset=utf-8' }, '{}'));
+      const requestor = Requestor(platform, baseConfig, env);
+
+      const result = await requestor.fetchFlagSettings(user);
+      expect(result).toEqual({});
+    });
+  });
+
   it('returns error for non-JSON content type', async () => {
     await withServer(async (baseConfig, server) => {
       server.byDefault(respond(200, { 'content-type': 'text/plain' }, 'sorry'));