Makes contenttype resolvement more error relaxed.

Author: michaelkrog

src/http/client/rest-template.ts

@@ -102,7 +102,7 @@ export class RestTemplate implements RestOperations {
 
     private async handleData<D>(response: Response): Promise<[D, Response]> {
         const contentTypeHeader = response.headers.get('content-type');
-        const contentType = contentTypeHeader?.split(';')[0] ?? undefined;
+        const contentType = this.resolvePrimaryContentType(contentTypeHeader);
 
         if(!contentType) {
             return Promise.resolve([null, response]);
@@ -128,4 +128,13 @@ export class RestTemplate implements RestOperations {
         }
     }
 
+    private resolvePrimaryContentType(value: string) {
+        let result: string | undefined = undefined;
+        const firstPart = value?.split(';')[0] ?? undefined;
+        if(firstPart) {
+            result = firstPart.split(',')[0];
+        }
+        return result;
+    }
+
 }

test/http/client/rest-template.test.ts

@@ -41,4 +41,28 @@ describe("passport control", () => {
         expect(result).toEqual('error');
     });
 
+    it("should contenttype header issues correctly", async () => {
+        // Arrange
+        template.errorHandler = {
+            hasError: () => false,
+            handleError: () => {throw Error('')}
+        }
+        fetchMock.mockIf('http://localhost/test', req => {
+            return Promise.resolve({
+                status: 200,
+                body: JSON.stringify({id: '123'}),
+                headers: {
+                    'content-type': 'application/json; application/xml',
+                    'Content-Type': 'application/json'
+                }
+            });
+        });
+
+        // Act
+        const result = await template.getForObject('http://localhost/test') as any;
+        
+        // Assert
+        expect(result.id).toEqual('123');
+    });
+
 });