Merged in feature/IO-2460-Node-18-Server (pull request #1061)

Feature/IO-2460 Node 18 Server

Approved-by: Patrick Fic

.circleci/config.yml

@@ -8,13 +8,13 @@ orbs:
 jobs:
   api-deploy:
     docker:
-      - image: "cimg/base:stable"
+      - image: cimg/node:18
     steps:
       - checkout
       - eb/setup
       - run:
           command: |
-            eb init imex-online-production-api -r ca-central-1 -p "Node.js 16 running on 64bit Amazon Linux 2"
+            eb init imex-online-production-api -r ca-central-1 -p "Node.js 18 running on 64bit Amazon Linux 2"
             eb status --verbose
             eb deploy
             eb status

.npmrc

@@ -0,0 +1 @@
+legacy-peer-deps=true

client/package.json

@@ -89,8 +89,8 @@
     "analyze": "source-map-explorer 'build/static/js/*.js'",
     "start": "craco start",
     "build": "REACT_APP_GIT_SHA=`git rev-parse --short HEAD` craco build",
-    "build:test": "env-cmd -f .env.test yarn run build",
+    "build:test": "env-cmd -f .env.test npm run build",
-    "build-deploy:test": "yarn run build:test && s3cmd sync build/* s3://imex-online-test && echo '🚀 TESTING Deployed!'",
+    "build-deploy:test": "npm run build:test && s3cmd sync build/* s3://imex-online-test && echo '🚀 TESTING Deployed!'",
     "buildcra": "REACT_APP_GIT_SHA=`git rev-parse --short HEAD` craco build",
     "test": "cypress open",
     "eject": "react-scripts eject",

package.json

@@ -3,64 +3,63 @@
   "version": "0.0.1",
   "license": "UNLICENSED",
   "engines": {
-    "node": ">=16.0.0",
+    "node": ">=18.0.0",
     "npm": ">=8.0.0"
   },
   "scripts": {
-    "setup": "rm -rf node_modules && yarn && cd client && rm -rf node_modules && yarn",
+    "setup": "rm -rf node_modules && npm i && cd client && rm -rf node_modules && npm i",
-    "admin": "cd admin && yarn start",
+    "admin": "cd admin && npm start",
-    "client": "cd client && yarn start",
+    "client": "cd client && npm start",
     "server": "nodemon server.js",
-    "build": "cd client && yarn run build",
+    "build": "cd client && npm run build",
-    "dev": "concurrently --kill-others-on-fail \"yarn run server\" \"yarn run client\"",
+    "dev": "concurrently --kill-others-on-fail \"npm run server\" \"npm run client\"",
-    "deva": "concurrently --kill-others-on-fail \"yarn run server\" \"yarn run client\" \"yarn run admin\"",
+    "deva": "concurrently --kill-others-on-fail \"npm run server\" \"npm run client\" \"npm run admin\"",
     "start": "node server.js"
   },
   "dependencies": {
-    "@aws-sdk/client-secrets-manager": "^3.388.0",
+    "@aws-sdk/client-secrets-manager": "^3.454.0",
-    "@aws-sdk/credential-provider-node": "^3.319.0",
+    "@aws-sdk/client-ses": "^3.454.0",
-    "@opensearch-project/opensearch": "^2.2.1",
+    "@aws-sdk/credential-provider-node": "^3.451.0",
-    "aws-sdk": "^2.1326.0",
+    "@opensearch-project/opensearch": "^2.4.0",
     "aws4": "^1.12.0",
-    "axios": "^0.27.2",
+    "axios": "^1.6.2",
     "bluebird": "^3.7.2",
     "body-parser": "^1.20.2",
-    "cloudinary": "^1.34.0",
+    "cloudinary": "^1.41.0",
     "compression": "^1.7.4",
     "cookie-parser": "^1.4.6",
     "cors": "2.8.5",
     "csrf": "^3.1.0",
     "dinero.js": "^1.9.1",
-    "dotenv": "16.0.3",
+    "dotenv": "^16.3.1",
     "express": "^4.18.2",
-    "firebase-admin": "^11.5.0",
+    "firebase-admin": "^11.11.0",
-    "graphql": "^16.6.0",
+    "graphql": "^16.8.1",
-    "graphql-request": "^4.2.0",
+    "graphql-request": "^6.1.0",
     "graylog2": "^0.2.1",
     "inline-css": "^4.0.2",
     "intuit-oauth": "^4.0.0",
-    "json-2-csv": "^3.19.0",
+    "json-2-csv": "^5.0.1",
     "lodash": "^4.17.21",
     "moment": "^2.29.4",
     "moment-timezone": "^0.5.41",
     "multer": "^1.4.5-lts.1",
-    "node-mailjet": "^6.0.2",
+    "node-mailjet": "^6.0.4",
     "node-persist": "^3.1.3",
-    "node-quickbooks": "^2.0.41",
+    "node-quickbooks": "^2.0.43",
-    "nodemailer": "^6.9.1",
+    "nodemailer": "^6.9.7",
-    "phone": "^3.1.35",
+    "phone": "^3.1.41",
-    "query-string": "^7.1.1",
     "soap": "^1.0.0",
-    "socket.io": "^4.6.1",
+    "socket.io": "^4.7.2",
-    "ssh2-sftp-client": "^9.0.4",
+    "ssh2-sftp-client": "^9.1.0",
-    "stripe": "^9.15.0",
+    "stripe": "^14.5.0",
-    "twilio": "^4.8.0",
+    "twilio": "^4.19.0",
-    "uuid": "^9.0.0",
+    "uuid": "^9.0.1",
-    "xml2js": "^0.4.23",
+    "xml2js": "^0.6.2",
-    "xmlbuilder2": "^3.0.2"
+    "xmlbuilder2": "^3.1.1"
   },
   "devDependencies": {
-    "concurrently": "^7.3.0",
+    "concurrently": "^8.2.2",
     "source-map-explorer": "^2.5.2"
   }
 }

