backend-manager 3.0.40 → 3.0.41

package/package.json

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

package/src/manager/helpers/assistant.js

@@ -341,7 +341,9 @@ BackendAssistant.prototype.errorManager = function(e, options) {
   options.sentry = typeof options.sentry === 'undefined' ? true : options.sentry;
   options.send = typeof options.send === 'undefined' ? true : options.send;
 
-  const newError = e instanceof Error ? e : new Error(e);
+  const newError = e instanceof Error
+    ? e
+    : new Error(stringify(e));
 
   // Attach properties
   Object.keys(options)
@@ -370,6 +372,14 @@ BackendAssistant.prototype.errorManager = function(e, options) {
   }
 }
 
+function stringify(e) {
+  if (typeof e === 'string') {
+    return e;
+  } else {
+    return JSON.stringify(e);
+  }
+}
+
 
 BackendAssistant.prototype.authenticate = async function (options) {
   const self = this;

package/src/manager/helpers/usage.js

@@ -105,9 +105,6 @@ Usage.prototype.init = function (assistant, options) {
     self.log(`Usage.init(): Got app data`, self.app);
     self.log(`Usage.init(): Got user`, self.user);
 
-    // Resolve with the user to get their current plan limits
-    // If there is no user, go forward with their IP and make them a basic plan user
-
     // Set initialized to true
     self.initialized = true;
 
@@ -127,8 +124,8 @@ Usage.prototype.validate = function (path, options) {
     options.useCaptchaResponse = typeof options.useCaptchaResponse === 'undefined' ? true : options.useCaptchaResponse;
 
     // Check for required options
-    const period = _.get(self.user, `usage.${path}.period`, 0);
-    const allowed = _.get(self.app, `products.${self.options.app}-${self.user.plan.id}.limits.${path}`, 0);
+    const period = self.getUsage(path)
+    const allowed = self.getLimits(path);
 
     // Log
     self.log(`Usage.validate(): Checking ${period}/${allowed} for ${path}...`);
@@ -214,6 +211,22 @@ Usage.prototype.set = function (path, value) {
   return self;
 };
 
+Usage.prototype.getUsage = function (path) {
+  const self = this;
+  const Manager = self.Manager;
+  const assistant = self.assistant;
+
+  return _.get(self.user, `usage.${path}.period`, 0);
+};
+
+Usage.prototype.getLimit = function (path) {
+  const self = this;
+  const Manager = self.Manager;
+  const assistant = self.assistant;
+
+  return _.get(self.app, `products.${self.options.app}-${self.user.plan.id}.limits.${path}`, 0);
+};
+
 Usage.prototype.update = function () {
   const self = this;