web-manager 3.1.39 → 3.1.41

package/index.js

@@ -194,7 +194,7 @@ function Manager() {
 
     if (!utilities.get(this, 'properties.page.status.eventHandlersSet', false)) {
       this.properties.page.status.eventHandlersSet = true;
-      
+
       document.addEventListener('click', function (event) {
         // auth events
         if (event.target.matches('.auth-signin-email-btn')) {
@@ -214,15 +214,15 @@ function Manager() {
         } else if (event.target.matches('.auth-subscribe-notifications-btn')) {
           This.notifications().subscribe()
         }
-      
+
         // Autorequest
         if (!This._notificationRequested && This.properties.options.pushNotifications.autoRequest) {
           This._notificationRequested = true;
-          
+
           setTimeout(function () {
             This.notifications().subscribe()
           }, This.properties.options.pushNotifications.autoRequest * 1000);
-        }        
+        }
 
       }, false);
     }
@@ -271,7 +271,7 @@ function Manager() {
         done = true;
         store.set(didSignUp, true)
         _authHandle_in_normal(This, user);
-      }            
+      }
     }
 
     if (!store.get(didSignUp) && hoursSinceCreation < 0.5) {
@@ -285,7 +285,8 @@ function Manager() {
               command: 'user:sign-up',
               payload: {
                 newsletterSignUp: select('.auth-newsletter-input').getValue(),
-                affiliateCode: store.get('auth.affiliateCode', ''),
+                // affiliateCode: store.get('auth.affiliateCode', ''),
+                affiliateCode: store.get('affiliateCode', ''),
               },
             }),
           })
@@ -491,8 +492,8 @@ function Manager() {
       This.properties.page.status.initializing = true;
 
       // set other properties
-      This.properties.meta.environment = window.location.host.match(/:40|ngrok/) 
-        ? 'development' 
+      This.properties.meta.environment = window.location.host.match(/:40|ngrok/)
+        ? 'development'
         : 'production';
 
       // Load polyfills
@@ -546,8 +547,13 @@ function Manager() {
                   storageBucket: '',
                   messagingSenderId: '',
                   appId: '',
+                  measurementId: '',
                 },
               },
