backend-manager 5.0.91 → 5.0.93

package/src/manager/events/firestore/payments-webhooks/analytics.js

@@ -18,10 +18,11 @@
  * @param {object} options.unified - Unified subscription or one-time object
  * @param {string} options.uid - User ID
  * @param {string} options.processor - Payment processor (e.g., 'stripe', 'paypal')
- * @param {object} options.assistant - Assistant instance
- * @param {object} options.Manager - Manager instance
+ * @param {object} options.assistant - Assistant instance (Manager derived via assistant.Manager)
  */
-function trackPayment({ category, transitionName, unified, uid, processor, assistant, Manager }) {
+function trackPayment({ category, transitionName, unified, uid, processor, assistant }) {
+  const Manager = assistant.Manager;
+
   try {
     // Resolve the analytics event to fire based on transition
     const event = resolvePaymentEvent(category, transitionName, unified, Manager.config);

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

@@ -14,8 +14,9 @@ const { trackPayment } = require('./analytics.js');
  * 4. Detects state transitions and dispatches handler files (non-blocking)
  * 5. Marks the webhook as completed
  */
-module.exports = async ({ Manager, assistant, change, context, libraries }) => {
-  const { admin } = libraries;
+module.exports = async ({ assistant, change, context }) => {
+  const Manager = assistant.Manager;
+  const admin = Manager.libraries.admin;
 
   const dataAfter = change.after.data();
 
@@ -79,7 +80,7 @@ module.exports = async ({ Manager, assistant, change, context, libraries }) => {
       throw new Error(`Unknown event category: ${category}`);
     }
 
-    const transitionName = await processPaymentEvent({ category, library, resource, uid, processor, eventType, eventId, resourceId, orderId, now, nowUNIX, webhookReceivedUNIX, admin, assistant, Manager });
+    const transitionName = await processPaymentEvent({ category, library, resource, resourceType, uid, processor, eventType, eventId, resourceId, orderId, now, nowUNIX, webhookReceivedUNIX, assistant });
 
     // Mark webhook as completed (include transition name for auditing/testing)
     await webhookRef.set({
@@ -117,7 +118,9 @@ module.exports = async ({ Manager, assistant, change, context, libraries }) => {
  * 6. Track analytics (non-blocking)
  * 7. Write to Firestore (user doc for subscriptions + payments-orders)
  */
-async function processPaymentEvent({ category, library, resource, uid, processor, eventType, eventId, resourceId, orderId, now, nowUNIX, webhookReceivedUNIX, admin, assistant, Manager }) {
+async function processPaymentEvent({ category, library, resource, resourceType, uid, processor, eventType, eventId, resourceId, orderId, now, nowUNIX, webhookReceivedUNIX, assistant }) {
+  const Manager = assistant.Manager;
+  const admin = Manager.libraries.admin;
   const isSubscription = category === 'subscription';
 
   // Staleness check: skip if a newer webhook already wrote to this order
@@ -137,6 +140,19 @@ async function processPaymentEvent({ category, library, resource, uid, processor
   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);
+    if (customerName?.first) {
+      await admin.firestore().doc(`users/${uid}`).set({
+        personal: { name: customerName },
+      }, { merge: true });
+      assistant.log(`Auto-filled user name from ${resourceType}: ${customerName.first} ${customerName.last || ''}`);
+    }
+  }
+
   // Transform raw resource → unified object
   const transformOptions = { config: Manager.config, eventName: eventType, eventId: eventId };
   const unified = isSubscription
@@ -180,7 +196,7 @@ async function processPaymentEvent({ category, library, resource, uid, processor
 
     if (shouldRunHandlers) {
       transitions.dispatch(transitionName, category, {
-        before, after: unified, order, uid, userDoc: userData, admin, assistant, Manager, eventType, eventId,
+        before, after: unified, order, uid, userDoc: userData, assistant,
       });
     } else {
       assistant.log(`Transition handler skipped (testing mode): ${category}/${transitionName}`);
@@ -189,7 +205,7 @@ async function processPaymentEvent({ category, library, resource, uid, processor
 
   // Track payment analytics (non-blocking)
   if (transitionName && shouldRunHandlers) {
-    trackPayment({ category, transitionName, unified, uid, processor, assistant, Manager });
+    trackPayment({ category, transitionName, unified, uid, processor, assistant });
   }
 
   // Write unified subscription to user doc (subscriptions only)
@@ -206,3 +222,37 @@ async function processPaymentEvent({ category, library, resource, uid, processor
 
   return transitionName;
 }
+
+/**
+ * Extract customer name from a raw payment processor resource
+ *
+ * @param {object} resource - Raw processor resource (Stripe subscription, session, invoice)
+ * @param {string} resourceType - 'subscription' | 'session' | 'invoice'
+ * @returns {{ first: string, last: string }|null}
+ */
+function extractCustomerName(resource, resourceType) {
+  let fullName = null;
+
+  // Checkout sessions have customer_details.name
+  if (resourceType === 'session') {
+    fullName = resource.customer_details?.name;
+  }
+
+  // Invoices have customer_name
+  if (resourceType === 'invoice') {
+    fullName = resource.customer_name;
+  }
+
+  // Subscriptions only have customer ID, no name
+
+  if (!fullName) {
+    return null;
+  }
+
+  const { capitalize } = require('../../../libraries/infer-contact.js');
+  const parts = fullName.trim().split(/\s+/);
+  return {
+    first: capitalize(parts[0]) || null,
+    last: capitalize(parts.slice(1).join(' ')) || null,
+  };
+}

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

@@ -4,16 +4,16 @@
  */
 const { sendOrderEmail, formatDate } = require('../send-email.js');
 
-module.exports = async function ({ before, after, order, uid, assistant, Manager }) {
+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,
-    Manager,
     data: {
       order: {
         ...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, Manager }) {
+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

@@ -1,45 +1,49 @@
 /**
  * Shared email helper for payment transition handlers
- * Sends transactional order emails via POST /admin/email
+ * Sends transactional order emails directly via the shared email library (no HTTP round-trip)
  */
 const moment = require('moment');
 
 /**
- * Send an order email via the admin/email endpoint (fire-and-forget)
+ * Send an order email directly using the shared email library (fire-and-forget)
  *
  * @param {object} options
  * @param {string} options.template - SendGrid dynamic template ID
  * @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 API)
- * @param {string} options.uid - User UID (endpoint resolves email from Firestore)
+ * @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.assistant - Assistant instance
- * @param {object} options.Manager - Manager instance
  */
-function sendOrderEmail({ template, subject, categories, data, uid, assistant, Manager }) {
-  const fetch = require('wonderful-fetch');
+function sendOrderEmail({ template, subject, categories, data, uid, userDoc, assistant }) {
+  const email = assistant.Manager.Email(assistant);
 
-  fetch(`${Manager.project.apiUrl}/backend-manager/admin/email`, {
-    method: 'POST',
-    response: 'json',
-    timeout: 30000,
-    body: {
-      backendManagerKey: process.env.BACKEND_MANAGER_KEY,
-      user: { auth: { uid } },
-      subject: subject,
-      template: template,
-      categories: categories,
-      copy: false,
-      ensureUnique: true,
-      data: data,
-    },
-  })
-  .then((json) => {
-    assistant.log(`sendOrderEmail(): Success template=${template}, uid=${uid}, status=${json?.data?.status || 'unknown'}`);
-  })
-  .catch((e) => {
-    assistant.error(`sendOrderEmail(): Failed template=${template}, uid=${uid}: ${e.message}`);
-  });
+  // 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: { email: userEmail, ...(userName && { name: userName }) },
+    subject,
+    template,
+    categories,
+    copy: false,
+    data,
+  };
+
+  email.send(settings)
+    .then((result) => {
+      assistant.log(`sendOrderEmail(): Success template=${template}, uid=${uid}, status=${result.status}`);
+    })
+    .catch((e) => {
+      assistant.error(`sendOrderEmail(): Failed template=${template}, uid=${uid}: ${e.message}`);
+    });
 }
 
 /**

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

@@ -4,16 +4,16 @@
  */
 const { sendOrderEmail, formatDate } = require('../send-email.js');
 
-module.exports = async function ({ before, after, order, uid, assistant, Manager }) {
+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,
-    Manager,
     data: {
       order: {
         ...order,

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

@@ -5,18 +5,18 @@
  */
 const { sendOrderEmail, formatDate } = require('../send-email.js');
 
-module.exports = async function ({ before, after, order, uid, assistant, Manager }) {
+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,
-    Manager,
     data: {
       order: {
         ...order,

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

@@ -4,16 +4,16 @@
  */
 const { sendOrderEmail, formatDate } = require('../send-email.js');
 
-module.exports = async function ({ before, after, order, uid, assistant, Manager }) {
+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,
-    Manager,
     data: {
       order: {
         ...order,

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

@@ -4,16 +4,16 @@
  */
 const { sendOrderEmail, formatDate } = require('../send-email.js');
 
-module.exports = async function ({ before, after, order, uid, assistant, Manager }) {
+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,
-    Manager,
     data: {
       order: {
         ...order,

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

@@ -4,17 +4,17 @@
  */
 const { sendOrderEmail, formatDate } = require('../send-email.js');
 
-module.exports = async function ({ before, after, order, uid, assistant, Manager }) {
+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,
-    Manager,
     data: {
       order: {
         ...order,

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

@@ -4,19 +4,19 @@
  */
 const { sendOrderEmail, formatDate } = require('../send-email.js');
 
-module.exports = async function ({ before, after, order, uid, assistant, Manager }) {
+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,
-    Manager,
     data: {
       order: {
         ...order,

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

@@ -51,18 +51,6 @@ Module.prototype.main = function () {
       return reject(assistant.errorify(email.message, { code: 400 }));
     }
 
-    // Check for duplicate emails being sent
-    const uniqueResult = await self.ensureFirstInstance(email);
-
-    // If not unique, return early
-    if (!uniqueResult) {
-      return resolve({
-        data: {
-          status: 'non-unique',
-        },
-      });
-    }
-
     // If scheduled beyond SendGrid's limit, queue it
     if (email.sendAt && email.sendAt >= moment().add(SEND_AT_LIMIT, 'hours').unix()) {
       await self.saveToEmailQueue(email).catch(e => e);
@@ -151,7 +139,6 @@ Module.prototype.defaultize = function () {
 
     // Set defaults
     options.copy = typeof options.copy === 'undefined' ? true : options.copy;
-    options.ensureUnique = typeof options.ensureUnique === 'undefined' ? true : options.ensureUnique;
     options.categories = powertools.arrayify(options.categories || []);
 
     email.to = powertools.arrayify(options.to || []);
@@ -262,38 +249,6 @@ Module.prototype.defaultize = function () {
     email.cc = email.cc.filter(obj => !email.to.some(obj2 => obj.email === obj2.email));
     email.bcc = email.bcc.filter(obj => !email.to.some(obj2 => obj.email === obj2.email));
 
-    // Try to get contact name from SendGrid
-    await fetch(`https://api.sendgrid.com/v3/marketing/contacts/search/emails`, {
-      method: 'post',
-      response: 'json',
-      timeout: 60000,
-      headers: {
-        'Authorization': `Bearer ${process.env.SENDGRID_API_KEY}`,
-        'Content-Type': 'application/json',
-      },
-      body: {
-        emails: email.to.map(obj => obj.email),
-      },
-    })
-      .then((json) => {
-        assistant.log('Got contact names', json);
-
-        // Update names from contacts
-        email.to.forEach((to) => {
-          const match = json.result[to.email];
-          if (match) {
-            email.to[0].name = match.contact.first_name || email.dynamicTemplateData.user.personal.name.first;
-          }
-        });
-      })
-      .catch((e) => {
-        if (e.status === 404) {
-          assistant.log('Contact does not exist in database');
-        } else {
-          assistant.error('Failed to get contact names', e);
-        }
-      });
-
     // Log resolved email
     assistant.log('Resolved email.to', email.to);
 
@@ -331,7 +286,6 @@ Module.prototype.defaultize = function () {
     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.categories = email.categories;
     email.dynamicTemplateData.email.carbonCopy = options.copy;
-    email.dynamicTemplateData.email.ensureUnique = options.ensureUnique;
 
     // Handle raw HTML content (overrides template)
     if (options.html) {
@@ -350,16 +304,6 @@ Module.prototype.defaultize = function () {
       'List-Unsubscribe': `<${email.dynamicTemplateData.email.unsubscribeUrl}>`,
     };
 
-    // Generate email hash for deduplication
-    email.hash = crypto.createHash('sha256');
-    email.hash.update(
-      email.to.map(obj => obj.email).join(',')
-      + email.from.email
-      + email.subject
-      + options.categories.join(',')
-    );
-    email.hash = email.hash.digest('hex');
-
     // Clone and clean data for stringified version
     const emailClonedData = _.cloneDeep(email.dynamicTemplateData);
     emailClonedData.app.sponsorships = {};
@@ -400,81 +344,6 @@ Module.prototype.saveToEmailQueue = function (email) {
   });
 };
 
-Module.prototype.ensureFirstInstance = function (email) {
-  const self = this;
-  const Manager = self.Manager;
-  const assistant = self.assistant;
-  const payload = self.payload;
-
-  return new Promise(async function(resolve, reject) {
-    const timeout = assistant.isDevelopment() ? 3000 : 45000;
-    const { admin } = self.libraries;
-
-    const hash = email.hash;
-    const id = email.dynamicTemplateData.email.id;
-    const options = payload.data.payload;
-
-    assistant.log(`ensureFirstInstance(): Checking for unique email hash=${hash}, id=${id}`);
-
-    // Skip uniqueness check if disabled
-    if (!options.ensureUnique) {
-      assistant.log(`ensureFirstInstance(): Skipping unique email check`);
-      return resolve(true);
-    }
-
-    // Save email to temporary storage
-    await admin.firestore().doc(`temporary/email-queue`).set({
-      [hash]: {
-        [id]: assistant.meta.startTime.timestampUNIX,
-      },
-    }, { merge: true })
-      .then((doc) => {
-        assistant.log(`ensureFirstInstance(): Saved email to temporary storage`, hash);
-      })
-      .catch((e) => {
-        assistant.error(`ensureFirstInstance(): Failed to save email to temporary storage`, hash, e);
-      });
-
-    // Wait for timeout to allow duplicates to register
-    assistant.log(`ensureFirstInstance(): Waiting for ${timeout / 1000} sec`);
-    await powertools.poll(async (index) => {
-      return false;
-    }, { interval: 1000, timeout: timeout })
-      .catch((e) => {
-        assistant.log(`ensureFirstInstance(): Timeout reached`);
-      });
-
-    // Check if this is the first instance
-    const result = await admin.firestore().doc(`temporary/email-queue`).get()
-      .then((doc) => doc.data()?.[hash] || {})
-      .catch((e) => ({}));
-
-    const length = Object.keys(result).length;
-    const isFirstInstance = length === 1 || result[id] === Math.min(...Object.values(result));
-
-    assistant.log(`ensureFirstInstance(): Result`, result);
-    assistant.log(`ensureFirstInstance(): Result isFirstInstance`, length, isFirstInstance);
-
-    if (isFirstInstance) {
-      // Delete email from temporary storage
-      await admin.firestore().doc(`temporary/email-queue`).set({
-        [hash]: FieldValue.delete(),
-      }, { merge: true })
-        .then((doc) => {
-          assistant.log(`ensureFirstInstance(): Deleted email from temporary storage`, hash);
-        })
-        .catch((e) => {
-          assistant.error(`ensureFirstInstance(): Failed to delete email from temporary storage`, hash, e);
-        });
-
-      return resolve(true);
-    } else {
-      assistant.warn(`ensureFirstInstance(): Email is not unique`, hash, length, result);
-      return resolve(false);
-    }
-  });
-};
-
 // Helper to URL-encode base64
 function encode(s) {
   return encodeURIComponent(Buffer.from(String(s)).toString('base64'));