Merged in feature/IO-3498-QBO-Auth-Token (pull request #2810)

IO-3498 QBO Auth Token

Approved-by: Dave Richer

client/src/components/jobs-documents-local-gallery/jobs-documents-local-gallery.container.jsx

@@ -67,6 +67,7 @@ export function JobsDocumentsLocalGallery({
               src: val.thumbnail,
               height: val.thumbnailHeight,
               width: val.thumbnailWidth,
+              tags: [{ value: val.filename, title: val.filename }],
               ...(val.optimized && { src: val.optimized, fullsize: val.src })
             });
             if (val.optimized) optimized = true;

client/src/components/jobs-documents-local-gallery/local-media-grid.component.jsx

@@ -1,4 +1,5 @@
 import { Checkbox } from "antd";
+import { Tag } from "antd";
 import { useCallback, useEffect, useMemo, useRef, useState } from "react";
 
 /**
@@ -187,6 +188,30 @@ export function LocalMediaGrid({
                     transition: "opacity .25s ease"
                   }}
                 />
+                {img.tags && img.tags.length > 0 && (
+                  <div
+                    style={{
+                      position: "absolute",
+                      bottom: 0,
+                      left: 0,
+                      right: 0,
+                      padding: "2px 6px",
+                      borderRadius: "0 0 4px 4px",
+                      overflow: "hidden",
+                      textOverflow: "ellipsis",
+                      whiteSpace: "nowrap",
+                      display: "flex",
+                      flexWrap: "wrap",
+                      gap: "4px"
+                    }}
+                  >
+                    {img.tags.map((tag, tagIdx) => (
+                      <Tag key={tagIdx} variant="outlined" color="gold" style={{ opacity: 0.8 }}>
+                        {tag.value || tag.title}
+                      </Tag>
+                    ))}
+                  </div>
+                )}
               </>
             );
           })()}

server/accounting/qbo/qbo-callback.js

@@ -45,7 +45,7 @@ exports.default = async (req, res) => {
 
 exports.refresh = async (oauthClient, req) => {
   try {
-    // logger.log("qbo-token-refresh", "DEBUG", req.user.email, null, null);
+    logger.log("qbo-token-refresh", "DEBUG", req.user.email, null, null);
     const authResponse = await oauthClient.refresh();
     await client.request(queries.SET_QBO_AUTH, {
       email: req.user.email,
@@ -59,10 +59,12 @@ exports.refresh = async (oauthClient, req) => {
 };
 
 exports.setNewRefreshToken = async (email, apiResponse) => {
-  //logger.log("qbo-token-updated", "DEBUG", email, null, null);
+  // Deprecated - tokens are now auto-updated in the oauthClient and the token isn't pushed back from QBO API calls anymore
 
-  await client.request(queries.SET_QBO_AUTH, {
-    email,
-    qbo_auth: { ...apiResponse.token, createdAt: Date.now() }
-  });
+  // logger.log("qbo-token-updated", "DEBUG", email, null, {apiResponse: apiResponse});
+
+  // await client.request(queries.SET_QBO_AUTH, {
+  //   email,
+  //   qbo_auth: { ...apiResponse.token, createdAt: Date.now() }
+  // });
 };

server/cdk/cdk-wsdl.js

@@ -1,4 +1,4 @@
-const CdkBase = require("../web-sockets/web-socket");
+const { createLogEvent } = require("../web-sockets/createLogEvent");
 
 const IMEX_CDK_USER = process.env.IMEX_CDK_USER,
   IMEX_CDK_PASSWORD = process.env.IMEX_CDK_PASSWORD;
@@ -14,7 +14,7 @@ const cdkDomain =
 function CheckCdkResponseForError(socket, soapResponse) {
   if (!soapResponse[0]) {
     //The response was null, this might be ok, it might not.
-    CdkBase.createLogEvent(
+    createLogEvent(
       socket,
       "warn",
       `Warning detected in CDK Response - it appears to be null. Stack: ${new Error().stack}`
@@ -43,11 +43,7 @@ function checkIndividualResult(socket, ResultToCheck) {
     //TODO:  Verify that this is the best way to detect errors.
     return;
   else {
-    CdkBase.createLogEvent(
-      socket,
-      "ERROR",
-      `Error detected in CDK Response - ${JSON.stringify(ResultToCheck, null, 2)}`
-    );
+    createLogEvent(socket, "ERROR", `Error detected in CDK Response - ${JSON.stringify(ResultToCheck, null, 2)}`);
 
     throw new Error(`Error found while validating CDK response for ${JSON.stringify(ResultToCheck, null, 2)}:`);
   }