web-manager 3.2.18 → 3.2.19

package/lib/account.js

@@ -230,20 +230,20 @@ Account.prototype._resolveAccount = function (firebaseUser, account, options) {
 
   // Resolve auth
   account.auth = account.auth || {};
-  account.auth.email = account.auth.email || firebaseUser.email || null;
   account.auth.uid = account.auth.uid || firebaseUser.uid || null;
+  account.auth.email = account.auth.email || firebaseUser.email || null;
   account.auth.temporary = account.auth.temporary || false;
 
   // Resolve plan
   account.plan = account.plan || {};
   account.plan.id = account.plan.id || defaultPlanId;
 
+  account.plan.status = account.plan.status || 'cancelled';
+
   account.plan.expires = account.plan.expires || {};
   account.plan.expires.timestamp = new Date(account.plan.expires.timestamp || 0).toISOString();
   account.plan.expires.timestampUNIX = Math.round(new Date(account.plan.expires.timestamp || 0).getTime() / 1000);
 
-  account.plan.status = account.plan.status || 'cancelled';
-
   account.plan.trial = account.plan.trial || {};
   account.plan.trial.activated = account.plan.trial.activated || false;
   account.plan.trial.expires = account.plan.trial.expires || {};
@@ -254,14 +254,16 @@ Account.prototype._resolveAccount = function (firebaseUser, account, options) {
   // account.plan.devices = account.plan.devices || 1;
 
   account.plan.payment = account.plan.payment || {};
-  account.plan.payment.startDate = account.plan.payment.startDate || {};
-  account.plan.payment.startDate.timestamp = account.plan.payment.startDate.timestamp || '1970-01-01T00:00:00.000Z';
-  account.plan.payment.startDate.timestampUNIX = account.plan.payment.startDate.timestampUNIX || 0;
-  account.plan.payment.frequency = account.plan.payment.frequency || 'unknown';
+  account.plan.payment.processor = account.plan.payment.processor || 'unknown';
   account.plan.payment.orderId = account.plan.payment.orderId || 'unknown';
   account.plan.payment.resourceId = account.plan.payment.resourceId || 'unknown';
+  account.plan.payment.frequency = account.plan.payment.frequency || 'unknown';
   account.plan.payment.active = account.plan.payment.active || false;
 
+  account.plan.payment.startDate = account.plan.payment.startDate || {};
+  account.plan.payment.startDate.timestamp = account.plan.payment.startDate.timestamp || '1970-01-01T00:00:00.000Z';
+  account.plan.payment.startDate.timestampUNIX = account.plan.payment.startDate.timestampUNIX || 0;
+
   account.plan.payment.updatedBy = account.plan.payment.updatedBy || {};
   account.plan.payment.updatedBy.event = account.plan.payment.updatedBy.event || {};
   account.plan.payment.updatedBy.event.id = account.plan.payment.updatedBy.event.id || 'unknown';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "web-manager",
-  "version": "3.2.18",
+  "version": "3.2.19",
   "description": "Easily access important variables such as the query string, current domain, and current page in a single object.",
   "main": "index.js",
   "scripts": {
@@ -36,4 +36,4 @@
     "firebase": "^9.23.0",
     "lazysizes": "^5.3.2"
   }
-}
+}