backend-manager 5.0.74 → 5.0.76

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "backend-manager",
-  "version": "5.0.74",
+  "version": "5.0.76",
   "description": "Quick tools for developing Firebase functions",
   "main": "src/manager/index.js",
   "bin": {
@@ -74,7 +74,6 @@
     "npm-api": "^1.0.1",
     "paypal-server-api": "^2.0.14",
     "pushid": "^1.0.0",
-    "resolve-account": "^1.0.26",
     "shortid": "^2.2.17",
     "uid-generator": "^2.0.0",
     "uuid": "^9.0.1",

package/src/manager/helpers/assistant.js

@@ -221,7 +221,8 @@ BackendAssistant.prototype.init = function (ref, options) {
   }
   self.request.url = tryUrl(self);
   self.request.path = self.ref.req.path || '';
-  self.request.user = self.resolveAccount({authenticated: false});
+  self.request.user = self.Manager.User({}).properties;
+  self.request.user.authenticated = false;
 
   // Set body and query
   if (options.accept === 'json') {
@@ -656,7 +657,8 @@ BackendAssistant.prototype.authenticate = async function (options) {
 
     // Resolve the user
     if (options.resolve) {
-      self.request.user = self.resolveAccount(user);
+      self.request.user = self.Manager.User(user).properties;
+      self.request.user.authenticated = user.authenticated || false;
       return self.request.user;
     } else {
       return user;
@@ -763,11 +765,6 @@ BackendAssistant.prototype.authenticate = async function (options) {
   }
 };
 
-BackendAssistant.prototype.resolveAccount = function (user) {
-  const ResolveAccount = new (require('resolve-account'))();
-
-  return ResolveAccount.resolve(undefined, user)
-}
 
 BackendAssistant.prototype.parseRepo = function (repo) {
   let repoSplit = repo.split('/');

package/src/test/test-accounts.js

@@ -2,7 +2,7 @@ const uuid = require('uuid');
 
 /**
  * Helper to create a future expiration date for premium subscriptions
- * resolve-account checks subscription.expires to determine if subscription is active
+ * User() checks subscription.expires to determine if subscription is active
  * If expires is in the past (or default 1970), subscription gets downgraded to basic
  */
 function getFutureExpires(years = 10) {
@@ -38,7 +38,7 @@ function getPastExpires(years = 1) {
  * - properties: Object to merge into user doc after auth:on-create
  *
  * IMPORTANT: Premium accounts MUST have subscription.expires set to a future date
- * or resolve-account will downgrade them to basic
+ * and subscription.status set to 'active'
  */
 const STATIC_ACCOUNTS = {
   admin: {

package/templates/backend-manager-config.json

@@ -51,7 +51,7 @@
     {
       id: 'basic',
       name: 'Basic',
-      type: 'free',
+      type: 'subscription',
       limits: {
         requests: 100,
       },
@@ -68,10 +68,12 @@
       },
       prices: {
         monthly: {
+          amount: 4.99,
           stripe: 'price_xxx',
           paypal: 'P-xxx',
         },
         annually: {
+          amount: 49.99,
           stripe: 'price_yyy',
           paypal: 'P-yyy',
         },

package/test/routes/user/user.js

@@ -1,8 +1,8 @@
 /**
  * Test: GET /user
  * Tests the user resolve endpoint
- * Returns RESOLVED user account info for authenticated users
- * Validates that resolve-account correctly processes user data
+ * Returns user account info for authenticated users
+ * Validates that User() correctly structures user data
  */
 module.exports = {
   description: 'User resolve (account info)',
@@ -129,9 +129,9 @@ module.exports = {
       },
     },
 
-    // Test 6: Premium expired user - verify subscription is downgraded to basic
+    // Test 6: Premium expired user - verify subscription retains product but shows cancelled status
     {
-      name: 'premium-expired-user-downgraded',
+      name: 'premium-expired-user-cancelled',
       auth: 'premium-expired',
       timeout: 15000,
 
@@ -145,8 +145,9 @@ module.exports = {
         // Verify auth properties
         assert.equal(user.auth.uid, accounts['premium-expired'].uid, 'UID should match expired premium test account');
 
-        // Verify subscription - expired premium should be downgraded to basic by resolve-account
-        assert.equal(user.subscription.product.id, 'basic', 'Expired premium subscription should be downgraded to basic');
+        // Verify subscription - product.id stays premium, status reflects cancellation
+        assert.equal(user.subscription.product.id, 'premium', 'Product ID should remain premium');
+        assert.equal(user.subscription.status, 'cancelled', 'Status should be cancelled');
       },
     },
   ],