backend-manager 5.0.95 → 5.0.97

package/package.json

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

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

@@ -5,11 +5,14 @@
 const { sendOrderEmail, formatDate } = require('../send-email.js');
 
 module.exports = async function ({ before, after, order, uid, userDoc, assistant }) {
+  const brandName = assistant.Manager.config.brand?.name || '';
+  const productName = after.product?.name || '';
+
   assistant.log(`Transition [one-time/purchase-completed]: uid=${uid}, resourceId=${after.payment?.resourceId}`);
 
   sendOrderEmail({
     template: 'main/order/confirmation',
-    subject: 'Your order is confirmed!',
+    subject: `Your ${brandName} ${productName} order #${order?.id || ''}`,
     categories: ['order/confirmation'],
     userDoc,
     assistant,

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

@@ -27,12 +27,22 @@ function sendOrderEmail({ template, subject, categories, data, userDoc, assistan
     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 }) },
     subject,
     template,
     categories,
     copy: true,
+    user: safeUser,
     data,
   };
 

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

@@ -9,7 +9,7 @@ module.exports = async function ({ before, after, order, uid, userDoc, assistant
 
   sendOrderEmail({
     template: 'main/order/cancellation-requested',
-    subject: 'Your subscription cancellation is confirmed',
+    subject: `Your cancellation is confirmed #${order?.id || ''}`,
     categories: ['order/cancellation-requested'],
     userDoc,
     assistant,

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

@@ -7,12 +7,14 @@ const { sendOrderEmail, formatDate } = require('../send-email.js');
 
 module.exports = async function ({ before, after, order, uid, userDoc, assistant }) {
   const isTrial = after.trial?.claimed === true;
+  const brandName = assistant.Manager.config.brand?.name || '';
+  const planName = after.product?.name || '';
 
   assistant.log(`Transition [subscription/new-subscription]: uid=${uid}, product=${after.product?.id}, frequency=${after.payment?.frequency}, trial=${isTrial}`);
 
   sendOrderEmail({
     template: 'main/order/confirmation',
-    subject: isTrial ? 'Your free trial has started!' : 'Your subscription is confirmed!',
+    subject: `Your ${brandName} ${planName} order #${order?.id || ''}`,
     categories: ['order/confirmation'],
     userDoc,
     assistant,

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

@@ -9,7 +9,7 @@ module.exports = async function ({ before, after, order, uid, userDoc, assistant
 
   sendOrderEmail({
     template: 'main/order/payment-failed',
-    subject: 'Your payment failed',
+    subject: `Payment failed for order #${order?.id || ''}`,
     categories: ['order/payment-failed'],
     userDoc,
     assistant,

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

@@ -9,7 +9,7 @@ module.exports = async function ({ before, after, order, uid, userDoc, assistant
 
   sendOrderEmail({
     template: 'main/order/payment-recovered',
-    subject: 'Your payment was successful',
+    subject: `Payment received for order #${order?.id || ''}`,
     categories: ['order/payment-recovered'],
     userDoc,
     assistant,

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

@@ -10,7 +10,7 @@ module.exports = async function ({ before, after, order, uid, userDoc, assistant
 
   sendOrderEmail({
     template: 'main/order/plan-changed',
-    subject: 'Your subscription plan has been updated',
+    subject: `Your plan has been updated #${order?.id || ''}`,
     categories: ['order/plan-changed'],
     userDoc,
     assistant,

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

@@ -12,7 +12,7 @@ module.exports = async function ({ before, after, order, uid, userDoc, assistant
 
   sendOrderEmail({
     template: 'main/order/cancelled',
-    subject: 'Your subscription has been cancelled',
+    subject: `Your subscription has been cancelled #${order?.id || ''}`,
     categories: ['order/cancelled'],
     userDoc,
     assistant,

package/src/manager/libraries/email.js

@@ -91,15 +91,10 @@ Email.prototype.build = async function (settings) {
     throw errorWithCode('Missing brand configuration in backend-manager-config.json', 400);
   }
 
-  const app = {
-    id: brand.id,
-    name: brand.name,
-    url: brand.url,
-    email: brand.contact?.email,
-    images: sanitizeImagesForEmail(brand.images || {}),
-  };
+  const brandData = _.cloneDeep(brand);
+  brandData.images = sanitizeImagesForEmail(brandData.images || {});
 
-  if (!app.email) {
+  if (!brandData.contact?.email) {
     throw errorWithCode('Missing brand.contact.email in backend-manager-config.json', 400);
   }
 
@@ -108,8 +103,8 @@ Email.prototype.build = async function (settings) {
   // Add carbon copy recipients
   if (copy) {
     cc.push({
-      email: app.email,
-      name: app.name,
+      email: brandData.contact.email,
+      name: brandData.name,
     });
     bcc.push(
       {
@@ -152,7 +147,7 @@ Email.prototype.build = async function (settings) {
   // Build categories
   const categories = _.uniq([
     'transactional',
-    app.id,
+    brandData.id,
     ...powertools.arrayify(settings.categories),
   ]);
 
@@ -160,7 +155,7 @@ Email.prototype.build = async function (settings) {
   const sendAt = normalizeSendAt(settings.sendAt);
 
   // Build unsubscribe 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}`;
+  const unsubscribeUrl = `${Manager.project.websiteUrl}/portal/account/email-preferences?email=${encode(to[0].email)}&asmId=${encode(groupId)}&templateId=${encode(templateId)}&appName=${brandData.name}&appUrl=${brandData.url}`;
 
   // Build signoff
   const signoff = settings?.data?.signoff || {};
@@ -194,7 +189,7 @@ Email.prototype.build = async function (settings) {
       ...settings?.data?.personalization,
     },
     signoff,
-    app,
+    brand: brandData,
     user: userProperties,
     data: settings.data || {},
   };
@@ -204,8 +199,8 @@ Email.prototype.build = async function (settings) {
     to,
     cc,
     bcc,
-    from: settings.from || { email: app.email, name: app.name },
-    replyTo: settings.replyTo || app.email,
+    from: settings.from || { email: brandData.contact.email, name: brandData.name },
+    replyTo: settings.replyTo || brandData.contact.email,
     subject,
     templateId,
     asm: { groupId },
@@ -230,7 +225,7 @@ Email.prototype.build = async function (settings) {
 
   // Build stringified version for template rendering
   const clonedData = _.cloneDeep(dynamicTemplateData);
-  clonedData.app.sponsorships = {};
+  clonedData.brand.sponsorships = {};
   email.dynamicTemplateData._stringified = JSON.stringify(clonedData, null, 2);
 
   return email;