Fix hydra client with prefixed API URL (#124)

* fix hydra client for prefixed api

* fix tests

Author: czy30121

src/hydra/hydraClient.js

@@ -9,7 +9,6 @@ import {
   UPDATE,
 } from 'react-admin';
 import isPlainObject from 'lodash.isplainobject';
-import qs from 'qs';
 import fetchHydra from './fetchHydra';
 
 class ReactAdminDocument {
@@ -169,6 +168,9 @@ export default ({entrypoint, resources = []}, httpClient = fetchHydra) => {
    * @returns {Object}
    */
   const convertReactAdminRequestToHydraRequest = (type, resource, params) => {
+    const collectionUrl = new URL(`${entrypoint}/${resource}`);
+    const itemUrl = new URL(params.id, entrypoint);
+
     switch (type) {
       case CREATE:
         return transformReactAdminDataToRequestBody(resource, params.data).then(
@@ -177,7 +179,7 @@ export default ({entrypoint, resources = []}, httpClient = fetchHydra) => {
               body,
               method: 'POST',
             },
-            url: `${entrypoint}/${resource}`,
+            url: collectionUrl,
           }),
         );
 
@@ -186,7 +188,7 @@ export default ({entrypoint, resources = []}, httpClient = fetchHydra) => {
           options: {
             method: 'DELETE',
           },
-          url: entrypoint + params.id,
+          url: itemUrl,
         });
 
       case GET_LIST: {
@@ -195,31 +197,34 @@ export default ({entrypoint, resources = []}, httpClient = fetchHydra) => {
           sort: {field, order},
         } = params;
 
+        if (order) collectionUrl.searchParams.set(`order[${field}]`, order);
+        if (page) collectionUrl.searchParams.set('page', page);
+        if (perPage) collectionUrl.searchParams.set('perPage', perPage);
+        if (params.filter) {
+          Object.keys(params.filter).map(key =>
+            collectionUrl.searchParams.set(key, params.filter[key]),
+          );
+        }
+
         return Promise.resolve({
           options: {},
-          url: `${entrypoint}/${resource}?${qs.stringify({
-            ...params.filter,
-            order: {
-              [field]: order,
-            },
-            page,
-            perPage,
-          })}`,
+          url: collectionUrl,
         });
       }
 
       case GET_MANY_REFERENCE:
+        if (params.target) {
+          collectionUrl.searchParams.set(params.target, params.id);
+        }
         return Promise.resolve({
           options: {},
-          url: `${entrypoint}/${resource}?${qs.stringify({
-            [params.target]: params.id,
-          })}`,
+          url: collectionUrl,
         });
 
       case GET_ONE:
         return Promise.resolve({
           options: {},
-          url: entrypoint + params.id,
+          url: itemUrl,
         });
 
       case UPDATE:
@@ -229,7 +234,7 @@ export default ({entrypoint, resources = []}, httpClient = fetchHydra) => {
               body,
               method: 'PUT',
             },
-            url: entrypoint + params.id,
+            url: itemUrl,
           }),
         );
 

src/hydra/hydraClient.test.js

@@ -86,12 +86,16 @@ describe('fetch data from an hydra api', () => {
       }),
     );
 
-    await hydraClient({entrypoint: ''}, mockHttpClient)(GET_LIST, 'books', {
-      pagination: {page: 2},
-      sort: {field: 'id', order: 'ASC'},
-    }).then(() => {
-      expect(mockHttpClient.mock.calls[0][0]).toBe(
-        '/books?order%5Bid%5D=ASC&page=2',
+    await hydraClient({entrypoint: 'http://www.example.com'}, mockHttpClient)(
+      GET_LIST,
+      'books',
+      {
+        pagination: {page: 2},
+        sort: {field: 'id', order: 'ASC'},
+      },
+    ).then(() => {
+      expect(mockHttpClient.mock.calls[0][0].href).toBe(
+        'http://www.example.com/books?order%5Bid%5D=ASC&page=2',
       );
     });
   });
@@ -102,9 +106,13 @@ describe('fetch data from an hydra api', () => {
       .mockReturnValueOnce(Promise.resolve({json: {'@id': '/books/3'}}))
       .mockReturnValue(Promise.resolve({json: {'@id': '/books/5'}}));
 
-    await hydraClient({entrypoint: ''}, mockHttpClient)(GET_MANY, 'books', {
-      ids: [3, 5],
-    }).then(response => {
+    await hydraClient({entrypoint: 'http://www.example.com'}, mockHttpClient)(
+      GET_MANY,
+      'books',
+      {
+        ids: [3, 5],
+      },
+    ).then(response => {
       expect(response.data[0].id).toEqual('/books/3');
       expect(response.data[1].id).toEqual('/books/5');
     });
@@ -114,10 +122,16 @@ describe('fetch data from an hydra api', () => {
     const mockHttpClient = jest.fn();
     mockHttpClient.mockReturnValueOnce(Promise.resolve(''));
 
-    await hydraClient({entrypoint: ''}, mockHttpClient)(DELETE, 'books', {
-      id: '/books/1',
-    }).then(() => {
-      expect(mockHttpClient.mock.calls[0][0]).toBe('/books/1');
+    await hydraClient({entrypoint: 'http://www.example.com'}, mockHttpClient)(
+      DELETE,
+      'books',
+      {
+        id: '/books/1',
+      },
+    ).then(() => {
+      expect(mockHttpClient.mock.calls[0][0].href).toBe(
+        'http://www.example.com/books/1',
+      );
       expect(mockHttpClient.mock.calls[0][1].method).toBe('DELETE');
     });
   });
@@ -126,12 +140,20 @@ describe('fetch data from an hydra api', () => {
     const mockHttpClient = jest.fn();
     mockHttpClient.mockReturnValueOnce(Promise.resolve(''));
 
-    await hydraClient({entrypoint: ''}, mockHttpClient)(DELETE_MANY, 'books', {
-      ids: ['/books/1', '/books/2'],
-    }).then(() => {
-      expect(mockHttpClient.mock.calls[0][0]).toBe('/books/1');
+    await hydraClient({entrypoint: 'http://www.example.com'}, mockHttpClient)(
+      DELETE_MANY,
+      'books',
+      {
+        ids: ['/books/1', '/books/2'],
+      },
+    ).then(() => {
+      expect(mockHttpClient.mock.calls[0][0].href).toBe(
+        'http://www.example.com/books/1',
+      );
       expect(mockHttpClient.mock.calls[0][1].method).toBe('DELETE');
-      expect(mockHttpClient.mock.calls[1][0]).toBe('/books/2');
+      expect(mockHttpClient.mock.calls[1][0].href).toBe(
+        'http://www.example.com/books/2',
+      );
       expect(mockHttpClient.mock.calls[1][1].method).toBe('DELETE');
     });
   });