From 2cedc3e22e0156bc79388b70f48f6417a916a86f Mon Sep 17 00:00:00 2001
From: Eric <eashaw@sailsjs.com>
Date: Thu, 13 Nov 2025 11:29:19 -0600
Subject: [PATCH] Website: update logged warning in
 deliver-contact-form-message (#35695)

Closes: https://github.com/fleetdm/confidential/issues/13046

Changes:
- Updated the logged warning in deliver-contact-form-message to include
the full error thrown by the `build()` helper.
- Added intercepts to the helpers called inside of the `build()` helper
in deliver-contact-form-message, and updated it to throw an error if the
updateOrCreateContactAndAccount helper does not return an account ID.
---
 .../api/controllers/deliver-contact-form-message.js   | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/website/api/controllers/deliver-contact-form-message.js b/website/api/controllers/deliver-contact-form-message.js
index 020106bb69..4250b36ca7 100644
--- a/website/api/controllers/deliver-contact-form-message.js
+++ b/website/api/controllers/deliver-contact-form-message.js
@@ -116,7 +116,14 @@ Fleet Premium subscription details:
         lastName: lastName,
         contactSource: 'Website - Contact forms',
         description: `Sent a contact form message: ${message}`,
+      }).intercept((err)=>{
+        return new Error(`Could not create/update a contact or account. Full error: ${require('util').inspect(err)}`);
       });
+
+      // If the Contact record returned by the updateOrCreateContactAndAccount does not have a parent Account record, throw an error to stop the build helper.
+      if(!recordIds.salesforceAccountId) {
+        throw new Error(`Could not create historical event. The contact record (ID: ${recordIds.salesforceContactId}) returned by the updateOrCreateContactAndAccount helper is missing a parent account record.`);
+      }
       // Create the new Fleet website page view record.
       await sails.helpers.salesforce.createHistoricalEvent.with({
         salesforceAccountId: recordIds.salesforceAccountId,
@@ -124,10 +131,12 @@ Fleet Premium subscription details:
         eventType: 'Intent signal',
         intentSignal: 'Submitted the "Send a message" form',
         eventContent: message,
+      }).intercept((err)=>{
+        return new Error(`Could not create an historical event. Full error: ${require('util').inspect(err)}`);
       });
     }).exec((err)=>{// Use .exec() to run the salesforce helpers in the background.
       if(err) {
-        sails.log.warn(`Background task failed: When a user submitted a contact form message, a contact/account/historical event could not be created/updated in the CRM for this email address: ${emailAddress}.`, err);
+        sails.log.warn(`Background task failed: When a user submitted a contact form message, a contact/account/historical event could not be created/updated in the CRM for this email address: ${emailAddress}. Full error: ${require('util').inspect(err)}`);
       }
       return;
     });//_∏_