allow json service to accept other content types

brockallen · brockallen · commit e2edde991efe · 2018-07-05T10:28:29.000-04:00
diff --git a/src/JsonService.js b/src/JsonService.js
@@ -5,7 +5,17 @@ import { Log } from './Log';
 import { Global } from './Global';
 
 export class JsonService {
-    constructor(XMLHttpRequestCtor = Global.XMLHttpRequest) {
+    constructor(additionalContentTypes = null, XMLHttpRequestCtor = Global.XMLHttpRequest) {
+        if (additionalContentTypes && Array.isArray(additionalContentTypes))
+        {
+            this._contentTypes = additionalContentTypes.slice();
+        }
+        else
+        {
+            this._contentTypes = [];
+        }
+        this._contentTypes.push('application/json');
+
         this._XMLHttpRequest = XMLHttpRequestCtor;
     }
 
@@ -22,23 +32,36 @@ export class JsonService {
             var req = new this._XMLHttpRequest();
             req.open('GET', url);
 
+            var allowedContentTypes = this._contentTypes;
+
             req.onload = function() {
                 Log.debug("JsonService.getJson: HTTP response received, status", req.status);
 
                 if (req.status === 200) {
+
                     var contentType = req.getResponseHeader("Content-Type");
-                    if (contentType && contentType.startsWith("application/json")) {
-                        try {
-                            resolve(JSON.parse(req.responseText));
-                        }
-                        catch (e) {
-                            Log.error("JsonService.getJson: Error parsing JSON response", e.message);
-                            reject(e);
+                    if (contentType) {
+
+                        var found = allowedContentTypes.find(item=>{
+                            if (contentType.startsWith(item)) {
+                                return true;
+                            }
+                        });
+
+                        if (found) {
+                            try {
+                                resolve(JSON.parse(req.responseText));
+                                return;
+                            }
+                            catch (e) {
+                                Log.error("JsonService.getJson: Error parsing JSON response", e.message);
+                                reject(e);
+                                return;
+                            }
                         }
                     }
-                    else {
-                        reject(Error("Invalid response Content-Type: " + contentType + ", from URL: " + url));
-                    }
+
+                    reject(Error("Invalid response Content-Type: " + contentType + ", from URL: " + url));
                 }
                 else {
                     reject(Error(req.statusText + " (" + req.status + ")"));
diff --git a/src/MetadataService.js b/src/MetadataService.js
@@ -14,7 +14,7 @@ export class MetadataService {
         }
 
         this._settings = settings;
-        this._jsonService = new JsonServiceCtor();
+        this._jsonService = new JsonServiceCtor(['application/jwk-set+json']);
     }
 
     get metadataUrl() {
diff --git a/test/unit/JsonService.spec.js b/test/unit/JsonService.spec.js
@@ -14,7 +14,7 @@ describe("JsonService", function() {
 
     beforeEach(function(){
         stubHttpRequest = new StubXMLHttpRequest();
-        subject = new JsonService(()=>stubHttpRequest);
+        subject = new JsonService(null, ()=>stubHttpRequest);
     });
 
     describe("getJson", function() {
@@ -112,6 +112,21 @@ describe("JsonService", function() {
             stubHttpRequest.responseText = JSON.stringify({foo:1, bar:'test'});
             stubHttpRequest.onload();
         });
+
+        it("should accept custom content type in response", function(done) {
+            subject = new JsonService(['foo/bar'], ()=>stubHttpRequest);
+            let p = subject.getJson("http://test");
+
+            p.then(result => {
+                result.foo.should.equal(1);
+                done();
+            });
+
+            stubHttpRequest.status = 200;
+            stubHttpRequest.responseHeaders.set('Content-Type', 'foo/bar');
+            stubHttpRequest.responseText = JSON.stringify({foo:1, bar:'test'});
+            stubHttpRequest.onload();
+        });
     });
 });
 

Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ export class MetadataService {`
`14`	`14`	`}`
`15`	`15`
`16`	`16`	`this._settings = settings;`
`17`		`- this._jsonService = new JsonServiceCtor();`
	`17`	`+ this._jsonService = new JsonServiceCtor(['application/jwk-set+json']);`
`18`	`18`	`}`
`19`	`19`
`20`	`20`	`get metadataUrl() {`