backend-manager 5.0.148 → 5.0.149

package/src/manager/functions/core/actions/api/general/add-marketing-contact.js

@@ -1,11 +1,6 @@
-const fetch = require('wonderful-fetch');
 const path = require('path');
-const dns = require('dns').promises;
 const recaptcha = require(path.join(__dirname, '..', '..', '..', '..', '..', 'libraries', 'recaptcha.js'));
-
-// Load disposable domains list
-const DISPOSABLE_DOMAINS = require(path.join(__dirname, '..', '..', '..', '..', '..', 'libraries', 'disposable-domains.json'));
-const DISPOSABLE_SET = new Set(DISPOSABLE_DOMAINS.map(d => d.toLowerCase()));
+const { validate: validateEmail } = require(path.join(__dirname, '..', '..', '..', '..', '..', 'libraries', 'email', 'validation.js'));
 const { inferContact } = require(path.join(__dirname, '..', '..', '..', '..', '..', 'libraries', 'infer-contact.js'));
 
 function Module() {}
@@ -73,38 +68,29 @@ Module.prototype.main = function () {
       }
     }
 
-    // Email validation
-    const validation = { valid: true, checks: {} };
-
     // Skip external API calls in test mode unless TEST_EXTENDED_MODE is set
     const shouldCallExternalAPIs = !assistant.isTesting() || process.env.TEST_EXTENDED_MODE;
 
+    // Email validation
+    let validation = { valid: true, checks: {} };
+
     if (!skipValidation) {
-      // Check disposable domain
-      const domain = email.split('@')[1];
-      if (DISPOSABLE_SET.has(domain.toLowerCase())) {
-        validation.valid = false;
-        validation.checks.disposable = { blocked: true, domain };
+      validation = await validateEmail(email, {
+        zerobounce: isAdmin && shouldCallExternalAPIs,
+      });
 
+      if (!validation.valid) {
         // For public requests, return generic success to prevent enumeration
         if (!isAdmin) {
           return resolve({ data: { success: true } });
         }
-        return reject(assistant.errorify(`Disposable email domain not allowed: ${domain}`, { code: 400 }));
-      }
-      validation.checks.disposable = { blocked: false };
-
-      // MX record check (optional, skip for speed in most cases)
-      // const hasMx = await checkMxRecord(domain);
-      // validation.checks.mx = { valid: hasMx };
 
-      // ZeroBounce validation (admin only, if key exists, and not in test mode unless TEST_EXTENDED_MODE)
-      if (isAdmin && process.env.ZEROBOUNCE_API_KEY && shouldCallExternalAPIs) {
-        const zbResult = await validateWithZeroBounce(email);
-        validation.checks.zerobounce = zbResult;
-        if (!zbResult.valid) {
-          validation.valid = false;
+        const disposable = validation.checks.disposable;
+        if (disposable && !disposable.valid) {
+          return reject(assistant.errorify(`Disposable email domain not allowed: ${disposable.domain}`, { code: 400 }));
         }
+
+        return reject(assistant.errorify('Email validation failed', { code: 400 }));
       }
     }
 
@@ -117,35 +103,19 @@ Module.prototype.main = function () {
     }
 
     // Add to providers
-    const providerResults = {};
+    let providerResults = {};
 
     if (!shouldCallExternalAPIs) {
       assistant.log('add-marketing-contact: Skipping providers (BEM_TESTING=true, TEST_EXTENDED_MODE not set)');
     } else {
-      assistant.log('add-marketing-contact: Adding contact to providers:', { providers });
-
-      // SendGrid Marketing Contacts
-      if (providers.includes('sendgrid') && process.env.SENDGRID_API_KEY) {
-        providerResults.sendgrid = await addToSendGrid({
-          email,
-          firstName,
-          lastName,
-          source,
-          appId: Manager.config.app.id,
-          brandName: Manager.config.brand?.name,
-        });
-      }
-
-      // Beehiiv
-      if (providers.includes('beehiiv') && process.env.BEEHIIV_API_KEY) {
-        providerResults.beehiiv = await addToBeehiiv({
-          email,
-          firstName,
-          lastName,
-          source,
-          brandName: Manager.config.brand?.name,
-        });
-      }
+      const mailer = Manager.Email(assistant);
+      providerResults = await mailer.add({
+        email,
+        firstName,
+        lastName,
+        source,
+        providers,
+      });
     }
 
     // Log result
@@ -177,270 +147,4 @@ Module.prototype.main = function () {
   });
 };
 
