- merge adjustments

Signed-off-by: Dave Richer <dave@imexsystems.ca>

server.js

@@ -1,309 +1,93 @@
+// Import core modules
 const express = require("express");
 const cors = require("cors");
 const bodyParser = require("body-parser");
 const path = require("path");
 const compression = require("compression");
-const twilio = require("twilio");
-const logger = require("./server/utils/logger");
-const fb = require("./server/firebase/firebase-handler");
 const cookieParser = require("cookie-parser");
-const multer = require("multer");
-const upload = multer();
-//var enforce = require("express-sslify");
+const http = require("http");
+const {Server} = require("socket.io");
 
+// Load environment variables
 require("dotenv").config({
-  path: path.resolve(
-    process.cwd(),
-    `.env.${process.env.NODE_ENV || "development"}`
-  ),
+    path: path.resolve(process.cwd(), `.env.${process.env.NODE_ENV || "development"}`)
 });
 
+// Import custom utilities and handlers
+const logger = require("./server/utils/logger");
+
+// Express app and server setup
 const app = express();
 const port = process.env.PORT || 5000;
-//const port = 5000;
-
-const http = require("http");
 const server = http.createServer(app);
-const { Server } = require("socket.io");
 const io = new Server(server, {
-  path: "/ws",
-  cors: {
-    origin: [
-      "https://test.imex.online",
-      "https://www.test.imex.online",
-      "http://localhost:3000",
-      "https://imex.online",
-      "https://www.imex.online",
-      "https://romeonline.io",
-      "https://www.romeonline.io",
-    ],
-    methods: ["GET", "POST"],
-    credentials: true,
-    exposedHeaders: ["set-cookie"],
-  },
+    path: "/ws",
+    cors: {
+        origin: [
+            "https://test.imex.online",
+            "https://www.test.imex.online",
+            "http://localhost:3000",
+            "https://imex.online",
+            "https://www.imex.online",
+            "https://romeonline.io",
+            "https://www.romeonline.io",
+        ],
+        methods: ["GET", "POST"],
+        credentials: true,
+        exposedHeaders: ["set-cookie"],
+    },
 });
 exports.io = io;
+
 require("./server/web-sockets/web-socket");
-// app.set('trust proxy', true)
-// app.use(fb.validateFirebaseIdToken);
+
+
+// Middleware
 app.use(compression());
 app.use(cookieParser());
-app.use(bodyParser.json({ limit: "50mb" }));
-app.use(bodyParser.urlencoded({ limit: "50mb", extended: true }));
-// app.use(enforce.HTTPS({ trustProtoHeader: true }));
-app.use(
-  cors({ credentials: true, exposedHeaders: ["set-cookie"] })
-  // cors({
-  //   credentials: true,
-  //   origin: [
-  //     "https://test.imex.online",
-  //     "http://localhost:3000",
-  //     "https://imex.online",
-  //   ],
-  // })
-);
+app.use(bodyParser.json({limit: "50mb"}));
+app.use(bodyParser.urlencoded({limit: "50mb", extended: true}));
+app.use(cors({credentials: true, exposedHeaders: ["set-cookie"]}));
 
