From b6cbfb8e456871df65f69083aea53120627ba299 Mon Sep 17 00:00:00 2001
From: Patrick Fic <patrick@imexsystems.ca>
Date: Mon, 20 Apr 2026 11:37:19 -0700
Subject: [PATCH] IO-2443 Minor clean up.

---
 bodyshop_translations.babel                   | 114 +++++++++-
 .../esignature-modal.container.jsx            |  13 +-
 .../job-audit-trail.component.jsx             |   6 +-
 .../print-center-jobs.component.jsx           |   2 +-
 client/src/translations/en_us/common.json     |   4 +-
 client/src/translations/es/common.json        |   4 +-
 client/src/translations/fr/common.json        |   4 +-
 hasura/metadata/tables.yaml                   |   1 +
 .../down.sql                                  |   4 +
 .../up.sql                                    |   2 +
 server/esign/esign-new.js                     |  62 +++---
 server/esign/webhook.js                       | 209 +-----------------
 server/graphql-client/queries.js              |   7 +
 server/routes/esignRoutes.js                  |   2 -
 14 files changed, 176 insertions(+), 258 deletions(-)
 create mode 100644 hasura/migrations/1776709200491_alter_table_public_bodyshops_add_column_documenso_api_key/down.sql
 create mode 100644 hasura/migrations/1776709200491_alter_table_public_bodyshops_add_column_documenso_api_key/up.sql

diff --git a/bodyshop_translations.babel b/bodyshop_translations.babel
index ff585510e..9f3436df1 100644
--- a/bodyshop_translations.babel
+++ b/bodyshop_translations.babel
@@ -1,4 +1,4 @@
-<babeledit_project version="1.2" be_version="2.7.1">
+<babeledit_project be_version="2.7.1" version="1.2">
     <!--
 
     BabelEdit project file
@@ -20514,6 +20514,95 @@
                                             </translation>
                                         </translations>
                                     </concept_node>
+                                    <concept_node>
+                                        <name>upload_document</name>
+                                        <definition_loaded>false</definition_loaded>
+                                        <description></description>
+                                        <comment></comment>
+                                        <default_text></default_text>
+                                        <translations>
+                                            <translation>
+                                                <language>en-US</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>es-MX</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>fr-CA</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                        </translations>
+                                    </concept_node>
+                                </children>
+                            </folder_node>
+                            <folder_node>
+                                <name>errors</name>
+                                <children>
+                                    <concept_node>
+                                        <name>no_token</name>
+                                        <definition_loaded>false</definition_loaded>
+                                        <description></description>
+                                        <comment></comment>
+                                        <default_text></default_text>
+                                        <translations>
+                                            <translation>
+                                                <language>en-US</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>es-MX</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>fr-CA</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                        </translations>
+                                    </concept_node>
+                                    <concept_node>
+                                        <name>pdf_only</name>
+                                        <definition_loaded>false</definition_loaded>
+                                        <description></description>
+                                        <comment></comment>
+                                        <default_text></default_text>
+                                        <translations>
+                                            <translation>
+                                                <language>en-US</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>es-MX</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>fr-CA</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                        </translations>
+                                    </concept_node>
+                                    <concept_node>
+                                        <name>upload_title</name>
+                                        <definition_loaded>false</definition_loaded>
+                                        <description></description>
+                                        <comment></comment>
+                                        <default_text></default_text>
+                                        <translations>
+                                            <translation>
+                                                <language>en-US</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>es-MX</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>fr-CA</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                        </translations>
+                                    </concept_node>
                                 </children>
                             </folder_node>
                         </children>
@@ -37737,7 +37826,28 @@
                                         </translations>
                                     </concept_node>
                                     <concept_node>
-                                        <name>esignature</name>
+                                        <name>esignature_imex</name>
+                                        <definition_loaded>false</definition_loaded>
+                                        <description></description>
+                                        <comment></comment>
+                                        <default_text></default_text>
+                                        <translations>
+                                            <translation>
+                                                <language>en-US</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>es-MX</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>fr-CA</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                        </translations>
+                                    </concept_node>
+                                    <concept_node>
+                                        <name>esignature_rome</name>
                                         <definition_loaded>false</definition_loaded>
                                         <description></description>
                                         <comment></comment>
