fix(data-service): prevent calling proxying ESRI rest URL twice to en…

…sure query params encoding otherwise first call encodes URL without query params and second call returns unmodified URL, since the host is already the window host
geonetwork · Oct 18, 2023 · 75afa40 · 75afa40
1 parent ec67fd5
commit 75afa40
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 3 deletions.
diff --git a/libs/feature/dataviz/src/lib/service/data.service.spec.ts b/libs/feature/dataviz/src/lib/service/data.service.spec.ts
@@ -593,11 +593,22 @@ describe('DataService', () => {
       it('builds a proxied url', () => {
         expect(
           service.getDownloadUrlFromEsriRest(
-            'http://esri.rest/local/',
+            'http://esri.rest/local',
             'geojson'
           )
         ).toBe(
-          'http://proxy.local/?url=http%3A%2F%2Fesri.rest%2Flocal%2F%2Fquery%3Ff%3Dgeojson%26where%3D1%3D1%26outFields%3D*'
+          'http://proxy.local/?url=http%3A%2F%2Fesri.rest%2Flocal%2Fquery%3Ff%3Dgeojson%26where%3D1%3D1%26outFields%3D*'
+        )
+      })
+      it('calls DataFetcher.openDataset with a proxied url', () => {
+        service.getDataset({
+          url: new URL('http://esri.rest/local'),
+          accessServiceProtocol: 'esriRest',
+          type: 'service',
+        })
+        expect(openDataset).toHaveBeenCalledWith(
+          'http://proxy.local/?url=http%3A%2F%2Fesri.rest%2Flocal%2Fquery%3Ff%3Dgeojson%26where%3D1%3D1%26outFields%3D*',
+          'geojson'
         )
       })
     })

diff --git a/libs/feature/dataviz/src/lib/service/data.service.ts b/libs/feature/dataviz/src/lib/service/data.service.ts
@@ -197,7 +197,10 @@ export class DataService {
       link.type === 'service' &&
       link.accessServiceProtocol === 'esriRest'
     ) {
-      const url = this.getDownloadUrlFromEsriRest(linkUrl, 'geojson')
+      const url = this.getDownloadUrlFromEsriRest(
+        link.url.toString(), //let getDownloadUrlFromEsriRest() proxy url with params
+        'geojson'
+      )
       return from(openDataset(url, 'geojson')).pipe()
     }
     return throwError(() => 'protocol not supported')