+              firebase_auth: {
+                enabled: true,
+                load: false,
+              },
               firebase_firestore: {
                 enabled: true,
                 load: false,
@@ -556,9 +562,12 @@ function Manager() {
                 enabled: true,
                 load: false,
               },
-              firebase_auth: {
+              firebase_appCheck: {
                 enabled: true,
                 load: false,
+                config: {
+                  siteKey: '',
+                },
               },
               lazysizes: {
                 enabled: true,
@@ -578,7 +587,7 @@ function Manager() {
                   settings: {
                     openChatButton: {
                       background: '#237afc',
-                      text: '#ffffff',                      
+                      text: '#ffffff',
                     },
                   },
                 },
@@ -641,7 +650,7 @@ function Manager() {
           This.properties.global.version = configuration.global.version;
           This.properties.global.url = configuration.global.url;
           This.properties.global.cacheBreaker = configuration.global.cacheBreaker;
-          
+
           This.properties.global.brand = configuration.global.brand;
           This.properties.global.contact = configuration.global.contact;
           This.properties.global.download = configuration.global.download;
@@ -650,11 +659,13 @@ function Manager() {
           This.properties.global.validRedirectHosts = configuration.global.validRedirectHosts;
           This.properties.meta.environment = utilities.get(configuration, 'global.settings.debug.environment', This.properties.meta.environment);
           This.properties.page.queryString = new URLSearchParams(window.location.search);
+
           var pageQueryString = This.properties.page.queryString
           var pagePathname = window.location.pathname;
           var qsAff = pageQueryString.get('aff');
           if (qsAff) {
-            store.set('auth.affiliateCode', qsAff);
+            // store.set('auth.affiliateCode', qsAff);
+            store.set('affiliateCode', qsAff);
           }
           var qsRedirect = pageQueryString.get('redirect');
           if (qsRedirect && This.isValidRedirectUrl(qsRedirect)) {
@@ -669,7 +680,6 @@ function Manager() {
             })
           }
 
-
           // load critical libraries
           function postCrucial() {
             // console.log('HERE 5');
@@ -707,7 +717,7 @@ function Manager() {
             var chatsyOps = options_user.libraries.chatsy;
             if (chatsyOps.enabled) {
               var preChatBtn = select('#prechat-btn');
-              
+
               preChatBtn.css({
                 background: chatsyOps.config.settings.openChatButton.background,
               })
@@ -1303,6 +1313,7 @@ function Manager() {
             load_firebase_auth(This, options),
             load_firebase_firestore(This, options),
             load_firebase_messaging(This, options),
+            load_firebase_appCheck(This, options),
           ])
           .then(resolve)
           .catch(reject);
@@ -1312,7 +1323,8 @@ function Manager() {
           .then(_post)
           .catch(reject);
         } else {
-          import('firebase/app')
+          // import('firebase/app')
+          import('firebase/compat/app')
           .then(function(mod) {
             window.firebase = mod.default;
             _post()
@@ -1338,7 +1350,8 @@ function Manager() {
           .then(resolve)
           .catch(reject);
         } else {
-          import('firebase/auth')
+          // import('firebase/auth')
+          import('firebase/compat/auth')
           .then(resolve)
           .catch(reject);
         }
@@ -1362,7 +1375,8 @@ function Manager() {
           .then(resolve)
           .catch(reject);
         } else {
-          import('firebase/firestore')
+          // import('firebase/firestore')
+          import('firebase/compat/firestore')
           .then(resolve)
           .catch(reject);
         }
@@ -1384,7 +1398,8 @@ function Manager() {
           .then(resolve)
           .catch(reject);
         } else {
-          import('firebase/messaging')
+          // import('firebase/messaging')
+          import('firebase/compat/messaging')
           .then(resolve)
           .catch(reject);
         }
@@ -1394,6 +1409,39 @@ function Manager() {
     });
   }
 
+  var load_firebase_appCheck = function(This, options) {
+    return new Promise(function(resolve, reject) {
+      var setting = options.libraries.firebase_appCheck;
+      if (setting.enabled === true) {
+        if (setting.load) {
+          setting.load(This)
+          .then(resolve)
+          .catch(reject);
+        } else {
+          // import('firebase/app-check')
+          import('firebase/compat/app-check')
+          .then(function (mod) {
+            var appCheck = firebase.appCheck;
+            var siteKey = setting.config.siteKey;
+
+            if (!siteKey) {
+              return resolve();
+            }
+
+            appCheck().activate(
+              new appCheck.ReCaptchaEnterpriseProvider(siteKey),
+              true,
+            );
+
+            resolve();
+          })
+          .catch(reject);
+        }
+      } else {
+        resolve();
+      }
+    });
+  }
 
   var load_lazysizes = function(This, options) {
     return new Promise(function(resolve, reject) {
@@ -1451,8 +1499,8 @@ function Manager() {
         var chatsyPath = 'libraries.chatsy.config';
 
         loadScript({
-          src: 'https://app.chatsy.ai/resources/script.js', 
-          // src: 'http://localhost:4001/resources/script.js', 
+          src: 'https://app.chatsy.ai/resources/script.js',
+          // src: 'http://localhost:4001/resources/script.js',
           attributes: [
             {name: 'data-account-id', value: utilities.get(options, chatsyPath + '.accountId', '')},
             {name: 'data-chat-id', value: utilities.get(options, chatsyPath + '.chatId', '')},

package/lib/account.js

@@ -91,7 +91,7 @@ Account.prototype.initializeAccountPage = function (options) {
 
 Account.prototype.delete = function (options) {
   var self = this;
-  
+
   var user = firebase.auth().currentUser;
   var errorElement = self.dom.select('.auth-delete-account-error-message-element');
   var confirmValue = self.dom.select('.auth-delete-account-confirmation-input').getValue()
@@ -168,7 +168,7 @@ Account.prototype.resolve = function (account, options) {
     .get()
     .then(function (doc) {
       return resolve(self._resolveAccount(currentUser, doc.data(), options));
-    })      
+    })
   });
 }
 
@@ -229,11 +229,13 @@ 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.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 || {};

package/lib/dom.js

@@ -256,7 +256,7 @@ Dom.loadScript = function(options, callback) {
     options.crossorigin = typeof options.crossorigin === 'undefined' ? false : options.crossorigin;
     options.cacheBreaker = typeof options.cacheBreaker === 'undefined' ? true : options.cacheBreaker;
     options.attributes = typeof options.attributes === 'undefined' ? [] : options.attributes;
-    
+
     var s = document.createElement('script');
 
     // Set the script cache breaker

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "web-manager",
-  "version": "3.1.39",
+  "version": "3.1.41",
   "description": "Easily access important variables such as the query string, current domain, and current page in a single object.",
   "main": "index.js",
   "scripts": {
@@ -22,10 +22,18 @@
     "url": "https://github.com/itw-creative-works/web-manager/issues"
   },
   "homepage": "https://itwcreativeworks.com",
+  "backup": {
+    "dependencies": {
+      "@sentry/browser": "^6.19.7",
+      "cookieconsent": "^3.1.1",
+      "firebase": "^8.10.1",
+      "lazysizes": "^5.3.2"
+    }
+  },
   "dependencies": {
     "@sentry/browser": "^6.19.7",
     "cookieconsent": "^3.1.1",
-    "firebase": "^8.10.1",
+    "firebase": "^9.23.0",
     "lazysizes": "^5.3.2"
   }
-}
+}