backend-manager 5.2.2 → 5.2.5

package/src/manager/libraries/email/providers/beehiiv.js

@@ -79,39 +79,55 @@ async function addSubscriber({ email, firstName, lastName, source, publicationId
 }
 
 /**
- * Remove a subscriber from a Beehiiv publication by email.
+ * Look up a Beehiiv subscriber by email. Returns the subscription object
+ * (id, email, status, custom_fields, ...) or null if not found.
+ *
+ * Useful for tests that need to verify whether a subscriber landed in the
+ * publication after a marketing sync.
  *
  * @param {string} email
  * @param {string} publicationId
- * @returns {{ success: boolean, deleted?: boolean, skipped?: boolean, error?: string }}
+ * @returns {Promise<object|null>}
  */
-async function removeSubscriber(email, publicationId) {
+async function findSubscriber(email, publicationId) {
   try {
     const encodedEmail = encodeURIComponent(email);
-
-    // Step 1: Get subscription by email
-    let searchData;
-    try {
-      searchData = await fetch(
-        `${BASE_URL}/publications/${publicationId}/subscriptions/by_email/${encodedEmail}`,
-        {
-          response: 'json',
-          headers: headers(),
-          timeout: 10000,
-        }
-      );
-    } catch (e) {
-      if (e.status === 404) {
-        return { success: true, skipped: true, reason: 'Subscriber not found' };
+    const searchData = await fetch(
+      `${BASE_URL}/publications/${publicationId}/subscriptions/by_email/${encodedEmail}`,
+      {
+        response: 'json',
+        headers: headers(),
+        timeout: 60000,
       }
-      throw e;
+    );
+
+    return searchData.data || null;
+  } catch (e) {
+    if (e.status === 404) {
+      return null;
     }
+    console.error('Beehiiv findSubscriber error:', e);
+    return null;
+  }
+}
+
+/**
+ * Remove a subscriber from a Beehiiv publication by email.
+ *
+ * @param {string} email
+ * @param {string} publicationId
+ * @returns {{ success: boolean, deleted?: boolean, skipped?: boolean, error?: string }}
+ */
+async function removeSubscriber(email, publicationId) {
+  try {
+    // Step 1: Look up the subscription
+    const subscription = await findSubscriber(email, publicationId);
 
-    if (!searchData.data?.id) {
-      return { success: true, skipped: true, reason: 'Subscription not found' };
+    if (!subscription?.id) {
+      return { success: true, skipped: true, reason: 'Subscriber not found' };
     }
 
-    const subscriptionId = searchData.data.id;
+    const subscriptionId = subscription.id;
 
     // Step 2: Permanently delete the subscription
     await fetch(
@@ -119,7 +135,7 @@ async function removeSubscriber(email, publicationId) {
       {
         method: 'delete',
         headers: headers(),
-        timeout: 10000,
+        timeout: 60000,
       }
     );
 
@@ -131,80 +147,96 @@ async function removeSubscriber(email, publicationId) {
 }
 
 /**
- * Get a Beehiiv publication ID by brand name (fuzzy match).
+ * Get this brand's Beehiiv publication ID.
  *
- * @param {string} brandName
- * @returns {string|null} Publication ID or null
+ * Reads `Manager.config.marketing.beehiiv.publicationId` — populated by
+ * OMEGA's `beehiiv/ensure/publication.js` at brand-onboarding time. No
+ * runtime API call, no fuzzy-match fragility.
+ *
+ * If the brand hasn't been onboarded yet (publicationId missing/empty), logs
+ * a warning and returns null — the marketing sync will skip Beehiiv for this
+ * brand. Fix: run OMEGA's beehiiv service to populate.
+ *
+ * @returns {string|null} Publication ID or null if not configured
  */
-let _publicationIdCache = null;
-
-async function getPublicationId() {
-  if (_publicationIdCache) {
-    return _publicationIdCache;
-  }
-
-  // Use publicationId from config if set (skips API call)
-  const configPubId = Manager.config?.marketing?.beehiiv?.publicationId;
-
-  if (configPubId) {
-    _publicationIdCache = configPubId;
-    return configPubId;
-  }
-
-  // Fuzzy-match by brand name (guard against uninitialized Manager singleton —
-  // happens in test stubs that build their own Manager without init()).
-  const brandName = Manager.config?.brand?.name;
+function getPublicationId() {
+  const publicationId = Manager.config?.marketing?.beehiiv?.publicationId;
 
-  if (!brandName) {
-    console.error('Beehiiv: Brand name is required to find publication');
+  if (!publicationId) {
+    console.warn(
+      'Beehiiv: marketing.beehiiv.publicationId is not set in config. '
+      + 'Subscriber will NOT be added to a publication. '
+      + 'Run OMEGA to populate.',
+    );
     return null;
   }
 
-  const brandNameLower = brandName.toLowerCase();
-  const allPublications = [];
-  let page = 1;
-  const limit = 100;
-
-  try {
-    while (true) {
-      const data = await fetch(`${BASE_URL}/publications?limit=${limit}&page=${page}`, {
-        response: 'json',
-        headers: headers(),
-        timeout: 10000,
-      });
-
-      if (!data.data || data.data.length === 0) {
-        break;
-      }
-
-      const matchedPub = data.data.find(pub =>
-        pub.name.toLowerCase() === brandNameLower
-        || pub.name.toLowerCase().includes(brandNameLower)
-        || brandNameLower.includes(pub.name.toLowerCase())
-      );
-
-      if (matchedPub) {
-        _publicationIdCache = matchedPub.id;
-        return matchedPub.id;
-      }
-
-      allPublications.push(...data.data);
-
-      if (data.data.length < limit) {
-        break;
-      }
-
-      page++;
-    }
-
-    console.error(`Beehiiv: No publication matched brand "${brandName}". Available: ${allPublications.map(p => p.name).join(', ')}`);
-  } catch (e) {
-    console.error('Beehiiv publication lookup error:', e);
-  }
-
-  return null;
+  return publicationId;
 }
 
+// LEGACY: Fuzzy-match-by-brand-name fallback. Kept commented out as a backstop
+// in case the config-based approach has an edge case we haven't seen yet.
+// Delete once we've verified the config-based approach works across all brands.
+//
+// let _publicationIdCache = null;
+//
+// async function getPublicationIdByFuzzyMatch() {
+//   if (_publicationIdCache) {
+//     return _publicationIdCache;
+//   }
+//
+//   const brandName = Manager.config?.brand?.name;
+//
+//   if (!brandName) {
+//     console.error('Beehiiv: Brand name is required to find publication');
+//     return null;
+//   }
+//
+//   const brandNameLower = brandName.toLowerCase();
+//   const allPublications = [];
+//   let page = 1;
+//   const limit = 100;
+//
+//   try {
+//     while (true) {
+//       const data = await fetch(`${BASE_URL}/publications?limit=${limit}&page=${page}`, {
+//         response: 'json',
+//         headers: headers(),
+//         timeout: 60000,
+//       });
+//
+//       if (!data.data || data.data.length === 0) {
+//         break;
+//       }
+//
+//       const matchedPub = data.data.find(pub =>
+//         pub.name.toLowerCase() === brandNameLower
+//         || pub.name.toLowerCase().includes(brandNameLower)
+//         || brandNameLower.includes(pub.name.toLowerCase())
+//       );
+//
+//       if (matchedPub) {
+//         _publicationIdCache = matchedPub.id;
+//         return matchedPub.id;
+//       }
+//
+//       allPublications.push(...data.data);
+//
+//       if (data.data.length < limit) {
+//         break;
+//       }
+//
+//       page++;
+//     }
+//
+//     console.error(`Beehiiv: No publication matched brand "${brandName}". Available: ${allPublications.map(p => p.name).join(', ')}`);
+//   } catch (e) {
+//     console.error('Beehiiv publication lookup error:', e);
+//   }
+//
+//   return null;
+// }
+
 /**
  * Add a contact to Beehiiv — resolves publication, adds subscriber with optional custom fields.
  *
@@ -217,7 +249,7 @@ async function getPublicationId() {
  * @returns {{ success: boolean, id?: string, error?: string }}
  */
 async function addContact({ email, firstName, lastName, company, source, customFields }) {
-  const publicationId = await getPublicationId();
+  const publicationId = getPublicationId();
 
   if (!publicationId) {
     return { success: false, error: 'Publication not found' };
@@ -245,7 +277,7 @@ async function addContact({ email, firstName, lastName, company, source, customF
  * @returns {{ success: boolean, deleted?: boolean, skipped?: boolean, error?: string }}
  */
 async function removeContact(email) {
-  const publicationId = await getPublicationId();
+  const publicationId = getPublicationId();
 
   if (!publicationId) {
     return { success: false, error: 'Publication not found' };
@@ -254,6 +286,25 @@ async function removeContact(email) {
   return removeSubscriber(email, publicationId);
 }
 
+/**
+ * Look up a contact in this brand's Beehiiv publication. Resolves the
+ * publicationId from config and calls findSubscriber. Mirrors SendGrid's
+ * findContact() surface so tests can use the same pattern across both
+ * providers.
+ *
+ * @param {string} email
+ * @returns {Promise<object|null>}
+ */
+async function findContact(email) {
+  const publicationId = getPublicationId();
+
+  if (!publicationId) {
+    return null;
+  }
+
+  return findSubscriber(email, publicationId);
+}
+
 /**
  * Build Beehiiv custom_fields array from a user doc.
  * Resolves all field values, then maps to display names for Beehiiv.
@@ -290,7 +341,7 @@ async function resolveSegmentIds() {
     return _segmentIdCache;
   }
 
-  const publicationId = await getPublicationId();
+  const publicationId = getPublicationId();
 
   if (!publicationId) {
     return {};
@@ -300,7 +351,7 @@ async function resolveSegmentIds() {
     const data = await fetch(`${BASE_URL}/publications/${publicationId}/segments?limit=100`, {
       response: 'json',
       headers: headers(),
-      timeout: 10000,
+      timeout: 60000,
     });
 
     _segmentIdCache = {};
@@ -337,7 +388,7 @@ async function resolveSegmentIds() {
  * @returns {{ success: boolean, id?: string, scheduled?: boolean, error?: string }}
  */
 async function createPost(options) {
-  const publicationId = options.publicationId || await getPublicationId();
+  const publicationId = options.publicationId || getPublicationId();
 
   if (!publicationId) {
     return { success: false, error: 'Publication not found' };
@@ -419,6 +470,8 @@ module.exports = {
 
   // Contacts
   addContact,
+  findContact,
+  findSubscriber,
   removeContact,
   buildFields,
 

package/src/manager/libraries/email/providers/sendgrid.js

@@ -9,6 +9,12 @@ const { resolveFieldValues } = require('../constants.js');
 
 const BASE_URL = 'https://api.sendgrid.com/v3';
 
+// SendGrid's API is normally fast (<2s) but spikes past 10s during their
+// hiccups, dropping signups silently. 60s is generous but harmless — the
+// metadata calls (resolveFieldIds, getListId) are cached for the process
+// lifetime so a slow first call costs nothing in steady state.
+const SENDGRID_TIMEOUT_MS = 60000;
+
 // --- Internal helpers ---
 
 function headers() {
@@ -35,7 +41,7 @@ async function resolveFieldIds() {
     const data = await fetch(`${BASE_URL}/marketing/field_definitions`, {
       response: 'json',
       headers: headers(),
-      timeout: 10000,
+      timeout: SENDGRID_TIMEOUT_MS,
     });
 
     _fieldIdCache = {};
@@ -70,7 +76,7 @@ async function resolveSegmentIds() {
     const data = await fetch(`${BASE_URL}/marketing/segments/2.0`, {
       response: 'json',
       headers: headers(),
-      timeout: 10000,
+      timeout: SENDGRID_TIMEOUT_MS,
     });
 
     _segmentIdCache = {};
@@ -125,34 +131,59 @@ async function upsertContacts({ contacts, listIds }) {
 }
 
 /**
- * Remove a contact from SendGrid by email address.
+ * Look up a SendGrid contact by email. Returns the contact object (id, email,
+ * list_ids, custom_fields, ...) or null if not found.
+ *
+ * Useful for tests that need to verify whether a contact landed in the list
+ * after a marketing sync.
  *
  * @param {string} email
- * @returns {{ success: boolean, jobId?: string, skipped?: boolean, error?: string }}
+ * @returns {Promise<object|null>}
  */
-async function removeContact(email) {
+async function findContact(email) {
   try {
-    // Step 1: Get contact ID by email
     const searchData = await fetch(`${BASE_URL}/marketing/contacts/search/emails`, {
       method: 'post',
       response: 'json',
       headers: headers(),
-      timeout: 10000,
+      timeout: SENDGRID_TIMEOUT_MS,
       body: { emails: [email] },
     });
 
-    if (!searchData.result?.[email]?.contact?.id) {
+    return searchData.result?.[email]?.contact || null;
+  } catch (e) {
+    // 404 is the normal "not in contacts" response — return null silently.
+    if (e.status === 404) {
+      return null;
+    }
+    console.error('SendGrid findContact error:', e);
+    return null;
+  }
+}
+
+/**
+ * Remove a contact from SendGrid by email address.
+ *
+ * @param {string} email
+ * @returns {{ success: boolean, jobId?: string, skipped?: boolean, error?: string }}
+ */
+async function removeContact(email) {
+  try {
+    // Step 1: Get contact ID by email
+    const contact = await findContact(email);
+
+    if (!contact?.id) {
       return { success: true, skipped: true, reason: 'Contact not found' };
     }
 
-    const contactId = searchData.result[email].contact.id;
+    const contactId = contact.id;
 
     // Step 2: Delete contact by ID
     const deleteData = await fetch(`${BASE_URL}/marketing/contacts?ids=${contactId}`, {
       method: 'delete',
       response: 'json',
       headers: headers(),
-      timeout: 10000,
+      timeout: SENDGRID_TIMEOUT_MS,
     });
 
     if (deleteData.job_id) {
@@ -167,69 +198,96 @@ async function removeContact(email) {
 }
 
 /**
- * Get a SendGrid list ID by brand name (fuzzy match).
+ * Get this brand's SendGrid Marketing list ID.
+ *
+ * Reads `Manager.config.marketing.sendgrid.listId` — populated by OMEGA's
+ * `sendgrid/ensure/list.js` at brand-onboarding time, same as how Beehiiv's
+ * `publicationId` works. No runtime API call, no fuzzy-match fragility.
+ *
+ * If the brand hasn't been onboarded yet (listId missing/empty), logs a
+ * warning and returns null — the marketing sync will still succeed, but the
+ * contact lands in SendGrid's global pool instead of the brand's list. Fix:
+ * run OMEGA's sendgrid service to populate the config.
  *
- * @param {string} brandName
- * @returns {string|null} List ID or null
+ * @returns {string|null} List ID or null if not configured
  */
-async function getListId() {
-  const brandName = Manager.config.brand?.name;
-  const brandNameLower = (brandName || '').toLowerCase();
-  const allLists = [];
-  let pageToken = '';
-  const pageSize = 1000;
-
-  try {
-    while (true) {
-      const url = `${BASE_URL}/marketing/lists?page_size=${pageSize}${pageToken ? `&page_token=${pageToken}` : ''}`;
-      const data = await fetch(url, {
-        response: 'json',
-        headers: headers(),
-        timeout: 10000,
-      });
-
-      if (!data.result || data.result.length === 0) {
-        break;
-      }
-
-      const matchedList = data.result.find(list =>
-        list.name.toLowerCase() === brandNameLower
-        || list.name.toLowerCase().includes(brandNameLower)
-        || brandNameLower.includes(list.name.toLowerCase())
-      );
-
-      if (matchedList) {
-        return matchedList.id;
-      }
-
-      allLists.push(...data.result);
-
-      if (!data._metadata?.next) {
-        break;
-      }
-
-      const nextUrl = new URL(data._metadata.next);
-      pageToken = nextUrl.searchParams.get('page_token');
-
-      if (!pageToken) {
-        break;
-      }
-    }
-
-    if (allLists.length === 1) {
-      return allLists[0].id;
-    }
-
-    if (allLists.length > 0) {
-      console.error(`SendGrid: No list matched brand "${brandName}". Available: ${allLists.map(l => l.name).join(', ')}`);
-    }
-  } catch (e) {
-    console.error('SendGrid list lookup error:', e);
+function getListId() {
+  const listId = Manager.config.marketing?.sendgrid?.listId;
+
+  if (!listId) {
+    console.warn(
+      'SendGrid: marketing.sendgrid.listId is not set in config. '
+      + 'Contact will be added to All Contacts only, not the brand list. '
+      + 'Run OMEGA to populate.',
+    );
+    return null;
   }
 
-  return null;
+  return listId;
 }
 
+// LEGACY: Fuzzy-match-by-brand-name fallback. Kept commented out as a backstop
+// in case the config-based approach has an edge case we haven't seen yet.
+// Delete once we've verified the config-based approach works across all brands.
+//
+// async function getListIdByFuzzyMatch() {
+//   const brandName = Manager.config.brand?.name;
+//   const brandNameLower = (brandName || '').toLowerCase();
+//   const allLists = [];
+//   let pageToken = '';
+//   const pageSize = 1000;
+//
+//   try {
+//     while (true) {
+//       const url = `${BASE_URL}/marketing/lists?page_size=${pageSize}${pageToken ? `&page_token=${pageToken}` : ''}`;
+//       const data = await fetch(url, {
+//         response: 'json',
+//         headers: headers(),
+//         timeout: SENDGRID_TIMEOUT_MS,
+//       });
+//
+//       if (!data.result || data.result.length === 0) {
+//         break;
+//       }
+//
+//       const matchedList = data.result.find(list =>
+//         list.name.toLowerCase() === brandNameLower
+//         || list.name.toLowerCase().includes(brandNameLower)
+//         || brandNameLower.includes(list.name.toLowerCase())
+//       );
+//
+//       if (matchedList) {
+//         return matchedList.id;
+//       }
+//
+//       allLists.push(...data.result);
+//
+//       if (!data._metadata?.next) {
+//         break;
+//       }
+//
+//       const nextUrl = new URL(data._metadata.next);
+//       pageToken = nextUrl.searchParams.get('page_token');
+//
+//       if (!pageToken) {
+//         break;
+//       }
+//     }
+//
+//     if (allLists.length === 1) {
+//       return allLists[0].id;
+//     }
+//
+//     if (allLists.length > 0) {
+//       console.error(`SendGrid: No list matched brand "${brandName}". Available: ${allLists.map(l => l.name).join(', ')}`);
+//     }
+//   } catch (e) {
+//     console.error('SendGrid list lookup error:', e);
+//   }
+//
+//   return null;
+// }
+
 // --- Single Sends (Campaigns) ---
 
 /**
@@ -354,7 +412,7 @@ async function cancelSingleSend(singleSendId) {
       method: 'delete',
       response: 'json',
       headers: headers(),
-      timeout: 10000,
+      timeout: SENDGRID_TIMEOUT_MS,
     });
 
     return { success: true };
@@ -375,7 +433,7 @@ async function getSingleSend(singleSendId) {
     const data = await fetch(`${BASE_URL}/marketing/singlesends/${singleSendId}`, {
       response: 'json',
       headers: headers(),
-      timeout: 10000,
+      timeout: SENDGRID_TIMEOUT_MS,
     });
 
     return data.id ? data : null;
@@ -400,7 +458,7 @@ async function listSingleSends(options) {
     const data = await fetch(url, {
       response: 'json',
       headers: headers(),
-      timeout: 10000,
+      timeout: SENDGRID_TIMEOUT_MS,
     });
 
     return data.result || [];
@@ -437,7 +495,7 @@ async function addContact({ email, firstName, lastName, company, customFields })
     }
   }
 
-  const listId = await getListId();
+  const listId = getListId();
   const result = await upsertContacts({
     contacts: [contact],
     listIds: listId ? [listId] : [],
@@ -508,7 +566,7 @@ async function getSegmentContacts(segmentId, maxWaitMs = 60000) {
       const statusData = await fetch(`${BASE_URL}/marketing/contacts/exports/${exportData.id}`, {
         response: 'json',
         headers: headers(),
-        timeout: 10000,
+        timeout: SENDGRID_TIMEOUT_MS,
       });
 
       console.log(`SendGrid getSegmentContacts: Poll #${pollCount} — ${statusData.status} (${Date.now() - startTime}ms)`);
@@ -602,6 +660,7 @@ module.exports = {
 
   // Contacts
   addContact,
+  findContact,
   removeContact,
   getSegmentContacts,
   bulkDeleteContacts,

package/src/test/runner.js

@@ -119,25 +119,6 @@ class TestRunner {
       await this.runTestsInDir(projectTestsDir, 'project');
     }
 
-    // Post-run cleanup: scrub test accounts from third-party marketing providers
-    // (SendGrid/Beehiiv) so each test run leaves the contact list in the same
-    // state it found it. Pairs with the pre-run cleanup as defense in depth —
-    // pre-run handles crashed previous runs, post-run handles the current run.
-    // Only fires in extended mode (normal mode never touches real providers).
-    if (process.env.TEST_EXTENDED_MODE) {
-      process.stdout.write(chalk.gray('\n  Cleaning up test accounts from marketing providers... '));
-      try {
-        const cleanupResult = await testAccounts.cleanupMarketingProviders(this.options.domain, {
-          apiUrl: this.options.apiUrl,
-          backendManagerKey: this.options.backendManagerKey,
-        });
-        console.log(chalk.green(`✓ (${cleanupResult.cleaned} cleaned)`));
-      } catch (e) {
-        // Post-run cleanup is best-effort — failures shouldn't change the test result
-        console.log(chalk.yellow(`⚠ cleanup error: ${e.message}`));
-      }
-    }
-
     // Cleanup rules context
     if (this.rulesContext) {
       await this.rulesContext.cleanup();
@@ -229,18 +210,6 @@ class TestRunner {
     const deleteResult = await testAccounts.deleteTestUsers(this.options.admin);
     console.log(chalk.green(`✓ (${deleteResult.deleted} deleted, ${deleteResult.skipped} skipped)`));
 
-    // Clean any leftover test accounts from third-party marketing providers
-    // (SendGrid/Beehiiv). Runs BEFORE we create fresh users so a previously
-    // killed run doesn't leave the contact list polluted.
-    if (process.env.TEST_EXTENDED_MODE) {
-      process.stdout.write(chalk.gray('  Cleaning test accounts from marketing providers... '));
-      const cleanupResult = await testAccounts.cleanupMarketingProviders(this.options.domain, {
-        apiUrl: this.options.apiUrl,
-        backendManagerKey: this.options.backendManagerKey,
-      });
-      console.log(chalk.green(`✓ (${cleanupResult.cleaned} cleaned)`));
-    }
-
     process.stdout.write(chalk.gray('  Creating test accounts... '));
 
     // Create fresh test accounts