Merge pull request #768 from rocket-admin/backend_development

fix: Handle axios error in TableActionActivationService

Author: Artuomka

backend/src/entities/table-actions/table-actions-module/table-action-activation.service.ts

@@ -185,6 +185,7 @@ export class TableActionActivationService {
     let operationResult = OperationResultStatusEnum.unknown;
     const dataAccessObject = getDataAccessObject(foundConnection);
     const tablePrimaryKeys = await dataAccessObject.getTablePrimaryColumns(tableName, null);
+
     const primaryKeyValuesArray: Array<Record<string, unknown>> = [];
     for (const primaryKeyInBody of request_body) {
       for (const primaryKey of tablePrimaryKeys) {
@@ -204,13 +205,29 @@ export class TableActionActivationService {
       $$_tableName: tableName,
     });
     const autoadminSignatureHeader = Encryptor.hashDataHMACexternalKey(foundConnection.signing_key, actionRequestBody);
-    const result = await axios.post(tableAction.url, actionRequestBody, {
-      headers: { 'Rocketadmin-Signature': autoadminSignatureHeader, 'Content-Type': 'application/json' },
-      maxRedirects: 0,
-      validateStatus: function (status) {
-        return status <= 599;
-      },
-    });
+
+    let result;
+    try {
+      result = await axios.post(tableAction.url, actionRequestBody, {
+        headers: { 'Rocketadmin-Signature': autoadminSignatureHeader, 'Content-Type': 'application/json' },
+        maxRedirects: 0,
+        validateStatus: function (status) {
+          return status <= 599;
+        },
+      });
+    } catch (error) {
+      if (axios.isAxiosError(error)) {
+        const errorMessage =
+          error.response?.data?.message || error.response?.data?.errorMessage || error.message || 'An error occurred';
+        const responseStatus = error.response?.status || 500;
+        throw new HttpException(
+          {
+            message: errorMessage,
+          },
+          responseStatus,
+        );
+      }
+    }
     const operationStatusCode = result.status;
     if (operationStatusCode >= 200 && operationStatusCode < 300) {
       operationResult = OperationResultStatusEnum.successfully;
@@ -228,9 +245,11 @@ export class TableActionActivationService {
       };
     }
     if (operationStatusCode >= 400 && operationStatusCode <= 599) {
+      const errorMessage =
+        result?.data?.message || result?.data?.errorMessage || result?.data?.response || 'An error occurred';
       throw new HttpException(
         {
-          message: result.data,
+          message: errorMessage,
         },
         operationStatusCode,
       );

shared-code/package.json

@@ -5,26 +5,26 @@
   "type": "module",
   "dependencies": {
     "@types/multer": "^1.4.11",
-    "axios": "^1.6.8",
-    "csv": "^6.3.8",
+    "axios": "^1.7.3",
+    "csv": "^6.3.10",
     "get-port": "^7.1.0",
     "jsonwebtoken": "^9.0.2",
     "knex": "^3.1.0",
-    "lru-cache": "^10.2.0",
-    "mysql2": "^3.9.4",
-    "oracledb": "^6.4.0",
+    "lru-cache": "^11.0.0",
+    "mysql2": "^3.11.0",
+    "oracledb": "^6.6.0",
     "p-queue": "^8.0.1",
-    "pg": "^8.11.5",
+    "pg": "^8.12.0",
     "pg-copy-streams": "^6.0.6",
-    "pg-query-stream": "^4.5.5",
+    "pg-query-stream": "^4.6.0",
     "ssh2": "^1.15.0",
-    "tedious": "^18.1.0",
+    "tedious": "^18.3.0",
     "tunnel-ssh": "5.1.2"
   },
   "devDependencies": {
-    "@types/oracledb": "^6.4.0",
+    "@types/oracledb": "^6.5.1",
     "@types/pg-copy-streams": "^1.2.5",
-    "prettier": "3.2.5",
-    "typescript": "^5.4.5"
+    "prettier": "3.3.3",
+    "typescript": "^5.5.4"
   }
 }