web-manager 3.0.5 → 3.0.8

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

@@ -287,17 +287,12 @@ function Manager() {
     }
   }
 
-  function _isValidRedirectUrl(This, url) {
-    var returnUrlObject = new URL(decodeURIComponent(url));
-    var currentUrlObject = new URL(window.location.href);
-    return returnUrlObject.host === currentUrlObject.host
-      || returnUrlObject.protocol === This.properties.global.app + ':'
-  }
+
 
   function _authHandle_in_normal(This, user) {
     var domLib = This.dom();
     var returnUrl = This.properties.page.queryString.get('auth_redirect');
-    if (returnUrl && _isValidRedirectUrl(This, returnUrl)) {
+    if (returnUrl && This.isValidRedirectUrl(returnUrl)) {
       window.location.href = decodeURIComponent(returnUrl);
       return;
     }
@@ -636,7 +631,7 @@ function Manager() {
             This.storage().set('auth.affiliateCode', qsAff);
           }
           var qsRedirect = pageQueryString.get('redirect');
-          if (qsRedirect && _isValidRedirectUrl(This, qsRedirect)) {
+          if (qsRedirect && This.isValidRedirectUrl(qsRedirect)) {
             window.location.href = decodeURIComponent(qsRedirect);
             return;
           }
@@ -821,6 +816,7 @@ function Manager() {
     var domLib = This.dom();
 
     function _displayError(msg) {
+      console.error(msg);
       domLib.select(erel).show().setInnerHTML(msg);
     }
     function _preDisplayError() {
@@ -863,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 {
@@ -893,7 +889,6 @@ function Manager() {
             firebase.auth()
               .getRedirectResult()
               .catch(function (error) {
-                console.error(error);
                 _displayError(error.message);
               });
           }
@@ -911,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);
@@ -939,7 +934,6 @@ function Manager() {
         } else {
           firebase.auth().signInWithRedirect(new firebase.auth.OAuthProvider(method))
           .catch(function (e) {
-            console.error(e);
             _displayError(e);
           })
         }
@@ -966,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();
@@ -999,20 +993,25 @@ function Manager() {
       signOut: function() {
         // This.log('signOut()');
         // var This = this;
-        firebase.auth().signOut()
-        .then(function() {
-          // This.log('signOut success.');
-        })
+        return firebase.auth().signOut()
         .catch(function(e) {
           console.error(e);
           // This.log('signOut failed: ', error);
         });
+        // return firebase.auth().signOut()
+        // .then(function() {
+        //   // This.log('signOut success.');
+        // })
+        // .catch(function(e) {
+        //   // console.error(e);
+        //   // This.log('signOut failed: ', error);
+        // });
       },
       forgot: function(email) {
         // 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);
@@ -1618,7 +1617,7 @@ function Manager() {
   //     }
   //   }
   // }
-  Manager.prototype.performance = function() {
+  Manager.prototype.performance = function () {
     return {
       mark: function(mark) {
         try {
@@ -1629,6 +1628,13 @@ function Manager() {
     }
   }
 
+  Manager.prototype.isValidRedirectUrl = function (url) {
+    var returnUrlObject = new URL(decodeURIComponent(url));
+    var currentUrlObject = new URL(window.location.href);
+    return returnUrlObject.host === currentUrlObject.host
+      || returnUrlObject.protocol === this.properties.global.app + ':'
+  }
+
   // Manager.prototype.performance = function() {
   //   var This = this;
   //

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "web-manager",
-  "version": "3.0.5",
+  "version": "3.0.8",
   "description": "Easily access important variables such as the query string, current domain, and current page in a single object.",
   "main": "index.js",
   "scripts": {
@@ -23,7 +23,7 @@
   },
   "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"