Merge pull request #2916 from RedisInsight/be/bugfix/dependabot-fixes-2023-11

Dependabot fixes

Author: vlad-dargel

package.json

@@ -117,10 +117,9 @@
     "@pmmmwh/react-refresh-webpack-plugin": "^0.5.10",
     "@svgr/webpack": "^8.1.0",
     "@teamsupercell/typings-for-css-modules-loader": "^2.4.0",
-    "@testing-library/jest-dom": "^5.16.4",
+    "@testing-library/jest-dom": "^6.2.0",
     "@testing-library/react": "^13.3.0",
     "@testing-library/user-event": "^14.4.3",
-    "@types/axios": "^0.14.0",
     "@types/classnames": "^2.2.11",
     "@types/d3": "^7.4.0",
     "@types/date-fns": "^2.6.0",
@@ -240,7 +239,7 @@
     "@elastic/eui": "34.6.0",
     "@reduxjs/toolkit": "^1.6.2",
     "@stablelib/snappy": "^1.0.2",
-    "axios": "^0.25.0",
+    "axios": "^1.6.0",
     "brotli-unicode": "^1.0.2",
     "buffer": "^6.0.3",
     "classnames": "^2.3.1",
@@ -263,7 +262,7 @@
     "jsonpath": "^1.1.1",
     "lodash": "^4.17.21",
     "lz4js": "^0.2.0",
-    "msgpackr": "^1.9.7",
+    "msgpackr": "^1.10.1",
     "pako": "^2.1.0",
     "php-serialize": "^4.0.2",
     "pickleparser": "^0.2.1",

redisinsight/api/package.json

@@ -58,7 +58,7 @@
     "@okta/okta-auth-js": "^7.3.0",
     "adm-zip": "^0.5.9",
     "analytics-node": "^4.0.1",
-    "axios": "^0.25.0",
+    "axios": "^1.6.0",
     "body-parser": "^1.19.0",
     "busboy": "^1.6.0",
     "class-transformer": "^0.2.3",
@@ -158,7 +158,8 @@
     "moduleNameMapper": {
       "src/(.*)": "<rootDir>/$1",
       "apiSrc/(.*)": "<rootDir>/$1",
-      "tests/(.*)": "<rootDir>/__tests__/$1"
+      "tests/(.*)": "<rootDir>/__tests__/$1",
+      "axios": "axios/dist/node/axios.cjs"
     }
   }
 }

redisinsight/api/src/modules/cloud/common/exceptions/cloud-api.error.handler.ts

@@ -16,7 +16,7 @@ export const wrapCloudApiError = (error: AxiosError, message?: string): HttpExce
   const { response } = error;
 
   if (response) {
-    const errorOptions = { cause: response?.data };
+    const errorOptions = { cause: new Error(response?.data as string) };
     switch (response?.status) {
       case 401:
         return new CloudApiUnauthorizedException(message, errorOptions);

redisinsight/api/src/modules/cloud/common/exceptions/cloud-capi.error.handler.ts

@@ -9,7 +9,7 @@ export const wrapCloudCapiError = (error: AxiosError, message?: string): HttpExc
   }
 
   if (error.response?.status === 401) {
-    return new CloudCapiUnauthorizedException(message, { cause: error.response?.data });
+    return new CloudCapiUnauthorizedException(message, { cause: new Error(error.response?.data as string) });
   }
 
   return wrapCloudApiError(error, message);

redisinsight/api/yarn.lock

@@ -10,8 +10,6 @@ const apiPrefix = process.env.RI_API_PREFIX
 const isDevelopment = process.env.NODE_ENV === 'development'
 const isWebApp = process.env.RI_APP_TYPE === 'web'
 
-axios.defaults.adapter = require('axios/lib/adapters/http')
-
 const axiosInstance = axios.create({
   baseURL:
     !isDevelopment && isWebApp

redisinsight/ui/src/services/apiService.ts

@@ -7,7 +7,6 @@ const isDevelopment = process.env.NODE_ENV === 'development'
 const isWebApp = process.env.RI_APP_TYPE === 'web'
 
 export const RESOURCES_BASE_URL = !isDevelopment && isWebApp ? '/' : `${baseApiUrl}:${apiPort}/`
-axios.defaults.adapter = require('axios/lib/adapters/http')
 
 const resourcesService = axios.create({
   baseURL: RESOURCES_BASE_URL,

redisinsight/ui/src/services/resourcesService.ts

@@ -1,4 +1,4 @@
-import '@testing-library/jest-dom/extend-expect'
+import '@testing-library/jest-dom'
 import 'whatwg-fetch'
 
 import { mswServer } from 'uiSrc/mocks/server'

redisinsight/ui/src/setup-tests.ts

@@ -34,7 +34,6 @@
   },
   "devDependencies": {
     "@types/archiver": "^5.3.2",
-    "@types/axios": "^0.14.0",
     "@types/chance": "1.1.3",
     "@types/edit-json-file": "1.7.0",
     "@types/fs-extra": "9.0.11",
@@ -43,7 +42,7 @@
     "@typescript-eslint/eslint-plugin": "4.28.2",
     "@typescript-eslint/parser": "4.28.2",
     "archiver": "^5.3.1",
-    "axios": "^0.25.0",
+    "axios": "^1.6.0",
     "chance": "1.1.8",
     "cross-env": "^7.0.3",
     "dotenv-cli": "^5.0.0",