diff --git a/client/src/components/esignature-modal/esignature-modal.container.jsx b/client/src/components/esignature-modal/esignature-modal.container.jsx
index 279a74551..48232d258 100644
--- a/client/src/components/esignature-modal/esignature-modal.container.jsx
+++ b/client/src/components/esignature-modal/esignature-modal.container.jsx
@@ -1,5 +1,5 @@
 import { EmbedUpdateDocumentV1 } from "@documenso/embed-react";
-import { Modal, notification } from "antd";
+import { Modal, notification, Result } from "antd";
 import axios from "axios";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
@@ -8,6 +8,7 @@ import { toggleModalVisible } from "../../redux/modals/modals.actions";
 import { selectEsignature } from "../../redux/modals/modals.selectors";
 import { selectBodyshop, selectCurrentUser } from "../../redux/user/user.selectors";
 import { useState } from "react";
+import InstanceRenderManager from "../../utils/instanceRenderMgr";
 
 const mapStateToProps = createStructuredSelector({
   esignatureModal: selectEsignature,
@@ -27,7 +28,10 @@ export function EsignatureModalContainer({ esignatureModal, toggleModalVisible,
   return (
     <Modal
       open={open}
-      title={t("jobs.labels.esignature")}
+      title={InstanceRenderManager({
+        imex: t("jobs.labels.esignature_imex"),
+        rome: t("jobs.labels.esignature_rome")
+      })}
       onOk={async () => {
         try {
           setDistributing(true);
@@ -51,7 +55,8 @@ export function EsignatureModalContainer({ esignatureModal, toggleModalVisible,
         try {
           await axios.post("/esign/delete", {
             documentId,
-            envelopeId
+            envelopeId,
+            bodyshopid: bodyshop.id
           });
 
           toggleModalVisible();
@@ -80,7 +85,7 @@ export function EsignatureModalContainer({ esignatureModal, toggleModalVisible,
             }}
           />
         ) : (
-          <div>No token...</div>
+          <Result status="warning" title={t("esignature.errors.no_token")} />
         )}
       </div>
     </Modal>
diff --git a/client/src/components/job-audit-trail/job-audit-trail.component.jsx b/client/src/components/job-audit-trail/job-audit-trail.component.jsx
index 5edb0d01c..303274de2 100644
--- a/client/src/components/job-audit-trail/job-audit-trail.component.jsx
+++ b/client/src/components/job-audit-trail/job-audit-trail.component.jsx
@@ -135,7 +135,8 @@ export function JobAuditTrail({ bodyshop, jobId }) {
               logImEXEvent("job_esig_delete", {});
               try {
                 const deleteResult = await axios.post("/esign/delete", {
-                  documentId: record.external_document_id
+                  documentId: record.external_document_id,
+                  bodyshopid: bodyshop.id
                 });
                 console.log("*** ~ JobAuditTrail ~ deleteResult:", deleteResult);
                 refetch();
@@ -155,7 +156,8 @@ export function JobAuditTrail({ bodyshop, jobId }) {
             onClick={() => {
               axios
                 .post("/esign/view", {
-                  documentId: record.external_document_id
+                  documentId: record.external_document_id,
+                  bodyshopid: bodyshop.id
                 })
                 .then((response) => {
                   window.open(response.data?.document?.downloadUrl, "_blank");
diff --git a/client/src/components/print-center-jobs/print-center-jobs.component.jsx b/client/src/components/print-center-jobs/print-center-jobs.component.jsx
index e8e665743..386698902 100644
--- a/client/src/components/print-center-jobs/print-center-jobs.component.jsx
+++ b/client/src/components/print-center-jobs/print-center-jobs.component.jsx
@@ -62,7 +62,7 @@ export function PrintCenterJobsComponent({ printCenterModal, bodyshop, technicia
             (temp.regions && bodyshop.region_config.includes(Object.keys(temp.regions)) === true)
         )
         .filter((temp) => !technician || temp.group !== "financial");
-        
+
   const JobsReportsList =
     Enhanced_Payroll.treatment === "on"
       ? Object.keys(Templates)
diff --git a/client/src/translations/en_us/common.json b/client/src/translations/en_us/common.json
index 7ed065350..e89fb9a1a 100644
--- a/client/src/translations/en_us/common.json
+++ b/client/src/translations/en_us/common.json
@@ -1245,6 +1245,7 @@
         "upload_document": "Upload Document for E-Sign"
       },
       "errors": {
+        "no_token": "Error connecting to signing server.  No authorization token was provided.",
         "pdf_only": "Only PDF documents can be uploaded for e-signature.",
         "upload_title": "Unable to prepare document for e-signature"
       }
@@ -2201,7 +2202,8 @@
         "duplicateconfirm": "Are you sure you want to duplicate this Job? Some elements of this Job will not be duplicated.",
         "emailaudit": "Email Audit Trail",
         "employeeassignments": "Employee Assignments",
-        "esignature": "E-Signature",
+        "esignature_imex": "ImEX Sign",
+        "esignature_rome": "Rome Sign",
         "estimatelines": "Estimate Lines",
         "estimator": "Estimator",
         "existing_jobs": "Existing Jobs",
diff --git a/client/src/translations/es/common.json b/client/src/translations/es/common.json
index 7afb106f3..c836b6d0d 100644
--- a/client/src/translations/es/common.json
+++ b/client/src/translations/es/common.json
@@ -1245,6 +1245,7 @@
         "upload_document": "Upload Document for E-Sign"
       },
       "errors": {
+        "no_token": "",
         "pdf_only": "Only PDF documents can be uploaded for e-signature.",
         "upload_title": "Unable to prepare document for e-signature"
       }
@@ -2201,7 +2202,8 @@
         "duplicateconfirm": "",
         "emailaudit": "",
         "employeeassignments": "",
-        "esignature": "",
+        "esignature_imex": "",
+        "esignature_rome": "",
         "estimatelines": "",
         "estimator": "",
         "existing_jobs": "Empleos existentes",
diff --git a/client/src/translations/fr/common.json b/client/src/translations/fr/common.json
index e5debb176..059bd9bec 100644
--- a/client/src/translations/fr/common.json
+++ b/client/src/translations/fr/common.json
@@ -1245,6 +1245,7 @@
         "upload_document": "Upload Document for E-Sign"
       },
       "errors": {
+        "no_token": "",
         "pdf_only": "Only PDF documents can be uploaded for e-signature.",
         "upload_title": "Unable to prepare document for e-signature"
       }
@@ -2201,7 +2202,8 @@
         "duplicateconfirm": "",
         "emailaudit": "",
         "employeeassignments": "",
-        "esignature": "",
+        "esignature_imex": "",
+        "esignature_rome": "",
         "estimatelines": "",
         "estimator": "",
         "existing_jobs": "Emplois existants",
diff --git a/hasura/metadata/tables.yaml b/hasura/metadata/tables.yaml
index 54973664d..402345a29 100644
--- a/hasura/metadata/tables.yaml
+++ b/hasura/metadata/tables.yaml
@@ -956,6 +956,7 @@
           - created_at
           - default_adjustment_rate
           - deliverchecklist
+          - documenso_api_key
           - email
           - enforce_class
           - enforce_conversion_category
diff --git a/hasura/migrations/1776709200491_alter_table_public_bodyshops_add_column_documenso_api_key/down.sql b/hasura/migrations/1776709200491_alter_table_public_bodyshops_add_column_documenso_api_key/down.sql
new file mode 100644
index 000000000..8d08f7e2e
--- /dev/null
+++ b/hasura/migrations/1776709200491_alter_table_public_bodyshops_add_column_documenso_api_key/down.sql
@@ -0,0 +1,4 @@
+-- Could not auto-generate a down migration.
+-- Please write an appropriate down migration for the SQL below:
+-- alter table "public"."bodyshops" add column "documenso_api_key" text
+--  null;
diff --git a/hasura/migrations/1776709200491_alter_table_public_bodyshops_add_column_documenso_api_key/up.sql b/hasura/migrations/1776709200491_alter_table_public_bodyshops_add_column_documenso_api_key/up.sql
new file mode 100644
index 000000000..e526fa264
--- /dev/null
+++ b/hasura/migrations/1776709200491_alter_table_public_bodyshops_add_column_documenso_api_key/up.sql
@@ -0,0 +1,2 @@
+alter table "public"."bodyshops" add column "documenso_api_key" text
+ null;
diff --git a/server/esign/esign-new.js b/server/esign/esign-new.js
index ebea3519d..d75a20828 100644
--- a/server/esign/esign-new.js
+++ b/server/esign/esign-new.js
@@ -4,14 +4,9 @@ const axios = require("axios");
 const { jsrAuthString } = require("../utils/utils");
 const logger = require("../utils/logger");
 //Need to pull the key dynamically to send documents. 
-const DOCUMENSO_API_KEY = "api_io2lssosg9v4p2mb";//Done on a by team basis,
-const documenso = new Documenso({
-    apiKey: DOCUMENSO_API_KEY,//Done on a by team basis,
-    serverURL: "https://sign.imex.online/api/v2",
-});
-const JSR_SERVER = "https://reports.test.imex.online";
+const JSR_SERVER = process.env.JSR_URL || "https://reports.imex.online";
 const jsreport = require("@jsreport/nodejs-client");
-const { QUERY_JOB_FOR_SIGNATURE, INSERT_ESIGNATURE_DOCUMENT, DISTRIBUTE_ESIGNATURE_DOCUMENT, QUERY_ESIGNATURE_BY_EXTERNAL_ID, UPDATE_ESIGNATURE_DOCUMENT } = require("../graphql-client/queries");
+const { QUERY_JOB_FOR_SIGNATURE, INSERT_ESIGNATURE_DOCUMENT, DISTRIBUTE_ESIGNATURE_DOCUMENT, QUERY_ESIGNATURE_BY_EXTERNAL_ID, UPDATE_ESIGNATURE_DOCUMENT, QUERY_DOCUMENSO_KEY } = require("../graphql-client/queries");
 const _ = require("lodash");
 
 function parseJsonField(value, fallback = null) {
@@ -41,10 +36,20 @@ function getDefaultEsignData({ esigData, bodyshop, fileName }) {
     };
 }
 
-async function createEsignDocumentFromPdf({ client, req, bodyshop, pdfBuffer, esigData, fileName }) {
+async function getDocumensoClient({ bodyshopid, req }) {
+    const client = req.userGraphQLClient;
+    const { bodyshops_by_pk: { documenso_api_key } } = await client.request(QUERY_DOCUMENSO_KEY, { bodyshopid });
+    return new Documenso({
+        apiKey: documenso_api_key,//Done on a by team basis,
+        serverURL: "https://sign.imex.online/api/v2",
+    });
+}
+
+async function createEsignDocumentFromPdf({ req, bodyshop, pdfBuffer, esigData, fileName }) {
     const resolvedEsigData = getDefaultEsignData({ esigData, bodyshop, fileName });
     const fileBlob = new Blob([pdfBuffer], { type: "application/pdf" });
     const jobid = req.body.jobid;
+    const client = req.userGraphQLClient;
 
     const { jobs_by_pk: jobData } = await client.request(QUERY_JOB_FOR_SIGNATURE, { jobid });
     const recipients = [{
@@ -53,6 +58,8 @@ async function createEsignDocumentFromPdf({ client, req, bodyshop, pdfBuffer, es
         role: "SIGNER",
     }];
 
+    const documenso = await getDocumensoClient({ bodyshopid: bodyshop.id, req })
+
     const createDocumentResponse = await documenso.documents.create({
         payload: {
             title: resolvedEsigData.title,
@@ -120,7 +127,9 @@ async function distributeDocument(req, res) {
     try {
         const client = req.userGraphQLClient;
 
-        const { documentId } = req.body;
+        const { documentId, bodyshopid } = req.body;
+        const documenso = await getDocumensoClient({ bodyshopid, req })
+
         const distributeResult = await documenso.documents.distribute({
             documentId,
         });
@@ -152,15 +161,16 @@ async function distributeDocument(req, res) {
 
 async function deleteDocument(req, res) {
     try {
-        //TODO: Add in logic to check if doc exists, is deletable etc. 
         const client = req.userGraphQLClient;
 
-        const { documentId } = req.body;
+        const { documentId, bodyshopid } = req.body;
         const { esignature_documents } = await client.request(QUERY_ESIGNATURE_BY_EXTERNAL_ID, { external_document_id: documentId.toString() });
 
         if (!esignature_documents || esignature_documents.length === 0) {
             //return res.status(404).json({ error: "Document not found" });
         }
+        const documenso = await getDocumensoClient({ bodyshopid, req })
+
         const deleteResult = await documenso.documents.delete({
             documentId: (documentId)
         });
@@ -184,7 +194,9 @@ async function deleteDocument(req, res) {
 
 async function viewDocument(req, res) {
     try {
-        const { documentId } = req.body;
+        const { documentId, bodyshopid } = req.body;
+        const documenso = await getDocumensoClient({ bodyshopid, req })
+
         const document = await documenso.document.documentDownload({
             documentId: parseInt(documentId)
         });
@@ -205,7 +217,6 @@ async function newEsignDocument(req, res) {
         const { bodyshop } = req.body;
         const { pdf: fileBuffer, esigData } = await RenderTemplate({ client, req });
         const result = await createEsignDocumentFromPdf({
-            client,
             req,
             bodyshop,
             pdfBuffer: fileBuffer,
@@ -225,7 +236,6 @@ async function newEsignDocument(req, res) {
 
 async function newCustomEsignDocument(req, res) {
     try {
-        const client = req.userGraphQLClient;
         const bodyshop = parseJsonField(req.body.bodyshop, req.body.bodyshop);
         const esigData = parseJsonField(req.body.esigData, {});
         const uploadedDocument = req.file;
@@ -242,14 +252,12 @@ async function newCustomEsignDocument(req, res) {
 
         const fileName = uploadedDocument.originalname?.replace(/\.[^.]+$/, "") || undefined;
         const result = await createEsignDocumentFromPdf({
-            client,
             req,
             bodyshop,
             pdfBuffer: uploadedDocument.buffer,
             esigData,
             fileName
         });
-
         res.json(result);
     }
     catch (error) {
@@ -262,10 +270,8 @@ async function newCustomEsignDocument(req, res) {
 }
 
 async function RenderTemplate({ req }) {
-    //TODO Refactor to pull
     const jsrAuth = jsrAuthString()
-
-    const jsreportClient = new jsreport("https://reports.test.imex.online", process.env.JSR_USER, process.env.JSR_PASSWORD);
+    const jsreportClient = new jsreport(JSR_SERVER, process.env.JSR_USER, process.env.JSR_PASSWORD);
     const { templateObject, bodyshop } = req.body;
     let { contextData, useShopSpecificTemplate, shopSpecificFolder, esigData } = await fetchContextData({ templateObject, jsrAuth, req });
 
@@ -410,21 +416,3 @@ module.exports = {
     deleteDocument,
     viewDocument
 }
-
-
-
-// const sample_esig_for_jsr = {
-//     "fields": [
-//         {
-//             "placeholder": "[[signature]]",
-//             "type": "SIGNATURE"
-//         },
-//         {
-//             "placeholder": "[[date]]",
-//             "type": "DATE"
-//         }
-//     ],
-//     "subject": "CASL Auth Set in JSR",
-//     "message": "CASL Message set in JSR",
-//     "title": "CASL Title set in JSR"
-// }
\ No newline at end of file
diff --git a/server/esign/webhook.js b/server/esign/webhook.js
index bbba8dab0..643482688 100644
--- a/server/esign/webhook.js
+++ b/server/esign/webhook.js
@@ -3,7 +3,6 @@ const { Documenso } = require("@documenso/sdk-typescript");
 const logger = require("../utils/logger");
 const { QUERY_META_FOR_ESIG_COMPLETION, INSERT_ESIGNATURE_COMPLETED_DOCOUMENT, UPDATE_ESIGNATURE_DOCUMENT, DISTRIBUTE_ESIGNATURE_DOCUMENT } = require("../graphql-client/queries");
 const { uploadFileBuffer } = require("../media/imgproxy-media");
-const { log } = require("node-persist");
 
 const client = require('../graphql-client/graphql-client').client;
 const documenso = new Documenso({
@@ -77,10 +76,8 @@ async function esignWebhook(req, res) {
                     body: message
                 });
                 return;
-
         }
         logger.log(`esig-webhook-processed`, "INFO", "redis", "api", { event: message.event, documentId: message.payload?.payload?.id, jobid: message.payload?.payload?.externalId?.split("|")[0] || null });
-
         res.sendStatus(200)
     } catch (error) {
         logger.log(`esig-webhook-error`, "ERROR", "redis", "api", {
@@ -91,7 +88,7 @@ async function esignWebhook(req, res) {
     }
 }
 
-async function handleDocumentCompleted(payload = sampleComplete) {
+async function handleDocumentCompleted(payload) {
     try {
         //Split the external id to get the uploaded user. 
         const [jobid, uploaded_by] = payload.externalId.split("|");
@@ -108,8 +105,6 @@ async function handleDocumentCompleted(payload = sampleComplete) {
         const response = await fetch(document.downloadUrl);
         const arrayBuffer = await response.arrayBuffer();
         const buffer = Buffer.from(arrayBuffer);
-
-
         let key = `${jobs_by_pk.bodyshop.id}/${jobs_by_pk.id}/${replaceAccents(document.filename).replace(/[^A-Z0-9]+/gi, "_")}-${new Date().getTime()}.pdf`;
 
         if (jobs_by_pk?.bodyshop?.uselocalmediaserver) {
@@ -149,7 +144,6 @@ async function handleDocumentCompleted(payload = sampleComplete) {
                     }
                 })
 
-
                 //insert the document record with the s3 key and bucket info.
                 await client.request(INSERT_ESIGNATURE_COMPLETED_DOCOUMENT, {
                     docInput: {
@@ -172,9 +166,6 @@ async function handleDocumentCompleted(payload = sampleComplete) {
             payload
         });
     }
-
-
-
 }
 
 
@@ -183,200 +174,6 @@ module.exports = {
 }
 
 
-const sampleComplete = {
-    "id": 10929,
-    "title": "CASL Title set in JSR",
-    "source": "DOCUMENT",
-    "status": "COMPLETED",
-    "teamId": 742,
-    "userId": 654,
-    "Recipient": [
-        {
-            "id": 24997,
-            "name": "James Tschetter",
-            "role": "SIGNER",
-            "email": "patrick@imexsystems.ca",
-            "token": "uMom0GwL29NBqMfohGpUE",
-            "signedAt": "2026-02-27T22:11:52.835Z",
-            "expiresAt": "2026-05-28T22:10:48.991Z",
-            "documentId": 10929,
-            "readStatus": "OPENED",
-            "sendStatus": "SENT",
-            "templateId": null,
-            "authOptions": {
-                "accessAuth": [],
-                "actionAuth": []
-            },
-            "signingOrder": null,
-            "signingStatus": "SIGNED",
-            "rejectionReason": null,
-            "documentDeletedAt": null,
-            "expirationNotifiedAt": null
-        }
-    ],
-    "createdAt": "2026-02-27T22:10:10.580Z",
-    "deletedAt": null,
-    "updatedAt": "2026-02-27T22:11:57.753Z",
-    "externalId": null,
-    "formValues": null,
-    "recipients": [
-        {
-            "id": 24997,
-            "name": "James Tschetter",
-            "role": "SIGNER",
-            "email": "patrick@imexsystems.ca",
-            "token": "uMom0GwL29NBqMfohGpUE",
-            "signedAt": "2026-02-27T22:11:52.835Z",
-            "expiresAt": "2026-05-28T22:10:48.991Z",
-            "documentId": 10929,
-            "readStatus": "OPENED",
-            "sendStatus": "SENT",
-            "templateId": null,
-            "authOptions": {
-                "accessAuth": [],
-                "actionAuth": []
-            },
-            "signingOrder": null,
-            "signingStatus": "SIGNED",
-            "rejectionReason": null,
-            "documentDeletedAt": null,
-            "expirationNotifiedAt": null
-        }
-    ],
-    "templateId": null,
-    "visibility": "EVERYONE",
-    "authOptions": {
-        "globalAccessAuth": [],
-        "globalActionAuth": []
-    },
-    "completedAt": "2026-02-27T22:11:57.752Z",
-    "documentMeta": {
-        "id": "cmm5g3y7u00ecad1sv3ague1w",
-        "message": "CASL Message set in JSR",
-        "subject": "CASL Auth Set in JSR",
-        "language": "en",
-        "timezone": "Etc/UTC",
-        "dateFormat": "yyyy-MM-dd hh:mm a",
-        "redirectUrl": null,
-        "signingOrder": "PARALLEL",
-        "emailSettings": {
-            "documentDeleted": true,
-            "documentPending": true,
-            "recipientSigned": true,
-            "recipientRemoved": true,
-            "documentCompleted": true,
-            "ownerDocumentCompleted": true,
-            "recipientSigningRequest": true
-        },
-        "distributionMethod": "EMAIL",
-        "drawSignatureEnabled": true,
-        "typedSignatureEnabled": true,
-        "allowDictateNextSigner": false,
-        "uploadSignatureEnabled": true
-    }
-}
-// const sampleBody = {
-//     event: "DOCUMENT_COMPLETED",
-//     payload: {
-//         Recipient: [
-//             {
-//                 authOptions: {
-//                     accessAuth: [
-//                     ],
-//                     actionAuth: [
-//                     ],
-//                 },
-//                 documentDeletedAt: null,
-//                 documentId: 9827,
-//                 email: "patrick@imexsystems.ca",
-//                 expired: null,
-//                 id: 13311,
-//                 name: "Customer Fullname",
-//                 readStatus: "OPENED",
-//                 rejectionReason: null,
-//                 role: "SIGNER",
-//                 sendStatus: "SENT",
-//                 signedAt: "2026-01-30T18:29:12.648Z",
-//                 signingOrder: null,
-//                 signingStatus: "SIGNED",
-//                 templateId: null,
-//                 token: "uiEWIsXUPTbWHd7QedVgt",
-//             },
-//         ],
-//         authOptions: {
-//             globalAccessAuth: [
-//             ],
-//             globalActionAuth: [
-//             ],
-//         },
-//         completedAt: "2026-01-30T18:29:16.279Z",
-//         createdAt: "2026-01-30T18:28:48.861Z",
-//         deletedAt: null,
-//         documentMeta: {
-//             allowDictateNextSigner: false,
-//             dateFormat: "yyyy-MM-dd hh:mm a",
-//             distributionMethod: "EMAIL",
-//             drawSignatureEnabled: true,
-//             emailSettings: {
-//                 documentCompleted: true,
-//                 documentDeleted: true,
-//                 documentPending: true,
-//                 ownerDocumentCompleted: true,
-//                 recipientRemoved: false,
-//                 recipientSigned: true,
-//                 recipientSigningRequest: true,
-//             },
-//             id: "cml17vfb200qjad1t2spxnc1n",
-//             language: "en",
-//             message: "To perform repairs on your vehicle, we must receive digital authorization. Please review and sign the document to proceed with repairs. ",
-//             redirectUrl: null,
-//             signingOrder: "PARALLEL",
-//             subject: "Repair Authorization for ABC Collision",
-//             timezone: "Etc/UTC",
-//             typedSignatureEnabled: true,
-//             uploadSignatureEnabled: true,
-//         },
-//         externalId: null,
-//         formValues: null,
-//         id: 9827,
-//         recipients: [
-//             {
-//                 authOptions: {
-//                     accessAuth: [
-//                     ],
-//                     actionAuth: [
-//                     ],
-//                 },
-//                 documentDeletedAt: null,
-//                 documentId: 9827,
-//                 email: "patrick@imexsystems.ca",
-//                 expired: null,
-//                 id: 13311,
-//                 name: "Customer Fullname",
-//                 readStatus: "OPENED",
-//                 rejectionReason: null,
-//                 role: "SIGNER",
-//                 sendStatus: "SENT",
-//                 signedAt: "2026-01-30T18:29:12.648Z",
-//                 signingOrder: null,
-//                 signingStatus: "SIGNED",
-//                 templateId: null,
-//                 token: "uiEWIsXUPTbWHd7QedVgt",
-//             },
-//         ],
-//         source: "DOCUMENT",
-//         status: "COMPLETED",
-//         teamId: 742,
-//         templateId: null,
-//         title: "Repair Authorization - 1/30/2026, 6:28:48 PM",
-//         updatedAt: "2026-01-30T18:29:16.280Z",
-//         userId: 654,
-//         visibility: "EVERYONE",
-//     },
-//     createdAt: "2026-01-30T18:29:18.504Z",
-//     webhookEndpoint: "https://dev.patrickfic.com/esign/webhook",
-// }
-
 function replaceAccents(str) {
     // Verifies if the String has accents and replace them
     if (str.search(/[\xC0-\xFF]/g) > -1) {
@@ -404,6 +201,4 @@ function replaceAccents(str) {
             .replace(/[\xFD\xFF]/g, "y");
     }
     return str;
-}
-
-`Unexpected Status or Content-Type: Status 200 Content-Type application/pdf\nBody: %PDF-1.7\n%����\n1 0 obj\n<<\n/Type /Catalog\n/Pages 2 0 R\n/Names 74 0 R\n/Dests 75 0 R\n/Info 77 0 R\n/Lang (en-US)\n/Version /1.7\n>>\nendobj\n77 0 obj\n<<\n/Type /Info\n/CreationDate (D:20260227230617Z00'00')\n/Producer <FEFF007000640066002D006C006900620020002800680074007400700073003A002F002F006700690074006800750062002E0063006F006D002F0048006F007000640069006E0067002F007000640066002D006C006900620029>\n/ModDate (D:20260227231057Z)…�5[�>�Wu7��V�����Pw�WX�ܮJ'6NWg�vYϳ�����Щr�\n\t+�1��m{휑�hwb���8��qy�1e�)۱�5m����MVM!�m�[A���{l��\t�hia4��Tm��8��a�e�}�߫���]MVpяG��֏�jJ<"�A�mO*�P�������ѧЛ\nendstream\nendobj\n26 0 obj\n<<\n/Length 478/Filter /FlateDecode\n>>\nstream\nx�MSK�9��)��*�O�i��,��o ��kS%�$��hR\rS'�I��~��������T[/�{�k�FC#��֛���;Ӏ�[�⫀m�|Q��\x1b��>�R�����a�E#�pI��._H�ᆫt�k�D3p�I����
�W2���oJ0�j���j#��!�$��-������.Ϋ���TI|8D�H��Y��x����1�73%�u�T��Ӑ.rcb�x��Dd6=��Oڏ1^�-�...and 252354 more chars`
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/server/graphql-client/queries.js b/server/graphql-client/queries.js
index 8ad74c0d2..2cf25b788 100644
--- a/server/graphql-client/queries.js
+++ b/server/graphql-client/queries.js
@@ -3329,4 +3329,11 @@ exports.INSERT_ESIGNATURE_COMPLETED_DOCOUMENT = `mutation INSERT_ESIGNATURE_COMP
     key
   }
 }
+`
+
+exports.QUERY_DOCUMENSO_KEY = `query QUERY_DOCUMENTS_KEY($bodyshopid: uuid!) {
+  bodyshops_by_pk(id: $bodyshopid) {
+    documenso_api_key
+  }
+}
 `
\ No newline at end of file
diff --git a/server/routes/esignRoutes.js b/server/routes/esignRoutes.js
index 47df32856..dbc6b5fa3 100644
--- a/server/routes/esignRoutes.js
+++ b/server/routes/esignRoutes.js
@@ -13,8 +13,6 @@ const upload = multer({
 	}
 });
 
-//router.use(validateFirebaseIdTokenMiddleware);
-
 router.post("/new", validateFirebaseIdTokenMiddleware, withUserGraphQLClientMiddleware, newEsignDocument);
 router.post("/new-custom", validateFirebaseIdTokenMiddleware, withUserGraphQLClientMiddleware, upload.single("document"), newCustomEsignDocument);
 router.post("/distribute", validateFirebaseIdTokenMiddleware, withUserGraphQLClientMiddleware, distributeDocument);