web-manager 3.1.29 → 3.1.31

package/index.js

@@ -244,6 +244,7 @@ function Manager() {
       user.getIdToken(false)
         .then(function(token) {
           var done;
+
           fetch('https://us-central1-' + This.properties.options.libraries.firebase_app.config.projectId + '.cloudfunctions.net/bm_api', {
             method: 'POST',
             body: JSON.stringify({
@@ -252,7 +253,7 @@ function Manager() {
               payload: {
                 newsletterSignUp: select('.auth-newsletter-input').getValue(),
                 affiliateCode: This.storage().get('auth.affiliateCode', ''),
-              }
+              },
             }),
           })
           .catch(function () {})

package/lib/account.js

@@ -210,7 +210,7 @@ Account.prototype._resolveAccount2 = function (firebaseUser, account, options) {
 */
 Account.prototype._resolveAccount = function (firebaseUser, account, options) {
   var self = this;
-  
+
   firebaseUser = firebaseUser || {};
   account = account || {};
   options = options || {};
@@ -229,9 +229,17 @@ Account.prototype._resolveAccount = function (firebaseUser, account, options) {
   // Resolve plan
   account.plan = account.plan || {};
   account.plan.id = account.plan.id || defaultPlanId;
+  
   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.trial = account.plan.trial || {};
+  account.plan.trial.activated = account.plan.trial.activated || false;
+  account.plan.trial.expires = account.plan.trial.expires || {};
+  account.plan.trial.expires.timestamp = new Date(account.plan.trial.expires.timestamp || 0).toISOString()
+  account.plan.trial.expires.timestampUNIX = Math.round(new Date(account.plan.trial.expires.timestamp || 0).getTime() / 1000);
+
   account.plan.limits = account.plan.limits || {};
   // account.plan.devices = account.plan.devices || 1;
 
@@ -279,7 +287,7 @@ Account.prototype._resolveAccount = function (firebaseUser, account, options) {
   var planExpireDate = new Date(account.plan.expires.timestamp);
   var now = new Date();
   var daysTillExpire = Math.floor((planExpireDate - now) / 86400000);
-  var difference = (planExpireDate.getTime() - now.getTime())/(24*3600*1000);
+  var difference = (planExpireDate.getTime() - now.getTime()) / (24 * 3600 * 1000);
   var startDate = new Date(account.plan.payment.startDate.timestamp);
   var planIsActive = difference > -1 && account.plan.id !== defaultPlanId;
 
@@ -320,6 +328,17 @@ Account.prototype._resolveAccount = function (firebaseUser, account, options) {
   account.activity.created.timestamp = account.activity.created.timestamp || '1970-01-01T00:00:00.000Z';
   account.activity.created.timestampUNIX = account.activity.created.timestampUNIX || 0;
 
+  account.activity.geolocation = account.activity.geolocation || {};
+  account.activity.geolocation.ip = account.activity.geolocation.ip || 'unknown';
+  account.activity.geolocation.continent = account.activity.geolocation.continent || 'unknown';
+  account.activity.geolocation.country = account.activity.geolocation.country || 'unknown';
+  account.activity.geolocation.city = account.activity.geolocation.city || 'unknown';
+  account.activity.geolocation.latitude = account.activity.geolocation.latitude || 'unknown';
+  account.activity.geolocation.longitude = account.activity.geolocation.longitude || 'unknown';
+  account.activity.geolocation.userAgent = account.activity.geolocation.userAgent || 'unknown';
+  account.activity.geolocation.language = account.activity.geolocation.language || 'unknown';
+  account.activity.geolocation.platform = account.activity.geolocation.platform || 'unknown';
+
   // Api
   account.api = account.api || {};
   account.api.clientId = account.api.clientId || 'unknown';
@@ -328,14 +347,6 @@ Account.prototype._resolveAccount = function (firebaseUser, account, options) {
   // Personal
   account.personal = account.personal || {};
 
-  account.personal.name = account.personal.name || {};
-  account.personal.name.first = account.personal.name.first || '';
-  account.personal.name.last = account.personal.name.last || '';
-
-  account.personal.telephone = account.personal.telephone || {};
-  account.personal.telephone.countryCode = account.personal.telephone.countryCode || 0;
-  account.personal.telephone.national = account.personal.telephone.national || 0;
-
   account.personal.birthday = account.personal.birthday || {};
   account.personal.birthday.timestamp = account.personal.birthday.timestamp || '1970-01-01T00:00:00.000Z';
   account.personal.birthday.timestampUNIX = account.personal.birthday.timestampUNIX || 0;
@@ -343,14 +354,20 @@ Account.prototype._resolveAccount = function (firebaseUser, account, options) {
   account.personal.gender = account.personal.gender || '';
 
   account.personal.location = account.personal.location || {};
+  account.personal.location.city = account.personal.location.city || '';
   account.personal.location.country = account.personal.location.country || '';
 
+  account.personal.name = account.personal.name || {};
+  account.personal.name.first = account.personal.name.first || '';
+  account.personal.name.last = account.personal.name.last || '';
+
+  account.personal.telephone = account.personal.telephone || {};
+  account.personal.telephone.countryCode = account.personal.telephone.countryCode || 0;
+  account.personal.telephone.national = account.personal.telephone.national || 0;
 
   // Set UI elements
   // In a try/catch because this lib is used in node sometimes
   try {
-    // var apiLinkURL = isDevelopment ? 'http://localhost:5000/discord-link' : 'https://api.{{ site.brand.name }}.com/discord-link';
-    // var apiUnlinkURL = isDevelopment ? 'http://localhost:5000/discord-unlink' : 'https://api.{{ site.brand.name }}.com/discord-unlink';
     var cancelURL = isDevelopment ? 'http://localhost:4001/cancel/' : 'https://itwcreativeworks.com/portal/account/manage/';
 
     var billingSubscribeBtn = self.dom.select('.auth-billing-subscribe-btn');

package/package.json

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