web-manager 3.2.11 → 3.2.15

package/helpers/auth-pages.js

@@ -21,29 +21,4 @@ function AuthPages() {
   })
 }
 
-// function AuthPages() {
-//   var self = this;
-//   dom = window.Manager.dom();
-//   var authRegex = /\/(signin|signup|forgot)/;
-//   var pageQueryString = window.Manager.properties.page.queryString;
-//   var pageAuthRedirect = pageQueryString.get('auth_redirect')
-//
-//   if (pageAuthRedirect) {
-//     dom.select('a').each(function (el) {
-//       var href = el.getAttribute('href');
-//       if (href && href.match(authRegex)) {
-//         try {
-//           var newURL = new URL(href);
-//           if (newURL.pathname.match(authRegex)) {
-//             newURL.searchParams.set('auth_redirect', pageAuthRedirect)
-//             el.setAttribute('href', newURL.toString())
-//           }
-//         } catch (e) {
-//           // console.warn('Failed to set auth URL', e);
-//         }
-//       }
-//     })
-//   }
-// }
-
 module.exports = AuthPages;

package/index.js

@@ -580,7 +580,7 @@ function Manager() {
             return window.location.href = redirect;
           }
 
-          if (pagePathname.match(/\/(signin|signup|forgot)\//)) {
+          if (pagePathname.match(/\/(authentication-required|authentication-success|authentication-token|forgot|oauth2|signin|signout|signup)/)) {
             import('./helpers/auth-pages.js')
             .then(function(mod) {
               mod.default()

package/lib/account.js

@@ -11,7 +11,9 @@ function Account(init) {
     self.dom = init.dom || self.Manager.dom();
     self.utilities = init.utilities || self.Manager.utilities();
 
-    if (new URL(window.location.href).pathname.includes('account')) {
+    var url = new URL(window.location.href);
+
+    if (url.pathname.startsWith('/account')) {
       self.initializeAccountPage();
     }
   } catch (e) {
@@ -102,9 +104,10 @@ Account.prototype.resolve = function (account, options) {
 
     account = account || {};
     options = options || {};
+    options.fetchNewAccount = typeof options.fetchNewAccount === 'undefined' ? true : options.fetchNewAccount;
 
     // If there is no user logged in or we choose not to fetch the account, resolve a default account
-    if (!currentUser || !currentUser.uid || options.fetchNewAccount === false) {
+    if (!currentUser || !currentUser.uid || !options.fetchNewAccount) {
       return resolve(
         self.handleAccount(
           self._resolveAccount(currentUser, account, options)
@@ -273,11 +276,11 @@ Account.prototype._resolveAccount = function (firebaseUser, account, options) {
     currentURL = new URL(window.location.href);
     isDevelopment = self.utilities.get(self.Manager, 'properties.meta.environment', '') === 'development';
 
-    if (self.utilities.get(isDevelopment)) {
+    if (isDevelopment) {
       currentURL.searchParams
       .forEach(function(value, key) {
         var accountValue = self.utilities.get(account, key, undefined)
-        if (typeof accountValue !== undefined) {
+        if (typeof accountValue !== 'undefined') {
           if (value === 'true') { value = true }
           if (value === 'false') { value = false }
 
@@ -297,6 +300,7 @@ Account.prototype._resolveAccount = function (firebaseUser, account, options) {
   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;
+  var planIsSuspended = account.plan.status === 'suspended';
 
   if (planIsActive) {
     account.plan.id = account.plan.id;
@@ -379,7 +383,7 @@ Account.prototype._resolveAccount = function (firebaseUser, account, options) {
   // Set UI elements
   // In a try/catch because this lib is used in node sometimes
   try {
-    var cancelURL = isDevelopment ? 'http://localhost:4001/cancel/' : 'https://itwcreativeworks.com/portal/account/manage/';
+    var cancelURL = isDevelopment ? 'http://localhost:4001/cancel' : 'https://itwcreativeworks.com/portal/account/manage';
 
     var billingSubscribeBtn = self.dom.select('.auth-billing-subscribe-btn');
     var billingUpdateBtn = self.dom.select('.auth-billing-update-btn');
@@ -387,6 +391,7 @@ Account.prototype._resolveAccount = function (firebaseUser, account, options) {
     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 billingSuspendedMessageEl = self.dom.select('.auth-billing-suspended-message-element');
 
     var $referralCount = self.dom.select('.auth-referral-count-element');
     var $referralCode = self.dom.select('.auth-referral-code-element');
@@ -420,18 +425,26 @@ Account.prototype._resolveAccount = function (firebaseUser, account, options) {
     )
     authPhoneInput.setInnerHTML(firebaseUser.phoneNumber).setValue(firebaseUser.phoneNumber)
 
+    billingUpdateBtn.setAttribute('hidden', true).setAttribute('href', updateURL.toString());
     billingSubscribeBtn.setAttribute('hidden', true);
-    billingUpdateBtn.setAttribute('hidden', true);
+    billingSuspendedMessageEl.setAttribute('hidden');
 
-    if (planIsActive) {
-      updateURL.searchParams.set('orderId', account.plan.payment.orderId);
-      updateURL.searchParams.set('resourceId', account.plan.payment.resourceId);
+    updateURL.searchParams.set('orderId', account.plan.payment.orderId);
+    updateURL.searchParams.set('resourceId', account.plan.payment.resourceId);
 
-      billingUpdateBtn.removeAttribute('hidden').setAttribute('href', updateURL.toString());
+    if (planIsActive) {
+      billingUpdateBtn.removeAttribute('hidden');
     } else {
       billingSubscribeBtn.removeAttribute('hidden');
     }
 
+    if (planIsSuspended) {
+      billingUpdateBtn.removeAttribute('hidden');
+      billingSubscribeBtn.setAttribute('hidden', true);
+
+      billingSuspendedMessageEl.removeAttribute('hidden');
+    }
+
     billingPlanId.setInnerHTML(uppercase(account.plan.id));
     billingFrequencyEl.setInnerHTML(account.plan.id !== defaultPlanId ? ' (billed ' + uppercase(account.plan.payment.frequency) + ')' : '');
     billingStartDateEl.setInnerHTML(account.plan.id !== defaultPlanId ? ' - Purchased ' + getMonth(startDate) + ' ' + startDate.getDate() + ', ' + startDate.getFullYear() : '');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "web-manager",
-  "version": "3.2.11",
+  "version": "3.2.15",
   "description": "Easily access important variables such as the query string, current domain, and current page in a single object.",
   "main": "index.js",
   "scripts": {