backend-manager 5.0.148 → 5.0.149

package/CHANGELOG.md

@@ -14,6 +14,56 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - `Fixed` for any bug fixes.
 - `Security` in case of vulnerabilities.
 
+# [5.0.149] - 2026-03-14
+### Added
+- Modular email library (`libraries/email/`) — replaces monolithic `libraries/email.js` with provider-based architecture
+- Marketing contact providers: SendGrid (`providers/sendgrid.js`) and Beehiiv (`providers/beehiiv.js`) with add/remove/sync operations
+- Email validation library (`libraries/email/validation.js`) — format, local-part, and disposable domain checks with configurable check selection
+- Runtime SendGrid custom field ID resolution — fetches field definitions from API and caches name→ID mapping (no hardcoded IDs)
+- 15 marketing custom fields synced to SendGrid/Beehiiv: brand, auth, subscription, payment, and attribution data
+- `PUT /marketing/contact` admin route for triggering contact sync by UID
+- `POST /marketing/contact` now syncs full custom field data on signup
+- Marketing contact sync in payment webhook pipeline — subscription changes automatically update SendGrid/Beehiiv custom fields
+- `mailer.sync(uid)` method for full contact re-sync from Firestore user doc
+- `resolveFieldValues()` in `constants.js` — SSOT for building custom field payloads from user docs
+- `User.resolveSubscription()` now includes `everPaid` field for marketing segmentation
+- `TEST_EXTENDED_MODE` propagation from emulator to Firebase function workers
+- `TEST_EXTENDED_MODE` mismatch detection between test runner and emulator via health check
+- Email queue cron processor (`cron/frequent/email-queue.js`) — processes deferred emails every 10 minutes via the full `email.send()` pipeline
+- Feedback route review URL builder with full site URLs
+- 28 email validation unit tests, 7 marketing contact route tests, 5 marketing lifecycle integration tests
+
+### Changed
+- Refactored `libraries/email.js` into modular `libraries/email/` directory (index, constants, validation, providers)
+- `POST /marketing/contact` validation now uses configurable check selection instead of boolean `skipValidation`
+- `DELETE /marketing/contact` uses new provider-based removal
+- Marketing contact schemas updated to match new validation options
+- `on-delete` auth event now uses new email library for contact removal
+- `saveToEmailQueue` now stores raw settings instead of pre-built SendGrid email, so queued emails re-enter the full build pipeline
+- Renamed `email-queue` collection to `emails-queue`
+- Feedback schema: renamed `like`/`dislike` fields to `positive`/`negative`
+- Feedback review prompt logic now checks total positive feedback length (50+ chars)
+- Renamed `GET /app` route to `GET /brand` (completes app→brand migration)
+
+### Removed
+- Monolithic `libraries/email.js` — replaced by modular `libraries/email/` directory
+
+# [5.0.148] - 2026-03-14
+### Added
+- Semantic email sender system — pass `sender: 'orders'` to `Email.send()` to auto-resolve from address, display name, and SendGrid ASM group
+- 7 sender categories: `orders`, `hello`, `account`, `marketing`, `security`, `newsletter`, `internal`
+- 7 dedicated SendGrid ASM groups for granular unsubscribe control
+- 4 new email tests for sender resolution, override precedence, and fallback behavior
+
+### Changed
+- Migrated all email call sites from `group:` to `sender:` parameter
+- `sendOrderEmail()` now accepts optional `sender` parameter (defaults to `'orders'`)
+- `replyTo` now defaults to the resolved from address instead of brand default
+
+# [5.0.147] - 2026-03-14
+### Added
+- 24-hour cancellation guard on `POST /payments/cancel` — blocks cancellations for subscriptions younger than 24 hours
+
 # [5.0.146] - 2026-03-13
 ### Added
 - Promo discount support in payment analytics — `resolveActualValue()` computes effective price accounting for trials ($0) and percentage discounts

package/CLAUDE.md

@@ -1058,6 +1058,32 @@ Key rules:
 
 The `test` processor generates Stripe-shaped data and auto-fires webhooks to the local server. Only available in non-production environments. Use `processor: 'test'` in intent requests during testing. The test webhook processor delegates to Stripe's parser since it generates Stripe-shaped payloads.
 
