backend-manager 5.0.93 → 5.0.95

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "backend-manager",
-  "version": "5.0.93",
+  "version": "5.0.95",
   "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,13 +5,12 @@
 const { sendOrderEmail, formatDate } = require('../send-email.js');
 
 module.exports = async function ({ before, after, order, uid, userDoc, assistant }) {
-  assistant.log(`Transition [one-time/purchase-completed]: uid=${uid}, resourceId=${after.payment.resourceId}`);
+  assistant.log(`Transition [one-time/purchase-completed]: uid=${uid}, resourceId=${after.payment?.resourceId}`);
 
   sendOrderEmail({
     template: 'main/order/confirmation',
     subject: 'Your order is confirmed!',
     categories: ['order/confirmation'],
-    uid,
     userDoc,
     assistant,
     data: {

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

@@ -12,16 +12,15 @@ 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
- * @param {object} options.userDoc - User document data (used to get email directly, avoids race conditions)
+ * @param {object} options.userDoc - User document data (already fetched by on-write.js)
  * @param {object} options.assistant - Assistant instance
  */
-function sendOrderEmail({ template, subject, categories, data, uid, userDoc, assistant }) {
+function sendOrderEmail({ template, subject, categories, data, 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;
+  const uid = userDoc?.auth?.uid;
 
   if (!userEmail) {
     assistant.error(`sendOrderEmail(): No email found for uid=${uid}, skipping`);
@@ -33,7 +32,7 @@ function sendOrderEmail({ template, subject, categories, data, uid, userDoc, ass
     subject,
     template,
     categories,
-    copy: false,
+    copy: true,
     data,
   };
 

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

@@ -5,13 +5,12 @@
 const { sendOrderEmail, formatDate } = require('../send-email.js');
 
 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}`);
+  assistant.log(`Transition [subscription/cancellation-requested]: uid=${uid}, product=${after.product?.id}, cancelDate=${after.cancellation?.date?.timestamp}`);
 
   sendOrderEmail({
     template: 'main/order/cancellation-requested',
     subject: 'Your subscription cancellation is confirmed',
     categories: ['order/cancellation-requested'],
-    uid,
     userDoc,
     assistant,
     data: {

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

@@ -8,13 +8,12 @@ const { sendOrderEmail, formatDate } = require('../send-email.js');
 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}`);
+  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!',
     categories: ['order/confirmation'],
-    uid,
     userDoc,
     assistant,
     data: {

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

@@ -5,13 +5,12 @@
 const { sendOrderEmail, formatDate } = require('../send-email.js');
 
 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}`);
+  assistant.log(`Transition [subscription/payment-failed]: uid=${uid}, product=${after.product?.id}, previousStatus=${before?.status}`);
 
   sendOrderEmail({
     template: 'main/order/payment-failed',
     subject: 'Your payment failed',
     categories: ['order/payment-failed'],
-    uid,
     userDoc,
     assistant,
     data: {

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

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

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

@@ -5,14 +5,13 @@
 const { sendOrderEmail, formatDate } = require('../send-email.js');
 
 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})`);
+  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: 'main/order/plan-changed',
     subject: 'Your subscription plan has been updated',
     categories: ['order/plan-changed'],
-    uid,
     userDoc,
     assistant,
     data: {

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

@@ -14,7 +14,6 @@ module.exports = async function ({ before, after, order, uid, userDoc, assistant
     template: 'main/order/cancelled',
     subject: 'Your subscription has been cancelled',
     categories: ['order/cancelled'],
-    uid,
     userDoc,
     assistant,
     data: {

package/src/manager/libraries/email.js

@@ -103,6 +103,8 @@ Email.prototype.build = async function (settings) {
     throw errorWithCode('Missing brand.contact.email in backend-manager-config.json', 400);
   }
 
+  const copy = settings.copy ?? true;
+
   // Add carbon copy recipients
   if (copy) {
     cc.push({
@@ -146,7 +148,6 @@ Email.prototype.build = async function (settings) {
 
   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([

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

@@ -70,10 +70,7 @@ module.exports = async ({ assistant, user, settings, libraries }) => {
   assistant.log(`signup(): Writing user record for ${uid}`, userRecord);
 
   await admin.firestore().doc(`users/${uid}`)
-    .set(userRecord, { merge: true })
-    .catch((e) => {
-      assistant.error(`signup(): Failed to update user record:`, e);
-    });
+    .set(userRecord, { merge: true });
 
   // 5. Process affiliate referral (writes to referrer's doc, not this user's)
   await processAffiliate(assistant, uid, settings);