Progress

2023-11-20 14:46:11 -05:00
parent c0d756fa38
commit 54af163ddf
7 changed files with 7475 additions and 5718 deletions
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@@ -17,24 +17,24 @@
    "start": "node server.js"
  },
  "dependencies": {
-    "@aws-sdk/client-secrets-manager": "^3.388.0",
-    "@aws-sdk/credential-provider-node": "^3.319.0",
-    "@opensearch-project/opensearch": "^2.2.1",
-    "aws-sdk": "^2.1326.0",
+    "@aws-sdk/client-secrets-manager": "^3.454.0",
+    "@aws-sdk/client-ses": "^3.454.0",
+    "@aws-sdk/credential-provider-node": "^3.451.0",
+    "@opensearch-project/opensearch": "^2.4.0",
    "aws4": "^1.12.0",
    "axios": "^0.27.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",
-    "graphql": "^16.6.0",
+    "firebase-admin": "^11.11.0",
+    "graphql": "^16.8.1",
    "graphql-request": "^4.2.0",
    "graylog2": "^0.2.1",
    "inline-css": "^4.0.2",
@@ -44,20 +44,20 @@
    "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",
-    "nodemailer": "^6.9.1",
-    "phone": "^3.1.35",
+    "node-quickbooks": "^2.0.43",
+    "nodemailer": "^6.9.7",
+    "phone": "^3.1.41",
    "query-string": "^7.1.1",
    "soap": "^1.0.0",
-    "socket.io": "^4.6.1",
-    "ssh2-sftp-client": "^9.0.4",
+    "socket.io": "^4.7.2",
+    "ssh2-sftp-client": "^9.1.0",
    "stripe": "^9.15.0",
-    "twilio": "^4.8.0",
-    "uuid": "^9.0.0",
-    "xml2js": "^0.4.23",
-    "xmlbuilder2": "^3.0.2"
+    "twilio": "^4.19.0",
+    "uuid": "^9.0.1",
+    "xml2js": "^0.6.2",
+    "xmlbuilder2": "^3.1.1"
  },
  "devDependencies": {
    "concurrently": "^7.3.0",
--- a/server.js
+++ b/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");
-var cookieParser = require("cookie-parser");
+const fb = require("./server/firebase/firebase-handler");
+const cookieParser = require("cookie-parser");
 const multer = require("multer");
 const upload = multer();
 //var enforce = require("express-sslify");
--- a/server/email/sendemail.js
+++ b/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 }) {
--- a/server/intellipay/aws-secrets-manager.js
+++ b/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 })
-        .promise();
+        .getSecretValue({ SecretId: secretName });
      if ("SecretString" in secretValue) {
        return secretValue.SecretString;
      } else {
--- a/server/opensearch/os-handler.js
+++ b/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 _ = require("lodash");
+const {pick} = 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 { defaultProvider } = require("@aws-sdk/credential-provider-node");
+const {Client, Connection} = require("@opensearch-project/opensearch");
+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({
-      ...(index ? { index } : {}),
+        const {body} = await osClient.search({
+            ...(index ? {index} : {}),
            body: {
                size: 100,
                query: {
--- a/yarn.lock
+++ b/yarn.lock