- merge adjustments

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

server/accounting/pbs/pbs-job-export.js

@@ -166,7 +166,7 @@ async function CheckForErrors(socket, response) {
     CdkBase.createLogEvent(
       socket,
       "DEBUG",
-      `Succesful response from DMS. ${response.Message || ""}`
+      `Successful response from DMS. ${response.Message || ""}`
     );
   } else {
     CdkBase.createLogEvent(

server/accounting/qbo/qbo-payables.js

@@ -18,10 +18,10 @@ const {
 } = require("./qbo-callback");
 const OAuthClient = require("intuit-oauth");
 const moment = require("moment-timezone");
-const GraphQLClient = require("graphql-request").GraphQLClient;
 const findTaxCode = require("../qb-receivables-lines").findTaxCode;
 
 exports.default = async (req, res) => {
+
   const oauthClient = new OAuthClient({
     clientId: process.env.QBO_CLIENT_ID,
     clientSecret: process.env.QBO_SECRET,
@@ -30,29 +30,31 @@ exports.default = async (req, res) => {
     redirectUri: process.env.QBO_REDIRECT_URI,
     logging: true,
   });
+
   try {
     //Fetch the API Access Tokens & Set them for the session.
     const response = await apiGqlClient.request(queries.GET_QBO_AUTH, {
       email: req.user.email,
     });
+
     const { qbo_realmId } = response.associations[0];
 
     oauthClient.setToken(response.associations[0].qbo_auth);
+
     if (!qbo_realmId) {
       res.status(401).json({ error: "No company associated." });
       return;
     }
+
     await refreshOauthToken(oauthClient, req);
 
-    const BearerToken = req.headers.authorization;
     const { bills: billsToQuery, elgen } = req.body;
-    //Query Job Info
-    const client = new GraphQLClient(process.env.GRAPHQL_ENDPOINT, {
-      headers: {
-        Authorization: BearerToken,
-      },
-    });
+
+    const BearerToken = req.BearerToken;
+    const client = req.userGraphQLClient;
+
     logger.log("qbo-payable-create", "DEBUG", req.user.email, billsToQuery);
+
     const result = await client
       .setHeaders({ Authorization: BearerToken })
       .request(queries.QUERY_BILLS_FOR_PAYABLES_EXPORT, {

server/accounting/qbo/qbo-payments.js

@@ -51,15 +51,13 @@ exports.default = async (req, res) => {
     }
     await refreshOauthToken(oauthClient, req);
 
-    const BearerToken = req.headers.authorization;
     const { payments: paymentsToQuery, elgen } = req.body;
-    //Query Job Info
-    const client = new GraphQLClient(process.env.GRAPHQL_ENDPOINT, {
-      headers: {
-        Authorization: BearerToken,
-      },
-    });
+
+    const BearerToken = req.BearerToken;
+    const client = req.userGraphQLClient;
+
     logger.log("qbo-payment-create", "DEBUG", req.user.email, paymentsToQuery);
+
     const result = await client
       .setHeaders({ Authorization: BearerToken })
       .request(queries.QUERY_PAYMENTS_FOR_EXPORT, {

server/accounting/qbo/qbo-receivables.js

@@ -45,15 +45,14 @@ exports.default = async (req, res) => {
 
     await refreshOauthToken(oauthClient, req);
 
-    const BearerToken = req.headers.authorization;
     const { jobIds, elgen } = req.body;
     //Query Job Info
-    const client = new GraphQLClient(process.env.GRAPHQL_ENDPOINT, {
-      headers: {
-        Authorization: BearerToken,
-      },
-    });
+
+    const BearerToken = req.BearerToken;
+    const client = req.userGraphQLClient;
+
     logger.log("qbo-receivable-create", "DEBUG", req.user.email, jobIds);
+
     const result = await client
       .setHeaders({ Authorization: BearerToken })
       .request(queries.QUERY_JOBS_FOR_RECEIVABLES_EXPORT, {

server/accounting/qbxml/qbxml-payables.js

@@ -3,10 +3,11 @@ const path = require("path");
 const DineroQbFormat = require("../accounting-constants").DineroQbFormat;
 const queries = require("../../graphql-client/queries");
 const Dinero = require("dinero.js");
-var builder = require("xmlbuilder2");
+const builder = require("xmlbuilder2");
 const QbXmlUtils = require("./qbxml-utils");
 const moment = require("moment-timezone");
-const logger = require("../../utils/logger");
+const logger = require('../../utils/logger');
+
 require("dotenv").config({
   path: path.resolve(
     process.cwd(),
@@ -15,14 +16,10 @@ require("dotenv").config({
 });
 
 exports.default = async (req, res) => {
-  const BearerToken = req.headers.authorization;
   const { bills: billsToQuery } = req.body;
 
-  const client = new GraphQLClient(process.env.GRAPHQL_ENDPOINT, {
-    headers: {
-      Authorization: BearerToken,
-    },
-  });
+  const BearerToken = req.BearerToken;
+  const client = req.userGraphQLClient;
 
   try {
     logger.log(

server/accounting/qbxml/qbxml-payments.js

@@ -1,13 +1,12 @@
-const GraphQLClient = require("graphql-request").GraphQLClient;
 const path = require("path");
 const DineroQbFormat = require("../accounting-constants").DineroQbFormat;
 const queries = require("../../graphql-client/queries");
 const Dinero = require("dinero.js");
-var builder = require("xmlbuilder2");
+const builder = require("xmlbuilder2");
 const moment = require("moment-timezone");
 const QbXmlUtils = require("./qbxml-utils");
 const QbxmlReceivables = require("./qbxml-receivables");
-const logger = require("../../utils/logger");
+const logger = require('../../utils/logger');
 
 require("dotenv").config({
   path: path.resolve(
@@ -19,14 +18,10 @@ require("dotenv").config({
 const { generateJobTier, generateOwnerTier, generateSourceTier } = QbXmlUtils;
 
 exports.default = async (req, res) => {
-  const BearerToken = req.headers.authorization;
   const { payments: paymentsToQuery } = req.body;
 
-  const client = new GraphQLClient(process.env.GRAPHQL_ENDPOINT, {
-    headers: {
-      Authorization: BearerToken,
-    },
-  });
+  const BearerToken = req.BearerToken;
+  const client = req.userGraphQLClient;
 
   try {
     logger.log(

server/accounting/qbxml/qbxml-receivables.js

@@ -1,13 +1,12 @@
-const GraphQLClient = require("graphql-request").GraphQLClient;
 const path = require("path");
 const DineroQbFormat = require("../accounting-constants").DineroQbFormat;
 const queries = require("../../graphql-client/queries");
 const Dinero = require("dinero.js");
 const moment = require("moment-timezone");
-var builder = require("xmlbuilder2");
+const builder = require("xmlbuilder2");
 const QbXmlUtils = require("./qbxml-utils");
-const logger = require("../../utils/logger");
 const CreateInvoiceLines = require("../qb-receivables-lines").default;
+const logger = require('../../utils/logger');
 
 require("dotenv").config({
   path: path.resolve(
@@ -20,14 +19,10 @@ Dinero.globalRoundingMode = "HALF_EVEN";
 const { generateJobTier, generateOwnerTier, generateSourceTier } = QbXmlUtils;
 
 exports.default = async (req, res) => {
-  const BearerToken = req.headers.authorization;
   const { jobIds } = req.body;
 
-  const client = new GraphQLClient(process.env.GRAPHQL_ENDPOINT, {
-    headers: {
-      Authorization: BearerToken,
-    },
-  });
+  const BearerToken = req.BearerToken;
+  const client = req.userGraphQLClient;
 
   try {
     logger.log(