backend-manager 2.5.64 → 2.5.66

package/package.json

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

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

@@ -162,6 +162,8 @@ Module.prototype.resolveCommand = function (command) {
   const self = this;
   const originalCommand = command;
 
+  command = command || '';
+
   // Start
   if (false) {
 
@@ -218,8 +220,6 @@ Module.prototype.resolveCommand = function (command) {
     // command = 'error:error';
   }
 
-  command = command || '';
-
   // Check local path
   const resolvedPath = resolveApiPath(command);
 

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

@@ -27,6 +27,9 @@ SubscriptionResolver.prototype.resolve = function (options) {
       timestamp: moment(0),
       timestampUNIX: moment(0),
     },
+    trial: {
+      active: false,
+    }
   }
 
   const profile = self.profile;
@@ -42,10 +45,22 @@ SubscriptionResolver.prototype.resolve = function (options) {
   // Process differently based on each provider
   if (profile.processor === 'paypal') {
     // Set status
-    // subscription: https://developer.paypal.com/docs/api/subscriptions/v1/#subscriptions_get
-    // APPROVAL_PENDING. The subscription is created but not yet approved by the buyer. APPROVED. The buyer has approved the subscription. ACTIVE. The subscription is active. SUSPENDED. The subscription is suspended. CANCELLED. The subscription is cancelled. EXPIRED. The subscription is expired.
-    // order: https://developer.paypal.com/docs/api/orders/v2/#orders_get
-    // CREATED. The order was created with the specified context. SAVED. The order was saved and persisted. The order status continues to be in progress until a capture is made with final_capture = true for all purchase units within the order. APPROVED. The customer approved the payment through the PayPal wallet or another form of guest or unbranded payment. For example, a card, bank account, or so on. VOIDED. All purchase units in the order are voided. COMPLETED. The payment was authorized or the authorized payment was captured for the order. PAYER_ACTION_REQUIRED. The order requires an action from the payer (e.g. 3DS authentication). Redirect the payer to the "rel":"payer-action" HATEOAS link returned as part of the response prior to authorizing or capturing the order.
+    /*
+      subscription: https://developer.paypal.com/docs/api/subscriptions/v1/#subscriptions_get
+      APPROVAL_PENDING. The subscription is created but not yet approved by the buyer. 
+      APPROVED. The buyer has approved the subscription. 
+      ACTIVE. The subscription is active. 
+      SUSPENDED. The subscription is suspended.
+      CANCELLED. The subscription is cancelled. 
+      EXPIRED. The subscription is expired.
+
+      order: https://developer.paypal.com/docs/api/orders/v2/#orders_get
+      CREATED. The order was created with the specified context. 
+      SAVED. The order was saved and persisted. The order status continues to be in progress until a capture is made with final_capture = true for all purchase units within the order. 
+      APPROVED. The customer approved the payment through the PayPal wallet or another form of guest or unbranded payment. For example, a card, bank account, or so on. 
+      VOIDED. All purchase units in the order are voided. COMPLETED. The payment was authorized or the authorized payment was captured for the order. 
+      PAYER_ACTION_REQUIRED. The order requires an action from the payer (e.g. 3DS authentication). Redirect the payer to the "rel":"payer-action" HATEOAS link returned as part of the response prior to authorizing or capturing the order.
+    */
     if (['ACTIVE'].includes(resource.status)) {
       resolved.status = 'active';
     } else if (['SUSPENDED'].includes(resource.status)) {
@@ -57,10 +72,25 @@ SubscriptionResolver.prototype.resolve = function (options) {
     // Set resource ID
     resolved.resource.id = resource.id;
 
-    // Set expiration and start
-    resolved.expires.timestamp = moment(
-      get(resource, 'billing_info.last_payment.time', 0)
-    )
+    // Get trial
+    const trialTenure = get(resource, 'billing_info.cycle_executions', []).find((cycle) => cycle.tenure_type === 'TRIAL');
+    const regularTenure = get(resource, 'billing_info.cycle_executions', []).find((cycle) => cycle.tenure_type === 'REGULAR');
+
+    // Resolve trial
+    if (trialTenure && regularTenure && regularTenure.cycles_completed === 0) {
+      resolved.trial.active = true;
+      
+      // Set expiration and start
+      resolved.expires.timestamp = moment(
+        get(resource, 'billing_info.next_billing_time', 0)
+      )
+    } else {
+      // Set expiration and start
+      resolved.expires.timestamp = moment(
+        get(resource, 'billing_info.last_payment.time', 0)
+      )
+    }
+
     resolved.start.timestamp = moment(
       get(resource, 'start_time', 0)
     )
@@ -71,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
@@ -86,18 +117,34 @@ SubscriptionResolver.prototype.resolve = function (options) {
     // Set resource ID
     resolved.resource.id = resource.id;
 
-    // Set expiration and start
-    resolved.expires.timestamp = moment(
-      get(resource, 'current_term_start', 0) * 1000
-    )
+    // Get trial
+    if (resource.status === 'in_trial') {
+      resolved.trial.active = true;
+      
+      // Set expiration and start
+      resolved.expires.timestamp = moment(
+        (
+          get(resource, 'trial_end', 0)
+        ) * 1000
+      )
+    } else {
+      // Set expiration and start
+      resolved.expires.timestamp = moment(
+        (
+          get(resource, 'current_term_start', 0)
+        ) * 1000
+      )
+    }
+
     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
@@ -116,10 +163,23 @@ SubscriptionResolver.prototype.resolve = function (options) {
     // Set resource ID
     resolved.resource.id = resource.id;
 
-    // Set expiration and start
-    resolved.expires.timestamp = moment(
-      get(resource, 'current_period_start', 0) * 1000
-    );
+    // Get trial
+    if (resource.status === 'trialing') {
+      resolved.trial.active = true;
+
+      // Set expiration and start
+      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
     );
@@ -130,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';
@@ -137,6 +198,11 @@ SubscriptionResolver.prototype.resolve = function (options) {
     // Set resource ID
     resolved.resource.id = resource.id;
 
+    // Get trial
+    if (true) {
+      resolved.trial.active = false;
+    }
+
     // Set expiration and start
     resolved.expires.timestamp = moment(
       get(resource, 'created_at', 0)
@@ -151,25 +217,28 @@ 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 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
   resolved.expires.timestampUNIX = resolved.expires.timestamp.unix()
   resolved.expires.timestamp = resolved.expires.timestamp.toISOString()
@@ -177,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);
   }

package/src/manager/index.js

@@ -7,9 +7,11 @@ const JSON5 = require('json5');
 // const { debug, log, error, warn } = require('firebase-functions/lib/logger');
 // let User;
 // let Analytics;
+// Paths
+const core = './functions/core';
+const wrappers = './functions/wrappers';
 
-
-  function Manager(exporter, options) {
+function Manager(exporter, options) {
   const self = this;
   // Constants
   self.SERVER_UUID = '11111111-1111-1111-1111-111111111111';
@@ -30,10 +32,6 @@ const JSON5 = require('json5');
 Manager.prototype.init = function (exporter, options) {
   const self = this;
 
-  // Paths
-  const core = './functions/core';
-  const wrappers = './functions/wrappers';
-
   // Set options defaults
   options = options || {};
   options.initialize = typeof options.initialize === 'undefined' ? true : options.initialize;
@@ -583,6 +581,18 @@ Manager.prototype.SubscriptionResolver = function () {
   return new self.libraries.SubscriptionResolver(...arguments);
 };
 
+// For importing API libraries
+Manager.prototype.Api = function () {
+  const self = this;
+  // self.libraries.Api = self.libraries.Api || require('./helpers/subscription-resolver.js');
+  // return new self.libraries.Api(...arguments);
+  // return self._process((new (require(`${core}/actions/api.js`))()).init(self, { req: req, res: res, }))
+  
+  const Api = (new (require(`${core}/actions/api.js`))()).init(self, { req: {}, res: {}, });
+
+  return Api;
+};
+
 // Manager.prototype.Utilities = function () {
 //   const self = this;
 //   self.libraries.Utilities = self.libraries.Utilities || require('./helpers/utilities.js');