web-manager 3.0.6 → 3.0.9

package/README.md

@@ -265,6 +265,7 @@ The Firebase login system works like charm out of the box without you having to
 * `.auth-signout-all-btn`: Add to a button to handle the signout process
 * `.auth-email-element`: Add to any element to display the user's email
 * `.auth-terms-input`: Add to a checkbox to require a TOS agreement before signup occurs
+* `.auth-newsletter-input`: Add to a checkbox to opt-in the user to newsletters upon signup
 * `.auth-uid-element`: Add to any element to display the user's uid
 * `.auth-signedin-true-element`: Add to any element and it will be hidden if the user *is* signed in
 * `.auth-signedin-false-element`: Add to any element and it will be hidden if the user *is not* signed in

package/helpers/auth-pages.js

@@ -5,26 +5,45 @@ var dom;
 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);
-        }
-      }
-    })
-  }
+  dom.select('a[href*=signin], a[href*=signup], a[href*=forgot]').each(function (el) {
+    var href = el.getAttribute('href');
+    try {
+      var newURL = new URL(href);
+      pageQueryString.forEach(function(value, key) {
+        newURL.searchParams.set(key, value)
+      })
+      el.setAttribute('href', newURL.toString())
+    } catch (e) {
+      console.warn('Failed to set auth URL', e);
+    }
+  })
 }
 
+// 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

@@ -816,6 +816,7 @@ function Manager() {
     var domLib = This.dom();
 
     function _displayError(msg) {
+      console.error(msg);
       domLib.select(erel).show().setInnerHTML(msg);
     }
     function _preDisplayError() {
@@ -858,9 +859,9 @@ function Manager() {
       var authSelector = '.auth-';
       var inputSelector = authSelector + input + '-input';
       var formSelector = authSelector + mode + '-form ';
-      // var temp
+      var result = existing || domLib.select(formSelector + inputSelector).getValue() || domLib.select(inputSelector).getValue();
 
-      return existing || domLib.select(formSelector + inputSelector).getValue() || domLib.select(inputSelector).getValue()
+      return input === 'email' ? result.trim().toLowerCase() : result;
     }
 
     return {
@@ -888,7 +889,6 @@ function Manager() {
             firebase.auth()
               .getRedirectResult()
               .catch(function (error) {
-                console.error(error);
                 _displayError(error.message);
               });
           }
@@ -906,7 +906,7 @@ function Manager() {
         // This.log('Signin attempt: ', method, email, password);
         if (method === 'email') {
           // email = (email || domLib.select('.auth-email-input').getValue()).trim().toLowerCase();
-          email = resolveAuthInput(email, mode, 'email').trim().toLowerCase();
+          email = resolveAuthInput(email, mode, 'email');
           // password = password || domLib.select('.auth-password-input').getValue();
           password = resolveAuthInput(password, mode, 'password');
           // console.log('Signin attempt: ', method, email, password);
@@ -934,7 +934,6 @@ function Manager() {
         } else {
           firebase.auth().signInWithRedirect(new firebase.auth.OAuthProvider(method))
           .catch(function (e) {
-            console.error(e);
             _displayError(e);
           })
         }
@@ -961,7 +960,7 @@ function Manager() {
 
         if (method === 'email') {
           // email = (email || domLib.select('.auth-email-input').getValue()).trim().toLowerCase();
-          email = resolveAuthInput(email, mode, 'email').trim().toLowerCase();
+          email = resolveAuthInput(email, mode, 'email');
           // password = password || domLib.select('.auth-password-input').getValue();
           password = resolveAuthInput(password, mode, 'password');
           // passwordConfirm = passwordConfirm || domLib.select('.auth-password-confirm-input').getValue();
@@ -1012,7 +1011,7 @@ function Manager() {
         // This.log('forgot()');
         var mode = 'forgot';
         // email = email || domLib.select('.auth-email-input').getValue();
-        email = resolveAuthInput(email, mode, 'email').trim().toLowerCase();
+        email = resolveAuthInput(email, mode, 'email')
 
         // forgotButtonDisabled(true);
         setAuthButtonDisabled(mode, true);
@@ -1633,7 +1632,7 @@ function Manager() {
     var returnUrlObject = new URL(decodeURIComponent(url));
     var currentUrlObject = new URL(window.location.href);
     return returnUrlObject.host === currentUrlObject.host
-      || returnUrlObject.protocol === This.properties.global.app + ':'
+      || returnUrlObject.protocol === this.properties.global.app + ':'
   }
 
   // Manager.prototype.performance = function() {

package/lib/account.js

@@ -323,7 +323,7 @@ Account.prototype._resolveAccount = function (currentUser, account, options) {
 
     _setAuthItem('.auth-apikey-element', utilities.get(account, 'api.privateKey', 'n/a'))
   } catch (e) {
-    console.error('Unable to set DOM elements', e);
+    // console.error('Unable to set DOM elements', e);
   }
   self.properties = account;
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "web-manager",
-  "version": "3.0.6",
+  "version": "3.0.9",
   "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.17.3",
+    "@sentry/browser": "^6.19.7",
     "cookieconsent": "^3.1.1",
     "firebase": "^8.10.1",
     "lazysizes": "^5.3.2"
   }
-}
+}