backend-manager 2.5.82 → 2.5.83

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "backend-manager",
-  "version": "2.5.82",
+  "version": "2.5.83",
   "description": "Quick tools for developing Firebase functions",
   "main": "src/manager/index.js",
   "bin": {
@@ -49,11 +49,11 @@
     "moment": "^2.29.4",
     "nanoid": "^3.3.6",
     "node-fetch": "^2.6.9",
-    "node-powertools": "^0.0.23",
+    "node-powertools": "^1.0.2",
     "npm-api": "^1.0.1",
     "paypal-server-api": "^1.0.2",
     "pushid": "^1.0.0",
-    "semver": "^7.3.8",
+    "semver": "^7.4.0",
     "shortid": "^2.2.16",
     "uid-generator": "^2.0.0",
     "ultimate-jekyll-poster": "^0.0.15",

package/src/manager/functions/core/actions/api/user/validate-settings.js

@@ -0,0 +1,84 @@
+const _ = require('lodash')
+const jetpack = require('fs-jetpack')
+const powertools = require('node-powertools')
+const path = require('path')
+
+function Module() {
+
+}
+
+Module.prototype.main = function () {
+  const self = this;
+  const Manager = self.Manager;
+  const Api = self.Api;
+  const assistant = self.assistant;
+  const payload = self.payload;
+
+  return new Promise(async function(resolve, reject) {
+    self.Api.resolveUser({adminRequired: true})
+    .then(async (user) => {
+
+      payload.data.payload.defaultsPath = payload.data.payload.defaultsPath || '';
+      payload.data.payload.existingSettings = payload.data.payload.existingSettings || {};
+      payload.data.payload.newSettings = payload.data.payload.newSettings || {};
+
+      const settings = _.merge({}, payload.data.payload.existingSettings, payload.data.payload.newSettings);
+
+      const resolvedPath = path.join(process.cwd(), `defaults.js`);
+      
+      // Check if the file exists
+      if (!jetpack.exists(resolvedPath)) {
+        return reject(assistant.errorManager(`Defaults file at ${resolvedPath} does not exist, please add it manually.`, {code: 500, sentry: true, send: false, log: true}).error);
+      }
+
+      // Load the file
+      try {
+        const defaults = _.get(require(resolvedPath)(), payload.data.payload.defaultsPath);
+        const combined = combine(defaults.all, defaults[user.plan.id] || {})
+
+        assistant.log('Combined settings', combined, {environment: 'development'})
+
+        return resolve({data: powertools.defaults(settings, combined)});
+      } catch (e) {
+        return reject(assistant.errorManager(`Unable to load file at ${resolvedPath}: ${e}`, {code: 500, sentry: true, send: false, log: true}).error);
+      }
+
+    })
+    .catch(e => {
+      return reject(e);
+    })
+  });
+
+};
+
+function isObject(value) {
+  return value && typeof value === 'object' && !Array.isArray(value);
+}
+
+function combine(one, two) {
+  const done = [];
+
+  // Iterate through the keys of the second object
+  powertools.getKeys(two)
+    .forEach(path => {
+      const pathMinusLast = path.split('.').slice(0, -1).join('.');
+      const valueAtPath = _.get(two, path);
+      const valueAtParent = _.get(two, pathMinusLast);
+
+      if (
+        done.includes(pathMinusLast)
+        || isObject(valueAtPath)
+      ) {
+        return;
+      }
+
+      // If the path is an object, merge the two object using lodash
+      _.set(one, pathMinusLast, valueAtParent)
+      
+      done.push(pathMinusLast);
+    })
+  return one;
+}
+
+
+module.exports = Module;

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

@@ -161,6 +161,11 @@ Module.prototype.import = function (command, payload, user, response) {
         lib.payload.data.authenticationToken = self.payload.data.authenticationToken;
       }
 
+      // Set itself to the instance
+      self.lib = lib;
+
+      // console.log('***** import() lib.payload 4', lib.payload);
+
       // lib.payload = {};
       //
       // // Set payload and user if it's provided
@@ -255,12 +260,13 @@ Module.prototype.resolveCommand = function (command) {
 
 Module.prototype.resolveUser = function (options) {
   const self = this;
+
   return new Promise(async function(resolve, reject) {
     let user = null;
 
     options = options || {};
-    options.uid = typeof options.uid !== 'undefined' ? options.uid : self.payload.data.payload.uid;
-    options.admin = typeof options.admin !== 'undefined' ? options.admin : self.payload.user.roles.admin;
+    options.uid = typeof options.uid !== 'undefined' ? options.uid : _.get(self.payload, 'data.payload.uid');
+    options.admin = typeof options.admin !== 'undefined' ? options.admin : _.get(self.payload, 'user.roles.admin');
     options.adminRequired = typeof options.adminRequired !== 'undefined' ? options.adminRequired : true;
 
     if (options.uid) {
@@ -283,6 +289,8 @@ Module.prototype.resolveUser = function (options) {
       }
     } else if (self.payload.user.authenticated) {
       user = self.payload.user;
+    } else if (_.get(self.lib, 'payload.user.authenticated')) {
+      user = self.lib.payload.user;
     }
 
     if (user instanceof Error) {

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

@@ -23,14 +23,18 @@ SubscriptionResolver.prototype.resolve = function (options) {
     payment: {
       completed: false,
     },
-    expires: {
+    start: {
       timestamp: moment(0),
       timestampUNIX: moment(0),
     },
-    start: {
+    expires: {
       timestamp: moment(0),
       timestampUNIX: moment(0),
     },
+    cancelled: {
+      timestamp: moment(0),
+      timestampUNIX: moment(0),
+    },        
     lastPayment: {
       amount: 0,
       date: {
@@ -125,6 +129,13 @@ SubscriptionResolver.prototype.resolve = function (options) {
       get(resource, 'billing_info.last_payment.time', 0)
     )
 
+    // Set cancelled
+    if (resolved.status === 'cancelled') {
+      resolved.cancelled.timestamp = moment(
+        get(resource, 'status_update_time', 0)
+      )
+    }
+
     // Set last payment
     if (get(resource, 'billing_info.last_payment')) {
       resolved.lastPayment.amount = parseFloat(resource.billing_info.last_payment.amount.value);
@@ -203,6 +214,13 @@ SubscriptionResolver.prototype.resolve = function (options) {
       ) * 1000
     )
 
+    // Set cancelled
+    if (resolved.status === 'cancelled') {
+      resolved.cancelled.timestamp = moment(
+        get(resource, 'cancelled_at', 0)
+      )
+    }
+
     // Set last payment
     if (resource.total_dues) {
       resolved.lastPayment.amount = resource.total_dues / 100;
@@ -270,6 +288,13 @@ SubscriptionResolver.prototype.resolve = function (options) {
       get(resource, 'current_period_start', 0) * 1000
     );
 
+    // Set cancelled
+    if (resolved.status === 'cancelled') {
+      resolved.cancelled.timestamp = moment(
+        get(resource, 'canceled_at', 0)
+      )
+    }    
+
     // Set last payment
     if (resource.latest_invoice) {
       resolved.lastPayment.amount = resource.latest_invoice.amount_paid / 100;
@@ -328,6 +353,11 @@ SubscriptionResolver.prototype.resolve = function (options) {
       get(resource, 'created_at', 0)
     );
 
+    // Set cancelled
+    resolved.cancelled.timestamp = moment(
+      get(resource, 'created_at', 0)
+    )
+
     // Retrieve last payment
     const lastPayment = resource.payments.find(p => p.status === 'CONFIRMED');
 
@@ -389,11 +419,14 @@ SubscriptionResolver.prototype.resolve = function (options) {
   }
 
   // Fix timestamps
+  resolved.start.timestampUNIX = resolved.start.timestamp.unix();
+  resolved.start.timestamp = resolved.start.timestamp.toISOString();
+
   resolved.expires.timestampUNIX = resolved.expires.timestamp.unix();
   resolved.expires.timestamp = resolved.expires.timestamp.toISOString();
 
-  resolved.start.timestampUNIX = resolved.start.timestamp.unix();
-  resolved.start.timestamp = resolved.start.timestamp.toISOString();
+  resolved.cancelled.timestampUNIX = resolved.cancelled.timestamp.unix();
+  resolved.cancelled.timestamp = resolved.cancelled.timestamp.toISOString();  
 
   // Fix trial days
   resolved.trial.daysLeft = resolved.trial.daysLeft < 0 ? 0 : resolved.trial.daysLeft;

package/src/manager/index.js

@@ -599,6 +599,20 @@ Manager.prototype.Api = function () {
   return Api;
 };
 
+// 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, }))
+//   return new Promise(function(resolve, reject) {
+//     const Api = (new (require(`${core}/actions/api.js`))()).init(self, { req: {}, res: {}, });
+    
+//     Api.main()
+
+//     return Api;
+//   });
+// };
+
 // Manager.prototype.Utilities = function () {
 //   const self = this;
 //   self.libraries.Utilities = self.libraries.Utilities || require('./helpers/utilities.js');