server.js

@@ -5,8 +5,8 @@ const path = require("path");
 const compression = require("compression");
 const twilio = require("twilio");
 const logger = require("./server/utils/logger");
-var fb = require("./server/firebase/firebase-handler");
+const fb = require("./server/firebase/firebase-handler");
-var cookieParser = require("cookie-parser");
+const cookieParser = require("cookie-parser");
 const multer = require("multer");
 const upload = multer();
 //var enforce = require("express-sslify");

server/accounting/qbo/qbo-callback.js

@@ -9,7 +9,7 @@ const logger = require("../../utils/logger");
 const OAuthClient = require("intuit-oauth");
 const client = require("../../graphql-client/graphql-client").client;
 const queries = require("../../graphql-client/queries");
-const queryString = require("query-string");
+const {parse, stringify} = require("querystring");
 
 const oauthClient = new OAuthClient({
   clientId: process.env.QBO_CLIENT_ID,
@@ -30,7 +30,8 @@ if (process.env.NODE_ENV === "production") {
 }
 
 exports.default = async (req, res) => {
-  const params = queryString.parse(req.url.split("?").reverse()[0]);
+  const queryString = req.url.split("?").reverse()[0];
+  const params = parse(queryString);
   try {
     logger.log("qbo-callback-create-token", "DEBUG", params.state, null, null);
     const authResponse = await oauthClient.createToken(req.url);
@@ -58,7 +59,7 @@ exports.default = async (req, res) => {
       );
 
       res.redirect(
-        `${url}/manage/accounting/qbo?${queryString.stringify(params)}`
+        `${url}/manage/accounting/qbo?${stringify(params)}`
       );
     }
   } catch (e) {

server/email/sendemail.js

@@ -7,15 +7,19 @@ require("dotenv").config({
 });
 const axios = require("axios");
 let nodemailer = require("nodemailer");
-let aws = require("aws-sdk");
+let aws = require("@aws-sdk/client-ses");
+let { defaultProvider } = require("@aws-sdk/credential-provider-node");
+
 const logger = require("../utils/logger");
 const client = require("../graphql-client/graphql-client").client;
 const queries = require("../graphql-client/queries");
 
 const ses = new aws.SES({
+  // The key apiVersion is no longer supported in v3, and can be removed.
+  // @deprecated The client uses the "latest" apiVersion.
   apiVersion: "latest",
-
   region: "ca-central-1",
+  defaultProvider
 });
 
 let transporter = nodemailer.createTransport({
@@ -48,7 +52,6 @@ exports.sendServerEmail = async function ({ subject, text }) {
   } catch (error) {
     console.log(error);
     logger.log("server-email-failure", "error", null, null, error);
-    res.status(500).json(error);
   }
 };
 exports.sendTaskEmail = async function ({ to, subject, text, attachments }) {

server/intellipay/aws-secrets-manager.js

@@ -1,6 +1,6 @@
 "use strict";
 
-const AWS = require("aws-sdk");
+const awsSecretManager = require("@aws-sdk/client-secrets-manager");
 
 class SecretsManager {
   /**
@@ -8,11 +8,10 @@ class SecretsManager {
    */
   static async getSecret(secretName, region) {
     const config = { region: region };
-    let secretsManager = new AWS.SecretsManager(config);
+    let secretsManager = new awsSecretManager.SecretsManager(config);
     try {
       let secretValue = await secretsManager
-        .getSecretValue({ SecretId: secretName })
+        .getSecretValue({ SecretId: secretName });
-        .promise();
       if ("SecretString" in secretValue) {
         return secretValue.SecretString;
       } else {

server/opensearch/os-handler.js

@@ -1,9 +1,8 @@
-const Dinero = require("dinero.js");
 const queries = require("../graphql-client/queries");
-//const client = require("../graphql-client/graphql-client").client;
+const {pick} = require("lodash");
-const _ = require("lodash");
 const GraphQLClient = require("graphql-request").GraphQLClient;
 const logger = require("../utils/logger");
+//const client = require("../graphql-client/graphql-client").client;
 
 const path = require("path");
 const client = require("../graphql-client/graphql-client").client;
@@ -13,10 +12,10 @@ require("dotenv").config({
         `.env.${process.env.NODE_ENV || "development"}`
     ),
 });
-const { Client, Connection } = require("@opensearch-project/opensearch");
+const {Client, Connection} = require("@opensearch-project/opensearch");
-const { defaultProvider } = require("@aws-sdk/credential-provider-node");
+const {defaultProvider} = require("@aws-sdk/credential-provider-node");
 const aws4 = require("aws4");
-const { gql } = require("graphql-request");
+const {gql} = require("graphql-request");
 
 var host = process.env.OPEN_SEARCH_HOST;
 
@@ -32,6 +31,7 @@ const createAwsConnector = (credentials, region) => {
             return aws4.sign(request, credentials);
         }
     }
+
     return {
         Connection: AmazonConnection,
     };
@@ -68,7 +68,7 @@ async function OpenSearchUpdateHandler(req, res) {
 
             switch (req.body.table.name) {
                 case "jobs":
-          document = _.pick(req.body.event.data.new, [
+                    document = pick(req.body.event.data.new, [
                         "id",
                         "bodyshopid",
                         "clm_no",
@@ -92,7 +92,7 @@ async function OpenSearchUpdateHandler(req, res) {
                     document.bodyshopid = req.body.event.data.new.shopid;
                     break;
                 case "vehicles":
-          document = _.pick(req.body.event.data.new, [
+                    document = pick(req.body.event.data.new, [
                         "id",
                         "v_model_yr",
                         "v_model_desc",
@@ -104,7 +104,7 @@ async function OpenSearchUpdateHandler(req, res) {
                     document.bodyshopid = req.body.event.data.new.shopid;
                     break;
                 case "owners":
-          document = _.pick(req.body.event.data.new, [
+                    document = pick(req.body.event.data.new, [
                         "id",
                         "ownr_fn",
                         "ownr_ln",
@@ -131,10 +131,10 @@ async function OpenSearchUpdateHandler(req, res) {
             }
           }
           `,
-            { billId: req.body.event.data.new.id }
+                        {billId: req.body.event.data.new.id}
                     );
                     document = {
-            ..._.pick(req.body.event.data.new, [
+                        ...pick(req.body.event.data.new, [
                             "id",
                             "date",
                             "exported",
@@ -171,10 +171,10 @@ async function OpenSearchUpdateHandler(req, res) {
                 }
               }              
             `,
-            { paymentId: req.body.event.data.new.id }
+                        {paymentId: req.body.event.data.new.id}
                     );
                     document = {
-            ..._.pick(req.body.event.data.new, [
+                        ...pick(req.body.event.data.new, [
                             "id",
                             "amount",
                             "created_at",
@@ -210,7 +210,7 @@ async function OpenSearchUpdateHandler(req, res) {
 
 async function OpenSearchSearchHandler(req, res) {
     try {
-    const { search, bodyshopid, index } = req.body;
+        const {search, bodyshopid, index} = req.body;
 
         if (!req.user) {
             res.sendStatus(401);
@@ -229,7 +229,7 @@ async function OpenSearchSearchHandler(req, res) {
         });
 
         const assocs = await client
-      .setHeaders({ Authorization: BearerToken })
+            .setHeaders({Authorization: BearerToken})
             .request(queries.ACTIVE_SHOP_BY_USER, {
                 user: req.user.email,
             });
@@ -238,10 +238,10 @@ async function OpenSearchSearchHandler(req, res) {
             res.sendStatus(401);
         }
 
-    var osClient = await getClient();
+        const osClient = await getClient();
 
-    const { body } = await osClient.search({
+        const {body} = await osClient.search({
-      ...(index ? { index } : {}),
+            ...(index ? {index} : {}),
             body: {
                 size: 100,
                 query: {

server/stripe/payment.js

@@ -1,7 +1,4 @@
-const GraphQLClient = require("graphql-request").GraphQLClient;
 const path = require("path");
-const queries = require("../graphql-client/queries");
-const Dinero = require("dinero.js");
 
 require("dotenv").config({
     path: path.resolve(
@@ -9,10 +6,11 @@ require("dotenv").config({
         `.env.${process.env.NODE_ENV || "development"}`
     ),
 });
-const stripe = require("stripe")(process.env.STRIPE_SECRET_KEY);
 
-exports.payment = async (req, res) => {
+const stripe = require('stripe')(process.env.STRIPE_SECRET_KEY);
-  const { amount, stripe_acct_id } = req.body;
+
+const processor = async (req, res) => {
+    const {amount, stripe_acct_id} = req.body;
 
     try {
         await stripe.paymentIntents
@@ -44,36 +42,5 @@ exports.payment = async (req, res) => {
     }
 };
 
-exports.mobile_payment = async (req, res) => {
+exports.payment = processor;
-  const { amount, stripe_acct_id } = req.body;
+exports.mobile_payment = processor;
-
-  try {
-    await stripe.paymentIntents
-      .create(
-        {
-          //Pull the amounts from the payment request.
-          payment_method_types: ["card"],
-          amount: amount,
-          currency: "cad",
-          application_fee_amount: 50,
-        },
-        {
-          stripeAccount: stripe_acct_id,
-        }
-      )
-      .then(function (paymentIntent) {
-        try {
-          return res.send({
-            clientSecret: paymentIntent.client_secret,
-          });
-        } catch (err) {
-          return res.status(500).send({
-            error: err.message,
-          });
-        }
-      });
-  } catch (error) {
-    console.log("error", error);
-    res.status(400).send(error);
-  }
-};

server/tasks/tasks.js

@@ -5,16 +5,14 @@ require("dotenv").config({
         `.env.${process.env.NODE_ENV || "development"}`
     ),
 });
-const axios = require("axios");
 const client = require("../graphql-client/graphql-client").client;
 const emailer = require("../email/sendemail");
-const logger = require("../utils/logger");
 const moment = require("moment-timezone");
+const converter = require("json-2-csv");
+
 exports.taskHandler = async (req, res) => {
     try {
-    const { bodyshopid, query, variables, text, to, subject, timezone } =
+        const {bodyshopid, query, variables, text, to, subject, timezone} = req.body;
-      req.body;
-    //Run the query
 
         //Check the variables to see if they are an object.
         Object.keys(variables).forEach((key) => {
@@ -26,51 +24,45 @@ exports.taskHandler = async (req, res) => {
         });
 
         const response = await client.request(query, variables);
-    //Massage the data
+        const rootElement = response[Object.keys(response)[0]]; //This element should always be an array.
-    //Send the email
+
-    const rootElement = response[Object.keys(response)[0]]; //This element shoudl always be an array.
+        const csv = converter.json2csv(rootElement, {emptyFieldValue: ""});
-    let converter = require("json-2-csv");
-    converter.json2csv(
-      rootElement,
-      (err, csv) => {
-        if (err) {
-          res.status(500).json(err);
-        }
 
         emailer.sendTaskEmail({
             to,
             subject,
             text,
-          attachments: [{ filename: "query.csv", content: csv }],
+            attachments: [{filename: "query.csv", content: csv}],
+        }).catch(err => {
+            console.error('Errors sending CSV Email.')
         });
-        res.status(200).send(csv);
+
-      },
+        return res.status(200).send(csv);
-      { emptyFieldValue: "" }
-    );
     } catch (error) {
-    res.status(500).json({ error: error.message, stack: error.stackTrace });
+        res.status(500).json({error: error.message, stack: error.stackTrace});
     }
 };
 
-const isoformat = "YYYY-MM-DD";
+const isoFormat = "YYYY-MM-DD";
+
 function functionMapper(f, timezone) {
     switch (f) {
         case "date.today":
-      return moment().tz(timezone).format(isoformat);
+            return moment().tz(timezone).format(isoFormat);
         case "date.now":
             return moment().tz(timezone);
         case "date.yesterday":
-      return moment().tz(timezone).subtract(1, "day").format(isoformat);
+            return moment().tz(timezone).subtract(1, "day").format(isoFormat);
         case "date.3daysago":
-      return moment().tz(timezone).subtract(3, "days").format(isoformat);
+            return moment().tz(timezone).subtract(3, "days").format(isoFormat);
         case "date.7daysago":
-      return moment().tz(timezone).subtract(7, "days").format(isoformat);
+            return moment().tz(timezone).subtract(7, "days").format(isoFormat);
         case "date.tomorrow":
-      return moment().tz(timezone).add(1, "day").format(isoformat);
+            return moment().tz(timezone).add(1, "day").format(isoFormat);
         case "date.3daysfromnow":
-      return moment().tz(timezone).add(3, "days").format(isoformat);
+            return moment().tz(timezone).add(3, "days").format(isoFormat);
         case "date.7daysfromnow":
-      return moment().tz(timezone).add(7, "days").format(isoformat);
+            return moment().tz(timezone).add(7, "days").format(isoFormat);
         case "date.yesterdaytz":
             return moment().tz(timezone).subtract(1, "day");
         case "date.3daysagotz":