IO-2391 Remote IP comment out till proxy for X-Forwarded-For can be figured out from AWS Load balancer

client/src/components/tech-job-clock-in-form/tech-job-clock-in-form.container.jsx

@@ -2,7 +2,6 @@ import { useMutation } from "@apollo/client";
 import { Button, Card, Form, notification, Space } from "antd";
 import axios from "axios";
 import moment from "moment";
-import momenttz from "moment-timezone";
 import React, { useState } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
@@ -50,20 +49,14 @@ export function TechClockInContainer({
   const handleFinish = async (values) => {
     setLoading(true);
     const theTime = (await axios.post("/utils/time")).data;
+
     const result = await insertTimeTicket({
       variables: {
         timeTicketInput: [
           {
             bodyshopid: bodyshop.id,
             employeeid: technician.id,
-            date:
-              typeof bodyshop.timezone === "string"
-                ? momenttz.tz(theTime, bodyshop.timezone).format("YYYY-MM-DD")
-                : typeof bodyshop.timezone === "number"
-                ? moment(theTime)
-                    .format("YYYY-MM-DD")
-                    .utcOffset(bodyshop.timezone)
-                : moment(theTime).format("YYYY-MM-DD"),
+            date: moment(theTime).format("YYYY-MM-DD"),
             clockon: moment(theTime),
             jobid: values.jobid,
             cost_center: values.cost_center,

client/src/components/time-ticket-shift-form/time-ticket-shift-form.container.jsx

@@ -2,7 +2,6 @@ import { useMutation } from "@apollo/client";
 import { Button, Form, Space, notification } from "antd";
 import axios from "axios";
 import moment from "moment";
-import momenttz from "moment-timezone";
 import React, { useMemo, useState } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
@@ -69,14 +68,7 @@ export function TimeTicektShiftContainer({
               employeeid: isTechConsole ? technician.id : employeeId,
               cost_center: "timetickets.labels.shift",
               clockon: theTime,
-              date:
-                typeof bodyshop.timezone === "string"
-                  ? momenttz.tz(theTime, bodyshop.timezone).format("YYYY-MM-DD")
-                  : typeof bodyshop.timezone === "number"
-                  ? moment(theTime)
-                      .utcOffset(bodyshop.timezone)
-                      .format("YYYY-MM-DD")
-                  : moment(theTime).format("YYYY-MM-DD"),
+              date: theTime,
               memo: values.memo,
               created_by: isTechConsole
                 ? currentUser.email.concat(

server.js

@@ -42,13 +42,13 @@ const io = new Server(server, {
 });
 exports.io = io;
 require("./server/web-sockets/web-socket");
-
-//app.use(fb.validateFirebaseIdToken);
+// app.set('trust proxy', true)
+// app.use(fb.validateFirebaseIdToken);
 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(enforce.HTTPS({ trustProtoHeader: true }));
 app.use(
   cors({ credentials: true, exposedHeaders: ["set-cookie"] })
   // cors({
@@ -71,10 +71,17 @@ 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.    `,
+    text: `Server API check has come in.`,
   });
   res.status(200).send(`OK - ${commit}`);
 });