- Finish cleanup

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

server/job/job-lifecycle.js

@@ -1,6 +1,7 @@
 const _ = require("lodash");
 const jobLifecycle = (req, res) => {
     const {jobids} = req.body;
+
     return _.isArray(jobids) ?
         handleMultipleJobs(jobids, req, res) :
         handleSingleJob(jobids, req, res);
@@ -11,6 +12,9 @@ const handleMultipleJobs = (jobIDs, req, res) => {
 }
 
 const handleSingleJob = (req, res) => {
+
+    const client = req.userGraphQLClient;
+
     return res.status(200).send(req.body);
 }
 

server/job/job-totals.js

@@ -1,20 +1,18 @@
 const Dinero = require("dinero.js");
 const queries = require("../graphql-client/queries");
-const GraphQLClient = require("graphql-request").GraphQLClient;
-const logger = require("../utils/logger");
+const logger = require('../utils/logger');
+
 // Dinero.defaultCurrency = "USD";
 // Dinero.globalLocale = "en-CA";
 Dinero.globalRoundingMode = "HALF_EVEN";
 
 exports.totalsSsu = async function (req, res) {
-  const BearerToken = req.headers.authorization;
   const { id } = req.body;
+
+  const BearerToken = req.BearerToken;
+  const client = req.userGraphQLClient;
+
   logger.log("job-totals-ssu", "DEBUG", req.user.email, id, null);
-  const client = new GraphQLClient(process.env.GRAPHQL_ENDPOINT, {
-    headers: {
-      Authorization: BearerToken,
-    },
-  });
 
   try {
     const job = await client
@@ -75,21 +73,19 @@ async function TotalsServerSide(req, res) {
 }
 
 async function Totals(req, res) {
-  const { job } = req.body;
+  const { job, id } = req.body;
+
+  const logger = req.logger;
+  const client = req.userGraphQLClient;
+
   logger.log("job-totals", "DEBUG", req.user.email, job.id, {
     jobid: job.id,
   });
 
-  const BearerToken = req.headers.authorization;
-  const { id } = req.body;
   logger.log("job-totals-ssu", "DEBUG", req.user.email, id, null);
-  const client = new GraphQLClient(process.env.GRAPHQL_ENDPOINT, {
-    headers: {
-      Authorization: BearerToken,
-    },
-  });
 
   await AutoAddAtsIfRequired({ job, client });
+
   try {
     let ret = {
       parts: CalculatePartsTotals(job.joblines),