web-manager 2.1.22 → 2.1.28

package/index.js

@@ -240,6 +240,17 @@ 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({
+          //     authenticationToken: token,
+          //     command: 'signup-handler',
+          //     payload: {
+          //       newsletterSignUp: domLib.select('.auth-newsletter-input').getValue(),
+          //       affiliateCode: This.storage().get('auth.affiliateCode', '')
+          //     }
+          //   }),
+          // })
           fetch('https://us-central1-' + This.properties.options.libraries.firebase_app.config.projectId + '.cloudfunctions.net/bm_signUpHandler', {
             method: 'POST',
             body: JSON.stringify({
@@ -525,6 +536,7 @@ function Manager() {
             libraries: {
               firebase_app: {
                 enabled: true,
+                load: false,
                 config: {
                   apiKey: '',
                   authDomain: '',
@@ -536,13 +548,16 @@ function Manager() {
                 }
               },
               firebase_firestore: {
-                enabled: true
+                enabled: true,
+                load: false,
               },
               firebase_messaging: {
-                enabled: true
+                enabled: true,
+                load: false,
               },
               firebase_auth: {
                 enabled: true,
+                load: false,
               },
               lazysizes: {
                 enabled: true
@@ -1201,12 +1216,11 @@ function Manager() {
       // if (typeof window.firebase !== 'undefined') {
       //   return resolve();
       // }
-      if (options.libraries.firebase_app.enabled === true) {
-        import('firebase/app')
-        .then(function(mod) {
+      var setting = options.libraries.firebase_app
+      if (setting.enabled === true) {
+        function _post() {
           // This.log('Loaded Firebase.');
-          window.firebase = mod.default;
-          window.app = firebase.initializeApp(options.libraries.firebase_app.config);
+          window.app = firebase.initializeApp(setting.config);
 
           Promise.all([
             load_firebase_auth(This, options),
@@ -1215,8 +1229,19 @@ function Manager() {
           ])
           .then(resolve)
           .catch(reject);
-         })
-         .catch(reject);
+        }
+        if (setting.load) {
+          setting.load()
+          _post()
+        } else {
+          import('firebase/app')
+          .then(function(mod) {
+            window.firebase = mod.default;
+            _post()
+           })
+           .catch(reject);
+        }
+        return resolve()
       } else {
         return resolve();
       }
@@ -1229,10 +1254,16 @@ function Manager() {
       // if (typeof utilities.get(window, 'firebase.auth', undefined) !== 'undefined') {
       //   return resolve();
       // }
-      if (options.libraries.firebase_auth.enabled === true) {
-        import('firebase/auth')
-        .then(resolve)
-        .catch(reject);
+      var setting = options.libraries.firebase_auth;
+      if (setting.enabled === true) {
+        if (setting.load) {
+          setting.load()
+          resolve()
+        } else {
+          import('firebase/auth')
+          .then(resolve)
+          .catch(reject);
+        }
       } else {
         return resolve();
       }
@@ -1246,10 +1277,16 @@ function Manager() {
       // if (typeof utilities.get(window, 'firebase.firestore', undefined) !== 'undefined') {
       //   return resolve();
       // }
-      if (options.libraries.firebase_firestore.enabled === true) {
-        import('firebase/firestore')
-        .then(resolve)
-        .catch(reject);
+      var setting = options.libraries.firebase_firestore;
+      if (setting.enabled === true) {
+        if (setting.load) {
+          setting.load()
+          resolve()
+        } else {
+          import('firebase/firestore')
+          .then(resolve)
+          .catch(reject);
+        }
       } else {
         return resolve();
       }
@@ -1261,10 +1298,16 @@ function Manager() {
       // if (typeof utilities.get(window, 'firebase.messaging', undefined) !== 'undefined') {
       //   return resolve();
       // }
-      if (options.libraries.firebase_messaging.enabled === true) {
-        import('firebase/messaging')
-        .then(resolve)
-        .catch(reject);
+      var setting = options.libraries.firebase_messaging;
+      if (setting.enabled === true) {
+        if (setting.load) {
+          setting.load()
+          resolve()
+        } else {
+          import('firebase/messaging')
+          .then(resolve)
+          .catch(reject);
+        }
       } else {
         return resolve();
       }

package/lib/account.js

@@ -158,14 +158,14 @@ Account.prototype.resolve = function (account, options) {
       firebase.firestore().doc('users/' + currentUser.uid)
       .get()
       .then(function (doc) {
-        return resolve(_resolveAccount(self, currentUser, doc.data(), options));
+        return resolve(self._resolveAccount(currentUser, doc.data(), options));
       })
       .catch(reject)
     } else {
       if (!currentUser) {
         return reject(new Error('No currently authenticated user'))
       }
-      return resolve(_resolveAccount(self, currentUser, account, options));
+      return resolve(self._resolveAccount(currentUser, account, options));
     }
   });
 }
@@ -190,7 +190,8 @@ function getMonth(date) {
   return monthNames[date.getMonth()];
 }
 
-function _resolveAccount(self, currentUser, account, options) {
+Account.prototype._resolveAccount = function (currentUser, account, options) {
+  var self = this;
   account = account || {};
   options = options || {};
 
@@ -224,49 +225,17 @@ function _resolveAccount(self, currentUser, account, options) {
 
   var planExpireDate = new Date(account.plan.expires.timestamp);
   var now = new Date();
-  var daysTillExpire = Math.floor(( planExpireDate - now ) / 86400000);
+  var daysTillExpire = Math.floor((planExpireDate - now) / 86400000);
   let 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 isDevelopment = utilities.get(self.Manager, 'properties.meta.environment', '') === 'development';
-  // 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 updateURL = new URL(cancelURL);
-  var currentURL = new URL(window.location.href);
-
-  billingSubscribeBtn.setAttribute('hidden', true);
-  billingUpdateBtn.setAttribute('hidden', true);
-
-  if (difference > -1 && account.plan.id !== defaultPlanId) {
+  if (planIsActive) {
     account.plan.id = account.plan.id;
-    updateURL.searchParams.set('appName', utilities.get(self.Manager, 'properties.global.brand.name', 'Unknown'));
-    updateURL.searchParams.set('supportUrl', currentURL.origin + '/support');
-    updateURL.searchParams.set('supportEmail', utilities.get(self.Manager, 'properties.contact.emailSupport', 'unknown@email.com'));
-    updateURL.searchParams.set('userEmail', currentUser.email);
-    updateURL.searchParams.set('userId', currentUser.uid);
-    updateURL.searchParams.set('orderId', account.plan.payment.orderId);
-    updateURL.searchParams.set('resourceId', account.plan.payment.resourceId);
-    billingUpdateBtn.removeAttribute('hidden').setAttribute('href', updateURL.toString());
   } else {
     account.plan.id = defaultPlanId;
-    billingSubscribeBtn.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() : '');
-  billingExpirationDateEl.setInnerHTML(account.plan.id !== defaultPlanId && daysTillExpire < 366
-    ? '<i class="fas fa-exclamation-triangle mr-1"></i> Expires in ' + daysTillExpire + ' days '
-    : '');
-
   // Resolve oAuth2
   account.oauth2 = account.oauth2 || {};
   account.oauth2.discord = account.oauth2.discord || {};
@@ -280,10 +249,50 @@ function _resolveAccount(self, currentUser, account, options) {
   account.roles.vip = account.roles.vip === true || account.roles.vip === 'true';
   account.roles.promoExempt = account.roles.promoExempt === true || account.roles.promoExempt === 'true';
 
-  self.properties = account;
-
   // Set UI elements
-  _setAuthItem('.auth-apikey-element', utilities.get(account, 'api.privateKey', 'n/a'))
+  try {
+    var isDevelopment = utilities.get(self.Manager, 'properties.meta.environment', '') === 'development';
+    // 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 updateURL = new URL(cancelURL);
+    var currentURL = new URL(window.location.href);
+
+    billingSubscribeBtn.setAttribute('hidden', true);
+    billingUpdateBtn.setAttribute('hidden', true);
+
+    if (planIsActive) {
+      updateURL.searchParams.set('appName', utilities.get(self.Manager, 'properties.global.brand.name', 'Unknown'));
+      updateURL.searchParams.set('supportUrl', currentURL.origin + '/support');
+      updateURL.searchParams.set('supportEmail', utilities.get(self.Manager, 'properties.contact.emailSupport', 'unknown@email.com'));
+      updateURL.searchParams.set('userEmail', currentUser.email);
+      updateURL.searchParams.set('userId', currentUser.uid);
+      updateURL.searchParams.set('orderId', account.plan.payment.orderId);
+      updateURL.searchParams.set('resourceId', account.plan.payment.resourceId);
+      billingUpdateBtn.removeAttribute('hidden').setAttribute('href', updateURL.toString());
+    } else {
+      billingSubscribeBtn.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() : '');
+    billingExpirationDateEl.setInnerHTML(account.plan.id !== defaultPlanId && daysTillExpire < 366
+      ? '<i class="fas fa-exclamation-triangle mr-1"></i> Expires in ' + daysTillExpire + ' days '
+      : '');
+
+    _setAuthItem('.auth-apikey-element', utilities.get(account, 'api.privateKey', 'n/a'))
+  } catch (e) {
+    console.error('Unable to set DOM elements', e);
+  }
+  self.properties = account;
 
   return self.properties;
 }

package/lib/dom.js

@@ -250,22 +250,27 @@ Dom.prototype.exists = function() {
 }
 
 Dom.loadScript = function(options, callback) {
-  options = options || {};
-  options.async = (typeof options.async === 'undefined') ? false : options.async;
-  options.crossorigin = (typeof options.crossorigin === 'undefined') ? false : options.crossorigin;
-  var s = document.createElement('script');
-  s.src = options.src;
-  s.async = options.async;
-  if (options.crossorigin) {
-    s.setAttribute('crossorigin','*');
-  }
-  s.onload = function() {
-    callback();
-  };
-  s.onerror = function() {
-    callback(new Error('Failed to load script ' + options.src));
-  };
-  document.head.appendChild(s);
+  return new Promise(function(resolve, reject) {
+    options = options || {};
+    options.async = (typeof options.async === 'undefined') ? false : options.async;
+    options.crossorigin = (typeof options.crossorigin === 'undefined') ? false : options.crossorigin;
+    var s = document.createElement('script');
+    s.src = options.src;
+    s.async = options.async;
+    if (options.crossorigin) {
+      s.setAttribute('crossorigin','*');
+    }
+    s.onload = function() {
+      if (callback) { callback(); }
+      return resolve();
+    };
+    s.onerror = function() {
+      var error = new Error('Failed to load script ' + options.src);
+      if (callback) { callback(error); }
+      return reject(error);
+    };
+    document.head.appendChild(s);
+  });
 }
 
 Dom.select = function(selector, options) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "web-manager",
-  "version": "2.1.22",
+  "version": "2.1.28",
   "description": "Easily access important variables such as the query string, current domain, and current page in a single object.",
   "main": "index.js",
   "scripts": {
@@ -23,9 +23,9 @@
   },
   "homepage": "https://itwcreativeworks.com",
   "dependencies": {
-    "@sentry/browser": "^6.13.2",
+    "@sentry/browser": "^6.15.0",
     "cookieconsent": "^3.1.1",
     "firebase": "^8.10.0",
     "lazysizes": "^5.3.2"
   }
-}
+}