-/**
- * Validate email with ZeroBounce API
- */
-async function validateWithZeroBounce(email) {
-  try {
-    const data = await fetch(
-      `https://api.zerobounce.net/v2/validate?api_key=${process.env.ZEROBOUNCE_API_KEY}&email=${encodeURIComponent(email)}`,
-      {
-        response: 'json',
-        timeout: 10000,
-      }
-    );
-
-    // ZeroBounce returns error in response body (e.g., invalid API key, out of credits)
-    if (data.error) {
-      console.error('ZeroBounce API error:', data.error);
-      return { valid: true, error: data.error }; // Fail open
-    }
-
-    // Ensure status exists (defensive check)
-    if (!data.status) {
-      console.error('ZeroBounce unexpected response:', data);
-      return { valid: true, error: 'Unexpected response format' };
-    }
-
-    return {
-      valid: data.status === 'valid',
-      status: data.status,
-      subStatus: data.sub_status || null,
-    };
-  } catch (e) {
-    console.error('ZeroBounce validation error:', e);
-    return { valid: true, error: e.message }; // Fail open
-  }
-}
-
-/**
- * Check if domain has valid MX records
- */
-async function checkMxRecord(domain) {
-  try {
-    const records = await dns.resolveMx(domain);
-    return records && records.length > 0;
-  } catch (e) {
-    return false;
-  }
-}
-
-/**
- * Add contact to SendGrid Marketing Contacts
- */
-async function addToSendGrid({ email, firstName, lastName, source, appId, brandName }) {
-  try {
-    // Get list ID matched by brand name
-    const listId = await getSendGridListId(brandName);
-
-    const requestBody = {
-      contacts: [
-        {
-          email,
-          first_name: firstName || undefined,
-          last_name: lastName || undefined,
-          custom_fields: {
-            e1_T: source, // Assumes custom field exists for source
-            e2_T: appId,  // Assumes custom field exists for app_id
-          },
-        },
-      ],
-    };
-
-    // Add to specific list if matched
-    if (listId) {
-      requestBody.list_ids = [listId];
-    }
-
-    const data = await fetch('https://api.sendgrid.com/v3/marketing/contacts', {
-      method: 'put',
-      response: 'json',
-      headers: {
-        'Authorization': `Bearer ${process.env.SENDGRID_API_KEY}`,
-      },
-      timeout: 15000,
-      body: requestBody,
-    });
-
-    if (data.job_id) {
-      return { success: true, jobId: data.job_id, listId };
-    }
-
-    return { success: false, error: data.errors?.[0]?.message || 'Unknown error' };
-  } catch (e) {
-    console.error('SendGrid error:', e);
-    return { success: false, error: e.message };
-  }
-}
-
-/**
- * Get SendGrid list ID by matching brand name (with pagination)
- */
-async function getSendGridListId(brandName) {
-  const brandNameLower = (brandName || '').toLowerCase();
-  const allLists = [];
-  let pageToken = '';
-  const pageSize = 1000;
-
-  try {
-    // Paginate through all lists
-    while (true) {
-      const url = `https://api.sendgrid.com/v3/marketing/lists?page_size=${pageSize}${pageToken ? `&page_token=${pageToken}` : ''}`;
-      const data = await fetch(url, {
-        response: 'json',
-        headers: {
-          'Authorization': `Bearer ${process.env.SENDGRID_API_KEY}`,
-        },
-        timeout: 10000,
-      });
-
-      if (!data.result || data.result.length === 0) {
-        break;
-      }
-
-      // Check for match in this page
-      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);
-
-      // Check for next page token in metadata
-      if (!data._metadata?.next) {
-        break;
-      }
-
-      // Extract page_token from next URL
-      const nextUrl = new URL(data._metadata.next);
-      pageToken = nextUrl.searchParams.get('page_token');
-
-      if (!pageToken) {
-        break;
-      }
-    }
-
-    // Fallback to first list if only one exists total
-    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;
-}
-
-/**
- * Add contact to Beehiiv newsletter
- */
-async function addToBeehiiv({ email, firstName, lastName, source, brandName }) {
-  try {
-    // Get publication ID (cached, matched by brand name)
-    const pubId = await getBeehiivPublicationId(brandName);
-    if (!pubId) {
-      return { success: false, error: 'Could not find matching publication' };
-    }
-
-    const data = await fetch(`https://api.beehiiv.com/v2/publications/${pubId}/subscriptions`, {
-      method: 'post',
-      response: 'json',
-      headers: {
-        'Authorization': `Bearer ${process.env.BEEHIIV_API_KEY}`,
-      },
-      timeout: 15000,
-      body: {
-        email,
-        reactivate_existing: true,
-        send_welcome_email: true,
-        utm_source: source,
-        custom_fields: [
-          firstName ? { name: 'first_name', value: firstName } : null,
-          lastName ? { name: 'last_name', value: lastName } : null,
-        ].filter(Boolean),
-      },
-    });
-
-    if (data.data?.id) {
-      return { success: true, id: data.data.id };
-    }
-
-    return { success: false, error: data.message || 'Unknown error' };
-  } catch (e) {
-    console.error('Beehiiv error:', e);
-    return { success: false, error: e.message };
-  }
-}
-
-/**
- * Get Beehiiv publication ID by matching brand name (with pagination)
- * Brand name is REQUIRED - no fallback to random publications
- * @param {string} brandName - Brand name to match (required)
- */
-async function getBeehiivPublicationId(brandName) {
-  // Brand name is required
-  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 {
-    // Paginate through all publications
-    while (true) {
-      const data = await fetch(`https://api.beehiiv.com/v2/publications?limit=${limit}&page=${page}`, {
-        response: 'json',
-        headers: {
-          'Authorization': `Bearer ${process.env.BEEHIIV_API_KEY}`,
-        },
-        timeout: 10000,
-      });
-
-      if (!data.data || data.data.length === 0) {
-        break;
-      }
-
-      // Check for match in this page
-      const matchedPub = data.data.find(pub =>
-        pub.name.toLowerCase() === brandNameLower
-        || pub.name.toLowerCase().includes(brandNameLower)
-        || brandNameLower.includes(pub.name.toLowerCase())
-      );
-
-      if (matchedPub) {
-        return matchedPub.id;
-      }
-
-      allPublications.push(...data.data);
-
-      // If we got fewer than limit, we've reached the end
-      if (data.data.length < limit) {
-        break;
-      }
-
-      page++;
-    }
-
-    // No fallback - brand must match
-    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;
-}
-
 module.exports = Module;

package/src/manager/functions/core/actions/api/general/emails/general:download-app-link.js

@@ -10,10 +10,10 @@ module.exports = function (payload, config) {
         email: payload.email,
         name: payload.name,
       },
+      sender: 'marketing',
       categories: ['download'],
       subject: `Free ${config.brand.name} download link for ${payload.name || 'you'}!`,
       template: 'main/misc/app-download-link',
-      group: 'marketing',
       copy: false,
       data: {},
     }

