Merge branch 'release/2025-03-28' into feature/IO-3176-IntelliPay-Payment-Mapping

Signed-off-by: Allan Carr <allan.carr@thinkimex.com>

client/vite.config.js

@@ -191,11 +191,13 @@ export default defineConfig({
           "@sentry/react": ["@sentry/react"],
           "@splitsoftware/splitio-react": ["@splitsoftware/splitio-react"],
           logrocket: ["logrocket"],
-          "@firebase/analytics": ["@firebase/analytics"],
-          "@firebase/app": ["@firebase/app"],
-          "@firebase/firestore": ["@firebase/firestore"],
-          "@firebase/auth": ["@firebase/auth"],
-          "@firebase/messaging": ["@firebase/messaging"],
+          firebase: [
+            "@firebase/analytics",
+            "@firebase/app",
+            "@firebase/firestore",
+            "@firebase/auth",
+            "@firebase/messaging"
+          ],
           markerjs2: ["markerjs2"],
           "@apollo/client": ["@apollo/client"],
           "libphonenumber-js": ["libphonenumber-js"]
@@ -218,7 +220,13 @@ export default defineConfig({
       "react-router-dom",
       "dayjs",
       "redux",
-      "react-redux"
+      "react-redux",
+      "@firebase/app",
+      "@firebase/analytics",
+      "@firebase/firestore",
+      "@firebase/auth",
+      "@firebase/messaging",
+      "@firebase/util"
     ],
     esbuildOptions: {
       // Update for Vite 6: Use proper file extensions

package-lock.json

@@ -15,8 +15,8 @@
         "@aws-sdk/client-secrets-manager": "^3.772.0",
         "@aws-sdk/client-ses": "^3.772.0",
         "@aws-sdk/credential-provider-node": "^3.772.0",
-        "@aws-sdk/lib-storage": "^3.743.0",
-        "@aws-sdk/s3-request-presigner": "^3.731.1",
+        "@aws-sdk/lib-storage": "^3.774.0",
+        "@aws-sdk/s3-request-presigner": "^3.774.0",
         "@opensearch-project/opensearch": "^2.13.0",
         "@socket.io/admin-ui": "^0.5.1",
         "@socket.io/redis-adapter": "^8.3.0",
@@ -798,14 +798,14 @@
       }
     },
     "node_modules/@aws-sdk/lib-storage": {
-      "version": "3.743.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/lib-storage/-/lib-storage-3.743.0.tgz",
-      "integrity": "sha512-Rf/5sljlEJRVtB5C4UjLCOIcK2ODZet9rQsRtsn0bIc2byURbpOdqIGvfEcKWPayoXCS4dC/5bdjhL1zhZ0TMg==",
+      "version": "3.774.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/lib-storage/-/lib-storage-3.774.0.tgz",
+      "integrity": "sha512-xB3rD+F5pt+JLJaUt5eakCJ3+CUa8PXk9nxgN2VozfpuvuR6A/l3lnxmP5wYLhw1I9hxJLV9AD1/QYcibdBjtQ==",
       "license": "Apache-2.0",
       "dependencies": {
         "@smithy/abort-controller": "^4.0.1",
-        "@smithy/middleware-endpoint": "^4.0.2",
-        "@smithy/smithy-client": "^4.1.2",
+        "@smithy/middleware-endpoint": "^4.0.6",
+        "@smithy/smithy-client": "^4.1.6",
         "buffer": "5.6.0",
         "events": "3.3.0",
         "stream-browserify": "3.0.0",
@@ -815,7 +815,7 @@
         "node": ">=18.0.0"
       },
       "peerDependencies": {
-        "@aws-sdk/client-s3": "^3.743.0"
+        "@aws-sdk/client-s3": "^3.774.0"
       }
     },
     "node_modules/@aws-sdk/lib-storage/node_modules/buffer": {
@@ -1067,95 +1067,18 @@
       }
     },
     "node_modules/@aws-sdk/s3-request-presigner": {
-      "version": "3.731.1",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/s3-request-presigner/-/s3-request-presigner-3.731.1.tgz",
-      "integrity": "sha512-GdG0pXkcTgBpenouB834FoCHyLaivV2rGQn7OEQBiT8SBaTxSackZ6tGlJQAlzZQkiQfE/NePUJU7DczJZZvrg==",
+      "version": "3.774.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/s3-request-presigner/-/s3-request-presigner-3.774.0.tgz",
+      "integrity": "sha512-vD37Nq7+ChUkXSoDqkNMXu37R8kRDUo13pOfYgesSI4HA970fjXP1T4Mf2131Ms/NuYbBHNn330+3MAkbbYKxg==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@aws-sdk/signature-v4-multi-region": "3.731.0",
-        "@aws-sdk/types": "3.731.0",
-        "@aws-sdk/util-format-url": "3.731.0",
-        "@smithy/middleware-endpoint": "^4.0.0",
-        "@smithy/protocol-http": "^5.0.0",
-        "@smithy/smithy-client": "^4.0.0",
-        "@smithy/types": "^4.0.0",
-        "tslib": "^2.6.2"
-      },
-      "engines": {
-        "node": ">=18.0.0"
-      }
-    },
-    "node_modules/@aws-sdk/s3-request-presigner/node_modules/@aws-sdk/core": {
-      "version": "3.731.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/core/-/core-3.731.0.tgz",
-      "integrity": "sha512-ithBN1VWASkvAIlozJmenqDvNnFddr/SZXAs58+jCnBHgy3tXLHABZGVNCjetZkHRqNdXEO1kirnoxaFeXMeDA==",
-      "license": "Apache-2.0",
-      "dependencies": {
-        "@aws-sdk/types": "3.731.0",
-        "@smithy/core": "^3.0.0",
-        "@smithy/node-config-provider": "^4.0.0",
-        "@smithy/property-provider": "^4.0.0",
-        "@smithy/protocol-http": "^5.0.0",
-        "@smithy/signature-v4": "^5.0.0",
-        "@smithy/smithy-client": "^4.0.0",
-        "@smithy/types": "^4.0.0",
-        "@smithy/util-middleware": "^4.0.0",
-        "fast-xml-parser": "4.4.1",
-        "tslib": "^2.6.2"
-      },
-      "engines": {
-        "node": ">=18.0.0"
-      }
-    },
-    "node_modules/@aws-sdk/s3-request-presigner/node_modules/@aws-sdk/middleware-sdk-s3": {
-      "version": "3.731.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-sdk-s3/-/middleware-sdk-s3-3.731.0.tgz",
-      "integrity": "sha512-J9aKyQaVoec5eWTSDfO4h2sKHNP0wTzN15LFcHnkD+e/d0rdmOi7BTkkbJrIaynma9WShIasmrtM3HNi9GiiTA==",
-      "license": "Apache-2.0",
-      "dependencies": {
-        "@aws-sdk/core": "3.731.0",
-        "@aws-sdk/types": "3.731.0",
-        "@aws-sdk/util-arn-parser": "3.723.0",
-        "@smithy/core": "^3.0.0",
-        "@smithy/node-config-provider": "^4.0.0",
-        "@smithy/protocol-http": "^5.0.0",
-        "@smithy/signature-v4": "^5.0.0",
-        "@smithy/smithy-client": "^4.0.0",
-        "@smithy/types": "^4.0.0",
-        "@smithy/util-config-provider": "^4.0.0",
-        "@smithy/util-middleware": "^4.0.0",
-        "@smithy/util-stream": "^4.0.0",
-        "@smithy/util-utf8": "^4.0.0",
-        "tslib": "^2.6.2"
-      },
-      "engines": {
-        "node": ">=18.0.0"
-      }
-    },
-    "node_modules/@aws-sdk/s3-request-presigner/node_modules/@aws-sdk/signature-v4-multi-region": {
-      "version": "3.731.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/signature-v4-multi-region/-/signature-v4-multi-region-3.731.0.tgz",
-      "integrity": "sha512-1r/b4Os15dR+BCVRRLVQJMF7Krq6xX6IKHxN43kuvODYWz8Nv3XDlaSpeRpAzyJuzW/fTp4JgE+z0+gmJfdEeA==",
-      "license": "Apache-2.0",
-      "dependencies": {
-        "@aws-sdk/middleware-sdk-s3": "3.731.0",
-        "@aws-sdk/types": "3.731.0",
-        "@smithy/protocol-http": "^5.0.0",
-        "@smithy/signature-v4": "^5.0.0",
-        "@smithy/types": "^4.0.0",
-        "tslib": "^2.6.2"
-      },
-      "engines": {
-        "node": ">=18.0.0"
-      }
-    },
-    "node_modules/@aws-sdk/s3-request-presigner/node_modules/@aws-sdk/types": {
-      "version": "3.731.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/types/-/types-3.731.0.tgz",
-      "integrity": "sha512-NrdkJg6oOUbXR2r9WvHP408CLyvST8cJfp1/jP9pemtjvjPoh6NukbCtiSFdOOb1eryP02CnqQWItfJC1p2Y/Q==",
-      "license": "Apache-2.0",
-      "dependencies": {
-        "@smithy/types": "^4.0.0",
+        "@aws-sdk/signature-v4-multi-region": "3.774.0",
+        "@aws-sdk/types": "3.734.0",
+        "@aws-sdk/util-format-url": "3.734.0",
+        "@smithy/middleware-endpoint": "^4.0.6",
+        "@smithy/protocol-http": "^5.0.1",
+        "@smithy/smithy-client": "^4.1.6",
+        "@smithy/types": "^4.1.0",
         "tslib": "^2.6.2"
       },
       "engines": {
@@ -1237,27 +1160,14 @@
       }
     },
     "node_modules/@aws-sdk/util-format-url": {
-      "version": "3.731.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/util-format-url/-/util-format-url-3.731.0.tgz",
-      "integrity": "sha512-wZHObjnYmiz8wFlUQ4/5dHsT7k0at+GvZM02LgvshcRJLnFjYdrzjelMKuNynd/NNK3gLgTsFTGuIgPpz9r4rA==",
+      "version": "3.734.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/util-format-url/-/util-format-url-3.734.0.tgz",
+      "integrity": "sha512-TxZMVm8V4aR/QkW9/NhujvYpPZjUYqzLwSge5imKZbWFR806NP7RMwc5ilVuHF/bMOln/cVHkl42kATElWBvNw==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@aws-sdk/types": "3.731.0",
-        "@smithy/querystring-builder": "^4.0.0",
-        "@smithy/types": "^4.0.0",
-        "tslib": "^2.6.2"
-      },
-      "engines": {
-        "node": ">=18.0.0"
-      }
-    },
-    "node_modules/@aws-sdk/util-format-url/node_modules/@aws-sdk/types": {
-      "version": "3.731.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/types/-/types-3.731.0.tgz",
-      "integrity": "sha512-NrdkJg6oOUbXR2r9WvHP408CLyvST8cJfp1/jP9pemtjvjPoh6NukbCtiSFdOOb1eryP02CnqQWItfJC1p2Y/Q==",
-      "license": "Apache-2.0",
-      "dependencies": {
-        "@smithy/types": "^4.0.0",
+        "@aws-sdk/types": "3.734.0",
+        "@smithy/querystring-builder": "^4.0.1",
+        "@smithy/types": "^4.1.0",
         "tslib": "^2.6.2"
       },
       "engines": {
@@ -2241,71 +2151,6 @@
         "url": "https://github.com/sponsors/isaacs"
       }
     },
