web-manager 3.1.28 → 3.1.30

package/lib/account.js

@@ -1,17 +1,15 @@
 /*
 */
-var dom;
-var utilities;
-
 function Account(init) {
   var self = this;
+
   init = init || {};
   self.properties = {};
   self.accountPageInitialized = false;
 
   try {
-    dom = init.dom || self.Manager.dom();
-    utilities = init.utilities || self.Manager.utilities();
+    self.dom = init.dom || self.Manager.dom();
+    self.utilities = init.utilities || self.Manager.utilities();
 
     if (new URL(window.location.href).pathname.includes('account')) {
       self.initializeAccountPage();
@@ -93,10 +91,11 @@ Account.prototype.initializeAccountPage = function (options) {
 
 Account.prototype.delete = function (options) {
   var self = this;
+  
   var user = firebase.auth().currentUser;
-  var errorElement = dom.select('.auth-delete-account-error-message-element');
-  var confirmValue = dom.select('.auth-delete-account-confirmation-input').getValue()
-  var deleteButton = dom.select('.auth-delete-account-btn')
+  var errorElement = self.dom.select('.auth-delete-account-error-message-element');
+  var confirmValue = self.dom.select('.auth-delete-account-confirmation-input').getValue()
+  var deleteButton = self.dom.select('.auth-delete-account-btn')
 
   deleteButton.setAttribute('disabled', true).addClass('disabled');
   errorElement.setAttribute('hidden', true);
@@ -115,7 +114,7 @@ Account.prototype.delete = function (options) {
     } else {
       user.getIdToken(false)
       .then(function(token) {
-        fetch('https://us-central1-' + utilities.get(self.Manager, 'properties.options.libraries.firebase_app.config.projectId', 'unknown') + '.cloudfunctions.net/bm_api', {
+        fetch('https://us-central1-' + self.utilities.get(self.Manager, 'properties.options.libraries.firebase_app.config.projectId', 'unknown') + '.cloudfunctions.net/bm_api', {
         // fetch('http://localhost:5001/optiic-api/us-central1/bm_api', {
           method: 'POST',
           headers: { 'Content-Type': 'application/json' },
@@ -173,16 +172,6 @@ Account.prototype.resolve = function (account, options) {
   });
 }
 
-function _setAuthItem(selector, value) {
-  dom.select(selector).each(function(e, i) {
-    if (e.tagName === 'INPUT') {
-      dom.select(e).setValue(value);
-    } else {
-      dom.select(e).setInnerHTML(value);
-    }
-  });
-}
-
 function uppercase(str) {
   return str.charAt(0).toUpperCase() + str.slice(1);
 }
@@ -221,6 +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 || {};
@@ -239,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;
 
@@ -266,17 +264,17 @@ Account.prototype._resolveAccount = function (firebaseUser, account, options) {
   // In a try/catch because this lib is used in node sometimes
   try {
     currentURL = new URL(window.location.href);
-    isDevelopment = utilities.get(self.Manager, 'properties.meta.environment', '') === 'development';
+    isDevelopment = self.utilities.get(self.Manager, 'properties.meta.environment', '') === 'development';
 
-    if (utilities.get(isDevelopment)) {
+    if (self.utilities.get(isDevelopment)) {
       currentURL.searchParams
       .forEach(function(value, key) {
-        var accountValue = utilities.get(account, key, undefined)
+        var accountValue = self.utilities.get(account, key, undefined)
         if (typeof accountValue !== undefined) {
           if (value === 'true') { value = true }
           if (value === 'false') { value = false }
 
-          utilities.set(account, key, value)
+          self.utilities.set(account, key, value)
         }
       });
     }
@@ -289,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;
 
@@ -338,14 +336,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;
@@ -353,40 +343,56 @@ 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 = dom.select('.auth-billing-subscribe-btn');
-    var billingUpdateBtn = dom.select('.auth-billing-update-btn');
-    var billingPlanId = dom.select('.auth-billing-plan-id-element');
-    var billingFrequencyEl = dom.select('.auth-billing-frequency-element');
-    var billingStartDateEl = dom.select('.auth-billing-start-date-element');
-    var billingExpirationDateEl = dom.select('.auth-billing-expiration-date-element');
+    var billingSubscribeBtn = self.dom.select('.auth-billing-subscribe-btn');
+    var billingUpdateBtn = self.dom.select('.auth-billing-update-btn');
+    var billingPlanId = self.dom.select('.auth-billing-plan-id-element');
+    var billingFrequencyEl = self.dom.select('.auth-billing-frequency-element');
+    var billingStartDateEl = self.dom.select('.auth-billing-start-date-element');
+    var billingExpirationDateEl = self.dom.select('.auth-billing-expiration-date-element');
 
-    var $referralCount = dom.select('.auth-referral-count-element');
-    var $referralCode = dom.select('.auth-referral-code-element');
-    var $referralLink = dom.select('.auth-referral-link-element');
-    var $referralSocialLink = dom.select('a.auth-referral-social-link[data-provider]');
+    var $referralCount = self.dom.select('.auth-referral-count-element');
+    var $referralCode = self.dom.select('.auth-referral-code-element');
+    var $referralLink = self.dom.select('.auth-referral-link-element');
+    var $referralSocialLink = self.dom.select('a.auth-referral-social-link[data-provider]');
 
-    var authCreatedEl = dom.select('.auth-created-element');
-    var authPhoneInput = dom.select('.auth-phone-input');
+    var authCreatedEl = self.dom.select('.auth-created-element');
+    var authPhoneInput = self.dom.select('.auth-phone-input');
 
     var updateURL = new URL(cancelURL);
     var referralURL = new URL(window.location.origin || window.location.host);
 
+    function _setAuthItem(selector, value) {
+      self.dom.select(selector).each(function(e, i) {
+        if (e.tagName === 'INPUT') {
+          self.dom.select(e).setValue(value);
+        } else {
+          self.dom.select(e).setInnerHTML(value);
+        }
+      });
+    }
+
     referralURL.pathname = '/';
     referralURL.searchParams.set('aff', account.affiliate.code)
 
     authCreatedEl.setInnerHTML(
       new Date(
-        parseInt(utilities.get(firebaseUser, 'metadata.a', '0'))
+        parseInt(self.utilities.get(firebaseUser, 'metadata.a', '0'))
       )
       .toLocaleString(undefined, {
         weekday: 'long', year: 'numeric', month: 'long', day: 'numeric',
@@ -413,15 +419,14 @@ Account.prototype._resolveAccount = function (firebaseUser, account, options) {
       ? '<i class="fas fa-exclamation-triangle mr-1"></i> Expires in ' + daysTillExpire + ' days '
       : '');
 
-    _setAuthItem('.auth-apikey-element', utilities.get(account, 'api.privateKey', 'n/a'));
-
+    _setAuthItem('.auth-apikey-element', self.utilities.get(account, 'api.privateKey', 'n/a'));
 
     $referralCount.setInnerHTML(account.affiliate.referrals.length);
     $referralCode.setInnerHTML(account.affiliate.code).setValue(account.affiliate.code);
     $referralCode.setInnerHTML(referralURL.toString()).setValue(referralURL.toString());
 
     var affiliateLinkURI = encodeURIComponent(referralURL.toString());
-    var affiliateLinkTextURI = encodeURIComponent('Sign up for ' + utilities.get(self.Manager, 'properties.global.brand.name', 'this') + ', a useful service:');
+    var affiliateLinkTextURI = encodeURIComponent('Sign up for ' + self.utilities.get(self.Manager, 'properties.global.brand.name', 'this') + ', a useful service:');
 
     $referralSocialLink
     .each(function ($el) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "web-manager",
-  "version": "3.1.28",
+  "version": "3.1.30",
   "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"
   }
-}
+}