package/src/manager/functions/core/actions/api/general/remove-marketing-contact.js

@@ -1,5 +1,3 @@
-const fetch = require('wonderful-fetch');
-
 function Module() {}
 
 Module.prototype.main = function () {
@@ -31,21 +29,9 @@ Module.prototype.main = function () {
       return reject(assistant.errorify('Email is required', { code: 400 }));
     }
 
-    // Get brand name from Manager config
-    const brandName = Manager.config.brand?.name;
-
     // Remove from providers
-    const providerResults = {};
-
-    // SendGrid
-    if (providers.includes('sendgrid') && process.env.SENDGRID_API_KEY) {
-      providerResults.sendgrid = await removeFromSendGrid(email);
-    }
-
-    // Beehiiv
-    if (providers.includes('beehiiv') && process.env.BEEHIIV_API_KEY) {
-      providerResults.beehiiv = await removeFromBeehiiv(email, brandName);
-    }
+    const mailer = Manager.Email(assistant);
+    const providerResults = await mailer.remove(email, { providers });
 
     // Log result
     assistant.log('remove-marketing-contact result:', {
@@ -62,173 +48,4 @@ Module.prototype.main = function () {
   });
 };
 
-/**
- * Remove contact from SendGrid by email
- * Requires looking up contact ID first, then deleting
- */
-async function removeFromSendGrid(email) {
-  try {
-    // Step 1: Get contact ID by email
-    const searchData = await fetch('https://api.sendgrid.com/v3/marketing/contacts/search/emails', {
-      method: 'post',
-      response: 'json',
-      headers: {
-        'Authorization': `Bearer ${process.env.SENDGRID_API_KEY}`,
-      },
-      timeout: 10000,
-      body: { emails: [email] },
-    });
-
-    if (!searchData.result?.[email]?.contact?.id) {
-      return { success: true, skipped: true, reason: 'Contact not found' };
-    }
-
-    const contactId = searchData.result[email].contact.id;
-
-    // Step 2: Delete contact by ID
-    const deleteData = await fetch(`https://api.sendgrid.com/v3/marketing/contacts?ids=${contactId}`, {
-      method: 'delete',
-      response: 'json',
-      headers: {
-        'Authorization': `Bearer ${process.env.SENDGRID_API_KEY}`,
-      },
-      timeout: 10000,
-    });
-
-    if (deleteData.job_id) {
-      return { success: true, jobId: deleteData.job_id };
-    }
-
-    return { success: false, error: deleteData.errors?.[0]?.message || 'Delete failed' };
-  } catch (e) {
-    console.error('SendGrid remove error:', e);
-    return { success: false, error: e.message };
-  }
-}
-
-/**
- * Get Beehiiv publication ID by matching brand name (with pagination)
- * Brand name is REQUIRED - no fallback to random publications
- * @param {string} brandName - Brand name to match (required)
- */
-async function getBeehiivPublicationId(brandName) {
-  // Brand name is required
-  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 {
-    // Paginate through all publications
-    while (true) {
-      const data = await fetch(`https://api.beehiiv.com/v2/publications?limit=${limit}&page=${page}`, {
-        response: 'json',
-        headers: {
-          'Authorization': `Bearer ${process.env.BEEHIIV_API_KEY}`,
-        },
-        timeout: 10000,
-      });
-
-      if (!data.data || data.data.length === 0) {
-        break;
-      }
-
-      // Check for match in this page
-      const matchedPub = data.data.find(pub =>
-        pub.name.toLowerCase() === brandNameLower
-        || pub.name.toLowerCase().includes(brandNameLower)
-        || brandNameLower.includes(pub.name.toLowerCase())
-      );
-
-      if (matchedPub) {
-        return matchedPub.id;
-      }
-
-      allPublications.push(...data.data);
-
-      // If we got fewer than limit, we've reached the end
-      if (data.data.length < limit) {
-        break;
-      }
-
-      page++;
-    }
-
-    // No fallback - brand must match
-    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;
-}
-
-/**
- * Permanently delete subscriber from Beehiiv by email
- * Requires looking up subscription ID first, then calling DELETE endpoint
- * @param {string} email - Email to delete
- * @param {string} brandName - Brand name to match publication (required)
- */
-async function removeFromBeehiiv(email, brandName) {
-  try {
-    // Get publication ID by brand name (required)
-    const pubId = await getBeehiivPublicationId(brandName);
-    if (!pubId) {
-      return { success: false, error: `Publication not found for brand "${brandName}"` };
-    }
-
-    // Step 1: Get subscription by email
-    const encodedEmail = encodeURIComponent(email);
-
-    let searchData;
-    try {
-      searchData = await fetch(
-        `https://api.beehiiv.com/v2/publications/${pubId}/subscriptions/by_email/${encodedEmail}`,
-        {
-          response: 'json',
-          headers: {
-            'Authorization': `Bearer ${process.env.BEEHIIV_API_KEY}`,
-          },
-          timeout: 10000,
-        }
-      );
-    } catch (e) {
-      // 404 means subscriber doesn't exist - that's fine for cleanup
-      if (e.status === 404) {
-        return { success: true, skipped: true, reason: 'Subscriber not found' };
-      }
-      throw e;
-    }
-
-    if (!searchData.data?.id) {
-      return { success: true, skipped: true, reason: 'Subscription not found' };
-    }
-
-    const subscriptionId = searchData.data.id;
-
-    // Step 2: Permanently DELETE the subscription
-    await fetch(
-      `https://api.beehiiv.com/v2/publications/${pubId}/subscriptions/${subscriptionId}`,
-      {
-        method: 'delete',
-        headers: {
-          'Authorization': `Bearer ${process.env.BEEHIIV_API_KEY}`,
-        },
-        timeout: 10000,
-      }
-    );
-
-    // DELETE returns 204 No Content on success
-    return { success: true, deleted: true, subscriptionId };
-  } catch (e) {
-    console.error('Beehiiv remove error:', e);
-    return { success: false, error: e.message };
-  }
-}
-
 module.exports = Module;

package/src/manager/functions/core/actions/api/general/send-email.js

@@ -26,7 +26,7 @@ Module.prototype.main = function () {
       delay: 1,
       payload: {
         backendManagerKey: process.env.BACKEND_MANAGER_KEY,
-        app: Manager.config.app.id,
+        brand: Manager.config.brand.id,
       },
     }
 

package/src/manager/functions/core/actions/api/special/setup-electron-manager-client.js

@@ -1,5 +1,5 @@
 const path = require('path');
-const { buildPublicConfig } = require(path.join(__dirname, '..', '..', '..', '..', '..', 'routes', 'app', 'get.js'));
+const { buildPublicConfig } = require(path.join(__dirname, '..', '..', '..', '..', '..', 'routes', 'brand', 'get.js'));
 
 function Module() {
 
@@ -75,7 +75,7 @@ Module.prototype.main = function () {
         timestamp: new Date().toISOString(),
         ip: assistant.request.geolocation.ip,
         country: assistant.request.geolocation.country,
-        app: buildPublicConfig(Manager.config),
+        brand: buildPublicConfig(Manager.config),
         config: config,
       }
     });

package/src/manager/functions/core/actions/api/test/health.js

@@ -14,6 +14,7 @@ Module.prototype.main = function () {
       environment: assistant.meta?.environment || 'unknown',
       version: Manager.package?.version || 'unknown',
       bemVersion: Manager.version || 'unknown',
+      testExtendedMode: !!process.env.TEST_EXTENDED_MODE,
     };
 
     assistant.log('Health check', response);

package/src/manager/helpers/api-manager.js

@@ -26,7 +26,7 @@ function ApiManager(m) {
   const self = this;
   self.Manager = m;
   self.options = {
-    appId: '',
+    brandId: '',
     plans: {},
     maxUsersStored: 10000,
     refetchInterval: 60,
@@ -41,7 +41,7 @@ ApiManager.prototype.init = function (options) {
   const self = this;
   return new Promise(async function(resolve, reject) {
     options = options || {};
-    options.app = options.app || '';
+    options.brand = options.brand || '';
     options.plans = options.plans || {};
 
     // await self.Manager.libraries.admin.firestore

package/src/manager/helpers/user.js

@@ -347,11 +347,12 @@ function User(Manager, settings) {
 
 // Resolves calculated subscription fields that require derivation logic
 // Raw data (product.id, status, trial, cancellation) is on the user object directly
-// Returns: { plan, active, trialing, cancelling }
+// Returns: { plan, active, trialing, cancelling, everPaid }
 // - plan: the plan ID the user effectively has access to RIGHT NOW ('basic' if cancelled/suspended)
 // - active: user has active access (active, trialing, or cancelling)
 // - trialing: user is in an active trial (status is 'active' but trial hasn't expired)
 // - cancelling: cancellation is pending (status is 'active' but cancellation.pending is true)
+// - everPaid: user has had a paid subscription at some point (payment.startDate exists)
 User.resolveSubscription = function resolveSubscription(account) {
   const subscription = (account?.subscription || account?.properties?.subscription) || {};
   const productId = subscription.product?.id || 'basic';
@@ -372,6 +373,7 @@ User.resolveSubscription = function resolveSubscription(account) {
     active,
     trialing,
     cancelling,
+    everPaid: (subscription.payment?.startDate?.timestampUNIX || 0) > 0,
   };
 };