fix: support geo+json and vnd.geo+json content types

dhis2 · Nov 7, 2023 · 7bc8b5b · 7bc8b5b
1 parent 2aaee0e
commit 7bc8b5b
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 2 deletions.
diff --git a/services/data/src/links/RestAPILink/fetchData.test.ts b/services/data/src/links/RestAPILink/fetchData.test.ts
@@ -9,6 +9,12 @@ describe('networkFetch', () => {
             expect(parseContentType('application/vnd.api+json')).toBe(
                 'application/vnd.api+json'
             )
+            expect(parseContentType('application/vnd.geo+json')).toBe(
+                'application/vnd.geo+json'
+            )
+            expect(parseContentType('application/geo+json')).toBe(
+                'application/geo+json'
+            )
         })
 
         it('should strip parameters', () => {
@@ -121,6 +127,8 @@ describe('networkFetch', () => {
                 get: (name: string) => headers[name] && headers[name](url),
             },
             json: async () => ({ foo: 'bar' }),
+            'geo+json': async () => ({ foo: 'geobar' }),
+            'vnd.geo+json': async () => ({ foo: 'vndgeobar' }),
             text: async () => 'foobar',
             blob: async () => 'blob of foobar',
         }))
@@ -135,6 +143,20 @@ describe('networkFetch', () => {
             })
         })
 
+        it('Should correctly parse a successful GEOJSON response', () => {
+            ;(global as any).fetch = mockFetch
+            expect(fetchData('geo+json', {})).resolves.toMatchObject({
+                foo: 'geobar',
+            })
+        })
+
+        it('Should correctly parse a successful VND.GEOJSON response', () => {
+            ;(global as any).fetch = mockFetch
+            expect(fetchData('vnd.geo+json', {})).resolves.toMatchObject({
+                foo: 'geobar',
+            })
+        })
+
         it('Should correctly parse a successful TEXT response', () => {
             ;(global as any).fetch = mockFetch
             expect(fetchData('text')).resolves.toBe('foobar')

diff --git a/services/data/src/links/RestAPILink/fetchData.ts b/services/data/src/links/RestAPILink/fetchData.ts
@@ -1,5 +1,11 @@
 import { FetchError, FetchErrorDetails, JsonValue } from '../../engine'
 
+const validJsonJsonContentTypes: string[] = [
+    'application/json',
+    'application/geo+json',
+    'application/vnd.geo+json',
+]
+
 export const parseContentType = (contentType: string | null) =>
     contentType ? contentType.split(';')[0].trim().toLowerCase() : ''
 
@@ -78,8 +84,7 @@ export function fetchData(
                 response.headers.get('Content-Type')
             )
 
-            // 'application/json'
-            if (contentType === 'application/json') {
+            if (validJsonJsonContentTypes.includes(contentType)) {
                 return await response.json() // Will throw if invalid JSON!
             }