backend-manager 3.2.67 → 3.2.69

package/package.json

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

package/src/manager/helpers/assistant.js

@@ -355,7 +355,8 @@ BackendAssistant.prototype.errorify = function (e, options) {
   options = options || {};
 
   // Code: default to 500, or else use the user's option
-  options.code = typeof options.code === 'undefined'
+  const isCodeSet = typeof options.code !== 'undefined';
+  options.code = !isCodeSet
     ? 500
     : options.code;
 
@@ -385,7 +386,8 @@ BackendAssistant.prototype.errorify = function (e, options) {
     : new Error(stringify(e));
 
   // Fix code
-  options.code = newError.code || options.code;
+  // options.code = newError.code || options.code;
+  options.code = isCodeSet ? options.code : newError.code || options.code;
   options.code = parseInt(options.code);
   options.code = isBetween(options.code, 400, 599) ? options.code : 500;
 

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

@@ -1,5 +1,6 @@
 const moment = require('moment');
 const { get } = require('lodash');
+const { arrayify } = require('node-powertools');
 
 function SubscriptionResolver(Manager, profile, resource) {
   const self = this;
@@ -426,19 +427,19 @@ SubscriptionResolver.prototype.resolve_paypal = function (profile, resource, res
   }
 
   // Set completed
-  if (!resource.plan) {
-    resolved.payment.completed = !['CREATED', 'SAVED', 'APPROVED', 'VOIDED', 'PAYER_ACTION_REQUIRED'].includes(resource.status);
-  } else {
+  if (resource.plan) {
     resolved.payment.completed = !['APPROVAL_PENDING', 'APPROVED'].includes(resource.status);
+  } else {
+    resolved.payment.completed = !['CREATED', 'SAVED', 'APPROVED', 'VOIDED', 'PAYER_ACTION_REQUIRED'].includes(resource.status);
   }
 
   // Check if refunded
-  if (!resource.plan) {
-    // resolved.payment.refunded = false; // @@@ TODO: check if this is correct
-  } else {
-    const transactions = get(resource, 'transactions', []);
+  if (resource.plan) {
+    const transactions = arrayify(get(resource, 'transactions', []));
 
     resolved.payment.refunded = transactions.some(t => t.status === 'REFUNDED');
+  } else {
+    // resolved.payment.refunded = false; // @@@ TODO: check if this is correct
   }
 
   return resolved;