backend-manager 5.0.92 → 5.0.93

package/package.json

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

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

@@ -140,6 +140,8 @@ async function processPaymentEvent({ category, library, resource, resourceType,
   const userData = userDoc.exists ? userDoc.data() : {};
   const before = isSubscription ? (userData.subscription || null) : null;
 
+  assistant.log(`User doc for ${uid}: exists=${userDoc.exists}, email=${userData?.auth?.email || 'null'}, name=${userData?.personal?.name?.first || 'null'}, subscription=${userData?.subscription?.product?.id || 'null'}`);
+
   // Auto-fill user name from payment processor if not already set
   if (!userData?.personal?.name?.first) {
     const customerName = extractCustomerName(resource, resourceType);
@@ -194,7 +196,7 @@ async function processPaymentEvent({ category, library, resource, resourceType,
 
     if (shouldRunHandlers) {
       transitions.dispatch(transitionName, category, {
-        before, after: unified, order, uid, assistant,
+        before, after: unified, order, uid, userDoc: userData, assistant,
       });
     } else {
       assistant.log(`Transition handler skipped (testing mode): ${category}/${transitionName}`);

package/src/manager/events/firestore/payments-webhooks/transitions/one-time/purchase-completed.js

@@ -4,14 +4,15 @@
  */
 const { sendOrderEmail, formatDate } = require('../send-email.js');
 
-module.exports = async function ({ before, after, order, uid, assistant }) {
+module.exports = async function ({ before, after, order, uid, userDoc, assistant }) {
   assistant.log(`Transition [one-time/purchase-completed]: uid=${uid}, resourceId=${after.payment.resourceId}`);
 
   sendOrderEmail({
-    template: 'd-5371ac2b4e3b490bbce51bfc2922ece8',
+    template: 'main/order/confirmation',
     subject: 'Your order is confirmed!',
     categories: ['order/confirmation'],
     uid,
+    userDoc,
     assistant,
     data: {
       order: {

package/src/manager/events/firestore/payments-webhooks/transitions/one-time/purchase-failed.js

@@ -4,7 +4,7 @@
  *
  * NOTE: No email template exists for this transition yet. Keeping as stub.
  */
-module.exports = async function ({ before, after, order, uid, assistant }) {
+module.exports = async function ({ before, after, order, uid, userDoc, assistant }) {
   assistant.log(`Transition [one-time/purchase-failed]: uid=${uid}, orderId=${order?.id}`);
 
   // TODO: Send payment failure email once template is created

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

@@ -12,14 +12,24 @@ 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 {string} options.uid - User UID (resolved from Firestore for email + name)
+ * @param {string} options.uid - User UID
+ * @param {object} options.userDoc - User document data (used to get email directly, avoids race conditions)
  * @param {object} options.assistant - Assistant instance
  */
-function sendOrderEmail({ template, subject, categories, data, uid, assistant }) {
+function sendOrderEmail({ template, subject, categories, data, uid, userDoc, assistant }) {
   const email = assistant.Manager.Email(assistant);
 
+  // Use email directly from userDoc (already fetched by on-write.js, avoids redundant Firestore lookup)
+  const userEmail = userDoc?.auth?.email;
+  const userName = userDoc?.personal?.name?.first;
+
+  if (!userEmail) {
+    assistant.error(`sendOrderEmail(): No email found for uid=${uid}, skipping`);
+    return;
+  }
+
   const settings = {
-    to: `uid:${uid}`,
+    to: { email: userEmail, ...(userName && { name: userName }) },
     subject,
     template,
     categories,

package/src/manager/events/firestore/payments-webhooks/transitions/subscription/cancellation-requested.js

@@ -4,14 +4,15 @@
  */
 const { sendOrderEmail, formatDate } = require('../send-email.js');
 
-module.exports = async function ({ before, after, order, uid, assistant }) {
+module.exports = async function ({ before, after, order, uid, userDoc, assistant }) {
   assistant.log(`Transition [subscription/cancellation-requested]: uid=${uid}, product=${after.product.id}, cancelDate=${after.cancellation.date?.timestamp}`);
 
   sendOrderEmail({
-    template: 'd-78074f3e8c844146bf263b86fc8d5ecf',
+    template: 'main/order/cancellation-requested',
     subject: 'Your subscription cancellation is confirmed',
     categories: ['order/cancellation-requested'],
     uid,
+    userDoc,
     assistant,
     data: {
       order: {

package/src/manager/events/firestore/payments-webhooks/transitions/subscription/new-subscription.js

@@ -5,16 +5,17 @@
  */
 const { sendOrderEmail, formatDate } = require('../send-email.js');
 
-module.exports = async function ({ before, after, order, uid, assistant }) {
+module.exports = async function ({ before, after, order, uid, userDoc, assistant }) {
   const isTrial = after.trial?.claimed === true;
 
   assistant.log(`Transition [subscription/new-subscription]: uid=${uid}, product=${after.product.id}, frequency=${after.payment.frequency}, trial=${isTrial}`);
 
   sendOrderEmail({
-    template: 'd-5371ac2b4e3b490bbce51bfc2922ece8',
+    template: 'main/order/confirmation',
     subject: isTrial ? 'Your free trial has started!' : 'Your subscription is confirmed!',
     categories: ['order/confirmation'],
     uid,
+    userDoc,
     assistant,
     data: {
       order: {

package/src/manager/events/firestore/payments-webhooks/transitions/subscription/payment-failed.js

@@ -4,14 +4,15 @@
  */
 const { sendOrderEmail, formatDate } = require('../send-email.js');
 
-module.exports = async function ({ before, after, order, uid, assistant }) {
+module.exports = async function ({ before, after, order, uid, userDoc, assistant }) {
   assistant.log(`Transition [subscription/payment-failed]: uid=${uid}, product=${after.product.id}, previousStatus=${before?.status}`);
 
   sendOrderEmail({
-    template: 'd-e56af0ac62364bfb9e50af02854e2cd3',
+    template: 'main/order/payment-failed',
     subject: 'Your payment failed',
     categories: ['order/payment-failed'],
     uid,
+    userDoc,
     assistant,
     data: {
       order: {

package/src/manager/events/firestore/payments-webhooks/transitions/subscription/payment-recovered.js

@@ -4,14 +4,15 @@
  */
 const { sendOrderEmail, formatDate } = require('../send-email.js');
 
-module.exports = async function ({ before, after, order, uid, assistant }) {
+module.exports = async function ({ before, after, order, uid, userDoc, assistant }) {
   assistant.log(`Transition [subscription/payment-recovered]: uid=${uid}, product=${after.product.id}`);
 
   sendOrderEmail({
-    template: 'd-d6dbd17a260a4755b34a852ba09c2454',
+    template: 'main/order/payment-recovered',
     subject: 'Your payment was successful',
     categories: ['order/payment-recovered'],
     uid,
+    userDoc,
     assistant,
     data: {
       order: {

package/src/manager/events/firestore/payments-webhooks/transitions/subscription/plan-changed.js

@@ -4,15 +4,16 @@
  */
 const { sendOrderEmail, formatDate } = require('../send-email.js');
 
-module.exports = async function ({ before, after, order, uid, assistant }) {
+module.exports = async function ({ before, after, order, uid, userDoc, assistant }) {
   const direction = after.product.id > before.product.id ? 'upgrade' : 'downgrade';
   assistant.log(`Transition [subscription/plan-changed]: uid=${uid}, ${before.product.id} → ${after.product.id} (${direction})`);
 
   sendOrderEmail({
-    template: 'd-399086311bbb48b4b77bc90b20fb9d0a',
+    template: 'main/order/plan-changed',
     subject: 'Your subscription plan has been updated',
     categories: ['order/plan-changed'],
     uid,
+    userDoc,
     assistant,
     data: {
       order: {

package/src/manager/events/firestore/payments-webhooks/transitions/subscription/subscription-cancelled.js

@@ -4,17 +4,18 @@
  */
 const { sendOrderEmail, formatDate } = require('../send-email.js');
 
-module.exports = async function ({ before, after, order, uid, assistant }) {
+module.exports = async function ({ before, after, order, uid, userDoc, assistant }) {
   assistant.log(`Transition [subscription/subscription-cancelled]: uid=${uid}, previousProduct=${before?.product?.id}, previousStatus=${before?.status}`);
 
   // Check if subscription has a future expiry (e.g., cancelled at period end)
   const hasFutureExpiry = after.expires?.timestamp && new Date(after.expires.timestamp) > new Date();
 
   sendOrderEmail({
-    template: 'd-39041132e6b24e5ebf0e95bce2d94dba',
+    template: 'main/order/cancelled',
     subject: 'Your subscription has been cancelled',
     categories: ['order/cancelled'],
     uid,
+    userDoc,
     assistant,
     data: {
       order: {

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

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

package/src/manager/libraries/email.js

@@ -17,6 +17,34 @@ const moment = require('moment');
 // SendGrid limit for scheduled emails (72 hours, but use 71 for buffer)
 const SEND_AT_LIMIT = 71;
 
+// Template shortcut map — callers use readable paths instead of SendGrid IDs
+// Paths mirror the email website structure: {category}/{subcategory}/{name}
+const TEMPLATES = {
+  // v1 templates
+  'main/basic/card': 'd-b7f8da3c98ad49a2ad1e187f3a67b546',
+  'main/engagement/feedback': 'd-c1522214c67b47058669acc5a81ed663',
+  'main/misc/app-download-link': 'd-1d730ac8cc544b7cbccc8fa4a4b3f9ce',
+
+  // v2 templates
+  'main/order/confirmation': 'd-5371ac2b4e3b490bbce51bfc2922ece8',
+  'main/order/payment-failed': 'd-e56af0ac62364bfb9e50af02854e2cd3',
+  'main/order/payment-recovered': 'd-d6dbd17a260a4755b34a852ba09c2454',
+  'main/order/cancellation-requested': 'd-78074f3e8c844146bf263b86fc8d5ecf',
+  'main/order/cancelled': 'd-39041132e6b24e5ebf0e95bce2d94dba',
+  'main/order/plan-changed': 'd-399086311bbb48b4b77bc90b20fb9d0a',
+  'main/order/trial-ending': 'd-af8ab499cbfb4d56918b4118f44343b0',
+};
+
+// "default" resolves to the basic card template
+TEMPLATES['default'] = TEMPLATES['main/basic/card'];
+
+// Group shortcut map — SendGrid ASM group IDs
+const GROUPS = {
+  'default': 24077,
+  'marketing': 25927,
+  'account': 25928,
+};
+
 function Email(assistant) {
   const self = this;
 
@@ -68,7 +96,7 @@ Email.prototype.build = async function (settings) {
     name: brand.name,
     url: brand.url,
     email: brand.contact?.email,
-    images: brand.images || {},
+    images: sanitizeImagesForEmail(brand.images || {}),
   };
 
   if (!app.email) {
@@ -76,7 +104,7 @@ Email.prototype.build = async function (settings) {
   }
 
   // Add carbon copy recipients
-  if (settings.copy) {
+  if (copy) {
     cc.push({
       email: app.email,
       name: app.name,
@@ -116,17 +144,9 @@ Email.prototype.build = async function (settings) {
     throw errorWithCode('Parameter subject is required', 400);
   }
 
-  const templateId = settings.template;
-
-  if (!templateId && !settings.html) {
-    throw errorWithCode('Parameter template is required', 400);
-  }
-
-  const groupId = settings.group;
-
-  if (!groupId) {
-    throw errorWithCode('Parameter group is required', 400);
-  }
+  const templateId = TEMPLATES[settings.template] || settings.template || TEMPLATES['default'];
+  const groupId = GROUPS[settings.group] || settings.group || GROUPS['default'];
+  const copy = settings.copy ?? true;
 
   // Build categories
   const categories = _.uniq([
@@ -139,7 +159,7 @@ Email.prototype.build = async function (settings) {
   const sendAt = normalizeSendAt(settings.sendAt);
 
   // Build unsubscribe URL
-  const unsubscribeUrl = `https://itwcreativeworks.com/portal/account/email-preferences?email=${encode(to[0].email)}&asmId=${encode(groupId)}&templateId=${encode(templateId)}&appName=${app.name}&appUrl=${app.url}`;
+  const unsubscribeUrl = `${Manager.project.websiteUrl}/portal/account/email-preferences?email=${encode(to[0].email)}&asmId=${encode(groupId)}&templateId=${encode(templateId)}&appName=${app.name}&appUrl=${app.url}`;
 
   // Build signoff
   const signoff = settings?.data?.signoff || {};
@@ -157,7 +177,7 @@ Email.prototype.build = async function (settings) {
   const dynamicTemplateData = {
     email: {
       id: Manager.require('uuid').v4(),
-      subject: settings?.data?.email?.subject || null,
+      subject: settings?.data?.email?.subject || subject,
       preview: settings?.data?.email?.preview || null,
       body: settings?.data?.email?.body || null,
       unsubscribeUrl,
@@ -165,7 +185,7 @@ Email.prototype.build = async function (settings) {
       footer: {
         text: settings?.data?.email?.footer?.text || null,
       },
-      carbonCopy: settings.copy,
+      carbonCopy: copy,
     },
     personalization: {
       email: to[0].email,
@@ -229,6 +249,8 @@ Email.prototype.send = async function (settings) {
   const admin = self.admin;
   const assistant = self.assistant;
 
+  assistant.log(`Email.send(): to=${JSON.stringify(settings.to)}, subject=${settings.subject}, template=${settings.template}`);
+
   // Build email from settings (throws with code: 400 on validation failure)
   const email = await self.build(settings);
 
@@ -473,6 +495,24 @@ function errorWithCode(message, code) {
   return err;
 }
 
+/**
+ * Convert SVG image URLs to PNG equivalents — email clients don't render SVGs.
+ * CDN naming convention: `-x.svg` → `-1024.png`
+ */
+function sanitizeImagesForEmail(images) {
+  const result = {};
+
+  for (const [key, value] of Object.entries(images)) {
+    if (typeof value === 'string' && value.endsWith('.svg')) {
+      result[key] = value.replace(/-x\.svg$/, '-1024.png');
+    } else {
+      result[key] = value;
+    }
+  }
+
+  return result;
+}
+
 /**
  * URL-encode a value as base64
  */

package/src/manager/routes/general/email/templates/download-app-link.js

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

package/src/manager/routes/user/signup/post.js

@@ -280,8 +280,8 @@ function sendWelcomeEmail(assistant, email) {
     to: email,
     categories: ['account/welcome'],
     subject: `Welcome to ${Manager.config.brand.name}!`,
-    template: 'd-b7f8da3c98ad49a2ad1e187f3a67b546',
-    group: 25928,
+    template: 'default',
+    group: 'account',
     copy: false,
     data: {
       email: {
@@ -326,8 +326,8 @@ function sendCheckupEmail(assistant, email) {
     to: email,
     categories: ['account/checkup'],
     subject: `How's your experience with ${Manager.config.brand.name}?`,
-    template: 'd-b7f8da3c98ad49a2ad1e187f3a67b546',
-    group: 25928,
+    template: 'default',
+    group: 'account',
     copy: false,
     sendAt: moment().add(7, 'days').unix(),
     data: {
@@ -373,8 +373,8 @@ function sendFeedbackEmail(assistant, email) {
     to: email,
     categories: ['engagement/feedback'],
     subject: `Want to share your feedback about ${Manager.config.brand.name}?`,
-    template: 'd-c1522214c67b47058669acc5a81ed663',
-    group: 25928,
+    template: 'main/engagement/feedback',
+    group: 'account',
     copy: false,
     sendAt: moment().add(14, 'days').unix(),
   })

package/src/manager/schemas/admin/email/post.js

@@ -14,12 +14,12 @@ module.exports = () => ({
   from: { types: ['object'], default: undefined },
   replyTo: { types: ['string'], default: undefined },
   subject: { types: ['string'], default: undefined },
-  template: { types: ['string'], default: 'd-b7f8da3c98ad49a2ad1e187f3a67b546' },
-  group: { types: ['number'], default: 24077 },
+  template: { types: ['string'], default: undefined },
+  group: { types: ['number'], default: undefined },
   sendAt: { types: ['number', 'string'], default: undefined },
   user: { types: ['object'], default: {} },
   data: { types: ['object'], default: {} },
   categories: { types: ['array'], default: [] },
-  copy: { types: ['boolean'], default: true },
+  copy: { types: ['boolean'], default: undefined },
   html: { types: ['string'], default: undefined },
 });

package/test/helpers/email.js

@@ -45,19 +45,26 @@ module.exports = {
     },
 
     {
-      name: 'missing-template-and-html-rejected',
+      name: 'default-template-used-when-omitted',
       auth: 'admin',
-      timeout: 15000,
+      timeout: 30000,
 
       async run({ http, assert, config }) {
         const response = await http.post('admin/email', {
-          subject: 'BEM Test Email - No Template',
+          subject: 'BEM Test Email - Default Template',
           to: [{ email: `_test-receiver@${config.domain}` }],
-          template: '',
           copy: false,
+          data: {
+            email: {
+              subject: 'BEM Test Email - Default Template',
+              body: 'Testing that default template is used when not specified.',
+            },
+          },
         });
 
-        assert.isError(response, 400, 'Missing template and html should return 400');
+        assert.isSuccess(response, 'Should succeed with default template');
+        assert.equal(response.data.status, 'sent', 'Status should be sent');
+        assert.equal(response.data.options.templateId, 'd-b7f8da3c98ad49a2ad1e187f3a67b546', 'Should use default template');
       },
     },
 
@@ -350,6 +357,39 @@ module.exports = {
       },
     },
 
+    {
+      name: 'svg-images-converted-to-png',
+      auth: 'admin',
+      timeout: 30000,
+
+      async run({ http, assert, config }) {
+        const response = await http.post('admin/email', {
+          subject: 'BEM Test Email - SVG to PNG',
+          to: `_test-receiver@${config.domain}`,
+          copy: false,
+          data: {
+            email: {
+              subject: 'BEM Test Email - SVG to PNG',
+              body: 'Testing that SVG images are converted to PNG for email.',
+            },
+          },
+        });
+
+        assert.isSuccess(response, 'Should send email');
+        assert.equal(response.data.status, 'sent', 'Status should be sent');
+
+        const appImages = response.data.options.dynamicTemplateData.app.images;
+
+        // Any image that was an SVG should now be a PNG (-x.svg → -1024.png)
+        for (const [key, value] of Object.entries(appImages)) {
+          assert.ok(
+            !String(value || '').endsWith('.svg'),
+            `app.images.${key} should not be an SVG (got: ${value})`,
+          );
+        }
+      },
+    },
+
     {
       name: 'sendat-iso-string-accepted',
       auth: 'admin',