- merge adjustments

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

server/payroll/calculate-totals.js

@@ -12,14 +12,11 @@ const {
 Dinero.globalRoundingMode = "HALF_EVEN";
 
 exports.calculatelabor = async function (req, res) {
-  const BearerToken = req.headers.authorization;
   const { jobid, calculateOnly } = req.body;
   logger.log("job-payroll-calculate-labor", "DEBUG", req.user.email, jobid, null);
-  const client = new GraphQLClient(process.env.GRAPHQL_ENDPOINT, {
-    headers: {
-      Authorization: BearerToken,
-    },
-  });
+
+    const BearerToken = req.BearerToken;
+    const client = req.userGraphQLClient;
 
   try {
     const { jobs_by_pk: job } = await client

server/payroll/claim-task.js

@@ -12,14 +12,11 @@ const moment = require("moment");
 Dinero.globalRoundingMode = "HALF_EVEN";
 
 exports.claimtask = async function (req, res) {
-  const BearerToken = req.headers.authorization;
   const { jobid, task, calculateOnly, employee } = req.body;
   logger.log("job-payroll-pay-all", "DEBUG", req.user.email, jobid, null);
-  const client = new GraphQLClient(process.env.GRAPHQL_ENDPOINT, {
-    headers: {
-      Authorization: BearerToken,
-    },
-  });
+
+  const BearerToken = req.BearerToken;
+  const client = req.userGraphQLClient;
 
   try {
     const { jobs_by_pk: job } = await client

server/payroll/pay-all.js

@@ -11,14 +11,11 @@ const { json } = require("body-parser");
 Dinero.globalRoundingMode = "HALF_EVEN";
 
 exports.payall = async function (req, res) {
-  const BearerToken = req.headers.authorization;
   const { jobid, calculateOnly } = req.body;
   logger.log("job-payroll-pay-all", "DEBUG", req.user.email, jobid, null);
-  const client = new GraphQLClient(process.env.GRAPHQL_ENDPOINT, {
-    headers: {
-      Authorization: BearerToken,
-    },
-  });
+
+  const BearerToken = req.BearerToken;
+  const client = req.userGraphQLClient;
 
   try {
     const { jobs_by_pk: job } = await client