backend-manager 5.0.168 → 5.0.169

package/TODO-2.md

@@ -10,6 +10,24 @@ payments/reactivate
 payments/upgrade
   * takes a subscription id and a new plan id and upgrades the user's subscription to the new plan. this can only be done if the user has an active subscription.
 
+
+-------
+USER OBJECT UPDGRADE --> INSTANCE?
+
+const User = require('backend-manager/src/manager/helpers/user');
++
+User.resolveSubscription(self.request.user);
+-->
+one object that cna do resolveSubscription(), getAccount(), etc
+
+since you changed some things, do all tests in all projects align still?
+
+after that, udpate README, CLAUDE.md and ANY TOPLEVLE CLAUDE SKILLS so that we never make this mistake again
+
+including
+
+---------
+
 TEST NEWSLETTER
 POST /admin/cron { id: 'daily/marketing-newsletter-generate' }
 

package/package.json

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

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

@@ -1,5 +1,6 @@
 const powertools = require('node-powertools');
 const { REMINDER_DELAYS, COLLECTION } = require('../../libraries/abandoned-cart-config.js');
+const User = require('../../helpers/user.js');
 
 /**
  * Abandoned cart reminder cron job
@@ -49,8 +50,7 @@ module.exports = async ({ Manager, assistant, context, libraries }) => {
       const userDoc = userSnap.data();
 
       // Belt-and-suspenders: skip if user already has active paid subscription
-      if (userDoc.subscription?.status === 'active'
-        && userDoc.subscription?.product?.id !== 'basic') {
+      if (User.resolveSubscription(userDoc).active) {
         assistant.log(`User ${uid} now has active subscription, marking cart completed`);
         await markCompleted(doc, admin, nowUNIX);
         skipped++;

package/src/manager/helpers/middleware.js

@@ -7,6 +7,7 @@ const path = require('path');
 const powertools = require('node-powertools');
 const { merge } = require('lodash');
 const JSON5 = require('json5');
+const User = require('./user.js');
 
 function Middleware(m, req, res) {
   const self = this;
@@ -126,7 +127,8 @@ Middleware.prototype.run = function (libPath, options) {
 
     // Log working user
     const workingUser = assistant.getUser();
-    assistant.log(`Middleware.process(): User (${workingUser.auth.uid}, ${workingUser.auth.email}, ${workingUser.subscription.product.id}=${workingUser.subscription.status}):`, safeStringify(workingUser));
+    const resolvedSub = User.resolveSubscription(workingUser);
+    assistant.log(`Middleware.process(): User (${workingUser.auth.uid}, ${workingUser.auth.email}, ${workingUser.subscription.product.id}=${workingUser.subscription.status} (resolved: ${resolvedSub.plan})):`, safeStringify(workingUser));
 
     // Setup analytics
     if (options.setupAnalytics) {

package/src/manager/helpers/usage.js

@@ -8,6 +8,7 @@
 const moment = require('moment');
 const _ = require('lodash');
 const hcaptcha = require('hcaptcha');
+const User = require('./user.js');
 
 function Usage(m) {
   const self = this;
@@ -319,8 +320,8 @@ Usage.prototype.getProduct = function (id) {
 
   const products = Manager.config.payment?.products || [];
 
-  // Look up by provided ID, or fall back to user's subscription product
-  id = id || self.user.subscription.product.id;
+  // Look up by provided ID, or fall back to user's resolved plan
+  id = id || User.resolveSubscription(self.user).plan;
 
   return products.find(p => p.id === id)
     || products.find(p => p.id === 'basic')