Progress
This commit is contained in:
7191
package-lock.json
generated
Normal file
7191
package-lock.json
generated
Normal file
File diff suppressed because it is too large
Load Diff
36
package.json
36
package.json
@@ -17,24 +17,24 @@
|
|||||||
"start": "node server.js"
|
"start": "node server.js"
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"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",
|
"aws4": "^1.12.0",
|
||||||
"axios": "^0.27.2",
|
"axios": "^0.27.2",
|
||||||
"bluebird": "^3.7.2",
|
"bluebird": "^3.7.2",
|
||||||
"body-parser": "^1.20.2",
|
"body-parser": "^1.20.2",
|
||||||
"cloudinary": "^1.34.0",
|
"cloudinary": "^1.41.0",
|
||||||
"compression": "^1.7.4",
|
"compression": "^1.7.4",
|
||||||
"cookie-parser": "^1.4.6",
|
"cookie-parser": "^1.4.6",
|
||||||
"cors": "2.8.5",
|
"cors": "2.8.5",
|
||||||
"csrf": "^3.1.0",
|
"csrf": "^3.1.0",
|
||||||
"dinero.js": "^1.9.1",
|
"dinero.js": "^1.9.1",
|
||||||
"dotenv": "16.0.3",
|
"dotenv": "^16.3.1",
|
||||||
"express": "^4.18.2",
|
"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": "^4.2.0",
|
||||||
"graylog2": "^0.2.1",
|
"graylog2": "^0.2.1",
|
||||||
"inline-css": "^4.0.2",
|
"inline-css": "^4.0.2",
|
||||||
@@ -44,20 +44,20 @@
|
|||||||
"moment": "^2.29.4",
|
"moment": "^2.29.4",
|
||||||
"moment-timezone": "^0.5.41",
|
"moment-timezone": "^0.5.41",
|
||||||
"multer": "^1.4.5-lts.1",
|
"multer": "^1.4.5-lts.1",
|
||||||
"node-mailjet": "^6.0.2",
|
"node-mailjet": "^6.0.4",
|
||||||
"node-persist": "^3.1.3",
|
"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",
|
"query-string": "^7.1.1",
|
||||||
"soap": "^1.0.0",
|
"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": "^9.15.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": {
|
"devDependencies": {
|
||||||
"concurrently": "^7.3.0",
|
"concurrently": "^7.3.0",
|
||||||
|
|||||||
@@ -5,8 +5,8 @@ const path = require("path");
|
|||||||
const compression = require("compression");
|
const compression = require("compression");
|
||||||
const twilio = require("twilio");
|
const twilio = require("twilio");
|
||||||
const logger = require("./server/utils/logger");
|
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 multer = require("multer");
|
||||||
const upload = multer();
|
const upload = multer();
|
||||||
//var enforce = require("express-sslify");
|
//var enforce = require("express-sslify");
|
||||||
|
|||||||
@@ -7,15 +7,19 @@ require("dotenv").config({
|
|||||||
});
|
});
|
||||||
const axios = require("axios");
|
const axios = require("axios");
|
||||||
let nodemailer = require("nodemailer");
|
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 logger = require("../utils/logger");
|
||||||
const client = require("../graphql-client/graphql-client").client;
|
const client = require("../graphql-client/graphql-client").client;
|
||||||
const queries = require("../graphql-client/queries");
|
const queries = require("../graphql-client/queries");
|
||||||
|
|
||||||
const ses = new aws.SES({
|
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",
|
apiVersion: "latest",
|
||||||
|
|
||||||
region: "ca-central-1",
|
region: "ca-central-1",
|
||||||
|
defaultProvider
|
||||||
});
|
});
|
||||||
|
|
||||||
let transporter = nodemailer.createTransport({
|
let transporter = nodemailer.createTransport({
|
||||||
@@ -48,7 +52,6 @@ exports.sendServerEmail = async function ({ subject, text }) {
|
|||||||
} catch (error) {
|
} catch (error) {
|
||||||
console.log(error);
|
console.log(error);
|
||||||
logger.log("server-email-failure", "error", null, null, error);
|
logger.log("server-email-failure", "error", null, null, error);
|
||||||
res.status(500).json(error);
|
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
exports.sendTaskEmail = async function ({ to, subject, text, attachments }) {
|
exports.sendTaskEmail = async function ({ to, subject, text, attachments }) {
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
"use strict";
|
"use strict";
|
||||||
|
|
||||||
const AWS = require("aws-sdk");
|
const awsSecretManager = require("@aws-sdk/client-secrets-manager");
|
||||||
|
|
||||||
class SecretsManager {
|
class SecretsManager {
|
||||||
/**
|
/**
|
||||||
@@ -8,11 +8,10 @@ class SecretsManager {
|
|||||||
*/
|
*/
|
||||||
static async getSecret(secretName, region) {
|
static async getSecret(secretName, region) {
|
||||||
const config = { region: region };
|
const config = { region: region };
|
||||||
let secretsManager = new AWS.SecretsManager(config);
|
let secretsManager = new awsSecretManager.SecretsManager(config);
|
||||||
try {
|
try {
|
||||||
let secretValue = await secretsManager
|
let secretValue = await secretsManager
|
||||||
.getSecretValue({ SecretId: secretName })
|
.getSecretValue({ SecretId: secretName });
|
||||||
.promise();
|
|
||||||
if ("SecretString" in secretValue) {
|
if ("SecretString" in secretValue) {
|
||||||
return secretValue.SecretString;
|
return secretValue.SecretString;
|
||||||
} else {
|
} else {
|
||||||
|
|||||||
@@ -1,9 +1,8 @@
|
|||||||
const Dinero = require("dinero.js");
|
|
||||||
const queries = require("../graphql-client/queries");
|
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 GraphQLClient = require("graphql-request").GraphQLClient;
|
||||||
const logger = require("../utils/logger");
|
const logger = require("../utils/logger");
|
||||||
|
//const client = require("../graphql-client/graphql-client").client;
|
||||||
|
|
||||||
const path = require("path");
|
const path = require("path");
|
||||||
const client = require("../graphql-client/graphql-client").client;
|
const client = require("../graphql-client/graphql-client").client;
|
||||||
@@ -13,10 +12,10 @@ require("dotenv").config({
|
|||||||
`.env.${process.env.NODE_ENV || "development"}`
|
`.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 aws4 = require("aws4");
|
||||||
const { gql } = require("graphql-request");
|
const {gql} = require("graphql-request");
|
||||||
|
|
||||||
var host = process.env.OPEN_SEARCH_HOST;
|
var host = process.env.OPEN_SEARCH_HOST;
|
||||||
|
|
||||||
@@ -32,6 +31,7 @@ const createAwsConnector = (credentials, region) => {
|
|||||||
return aws4.sign(request, credentials);
|
return aws4.sign(request, credentials);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return {
|
return {
|
||||||
Connection: AmazonConnection,
|
Connection: AmazonConnection,
|
||||||
};
|
};
|
||||||
@@ -68,7 +68,7 @@ async function OpenSearchUpdateHandler(req, res) {
|
|||||||
|
|
||||||
switch (req.body.table.name) {
|
switch (req.body.table.name) {
|
||||||
case "jobs":
|
case "jobs":
|
||||||
document = _.pick(req.body.event.data.new, [
|
document = pick(req.body.event.data.new, [
|
||||||
"id",
|
"id",
|
||||||
"bodyshopid",
|
"bodyshopid",
|
||||||
"clm_no",
|
"clm_no",
|
||||||
@@ -92,7 +92,7 @@ async function OpenSearchUpdateHandler(req, res) {
|
|||||||
document.bodyshopid = req.body.event.data.new.shopid;
|
document.bodyshopid = req.body.event.data.new.shopid;
|
||||||
break;
|
break;
|
||||||
case "vehicles":
|
case "vehicles":
|
||||||
document = _.pick(req.body.event.data.new, [
|
document = pick(req.body.event.data.new, [
|
||||||
"id",
|
"id",
|
||||||
"v_model_yr",
|
"v_model_yr",
|
||||||
"v_model_desc",
|
"v_model_desc",
|
||||||
@@ -104,7 +104,7 @@ async function OpenSearchUpdateHandler(req, res) {
|
|||||||
document.bodyshopid = req.body.event.data.new.shopid;
|
document.bodyshopid = req.body.event.data.new.shopid;
|
||||||
break;
|
break;
|
||||||
case "owners":
|
case "owners":
|
||||||
document = _.pick(req.body.event.data.new, [
|
document = pick(req.body.event.data.new, [
|
||||||
"id",
|
"id",
|
||||||
"ownr_fn",
|
"ownr_fn",
|
||||||
"ownr_ln",
|
"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 = {
|
document = {
|
||||||
..._.pick(req.body.event.data.new, [
|
...pick(req.body.event.data.new, [
|
||||||
"id",
|
"id",
|
||||||
"date",
|
"date",
|
||||||
"exported",
|
"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 = {
|
document = {
|
||||||
..._.pick(req.body.event.data.new, [
|
...pick(req.body.event.data.new, [
|
||||||
"id",
|
"id",
|
||||||
"amount",
|
"amount",
|
||||||
"created_at",
|
"created_at",
|
||||||
@@ -210,7 +210,7 @@ async function OpenSearchUpdateHandler(req, res) {
|
|||||||
|
|
||||||
async function OpenSearchSearchHandler(req, res) {
|
async function OpenSearchSearchHandler(req, res) {
|
||||||
try {
|
try {
|
||||||
const { search, bodyshopid, index } = req.body;
|
const {search, bodyshopid, index} = req.body;
|
||||||
|
|
||||||
if (!req.user) {
|
if (!req.user) {
|
||||||
res.sendStatus(401);
|
res.sendStatus(401);
|
||||||
@@ -229,7 +229,7 @@ async function OpenSearchSearchHandler(req, res) {
|
|||||||
});
|
});
|
||||||
|
|
||||||
const assocs = await client
|
const assocs = await client
|
||||||
.setHeaders({ Authorization: BearerToken })
|
.setHeaders({Authorization: BearerToken})
|
||||||
.request(queries.ACTIVE_SHOP_BY_USER, {
|
.request(queries.ACTIVE_SHOP_BY_USER, {
|
||||||
user: req.user.email,
|
user: req.user.email,
|
||||||
});
|
});
|
||||||
@@ -238,10 +238,10 @@ async function OpenSearchSearchHandler(req, res) {
|
|||||||
res.sendStatus(401);
|
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: {
|
body: {
|
||||||
size: 100,
|
size: 100,
|
||||||
query: {
|
query: {
|
||||||
|
|||||||
Reference in New Issue
Block a user