diff --git a/client/package-lock.json b/client/package-lock.json index 056e398..60ed3cb 100644 --- a/client/package-lock.json +++ b/client/package-lock.json @@ -20,6 +20,7 @@ "@types/loadable__component": "^5.13.8", "@yudiel/react-qr-scanner": "^1.2.4", "antd": "^5.12.2", + "axios": "^1.6.2", "flag-icons": "^7.1.0", "i18next": "^23.7.11", "i18next-browser-languagedetector": "^7.2.0", @@ -1782,6 +1783,16 @@ "axios": "^0.27.2" } }, + "node_modules/@ory/client/node_modules/axios": { + "version": "0.27.2", + "resolved": "https://registry.npmjs.org/axios/-/axios-0.27.2.tgz", + "integrity": "sha512-t+yRIyySRTp/wua5xEr+z1q60QmLq8ABsS5O9Me1AsE5dfKqgnCFzwiCZZ/cGNd1lq4/7akDWMxdhVlucjmnOQ==", + "dev": true, + "dependencies": { + "follow-redirects": "^1.14.9", + "form-data": "^4.0.0" + } + }, "node_modules/@radix-ui/react-compose-refs": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/@radix-ui/react-compose-refs/-/react-compose-refs-1.0.1.tgz", @@ -2256,16 +2267,6 @@ "@refinedev/core": "^4.0.0" } }, - "node_modules/@refinedev/simple-rest/node_modules/axios": { - "version": "1.6.2", - "resolved": "https://registry.npmjs.org/axios/-/axios-1.6.2.tgz", - "integrity": "sha512-7i24Ri4pmDRfJTR7LDBhsOTtcm+9kjX5WiY1X3wIisx6G9So3pfMkEiU7emUBe46oceVImccTEM3k6C5dbVW8A==", - "dependencies": { - "follow-redirects": "^1.15.0", - "form-data": "^4.0.0", - "proxy-from-env": "^1.1.0" - } - }, "node_modules/@refinedev/ui-types": { "version": "1.22.3", "resolved": "https://registry.npmjs.org/@refinedev/ui-types/-/ui-types-1.22.3.tgz", @@ -3616,13 +3617,13 @@ } }, "node_modules/axios": { - "version": "0.27.2", - "resolved": "https://registry.npmjs.org/axios/-/axios-0.27.2.tgz", - "integrity": "sha512-t+yRIyySRTp/wua5xEr+z1q60QmLq8ABsS5O9Me1AsE5dfKqgnCFzwiCZZ/cGNd1lq4/7akDWMxdhVlucjmnOQ==", - "dev": true, + "version": "1.6.2", + "resolved": "https://registry.npmjs.org/axios/-/axios-1.6.2.tgz", + "integrity": "sha512-7i24Ri4pmDRfJTR7LDBhsOTtcm+9kjX5WiY1X3wIisx6G9So3pfMkEiU7emUBe46oceVImccTEM3k6C5dbVW8A==", "dependencies": { - "follow-redirects": "^1.14.9", - "form-data": "^4.0.0" + "follow-redirects": "^1.15.0", + "form-data": "^4.0.0", + "proxy-from-env": "^1.1.0" } }, "node_modules/babel-core": { @@ -11281,17 +11282,6 @@ "vite": ">=3" } }, - "node_modules/vite-plugin-mkcert/node_modules/axios": { - "version": "1.6.2", - "resolved": "https://registry.npmjs.org/axios/-/axios-1.6.2.tgz", - "integrity": "sha512-7i24Ri4pmDRfJTR7LDBhsOTtcm+9kjX5WiY1X3wIisx6G9So3pfMkEiU7emUBe46oceVImccTEM3k6C5dbVW8A==", - "dev": true, - "dependencies": { - "follow-redirects": "^1.15.0", - "form-data": "^4.0.0", - "proxy-from-env": "^1.1.0" - } - }, "node_modules/vite-plugin-svgr": { "version": "4.2.0", "resolved": "https://registry.npmjs.org/vite-plugin-svgr/-/vite-plugin-svgr-4.2.0.tgz", diff --git a/client/package.json b/client/package.json index 48616dc..7d707da 100644 --- a/client/package.json +++ b/client/package.json @@ -7,6 +7,7 @@ "private": true, "type": "module", "dependencies": { + "axios": "^1.6.2", "@ant-design/icons": "^5.2.6", "@loadable/component": "^5.16.2", "@refinedev/antd": "^5.37.0", diff --git a/client/src/components/dataProvider.ts b/client/src/components/dataProvider.ts index b5eae66..751fe5c 100644 --- a/client/src/components/dataProvider.ts +++ b/client/src/components/dataProvider.ts @@ -144,8 +144,8 @@ const dataProvider = ( } if (headers) { - httpClient.defaults.headers = { - ...httpClient.defaults.headers, + httpClient.defaults.headers.common = { + ...httpClient.defaults.headers.common, ...headers, }; }