-//Email Based Paths.
-var sendEmail = require("./server/email/sendemail.js");
-app.post("/sendemail", fb.validateFirebaseIdToken, sendEmail.sendEmail);
-app.post("/emailbounce", bodyParser.text(), sendEmail.emailBounce);
-
-//Test route to ensure Express is responding.
-app.get("/test", async function (req, res) {
-  const commit = require("child_process").execSync(
-    "git rev-parse --short HEAD"
-  );
-  // console.log(app.get('trust proxy'));
-  // console.log("remoteAddress", req.socket.remoteAddress);
-  // console.log("X-Forwarded-For", req.header('x-forwarded-for'));
-  logger.log("test-api-status", "DEBUG", "api", { commit });
-  // sendEmail.sendServerEmail({
-  //   subject: `API Check - ${process.env.NODE_ENV}`,
-  //   text: `Server API check has come in. Remote IP: ${req.socket.remoteAddress}, X-Forwarded-For: ${req.header('x-forwarded-for')}`,
-  // });
-  sendEmail.sendServerEmail({
-    subject: `API Check - ${process.env.NODE_ENV}`,
-    text: `Server API check has come in.`,
-  });
-  res.status(200).send(`OK - ${commit}`);
+// Helper middleware
+app.use((req, res, next) => {
+    req.logger = logger;
+    next();
 });
 
-//Accounting Qbxml
-const accountQbxml = require("./server/accounting/qbxml/qbxml");
-app.post(
-  "/accounting/qbxml/receivables",
-  fb.validateFirebaseIdToken,
-  accountQbxml.receivables
-);
-app.post(
-  "/accounting/qbxml/payables",
-  fb.validateFirebaseIdToken,
-  accountQbxml.payables
-);
-app.post(
-  "/accounting/qbxml/payments",
-  fb.validateFirebaseIdToken,
-  accountQbxml.payments
-);
+// Route groupings
+app.use('/', require("./server/routes/miscellaneousRoutes"));
+app.use("/notifications", require("./server/routes/notificationsRoutes"));
+app.use("/render", require("./server/routes/renderRoutes"));
+app.use('/mixdata', require("./server/routes/mixDataRoutes"));
+app.use('/accounting', require("./server/routes/accountingRoutes"));
+app.use('/qbo', require("./server/routes/qboRoutes"));
+app.use('/media', require("./server/routes/mediaRoutes"));
+app.use('/sms', require("./server/routes/smsRoutes"));
+app.use('/job', require("./server/routes/jobRoutes"));
+app.use('/scheduling', require("./server/routes/schedulingRoutes"));
+app.use('/utils', require("./server/routes/utilRoutes"));
+app.use('/data', require("./server/routes/dataRoutes"));
+app.use('/adm', require("./server/routes/adminRoutes"));
+app.use('/tech', require("./server/routes/techRoutes"));
+app.use('/intellipay', require("./server/routes/intellipayRoutes"));
+app.use('/cdk', require("./server/routes/cdkRoutes"));
+app.use('/payroll', require("./server/routes/payrollRoutes"));
 
-//Cloudinary Media Paths
-var media = require("./server/media/media");
-app.post(
-  "/media/sign",
-  fb.validateFirebaseIdToken,
-  media.createSignedUploadURL
-);
-app.post("/media/download", fb.validateFirebaseIdToken, media.downloadFiles);
-app.post("/media/rename", fb.validateFirebaseIdToken, media.renameKeys);
-app.post("/media/delete", fb.validateFirebaseIdToken, media.deleteFiles);
-
-//SMS/Twilio Paths
-var smsReceive = require("./server/sms/receive");
-app.post(
-  "/sms/receive",
-  twilio.webhook({ validate: process.env.NODE_ENV === "PRODUCTION" }),
-  smsReceive.receive
-);
-var smsSend = require("./server/sms/send");
-app.post("/sms/send", fb.validateFirebaseIdToken, smsSend.send);
-var smsStatus = require("./server/sms/status");
-app.post(
-  "/sms/status",
-  twilio.webhook({ validate: process.env.NODE_ENV === "PRODUCTION" }),
-  smsStatus.status
-);
-app.post(
-  "/sms/markConversationRead",
-  fb.validateFirebaseIdToken,
-  smsStatus.markConversationRead
-);
-
-var job = require("./server/job/job");
-app.post("/job/totals", fb.validateFirebaseIdToken, job.totals);
-app.post(
-  "/job/statustransition",
-  // fb.validateFirebaseIdToken,
-  job.statustransition
-);
-app.post("/job/totalsssu", fb.validateFirebaseIdToken, job.totalsSsu);
-app.post("/job/costing", fb.validateFirebaseIdToken, job.costing);
-app.post("/job/costingmulti", fb.validateFirebaseIdToken, job.costingmulti);
-
-var ppc = require("./server/ccc/partspricechange");
-app.post("/job/ppc", fb.validateFirebaseIdToken, ppc.generatePpc);
-
-var partsScan = require("./server/parts-scan/parts-scan");
-app.post("/job/partsscan", fb.validateFirebaseIdToken, partsScan.partsScan);
-//Scheduling
-var scheduling = require("./server/scheduling/scheduling-job");
-app.post("/scheduling/job", fb.validateFirebaseIdToken, scheduling.job);
-
-//Handlebars Paths for Email/Report Rendering
-// var renderHandlebars = require("./server/render/renderHandlebars");
-// app.post("/render", fb.validateFirebaseIdToken, renderHandlebars.render);
-var inlineCss = require("./server/render/inlinecss");
-app.post("/render/inlinecss", fb.validateFirebaseIdToken, inlineCss.inlinecss);
-
-// app.post(
-//   "/notifications/send",
-
-//   fb.sendNotification
-// );
-app.post("/notifications/subscribe", fb.validateFirebaseIdToken, fb.subscribe);
-app.post(
-  "/notifications/unsubscribe",
-  fb.validateFirebaseIdToken,
-  fb.unsubscribe
-);
-app.post("/adm/updateuser", fb.validateFirebaseIdToken, fb.updateUser);
-app.post("/adm/getuser", fb.validateFirebaseIdToken, fb.getUser);
-app.post("/adm/createuser", fb.validateFirebaseIdToken, fb.createUser);
-const adm = require("./server/admin/adminops");
-app.post(
-  "/adm/createassociation",
-  fb.validateFirebaseIdToken,
-  fb.validateAdmin,
-  adm.createAssociation
-);
-app.post(
-  "/adm/createshop",
-  fb.validateFirebaseIdToken,
-  fb.validateAdmin,
-  adm.createShop
-);
-app.post(
-  "/adm/updateshop",
-  fb.validateFirebaseIdToken,
-  fb.validateAdmin,
-  adm.updateShop
-);
-app.post(
-  "/adm/updatecounter",
-  fb.validateFirebaseIdToken,
-  fb.validateAdmin,
-  adm.updateCounter
-);
-
-//Stripe Processing
-// var stripe = require("./server/stripe/payment");
-// app.post("/stripe/payment", fb.validateFirebaseIdToken, stripe.payment);
-// app.post(
-//   "/stripe/mobilepayment",
-//   fb.validateFirebaseIdToken,
-//   stripe.mobile_payment
-// );
-
-//Tech Console
-var tech = require("./server/tech/tech");
-app.post("/tech/login", fb.validateFirebaseIdToken, tech.techLogin);
-
-var utils = require("./server/utils/utils");
-app.post("/utils/time", utils.servertime);
-app.post("/utils/jsr", fb.validateFirebaseIdToken, utils.jsrAuth);
-var qbo = require("./server/accounting/qbo/qbo");
-app.post("/qbo/authorize", fb.validateFirebaseIdToken, qbo.authorize);
-app.get("/qbo/callback", qbo.callback);
-app.post("/qbo/receivables", fb.validateFirebaseIdToken, qbo.receivables);
-app.post("/qbo/payables", fb.validateFirebaseIdToken, qbo.payables);
-app.post("/qbo/payments", fb.validateFirebaseIdToken, qbo.payments);
-
-var data = require("./server/data/data");
-app.post("/data/ah", data.autohouse);
-app.post("/data/cc", data.claimscorp);
-app.post("/record-handler/arms", data.arms);
-
-var taskHandler = require("./server/tasks/tasks");
-app.post("/taskHandler", fb.validateFirebaseIdToken, taskHandler.taskHandler);
-
-var mixdataUpload = require("./server/mixdata/mixdata");
-
-app.post(
-  "/mixdata/upload",
-  fb.validateFirebaseIdToken,
-  upload.any(),
-  mixdataUpload.mixdataUpload
-);
-
-var intellipay = require("./server/intellipay/intellipay");
-app.post(
-  "/intellipay/lightbox_credentials",
-  fb.validateFirebaseIdToken,
-  intellipay.lightbox_credentials
-);
-
-app.post(
-  "/intellipay/payment_refund",
-  fb.validateFirebaseIdToken,
-  intellipay.payment_refund
-);
-
-app.post(
-  "/intellipay/generate_payment_url",
-  fb.validateFirebaseIdToken,
-  intellipay.generate_payment_url
-);
-
-app.post(
-  "/intellipay/postback",
-  // fb.validateFirebaseIdToken,
-  intellipay.postback
-);
-
-const payroll = require("./server/payroll/payroll");
-app.post(
-  "/payroll/calculatelabor",
-  fb.validateFirebaseIdToken,
-  payroll.calculatelabor
-);
-app.post("/payroll/payall", fb.validateFirebaseIdToken, payroll.payall);
-app.post("/payroll/claimtask", fb.validateFirebaseIdToken, payroll.claimtask);
-
-var ioevent = require("./server/ioevent/ioevent");
-app.post("/ioevent", ioevent.default);
-// app.post("/newlog", (req, res) => {
-//   const { message, type, user, record, object } = req.body;
-//   logger.log(message, type, user, record, object);
-// });
-
-var os = require("./server/opensearch/os-handler");
-app.post(
-  "/opensearch", //fb.validateFirebaseIdToken,
-  os.handler
-);
-app.post("/search", fb.validateFirebaseIdToken, os.search);
-
-var cdkGetMake = require("./server/cdk/cdk-get-makes");
-app.post("/cdk/getvehicles", fb.validateFirebaseIdToken, cdkGetMake.default);
-
-app.get("/", async function (req, res) {
-  res.status(200).send("Access Forbidden.");
+// Default route for forbidden access
+app.get("/", (req, res) => {
+    res.status(200).send("Access Forbidden.");
 });
 
-server.listen(port, (error) => {
-  if (error) throw error;
-  logger.log(
-    `[${process.env.NODE_ENV || "DEVELOPMENT"}] Server running on port ${port}`,
-    "INFO",
-    "api"
-  );
-});
+const main = async () => {
+    await server.listen(port);
+}
+
+// Start server
+main()
+    .then(() => {
+        logger.log(`[${process.env.NODE_ENV || "DEVELOPMENT"}] Server started on port ${port}`, "INFO", "api");
+    })
+    .catch((error) => {
+        logger.log(`[${process.env.NODE_ENV || "DEVELOPMENT"}] Server failed to start on port ${port}`, "ERROR", "api", error);
+    });