backend-manager 2.5.65 → 2.5.67

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "backend-manager",
-  "version": "2.5.65",
+  "version": "2.5.67",
   "description": "Quick tools for developing Firebase functions",
   "main": "src/manager/index.js",
   "bin": {
@@ -31,7 +31,7 @@
     "@google-cloud/storage": "^5.20.5",
     "@sendgrid/mail": "^7.7.0",
     "@sentry/node": "^6.19.7",
-    "backend-assistant": "^1.0.1",
+    "backend-assistant": "^1.0.2",
     "busboy": "^1.6.0",
     "chalk": "^4.1.2",
     "cors": "^2.8.5",
@@ -47,7 +47,7 @@
     "lowdb": "^1.0.0",
     "mailchimp-api-v3": "^1.15.0",
     "moment": "^2.29.4",
-    "nanoid": "^3.3.4",
+    "nanoid": "^3.3.6",
     "node-fetch": "^2.6.9",
     "node-powertools": "^0.0.23",
     "npm-api": "^1.0.1",

package/src/manager/functions/core/actions/api/admin/payment-processor.js

@@ -1,4 +1,5 @@
 const _ = require('lodash');
+const jetpack = require('fs-jetpack');
 
 function Module() {
 
@@ -24,11 +25,18 @@ Module.prototype.main = function () {
     const processorPath = `${process.cwd()}/payment-processors/${productId}.js`
     let processor;
     // console.log('---processorPath', processorPath);
+
     try {
+      if (!jetpack.exists(processorPath)) {
+        self.assistant.warn('Subprocessor does not exist:', processorPath, {environment: 'production'})
+
+        return resolve({data: {}})
+      }
       processor = new (require(processorPath));
       processor.Manager = self.Manager;
     } catch (e) {
-      self.assistant.error('Error loading processor', processorPath, e, {environment: 'production'})
+      self.assistant.error('Subprocessor failed to load:', processorPath, e, {environment: 'production'})
+
       return resolve({data: {}})
     }
 

package/src/manager/helpers/subscription-resolver.js

@@ -81,10 +81,9 @@ SubscriptionResolver.prototype.resolve = function (options) {
       resolved.trial.active = true;
       
       // Set expiration and start
-      // resolved.expires.timestamp = moment(
-      //   get(resource, 'billing_info.next_billing_time', 0)
-      // )
-      resolved.expires.timestamp = moment();
+      resolved.expires.timestamp = moment(
+        get(resource, 'billing_info.next_billing_time', 0)
+      )
     } else {
       // Set expiration and start
       resolved.expires.timestamp = moment(
@@ -102,6 +101,7 @@ SubscriptionResolver.prototype.resolve = function (options) {
     } else {
       resolved.payment.completed = !['CREATED', 'SAVED', 'APPROVED', 'VOIDED', 'PAYER_ACTION_REQUIRED'].includes(resource.status);         
     }
+
   } else if (profile.processor === 'chargebee') {
     // Set status
     // subscription: https://apidocs.chargebee.com/docs/api/subscriptions?prod_cat_ver=2#subscription_status
@@ -122,14 +122,11 @@ SubscriptionResolver.prototype.resolve = function (options) {
       resolved.trial.active = true;
       
       // Set expiration and start
-      resolved.expires.timestamp = moment();
-
-      // resolved.expires.timestamp = moment(
-      //   (
-      //     get(resource, 'current_term_start', 0)
-      //     || get(resource, 'current_term_start', 0)
-      //   ) * 1000
-      // )      
+      resolved.expires.timestamp = moment(
+        (
+          get(resource, 'trial_end', 0)
+        ) * 1000
+      )
     } else {
       // Set expiration and start
       resolved.expires.timestamp = moment(
@@ -141,12 +138,13 @@ SubscriptionResolver.prototype.resolve = function (options) {
 
     resolved.start.timestamp = moment(
       get(resource, 'created_at', 0) * 1000
-    )    
+    )
 
     // Set completed
     if (true) {
       resolved.payment.completed = !['future'].includes(resource.status);
     }
+
   } else if (profile.processor === 'stripe') {
     // Subscription: https://stripe.com/docs/api/subscriptions/object#subscription_object-status
     // incomplete, incomplete_expired, trialing, active, past_due, canceled, or unpaid
@@ -170,13 +168,17 @@ SubscriptionResolver.prototype.resolve = function (options) {
       resolved.trial.active = true;
 
       // Set expiration and start
-      resolved.expires.timestamp = moment();      
+      resolved.expires.timestamp = moment(
+        (
+          get(resource, 'trial_end', 0)
+        ) * 1000
+      )    
     } else {
       // Set expiration and start
       resolved.expires.timestamp = moment(
         get(resource, 'current_period_start', 0) * 1000
       );      
-    }    
+    }
 
     resolved.start.timestamp = moment(
       get(resource, 'start_date', 0) * 1000
@@ -188,6 +190,7 @@ SubscriptionResolver.prototype.resolve = function (options) {
     } else if (resource.object === 'payment_intent') {
       resolved.payment.completed = !['requires_payment_method', 'requires_confirmation', 'requires_action', 'processing', 'requires_capture', 'canceled'].includes(resource.status);      
     }
+
   } else if (profile.processor === 'coinbase') {
     // Set status
     resolved.status = 'cancelled';
@@ -214,28 +217,26 @@ SubscriptionResolver.prototype.resolve = function (options) {
     }
   }
 
-  // If there was NEVER any payment sent
-  if (!resolved.payment.completed) {
-    resolved.expires.timestamp = moment(0);
-  }  
-
-  // Fix expires by adding time to the date of last payment
+  // Fix expiry by adding time to the date of last payment
   if (resolved.status === 'active') {
     resolved.expires.timestamp.add(1, 'year').add(30, 'days');
   } else {
-    const freq = profile.details.planFrequency || 'monthly';
-    if (freq === 'annually') {
-      resolved.expires.timestamp.add(1, 'year');
-    } else if (freq === 'monthly') {
-      resolved.expires.timestamp.add(1, 'month');
-    } else if (freq === 'daily') {
-      resolved.expires.timestamp.add(1, 'day');
+    // If trial, it's already set to the trial end above
+    if (!resolved.trial.active) {
+      const freq = profile.details.planFrequency || 'monthly';
+      if (freq === 'annually') {
+        resolved.expires.timestamp.add(1, 'year');
+      } else if (freq === 'monthly') {
+        resolved.expires.timestamp.add(1, 'month');
+      } else if (freq === 'daily') {
+        resolved.expires.timestamp.add(1, 'day');
+      }      
     }
   }
 
-  // If trial, set to a max of 1 month
-  if (resolved.trial.active) {
-    resolved.expires.timestamp = moment().add(1, 'month');
+  // If there was NEVER any payment sent AND they are not trialing
+  if (!resolved.payment.completed && !resolved.trial.active) {
+    resolved.expires.timestamp = moment(0);
   }
 
   // Fix timestamps
@@ -245,8 +246,6 @@ SubscriptionResolver.prototype.resolve = function (options) {
   resolved.start.timestampUNIX = resolved.start.timestamp.unix()
   resolved.start.timestamp = resolved.start.timestamp.toISOString()  
 
-  // console.log('---resolved', resolved);
-
   if (options.log) {
     console.log('resolved', resolved);
   }