backend-manager 3.0.25 → 3.0.28

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "backend-manager",
-  "version": "3.0.25",
+  "version": "3.0.28",
   "description": "Quick tools for developing Firebase functions",
   "main": "src/manager/index.js",
   "bin": {
@@ -39,7 +39,7 @@
     "chalk": "^4.1.2",
     "cors": "^2.8.5",
     "dotenv": "^16.3.1",
-    "firebase-admin": "^11.11.0",
+    "firebase-admin": "^11.11.1",
     "firebase-functions": "^4.5.0",
     "fs-jetpack": "^5.1.0",
     "hcaptcha": "^0.1.1",
@@ -57,7 +57,7 @@
     "npm-api": "^1.0.1",
     "paypal-server-api": "^1.0.3",
     "pushid": "^1.0.0",
-    "resolve-account": "^1.0.5",
+    "resolve-account": "^1.0.6",
     "semver": "^7.5.4",
     "shortid": "^2.2.16",
     "sizeitup": "^1.0.7",

package/src/manager/functions/core/actions/api/user/delete.js

@@ -20,8 +20,12 @@ Module.prototype.main = function () {
       //   payload.response.error = new Error(`Failed to delete user: There is an active paid subscription on this account. Please cancel it first and then try deleting the account again.`);
       //   return reject(payload.response.error);
       // }
-      const isPlanActive = _.get(user, 'plan.payment.active', null);
-      if (isPlanActive === true) {
+
+      // Disallow deleting users with subscriptions in any state other than cancelled or active payments
+      if (
+        (user?.plan?.status && user?.plan?.status !== 'cancelled')
+        || user?.plan?.payment?.active
+      ) {
         // return reject(assistant.errorManager(`Failed to delete user: There is an active paid subscription on this account. Please cancel it first and then try deleting the account again.`, {code: 400, sentry: false, send: false, log: false}).error)
         // return reject(assistant.errorManager(`This account cannot be deleted until the paid subscription attached to it is cancelled. Please cancel the subscription and then try to delete the account.`, {code: 400, sentry: false, send: false, log: false}).error)
         return reject(assistant.errorManager(`This account cannot be deleted because it has a paid subscription attached to it. In order to delete the account, you must first cancel the paid subscription.`, {code: 400, sentry: false, send: false, log: false}).error)

package/src/manager/helpers/user.js

@@ -29,13 +29,9 @@ function User(Manager, settings, options) {
       email: _.get(settings, 'auth.email', null),
       temporary: _.get(settings, 'auth.temporary', defaults ? false : null),
     },
-    roles: {
-      admin: _.get(settings, 'roles.admin', defaults ? false : null),
-      betaTester: _.get(settings, 'roles.betaTester', defaults ? false : null),
-      developer: _.get(settings, 'roles.developer', defaults ? false : null),
-    },
     plan: {
       id: _.get(settings, 'plan.id', defaults ? 'basic' : null), // intro | basic | advanced | premium
+      status: _.get(settings, 'plan.status', defaults ? 'cancelled' : null), // active | suspended | cancelled
       expires: {
         timestamp: _.get(settings, 'plan.expires.timestamp', defaults ? oldDate : null),
         timestampUNIX: _.get(settings, 'plan.expires.timestampUNIX', defaults ? oldDateUNIX : null),
@@ -55,11 +51,11 @@ function User(Manager, settings, options) {
         orderId: _.get(settings, 'plan.payment.orderId', null), // xxx-xxx-xxx
         resourceId: _.get(settings, 'plan.payment.resourceId', null), // x-xxxxxx
         frequency: _.get(settings, 'plan.payment.frequency', null), // monthly || annually
+        active: _.get(settings, 'plan.payment.active', defaults ? false : null), // true | false
         startDate: {
           timestamp: _.get(settings, 'plan.payment.startDate.timestamp', defaults ? now : null), // x-xxxxxx
           timestampUNIX: _.get(settings, 'plan.payment.startDate.timestampUNIX', defaults ? nowUNIX : null), // x-xxxxxx
         },
-        active: _.get(settings, 'plan.payment.active', defaults ? false : null), // true | false
         updatedBy: {
           event: {
             name: _.get(settings, 'plan.payment.updatedBy.event.name', null), // x-xxxxxx
@@ -72,9 +68,14 @@ function User(Manager, settings, options) {
         },
       }
     },
+    roles: {
+      admin: _.get(settings, 'roles.admin', defaults ? false : null),
+      betaTester: _.get(settings, 'roles.betaTester', defaults ? false : null),
+      developer: _.get(settings, 'roles.developer', defaults ? false : null),
+    },
     affiliate: {
       code: _.get(settings, 'affiliate.code', defaults ? shortid.generate() : null),
-      referrals: [],
+      referrals: _.get(settings, 'affiliate.referrals', []),
       referrer: _.get(settings, 'affiliate.referrer', null),
     },
     activity: {