-    "node_modules/@msgpackr-extract/msgpackr-extract-darwin-arm64": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-darwin-arm64/-/msgpackr-extract-darwin-arm64-3.0.3.tgz",
-      "integrity": "sha512-QZHtlVgbAdy2zAqNA9Gu1UpIuI8Xvsd1v8ic6B2pZmeFnFcMWiPLfWXh7TVw4eGEZ/C9TH281KwhVoeQUKbyjw==",
-      "cpu": [
-        "arm64"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "darwin"
-      ]
-    },
-    "node_modules/@msgpackr-extract/msgpackr-extract-darwin-x64": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-darwin-x64/-/msgpackr-extract-darwin-x64-3.0.3.tgz",
-      "integrity": "sha512-mdzd3AVzYKuUmiWOQ8GNhl64/IoFGol569zNRdkLReh6LRLHOXxU4U8eq0JwaD8iFHdVGqSy4IjFL4reoWCDFw==",
-      "cpu": [
-        "x64"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "darwin"
-      ]
-    },
-    "node_modules/@msgpackr-extract/msgpackr-extract-linux-arm": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-linux-arm/-/msgpackr-extract-linux-arm-3.0.3.tgz",
-      "integrity": "sha512-fg0uy/dG/nZEXfYilKoRe7yALaNmHoYeIoJuJ7KJ+YyU2bvY8vPv27f7UKhGRpY6euFYqEVhxCFZgAUNQBM3nw==",
-      "cpu": [
-        "arm"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ]
-    },
-    "node_modules/@msgpackr-extract/msgpackr-extract-linux-arm64": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-linux-arm64/-/msgpackr-extract-linux-arm64-3.0.3.tgz",
-      "integrity": "sha512-YxQL+ax0XqBJDZiKimS2XQaf+2wDGVa1enVRGzEvLLVFeqa5kx2bWbtcSXgsxjQB7nRqqIGFIcLteF/sHeVtQg==",
-      "cpu": [
-        "arm64"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ]
-    },
-    "node_modules/@msgpackr-extract/msgpackr-extract-linux-x64": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-linux-x64/-/msgpackr-extract-linux-x64-3.0.3.tgz",
-      "integrity": "sha512-cvwNfbP07pKUfq1uH+S6KJ7dT9K8WOE4ZiAcsrSes+UY55E/0jLYc+vq+DO7jlmqRb5zAggExKm0H7O/CBaesg==",
-      "cpu": [
-        "x64"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ]
-    },
     "node_modules/@msgpackr-extract/msgpackr-extract-win32-x64": {
       "version": "3.0.3",
       "resolved": "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-win32-x64/-/msgpackr-extract-win32-x64-3.0.3.tgz",

package.json

@@ -19,8 +19,8 @@
     "@aws-sdk/client-secrets-manager": "^3.772.0",
     "@aws-sdk/client-ses": "^3.772.0",
     "@aws-sdk/credential-provider-node": "^3.772.0",
-    "@aws-sdk/lib-storage": "^3.743.0",
-    "@aws-sdk/s3-request-presigner": "^3.731.1",
+    "@aws-sdk/lib-storage": "^3.774.0",
+    "@aws-sdk/s3-request-presigner": "^3.774.0",
     "@opensearch-project/opensearch": "^2.13.0",
     "@socket.io/admin-ui": "^0.5.1",
     "@socket.io/redis-adapter": "^8.3.0",

server/graphql-client/queries.js

@@ -2768,6 +2768,9 @@ exports.GET_BODYSHOP_BY_ID = `
       id
       md_order_statuses
       shopname
+      imexshopid
+      intellipay_config
+      state
     }
   }
 `;

server/intellipay/intellipay.js

@@ -52,6 +52,7 @@ const getShopCredentials = async (bodyshop) => {
 const decodeComment = (comment) => {
   try {
     return comment ? JSON.parse(Buffer.from(comment, "base64").toString()) : null;
+  // eslint-disable-next-line no-unused-vars
   } catch (error) {
     return null; // Handle malformed base64 string gracefully
   }
@@ -361,24 +362,18 @@ exports.checkfee = async (req, res) => {
 exports.postback = async (req, res) => {
   const { body: values } = req;
   const decodedComment = decodeComment(values?.comment);
+
   const logResponseMeta = {
-    bodyshop: {
-      id: req.body?.bodyshop?.id,
-      imexshopid: req.body?.bodyshop?.imexshopid,
-      name: req.body?.bodyshop?.shopname,
-      state: req.body?.bodyshop?.state
-    },
     iprequest: values,
     decodedComment
   };
-  const ipMapping = req.body?.bodyshop?.intellipay_config?.payment_map;
 
-  logger.log("intellipay-postback-received", "DEBUG", req.user?.email, null, logResponseMeta);
+  logger.log("intellipay-postback-received", "DEBUG", "api", null, logResponseMeta);
 
   try {
     if ((!values.invoice || values.invoice === "") && !decodedComment) {
       //invoice is specified through the pay link. Comment by IO.
-      logger.log("intellipay-postback-ignored", "DEBUG", req.user?.email, null, {
+      logger.log("intellipay-postback-ignored", "DEBUG", "api", null, {
         message: "No invoice or comment provided",
         ...logResponseMeta
       });
@@ -391,7 +386,7 @@ exports.postback = async (req, res) => {
       //This has been triggered by IO and may have multiple jobs.
       const parsedComment = decodedComment;
 
-      logger.log("intellipay-postback-parsed-comment", "DEBUG", req.user?.email, null, {
+      logger.log("intellipay-postback-parsed-comment", "DEBUG", "api", null, {
         parsedComment,
         ...logResponseMeta
       });
@@ -405,8 +400,12 @@ exports.postback = async (req, res) => {
       const jobs = await gqlClient.request(queries.GET_JOBS_BY_PKS, {
         ids: partialPayments.map((p) => p.jobid)
       });
+      const bodyshop = await gqlClient.request(queries.GET_BODYSHOP_BY_ID, {
+        id: jobs.jobs[0].shopid
+      });
+      const ipMapping = bodyshop.bodyshops_by_pk.intellipay_config?.payment_map;
 
-      logger.log("intellipay-postback-jobs-fetched", "DEBUG", req.user?.email, null, {
+      logger.log("intellipay-postback-jobs-fetched", "DEBUG", "api", null, {
         jobs,
         parsedComment,
         ...logResponseMeta
@@ -424,7 +423,7 @@ exports.postback = async (req, res) => {
           payment_responses: {
             data: {
               amount: values.total,
-              bodyshopid: jobs.jobs[0].shopid,
+              bodyshopid: bodyshop.bodyshops_by_pk.id,
               jobid: p.jobid,
               declinereason: "Approved",
               ext_paymentid: values.paymentid,
@@ -435,7 +434,7 @@ exports.postback = async (req, res) => {
         }))
       });
 
-      logger.log("intellipay-postback-payment-success", "DEBUG", req.user?.email, null, {
+      logger.log("intellipay-postback-payment-success", "DEBUG", "api", null, {
         paymentResult,
         jobs,
         parsedComment,
@@ -458,7 +457,7 @@ exports.postback = async (req, res) => {
               .join("<br/>")
           })
         }).catch((error) => {
-          logger.log("intellipay-postback-email-error", "ERROR", req.user?.email, null, {
+          logger.log("intellipay-postback-email-error", "ERROR", "api", null, {
             message: error.message,
             jobs,
             paymentResult,
@@ -472,8 +471,14 @@ exports.postback = async (req, res) => {
         id: values.invoice
       });
 
-      logger.log("intellipay-postback-invoice-job-fetched", "DEBUG", req.user?.email, null, {
+      const bodyshop = await gqlClient.request(queries.GET_BODYSHOP_BY_ID, {
+        id: job.jobs_by_pk.shopid
+      });
+      const ipMapping = bodyshop.bodyshops_by_pk.intellipay_config?.payment_map;
+
+      logger.log("intellipay-postback-invoice-job-fetched", "DEBUG", "api", null, {
         job,
+        bodyshop,
         ...logResponseMeta
       });
 
@@ -488,7 +493,7 @@ exports.postback = async (req, res) => {
         }
       });
 
-      logger.log("intellipay-postback-invoice-payment-success", "DEBUG", req.user?.email, null, {
+      logger.log("intellipay-postback-invoice-payment-success", "DEBUG", "api", null, {
         paymentResult,
         ...logResponseMeta
       });
@@ -496,7 +501,7 @@ exports.postback = async (req, res) => {
       const responseResults = await gqlClient.request(queries.INSERT_PAYMENT_RESPONSE, {
         paymentResponse: {
           amount: values.total,
-          bodyshopid: job.jobs_by_pk.shopid,
+          bodyshopid: bodyshop.bodyshops_by_pk.id,
           paymentid: paymentResult.id,
           jobid: values.invoice,
           declinereason: "Approved",
@@ -506,14 +511,14 @@ exports.postback = async (req, res) => {
         }
       });
 
-      logger.log("intellipay-postback-invoice-response-success", "DEBUG", req.user?.email, null, {
+      logger.log("intellipay-postback-invoice-response-success", "DEBUG", "api", null, {
         responseResults,
         ...logResponseMeta
       });
       res.sendStatus(200);
     }
   } catch (error) {
-    logger.log("intellipay-postback-error", "ERROR", req.user?.email, null, {
+    logger.log("intellipay-postback-error", "ERROR", "api", null, {
       message: error?.message,
       ...logResponseMeta
     });