+## Marketing Custom Fields
+
+BEM syncs user data to marketing providers (SendGrid, Beehiiv) as custom fields. Field definitions live in a single dictionary; OMEGA provisions them in each provider.
+
+### Adding a New Field
+
+1. Add the field to `FIELDS` in `src/manager/libraries/email/constants.js` — the key IS the field name in both providers. Set `source`, `path`, `type`.
+2. Add matching entry in OMEGA's `src/lib/bem-fields.js` with `name`, `display`, `type`. If Beehiiv has it built-in (e.g., country, utm_source), set `beehiivBuiltIn: true`.
+3. Run OMEGA: `npm start -- --service=sendgrid,beehiiv --brand=X`
+4. BEM resolves field IDs at runtime — no provider code changes needed.
+
+### How It Works
+
+- **SendGrid**: `resolveFieldIds()` fetches field definitions from the SendGrid API, builds a name-to-ID cache, and maps values to SendGrid's auto-generated IDs (e.g., `brand_id` maps to `e35_T`).
+- **Beehiiv**: BEM uses the key directly as the custom field name — no ID resolution needed.
+- **OMEGA**: The `ensure/custom-fields.js` handlers are idempotent — they fetch existing fields and only create what is missing.
+
+### Key Files
+
+| Purpose | File |
+|---------|------|
+| Field dictionary (BEM SSOT) | `src/manager/libraries/email/constants.js` |
+| Field provisioning list (OMEGA SSOT) | `omega-manager/src/lib/bem-fields.js` |
+| SendGrid provisioning | `omega-manager/src/services/sendgrid/ensure/custom-fields.js` |
+| Beehiiv provisioning | `omega-manager/src/services/beehiiv/ensure/custom-fields.js` |
+
 ## Common Mistakes to Avoid
 
 1. **Don't modify Manager internals directly** - Use factory methods and public APIs

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "backend-manager",
-  "version": "5.0.148",
+  "version": "5.0.149",
   "description": "Quick tools for developing Firebase functions",
   "main": "src/manager/index.js",
   "bin": {

package/src/cli/commands/emulator.js

@@ -7,6 +7,7 @@ const JSON5 = require('json5');
 const powertools = require('node-powertools');
 const WatchCommand = require('./watch');
 const { DEFAULT_EMULATOR_PORTS } = require('./setup-tests/emulator-config');
+const { EXTENDED_MODE_WARNING } = require('../../test/utils/extended-mode-warning');
 
 class EmulatorCommand extends BaseCommand {
   async execute() {
@@ -15,9 +16,9 @@ class EmulatorCommand extends BaseCommand {
 
     // Warn if TEST_EXTENDED_MODE is enabled
     if (process.env.TEST_EXTENDED_MODE) {
-      this.log(chalk.yellow.bold('\n  ⚠️⚠️⚠️  WARNING: TEST_EXTENDED_MODE IS TRUE  ⚠️⚠️⚠️'));
-      this.log(chalk.yellow('  External API calls (emails, SendGrid, etc.) are ENABLED!'));
-      this.log(chalk.yellow('  This will send real emails and make real API calls.\n'));
+      this.log(chalk.yellow.bold(`\n  ${EXTENDED_MODE_WARNING[0]}`));
+      EXTENDED_MODE_WARNING.slice(1).forEach((line) => this.log(chalk.yellow(`  ${line}`)));
+      this.log('');
     }
 
     // Start BEM watcher in background
@@ -59,13 +60,22 @@ class EmulatorCommand extends BaseCommand {
     // hosting is included so localhost:5002 rewrites work (e.g., /backend-manager -> bm_api)
     // pubsub is included so scheduled functions (bm_cronDaily) can be triggered in tests
     // Use double quotes for command wrapper since the command may contain single quotes (JSON strings)
-    const emulatorCommand = `BEM_TESTING=true firebase emulators:exec --only functions,firestore,auth,database,hosting,pubsub --ui "${command}"`;
+    const envPrefix = process.env.TEST_EXTENDED_MODE
+      ? 'BEM_TESTING=true TEST_EXTENDED_MODE=true'
+      : 'BEM_TESTING=true';
+    const emulatorCommand = `${envPrefix} firebase emulators:exec --only functions,firestore,auth,database,hosting,pubsub --ui "${command}"`;
 
     // Set up log file in the project directory
     const logPath = path.join(projectDir, 'functions', 'emulator.log');
     const logStream = fs.createWriteStream(logPath, { flags: 'w' });
     const stripAnsi = (str) => str.replace(/\x1B\[[0-9;]*[a-zA-Z]/g, '');
 
+    // Write pre-emulator info to log file
+    if (process.env.TEST_EXTENDED_MODE) {
+      EXTENDED_MODE_WARNING.forEach((line) => logStream.write(`${line}\n`));
+      logStream.write('\n');
+    }
+
     this.log(chalk.gray(`  Logs saving to: ${logPath}\n`));
 
     await powertools.execute(emulatorCommand, {

package/src/cli/commands/test.js

@@ -103,15 +103,13 @@ class TestCommand extends BaseCommand {
       return null;
     }
 
-    // Derive convenience values
-    const projectId = config.firebaseConfig?.projectId;
+    // Derive computed values (not in config file)
     const backendManagerKey = argv.key || process.env.BACKEND_MANAGER_KEY;
-    const appId = config.brand?.id;
     const contactEmail = config.brand?.contact?.email || '';
     const domain = contactEmail.includes('@') ? contactEmail.split('@')[1] : '';
 
     // Validate required configuration
-    if (!projectId) {
+    if (!config.firebaseConfig?.projectId) {
       this.logError('Error: Missing firebaseConfig.projectId in backend-manager-config.json');
       return null;
     }
@@ -122,7 +120,7 @@ class TestCommand extends BaseCommand {
       return null;
     }
 
-    if (!appId) {
+    if (!config.brand?.id) {
       this.logError('Error: Missing brand.id in backend-manager-config.json');
       return null;
     }
@@ -132,15 +130,11 @@ class TestCommand extends BaseCommand {
       return null;
     }
 
-    // Pass entire config + convenience aliases used by runner/helpers
+    // Pass entire config + computed values not in config file
     return {
       ...config,
-      appId,
-      projectId,
       backendManagerKey,
       domain,
-      brandName: config.brand?.name,
-      githubRepoWebsite: config.github?.repo_website,
     };
   }
 

package/src/manager/cron/daily/ghostii-auto-publisher.js

@@ -4,7 +4,7 @@ const moment = require('moment');
 const JSON5 = require('json5');
 
 const PROMPT = `
-  Company: {app.brand.name}: {app.brand.description}
+  Company: {brand.brand.name}: {brand.brand.description}
   Date: {date}
   Instructions: {prompt}
 
@@ -29,11 +29,11 @@ module.exports = async ({ Manager, assistant, context, libraries }) => {
   // Set post ID
   postId = moment().unix();
 
-  // Build app object from local config
-  const appObject = buildAppObject(Manager.config);
+  // Build brand config from local config
+  const brandConfig = buildBrandConfig(Manager.config);
 
   // Log
-  assistant.log('App object', appObject);
+  assistant.log('Brand config', brandConfig);
 
   // Get settings
   const settingsArray = powertools.arrayify(Manager.config.ghostii);
@@ -48,22 +48,22 @@ module.exports = async ({ Manager, assistant, context, libraries }) => {
     settings.chance = settings.chance || 1.0;
     settings.author = settings.author || undefined;
 
-    // Resolve app data for this ghostii item
-    if (settings.app && settings.appUrl) {
-      // Cross-app: fetch from the other project's /app endpoint
-      settings.app = await fetchRemoteApp(settings.appUrl).catch((e) => e);
+    // Resolve brand data for this ghostii item
+    if (settings.brand && settings.brandUrl) {
+      // Cross-brand: fetch from the other project's /brand endpoint
+      settings.brand = await fetchRemoteBrand(settings.brandUrl).catch((e) => e);
 
-      if (settings.app instanceof Error) {
-        assistant.error('Error fetching remote app data', settings.app);
+      if (settings.brand instanceof Error) {
+        assistant.error('Error fetching remote brand data', settings.brand);
         continue;
       }
     } else {
-      // Same-app: use local config
-      settings.app = appObject;
+      // Same-brand: use local config
+      settings.brand = brandConfig;
     }
 
     // Log
-    assistant.log(`Settings (app=${settings.app.brand.id})`, settings);
+    assistant.log(`Settings (brand=${settings.brand.brand.id})`, settings);
 
     // Quit if articles are disabled
     if (!settings.articles || !settings.sources.length) {
@@ -90,19 +90,19 @@ module.exports = async ({ Manager, assistant, context, libraries }) => {
 };
 
 /**
- * Build app object from Manager.config (same shape as /app endpoint response)
+ * Build brand config from Manager.config (same shape as /brand endpoint response)
  */
-function buildAppObject(config) {
-  const { buildPublicConfig } = require(require('path').join(__dirname, '..', '..', 'routes', 'app', 'get.js'));
+function buildBrandConfig(config) {
+  const { buildPublicConfig } = require(require('path').join(__dirname, '..', '..', 'routes', 'brand', 'get.js'));
 
   return buildPublicConfig(config);
 }
 
 /**
- * Fetch app data from a remote BEM project's /app endpoint
+ * Fetch brand data from a remote BEM project's /brand endpoint
  */
-function fetchRemoteApp(appUrl) {
-  return fetch(`${appUrl}/backend-manager/app`, {
+function fetchRemoteBrand(brandUrl) {
+  return fetch(`${brandUrl}/backend-manager/brand`, {
     timeout: 30000,
     tries: 3,
     response: 'json',
@@ -113,7 +113,7 @@ async function harvest(assistant, settings) {
   const date = moment().format('MMMM YYYY');
 
   // Log
-  assistant.log(`harvest(): Starting ${settings.app.brand.id}...`);
+  assistant.log(`harvest(): Starting ${settings.brand.brand.id}...`);
 
   // Process the number of sources in the settings
   for (let index = 0; index < settings.articles; index++) {
@@ -209,16 +209,16 @@ function requestGhostii(settings, content) {
       description: content,
       insertLinks: true,
       headerImageUrl: 'unsplash',
-      url: settings.app.brand.url,
+      url: settings.brand.brand.url,
       sectionQuantity: powertools.random(3, 6, { mode: 'gaussian' }),
-      feedUrl: `${settings.app.brand.url}/feeds/posts.json`,
+      feedUrl: `${settings.brand.brand.url}/feeds/posts.json`,
       links: settings.links,
     },
   });
 }
 
 function uploadPost(assistant, settings, article) {
-  const apiUrl = `https://api.${(settings.app.brand.url || '').replace(/^https?:\/\//, '')}`;
+  const apiUrl = `https://api.${(settings.brand.brand.url || '').replace(/^https?:\/\//, '')}`;
   return fetch(`${apiUrl}/backend-manager/admin/post`, {
     method: 'POST',
     timeout: 90000,
@@ -236,8 +236,8 @@ function uploadPost(assistant, settings, article) {
       categories: article.categories,
       tags: article.keywords,
       path: 'ghostii',
-      githubUser: settings.app.github.user,
-      githubRepo: settings.app.github.repo,
+      githubUser: settings.brand.github.user,
+      githubRepo: settings.brand.github.repo,
     },
   });
 }

package/src/manager/cron/frequent/abandoned-carts.js

@@ -1,6 +1,5 @@
 const powertools = require('node-powertools');
 const { REMINDER_DELAYS, COLLECTION } = require('../../libraries/abandoned-cart-config.js');
-const { sendOrderEmail } = require('../../events/firestore/payments-webhooks/transitions/send-email.js');
 
 /**
  * Abandoned cart reminder cron job
@@ -26,6 +25,7 @@ module.exports = async ({ Manager, assistant, context, libraries }) => {
 
   assistant.log(`Processing ${snapshot.size} abandoned cart reminder(s)...`);
 
+  const email = Manager.Email(assistant);
   let sent = 0;
   let completed = 0;
   let skipped = 0;
@@ -68,12 +68,12 @@ module.exports = async ({ Manager, assistant, context, libraries }) => {
       // Send reminder email
       assistant.log(`Sending abandoned cart reminder #${reminderIndex + 1} to uid=${uid}, product=${data.productId}`);
 
-      sendOrderEmail({
+      email.send({
+        sender: 'marketing',
+        to: userDoc,
         template: 'main/order/abandoned-cart',
         subject: `Complete your ${brandName} ${productName} checkout`,
         categories: ['order/abandoned-cart', `order/abandoned-cart/reminder-${reminderIndex + 1}`],
-        userDoc,
-        assistant,
         copy: false,
         data: {
           abandonedCart: {
@@ -87,7 +87,9 @@ module.exports = async ({ Manager, assistant, context, libraries }) => {
             checkoutUrl: checkoutUrl,
           },
         },
-      });
+      })
+        .then(() => assistant.log(`Abandoned cart email sent for uid=${uid}`))
+        .catch((e) => assistant.error(`Abandoned cart email failed for uid=${uid}: ${e.message}`));
 
       sent++;
 

package/src/manager/cron/frequent/email-queue.js

@@ -0,0 +1,56 @@
+const moment = require('moment');
+
+// Must match the SEND_AT_LIMIT in email.js
+const SEND_AT_LIMIT = 71;
+
+/**
+ * Email queue processor cron job
+ *
+ * Picks up emails from the `emails-queue` collection that are now within
+ * SendGrid's 71-hour scheduling window and sends them back through the
+ * full email.send() pipeline (build, resolve recipients, send, audit trail).
+ *
+ * Emails land in this queue when their `sendAt` exceeds the 71-hour limit
+ * at the time of the original send() call (see email.js → saveToEmailQueue).
+ */
+module.exports = async ({ Manager, assistant, context, libraries }) => {
+  const { admin } = libraries;
+  const cutoff = moment().add(SEND_AT_LIMIT, 'hours').unix();
+
+  // Query emails that are now within the SendGrid scheduling window
+  const snapshot = await admin.firestore()
+    .collection('emails-queue')
+    .where('sendAt', '<=', cutoff)
+    .limit(100)
+    .get();
+
+  if (snapshot.empty) {
+    assistant.log('No queued emails ready to send');
+    return;
+  }
+
+  assistant.log(`Processing ${snapshot.size} queued email(s)...`);
+
+  const email = Manager.Email(assistant);
+
+  const results = await Promise.allSettled(snapshot.docs.map(async (doc) => {
+    const { settings } = doc.data();
+    const emailId = doc.id;
+
+    const result = await email.send(settings);
+    assistant.log(`Queued email ${emailId} ${result.status}`);
+
+    await doc.ref.delete();
+  }));
+
+  const sent = results.filter(r => r.status === 'fulfilled').length;
+  const failed = results.filter(r => r.status === 'rejected').length;
+
+  for (const r of results) {
+    if (r.status === 'rejected') {
+      assistant.error(`Failed to send queued email: ${r.reason?.message}`, r.reason);
+    }
+  }
+
+  assistant.log(`Completed! (${sent} sent, ${failed} failed)`);
+};

package/src/manager/events/auth/before-signin.js

@@ -3,6 +3,9 @@
  *
  * This function fires on every sign-in (including right after account creation).
  * It updates last activity and sends sign-in analytics.
+ *
+ * TODO: Add mailer.sync(uid) here with 1x/day rate limit to keep marketing
+ * contact data (name, country, subscription fields) fresh between sessions.
  */
 module.exports = async ({ Manager, assistant, user, context, libraries }) => {
   const startTime = Date.now();

package/src/manager/events/auth/on-delete.js

@@ -58,6 +58,14 @@ module.exports = async ({ Manager, assistant, user, context, libraries }) => {
     return;
   }
 
+  // Remove marketing contact from all providers (non-blocking)
+  if (user.email) {
+    const email = Manager.Email(assistant);
+    email.remove(user.email)
+      .then((r) => assistant.log('onDelete: Marketing remove:', r))
+      .catch((e) => assistant.error('onDelete: Marketing remove failed:', e));
+  }
+
   // Send delete analytics (server-side only event)
   Manager.Analytics({
     assistant: assistant,

package/src/manager/events/firestore/payments-disputes/on-write.js

@@ -334,7 +334,8 @@ function sendDisputeEmail({ alert, match, result, alertId, assistant }) {
   }
 
   email.send({
-    to: { email: brandEmail },
+    sender: 'internal',
+    to: brandEmail,
     subject: subject,
     template: 'main/basic/card',
     categories: ['order/dispute-alert'],

package/src/manager/events/firestore/payments-webhooks/on-write.js

@@ -288,6 +288,15 @@ async function processPaymentEvent({ category, library, resource, resourceType,
   if (isSubscription) {
     await admin.firestore().doc(`users/${uid}`).set({ subscription: unified }, { merge: true });
     assistant.log(`Updated users/${uid}.subscription: status=${unified.status}, product=${unified.product.id}`);
+
+    // Sync marketing contact with updated subscription data (non-blocking)
+    if (shouldRunHandlers) {
+      const email = Manager.Email(assistant);
+      const updatedUserDoc = { ...userData, subscription: unified };
+      email.sync(updatedUserDoc)
+        .then((r) => assistant.log('Marketing sync after payment:', r))
+        .catch((e) => assistant.error('Marketing sync after payment failed:', e));
+    }
   }
 
   // Write to payments-orders/{orderId}

package/src/manager/events/firestore/payments-webhooks/transitions/send-email.js

@@ -12,41 +12,27 @@ const moment = require('moment');
  * @param {string} options.subject - Email subject line
  * @param {string[]} options.categories - SendGrid categories for filtering
  * @param {object} options.data - Template data (passed as-is to the email)
- * @param {object} options.userDoc - User document data (already fetched by on-write.js)
+ * @param {object} options.userDoc - User document data (passed as `to` — email.js extracts email/name and user template data)
  * @param {object} options.assistant - Assistant instance
  */
-function sendOrderEmail({ template, subject, categories, data, userDoc, assistant, copy }) {
+function sendOrderEmail({ template, subject, categories, data, userDoc, assistant, copy, sender = 'orders' }) {
   const email = assistant.Manager.Email(assistant);
-
-  const userEmail = userDoc?.auth?.email;
-  const userName = userDoc?.personal?.name?.first;
   const uid = userDoc?.auth?.uid;
 
-  if (!userEmail) {
+  if (!userDoc?.auth?.email) {
     assistant.error(`sendOrderEmail(): No email found for uid=${uid}, skipping`);
     return;
   }
 
-  // Strip sensitive fields before passing to email template
-  const safeUser = { ...userDoc };
-  delete safeUser.api;
-  delete safeUser.oauth2;
-  delete safeUser.activity;
-  delete safeUser.affiliate;
-  delete safeUser.attribution;
-  delete safeUser.flags;
-
-  const settings = {
-    to: { email: userEmail, ...(userName && { name: userName }) },
+  email.send({
+    sender,
+    to: userDoc,
     subject,
     template,
     categories,
     copy: copy !== false,
-    user: safeUser,
     data,
-  };
-
-  email.send(settings)
+  })
     .then((result) => {
       assistant.log(`sendOrderEmail(): Success template=${template}, uid=${uid}, status=${result.status}`);
     })

package/src/manager/functions/core/actions/api/admin/get-stats.js

@@ -38,7 +38,7 @@ Module.prototype.main = function () {
         if (!doc.exists) {
           await stats.set({
             users: { total: 0 },
-            app: Manager.config?.app?.id || null,
+            brand: Manager.config?.brand?.id || null,
           });
           data = { users: { total: 0 } };
         }
@@ -102,7 +102,7 @@ Module.prototype.updateStats = function (existingData, update) {
     // Set defaults
     let error = null;
     let newData = {
-      app: self.Manager.config?.app?.id || null,
+      brand: self.Manager.config?.brand?.id || null,
     };
 
     // Log

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

@@ -131,7 +131,7 @@ Module.prototype.defaultize = function () {
         email: {},
         personalization: {},
         signoff: {},
-        app: {},
+        brand: {},
         user: {},
         data: {},
       },
@@ -181,14 +181,14 @@ Module.prototype.defaultize = function () {
 
     email.dynamicTemplateData.user = Manager.User(options.user).properties;
 
-    // Get app configuration from Manager.config.brand (backend-manager-config.json)
+    // Get brand configuration from Manager.config.brand (backend-manager-config.json)
     const brand = Manager.config?.brand;
     if (!brand) {
       return reject(new Error('Missing brand configuration in backend-manager-config.json'));
     }
 
-    // Build app object from brand config
-    const app = {
+    // Build brand object for email template data
+    const brandData = {
       id: brand.id,
       name: brand.name,
       url: brand.url,
@@ -196,11 +196,11 @@ Module.prototype.defaultize = function () {
       images: brand.images || {},
     };
 
-    if (!app.email) {
+    if (!brandData.email) {
       return reject(new Error('Missing brand.contact.email in backend-manager-config.json'));
     }
 
-    email.dynamicTemplateData.app = app;
+    email.dynamicTemplateData.brand = brandData;
 
     // Add user to recipients
     email.to.push({
@@ -211,8 +211,8 @@ Module.prototype.defaultize = function () {
     // Add carbon copy recipients
     if (options.copy) {
       email.cc.push({
-        email: email.dynamicTemplateData.app.email,
-        name: email.dynamicTemplateData.app.name,
+        email: email.dynamicTemplateData.brand.email,
+        name: email.dynamicTemplateData.brand.name,
       });
       email.bcc.push(
         {
@@ -227,17 +227,17 @@ Module.prototype.defaultize = function () {
     }
 
     // Set email properties
-    email.replyTo = email.replyTo || email.dynamicTemplateData.app.email;
+    email.replyTo = email.replyTo || email.dynamicTemplateData.brand.email;
     email.subject = email.subject || email.dynamicTemplateData.email.subject;
     email.dynamicTemplateData.email.subject = email.dynamicTemplateData.email.subject || email.subject;
     email.from = options.from || {
-      email: email.dynamicTemplateData.app.email,
-      name: email.dynamicTemplateData.app.name,
+      email: email.dynamicTemplateData.brand.email,
+      name: email.dynamicTemplateData.brand.name,
     };
     email.sendAt = options.sendAt;
 
     // Set categories
-    email.categories = ['transactional', email.dynamicTemplateData.app.id, ...options.categories];
+    email.categories = ['transactional', email.dynamicTemplateData.brand.id, ...options.categories];
 
     // Remove duplicates from email lists
     email.to = filter(email.to);
@@ -283,7 +283,7 @@ Module.prototype.defaultize = function () {
     };
 
     // Build unsubscribe URL
-    email.dynamicTemplateData.email.unsubscribeUrl = `https://itwcreativeworks.com/portal/account/email-preferences?email=${encode(email.to[0].email)}&asmId=${encode(email.asm.groupId)}&templateId=${encode(email.templateId)}&appName=${email.dynamicTemplateData.app.name}&appUrl=${email.dynamicTemplateData.app.url}`;
+    email.dynamicTemplateData.email.unsubscribeUrl = `https://itwcreativeworks.com/portal/account/email-preferences?email=${encode(email.to[0].email)}&asmId=${encode(email.asm.groupId)}&templateId=${encode(email.templateId)}&appName=${email.dynamicTemplateData.brand.name}&appUrl=${email.dynamicTemplateData.brand.url}`;
     email.dynamicTemplateData.email.categories = email.categories;
     email.dynamicTemplateData.email.carbonCopy = options.copy;
 
@@ -306,7 +306,7 @@ Module.prototype.defaultize = function () {
 
     // Clone and clean data for stringified version
     const emailClonedData = _.cloneDeep(email.dynamicTemplateData);
-    emailClonedData.app.sponsorships = {};
+    emailClonedData.brand.sponsorships = {};
     email.dynamicTemplateData._stringified = JSON.stringify(emailClonedData, null, 2);
 
     return resolve(email);