@mjhls/mjh-framework 1.0.791-auth-test-v3 → 1.0.791-auth-test-v4

package/dist/cjs/AuthWrapper.js

@@ -2825,7 +2825,7 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 
 _commonjsHelpers.unwrapExports(lib);
 
-var css = ".AuthWrapper-module_loginBox__3l-BE {\n  margin-bottom: 2rem;\n  width: 350px;\n  max-width: 90vw;\n  margin-left: auto;\n  margin-right: auto;\n  /* box-shadow: 2px 5px 12px rgba(0, 0, 0, 0.15); */\n  background: #fff;\n  z-index: 1;\n}\n.AuthWrapper-module_loginBox_title__12rGD {\n  margin-bottom: 2rem;\n  text-align: center;\n}\n.AuthWrapper-module_bar__1dafn {\n  background: #eee;\n  margin-left: unset;\n  margin-right: unset;\n}\n.AuthWrapper-module_bar__1dafn:nth-child(1) {\n  float: left;\n  border-right: 1rem solid #fff;\n  background: rgb(245, 245, 245);\n  height: 10rem;\n  width: 25%;\n  margin-left: auto;\n  margin-right: auto;\n  margin-bottom: 2rem;\n}\n.AuthWrapper-module_bar__1dafn:nth-child(2n) {\n  width: 97%;\n  height: 1.5rem;\n  margin-bottom: 0.25rem;\n}\n.AuthWrapper-module_bar__1dafn.AuthWrapper-module_bar__1dafn:nth-child(3n) {\n  width: 96%;\n  height: 1.5rem;\n  margin-bottom: 1.5rem;\n}\n.AuthWrapper-module_bar__1dafn.AuthWrapper-module_bar__1dafn:nth-child(4n) {\n  width: 72%;\n  height: 1.5rem;\n  margin-bottom: 0.25rem;\n}\n.AuthWrapper-module_bar__1dafn.AuthWrapper-module_bar__1dafn:nth-child(5n) {\n  width: 88%;\n  height: 1.5rem;\n  margin-bottom: 0.25rem;\n}\n\n.AuthWrapper-module_iframe__2wDJW {\n  border: none;\n  width: 100%;\n  height: 1900px;\n}";
+var css = ".AuthWrapper-module_loginBox__3l-BE {\n  margin-bottom: 2rem;\n  width: 350px;\n  max-width: 90vw;\n  margin-left: auto;\n  margin-right: auto;\n  /* box-shadow: 2px 5px 12px rgba(0, 0, 0, 0.15); */\n  background: #fff;\n  z-index: 1;\n}\n.AuthWrapper-module_loginBox_title__12rGD {\n  margin-bottom: 2rem;\n  text-align: center;\n}\n.AuthWrapper-module_bar__1dafn {\n  background: #eee;\n  margin-left: unset;\n  margin-right: unset;\n}\n.AuthWrapper-module_bar__1dafn:nth-child(1) {\n  float: left;\n  border-right: 1rem solid #fff;\n  background: rgb(245, 245, 245);\n  height: 10rem;\n  width: 25%;\n  margin-left: auto;\n  margin-right: auto;\n  margin-bottom: 2rem;\n}\n.AuthWrapper-module_bar__1dafn:nth-child(2n) {\n  width: 97%;\n  height: 1.5rem;\n  margin-bottom: 0.25rem;\n}\n.AuthWrapper-module_bar__1dafn.AuthWrapper-module_bar__1dafn:nth-child(3n) {\n  width: 96%;\n  height: 1.5rem;\n  margin-bottom: 1.5rem;\n}\n.AuthWrapper-module_bar__1dafn.AuthWrapper-module_bar__1dafn:nth-child(4n) {\n  width: 72%;\n  height: 1.5rem;\n  margin-bottom: 0.25rem;\n}\n.AuthWrapper-module_bar__1dafn.AuthWrapper-module_bar__1dafn:nth-child(5n) {\n  width: 88%;\n  height: 1.5rem;\n  margin-bottom: 0.25rem;\n}\n\n.AuthWrapper-module_iframe__2wDJW {\n  margin-top: -3rem;\n  border: none;\n  width: 100%;\n  height: 1900px;\n}";
 var styles = { "loginBox": "AuthWrapper-module_loginBox__3l-BE", "loginBox_title": "AuthWrapper-module_loginBox_title__12rGD", "bar": "AuthWrapper-module_bar__1dafn", "iframe": "AuthWrapper-module_iframe__2wDJW" };
 styleInject_es.styleInject(css);
 
@@ -2850,10 +2850,15 @@ var AuthWrapper = function AuthWrapper(_ref) {
       email = _useState4[0],
       setEmail = _useState4[1];
 
-  var _useState5 = React.useState(),
+  var _useState5 = React.useState(false),
       _useState6 = slicedToArray._slicedToArray(_useState5, 2),
-      password = _useState6[0],
-      setPassword = _useState6[1];
+      showForm = _useState6[0],
+      setShowForm = _useState6[1];
+
+  var _useState7 = React.useState(),
+      _useState8 = slicedToArray._slicedToArray(_useState7, 2),
+      password = _useState8[0],
+      setPassword = _useState8[1];
 
   React.useEffect(function () {
     setCallbackUrl(window.location.href);
@@ -2874,7 +2879,7 @@ var AuthWrapper = function AuthWrapper(_ref) {
       callbackUrl && React__default['default'].createElement(
         'div',
         null,
-        React__default['default'].createElement(
+        !showForm && React__default['default'].createElement(
           'div',
           { className: styles.loginBox },
           React__default['default'].createElement(
@@ -2915,13 +2920,33 @@ var AuthWrapper = function AuthWrapper(_ref) {
           ),
           React__default['default'].createElement(
             'p',
-            { className: 'mt-2 mb-0' },
+            { style: { textAlign: 'center' }, className: 'mt-2 mb-0' },
             'Don\'t have an account?',
             ' ',
-            'Please register below.'
+            React__default['default'].createElement(
+              'a',
+              { style: { color: 'blue', textDecoration: 'underline' }, onClick: function onClick() {
+                  return setShowForm(!showForm);
+                } },
+              'Click Here'
+            ),
+            ' to register.'
+          ),
+          React__default['default'].createElement(
+            'p',
+            { className: 'mt-1', style: { fontSize: '.8em', textAlign: 'center' } },
+            React__default['default'].createElement(
+              'em',
+              null,
+              React__default['default'].createElement(
+                'a',
+                { href: '/forgotpassword', style: { color: 'blue', textDecoration: 'underline' } },
+                'Forgot your password? '
+              )
+            )
           )
         ),
-        React__default['default'].createElement('iframe', { className: styles.iframe, src: formUrl })
+        showForm && React__default['default'].createElement('iframe', { className: styles.iframe, src: formUrl })
       )
     );
   } else {

package/dist/cjs/faundadb.js

@@ -3,6 +3,7 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var asyncToGenerator = require('./asyncToGenerator-58c289d9.js');
+require('prop-types');
 var md5 = require('./md5-e1ca5797.js');
 require('./_commonjsHelpers-06173234.js');
 require('./es6.string.iterator-c2573ffd.js');
@@ -199,6 +200,125 @@ var authenticateUser = function () {
   };
 }();
 
+var updateUserSecret = function () {
+  var _ref4 = asyncToGenerator._asyncToGenerator( /*#__PURE__*/asyncToGenerator.regenerator.mark(function _callee4(email, hash) {
+    var expiration, client, result;
+    return asyncToGenerator.regenerator.wrap(function _callee4$(_context4) {
+      while (1) {
+        switch (_context4.prev = _context4.next) {
+          case 0:
+            expiration = new Date().getTime() + 43200000; //1day
+
+            _context4.prev = 1;
+
+            console.log(email, hash, expiration);
+            client = new faunadb.Client({ secret: secret });
+            _context4.next = 6;
+            return client.query(q.Update(q.Select(['ref'], q.Get(q.Match(q.Index('Email'), email))), { data: { secretKey: hash, secretExpiration: expiration } }));
+
+          case 6:
+            result = _context4.sent;
+            return _context4.abrupt('return', result ? true : false);
+
+          case 10:
+            _context4.prev = 10;
+            _context4.t0 = _context4['catch'](1);
+
+            console.log(_context4.t0);
+            return _context4.abrupt('return', false);
+
+          case 14:
+          case 'end':
+            return _context4.stop();
+        }
+      }
+    }, _callee4, this, [[1, 10]]);
+  }));
+
+  return function updateUserSecret(_x5, _x6) {
+    return _ref4.apply(this, arguments);
+  };
+}();
+
+var updateUserPassword = function () {
+  var _ref5 = asyncToGenerator._asyncToGenerator( /*#__PURE__*/asyncToGenerator.regenerator.mark(function _callee5(hash, newPassword) {
+    var now, client, result, expiration, password, updatePassword;
+    return asyncToGenerator.regenerator.wrap(function _callee5$(_context5) {
+      while (1) {
+        switch (_context5.prev = _context5.next) {
+          case 0:
+            _context5.prev = 0;
+            now = Date.now();
+            client = new faunadb.Client({ secret: secret });
+            _context5.next = 5;
+            return client.query(q.Get(q.Match(q.Index('SecretKey'), hash)));
+
+          case 5:
+            result = _context5.sent;
+            expiration = result.data.secretExpiration;
+
+            if (!(now > expiration)) {
+              _context5.next = 9;
+              break;
+            }
+
+            throw new Error('eKey has expired.');
+
+          case 9:
+            if (!(now < expiration)) {
+              _context5.next = 18;
+              break;
+            }
+
+            _context5.next = 12;
+            return encrypt(newPassword);
+
+          case 12:
+            password = _context5.sent;
+            _context5.next = 15;
+            return client.query(q.Update(q.Select(['ref'], q.Get(q.Match(q.Index('SecretKey'), hash))), { data: { Password: password, secretKey: '' } }));
+
+          case 15:
+            updatePassword = _context5.sent;
+
+            if (updatePassword) {
+              _context5.next = 18;
+              break;
+            }
+
+            throw new Error('Failed to update password.');
+
+          case 18:
+            if (!(!result || result.error)) {
+              _context5.next = 20;
+              break;
+            }
+
+            throw new Error('User not found');
+
+          case 20:
+            return _context5.abrupt('return', true);
+
+          case 23:
+            _context5.prev = 23;
+            _context5.t0 = _context5['catch'](0);
+            return _context5.abrupt('return', { err: _context5.t0 });
+
+          case 26:
+          case 'end':
+            return _context5.stop();
+        }
+      }
+    }, _callee5, this, [[0, 23]]);
+  }));
+
+  return function updateUserPassword(_x7, _x8) {
+    return _ref5.apply(this, arguments);
+  };
+}();
+
 exports.authenticateUser = authenticateUser;
 exports.findUserByEmail = findUserByEmail;
 exports.registerUser = registerUser;
+exports.updateUserPassword = updateUserPassword;
+exports.updateUserSecret = updateUserSecret;

package/dist/esm/AuthWrapper.js

@@ -2819,7 +2819,7 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 
 unwrapExports(lib);
 
-var css = ".AuthWrapper-module_loginBox__3l-BE {\n  margin-bottom: 2rem;\n  width: 350px;\n  max-width: 90vw;\n  margin-left: auto;\n  margin-right: auto;\n  /* box-shadow: 2px 5px 12px rgba(0, 0, 0, 0.15); */\n  background: #fff;\n  z-index: 1;\n}\n.AuthWrapper-module_loginBox_title__12rGD {\n  margin-bottom: 2rem;\n  text-align: center;\n}\n.AuthWrapper-module_bar__1dafn {\n  background: #eee;\n  margin-left: unset;\n  margin-right: unset;\n}\n.AuthWrapper-module_bar__1dafn:nth-child(1) {\n  float: left;\n  border-right: 1rem solid #fff;\n  background: rgb(245, 245, 245);\n  height: 10rem;\n  width: 25%;\n  margin-left: auto;\n  margin-right: auto;\n  margin-bottom: 2rem;\n}\n.AuthWrapper-module_bar__1dafn:nth-child(2n) {\n  width: 97%;\n  height: 1.5rem;\n  margin-bottom: 0.25rem;\n}\n.AuthWrapper-module_bar__1dafn.AuthWrapper-module_bar__1dafn:nth-child(3n) {\n  width: 96%;\n  height: 1.5rem;\n  margin-bottom: 1.5rem;\n}\n.AuthWrapper-module_bar__1dafn.AuthWrapper-module_bar__1dafn:nth-child(4n) {\n  width: 72%;\n  height: 1.5rem;\n  margin-bottom: 0.25rem;\n}\n.AuthWrapper-module_bar__1dafn.AuthWrapper-module_bar__1dafn:nth-child(5n) {\n  width: 88%;\n  height: 1.5rem;\n  margin-bottom: 0.25rem;\n}\n\n.AuthWrapper-module_iframe__2wDJW {\n  border: none;\n  width: 100%;\n  height: 1900px;\n}";
+var css = ".AuthWrapper-module_loginBox__3l-BE {\n  margin-bottom: 2rem;\n  width: 350px;\n  max-width: 90vw;\n  margin-left: auto;\n  margin-right: auto;\n  /* box-shadow: 2px 5px 12px rgba(0, 0, 0, 0.15); */\n  background: #fff;\n  z-index: 1;\n}\n.AuthWrapper-module_loginBox_title__12rGD {\n  margin-bottom: 2rem;\n  text-align: center;\n}\n.AuthWrapper-module_bar__1dafn {\n  background: #eee;\n  margin-left: unset;\n  margin-right: unset;\n}\n.AuthWrapper-module_bar__1dafn:nth-child(1) {\n  float: left;\n  border-right: 1rem solid #fff;\n  background: rgb(245, 245, 245);\n  height: 10rem;\n  width: 25%;\n  margin-left: auto;\n  margin-right: auto;\n  margin-bottom: 2rem;\n}\n.AuthWrapper-module_bar__1dafn:nth-child(2n) {\n  width: 97%;\n  height: 1.5rem;\n  margin-bottom: 0.25rem;\n}\n.AuthWrapper-module_bar__1dafn.AuthWrapper-module_bar__1dafn:nth-child(3n) {\n  width: 96%;\n  height: 1.5rem;\n  margin-bottom: 1.5rem;\n}\n.AuthWrapper-module_bar__1dafn.AuthWrapper-module_bar__1dafn:nth-child(4n) {\n  width: 72%;\n  height: 1.5rem;\n  margin-bottom: 0.25rem;\n}\n.AuthWrapper-module_bar__1dafn.AuthWrapper-module_bar__1dafn:nth-child(5n) {\n  width: 88%;\n  height: 1.5rem;\n  margin-bottom: 0.25rem;\n}\n\n.AuthWrapper-module_iframe__2wDJW {\n  margin-top: -3rem;\n  border: none;\n  width: 100%;\n  height: 1900px;\n}";
 var styles = { "loginBox": "AuthWrapper-module_loginBox__3l-BE", "loginBox_title": "AuthWrapper-module_loginBox_title__12rGD", "bar": "AuthWrapper-module_bar__1dafn", "iframe": "AuthWrapper-module_iframe__2wDJW" };
 styleInject(css);
 
@@ -2844,10 +2844,15 @@ var AuthWrapper = function AuthWrapper(_ref) {
       email = _useState4[0],
       setEmail = _useState4[1];
 
-  var _useState5 = useState(),
+  var _useState5 = useState(false),
       _useState6 = _slicedToArray(_useState5, 2),
-      password = _useState6[0],
-      setPassword = _useState6[1];
+      showForm = _useState6[0],
+      setShowForm = _useState6[1];
+
+  var _useState7 = useState(),
+      _useState8 = _slicedToArray(_useState7, 2),
+      password = _useState8[0],
+      setPassword = _useState8[1];
 
   useEffect(function () {
     setCallbackUrl(window.location.href);
@@ -2868,7 +2873,7 @@ var AuthWrapper = function AuthWrapper(_ref) {
       callbackUrl && React.createElement(
         'div',
         null,
-        React.createElement(
+        !showForm && React.createElement(
           'div',
           { className: styles.loginBox },
           React.createElement(
@@ -2909,13 +2914,33 @@ var AuthWrapper = function AuthWrapper(_ref) {
           ),
           React.createElement(
             'p',
-            { className: 'mt-2 mb-0' },
+            { style: { textAlign: 'center' }, className: 'mt-2 mb-0' },
             'Don\'t have an account?',
             ' ',
-            'Please register below.'
+            React.createElement(
+              'a',
+              { style: { color: 'blue', textDecoration: 'underline' }, onClick: function onClick() {
+                  return setShowForm(!showForm);
+                } },
+              'Click Here'
+            ),
+            ' to register.'
+          ),
+          React.createElement(
+            'p',
+            { className: 'mt-1', style: { fontSize: '.8em', textAlign: 'center' } },
+            React.createElement(
+              'em',
+              null,
+              React.createElement(
+                'a',
+                { href: '/forgotpassword', style: { color: 'blue', textDecoration: 'underline' } },
+                'Forgot your password? '
+              )
+            )
           )
         ),
-        React.createElement('iframe', { className: styles.iframe, src: formUrl })
+        showForm && React.createElement('iframe', { className: styles.iframe, src: formUrl })
       )
     );
   } else {

package/dist/esm/faundadb.js

@@ -1,4 +1,5 @@
 import { a as _asyncToGenerator, r as regenerator } from './asyncToGenerator-7f8f9219.js';
+import 'prop-types';
 import { m as md5 } from './md5-4e42248e.js';
 import './_commonjsHelpers-0c4b6f40.js';
 import './es6.string.iterator-bc33758b.js';
@@ -195,4 +196,121 @@ var authenticateUser = function () {
   };
 }();
 
-export { authenticateUser, findUserByEmail, registerUser };
+var updateUserSecret = function () {
+  var _ref4 = _asyncToGenerator( /*#__PURE__*/regenerator.mark(function _callee4(email, hash) {
+    var expiration, client, result;
+    return regenerator.wrap(function _callee4$(_context4) {
+      while (1) {
+        switch (_context4.prev = _context4.next) {
+          case 0:
+            expiration = new Date().getTime() + 43200000; //1day
+
+            _context4.prev = 1;
+
+            console.log(email, hash, expiration);
+            client = new faunadb.Client({ secret: secret });
+            _context4.next = 6;
+            return client.query(q.Update(q.Select(['ref'], q.Get(q.Match(q.Index('Email'), email))), { data: { secretKey: hash, secretExpiration: expiration } }));
+
+          case 6:
+            result = _context4.sent;
+            return _context4.abrupt('return', result ? true : false);
+
+          case 10:
+            _context4.prev = 10;
+            _context4.t0 = _context4['catch'](1);
+
+            console.log(_context4.t0);
+            return _context4.abrupt('return', false);
+
+          case 14:
+          case 'end':
+            return _context4.stop();
+        }
+      }
+    }, _callee4, this, [[1, 10]]);
+  }));
+
+  return function updateUserSecret(_x5, _x6) {
+    return _ref4.apply(this, arguments);
+  };
+}();
+
+var updateUserPassword = function () {
+  var _ref5 = _asyncToGenerator( /*#__PURE__*/regenerator.mark(function _callee5(hash, newPassword) {
+    var now, client, result, expiration, password, updatePassword;
+    return regenerator.wrap(function _callee5$(_context5) {
+      while (1) {
+        switch (_context5.prev = _context5.next) {
+          case 0:
+            _context5.prev = 0;
+            now = Date.now();
+            client = new faunadb.Client({ secret: secret });
+            _context5.next = 5;
+            return client.query(q.Get(q.Match(q.Index('SecretKey'), hash)));
+
+          case 5:
+            result = _context5.sent;
+            expiration = result.data.secretExpiration;
+
+            if (!(now > expiration)) {
+              _context5.next = 9;
+              break;
+            }
+
+            throw new Error('eKey has expired.');
+
+          case 9:
+            if (!(now < expiration)) {
+              _context5.next = 18;
+              break;
+            }
+
+            _context5.next = 12;
+            return encrypt(newPassword);
+
+          case 12:
+            password = _context5.sent;
+            _context5.next = 15;
+            return client.query(q.Update(q.Select(['ref'], q.Get(q.Match(q.Index('SecretKey'), hash))), { data: { Password: password, secretKey: '' } }));
+
+          case 15:
+            updatePassword = _context5.sent;
+
+            if (updatePassword) {
+              _context5.next = 18;
+              break;
+            }
+
+            throw new Error('Failed to update password.');
+
+          case 18:
+            if (!(!result || result.error)) {
+              _context5.next = 20;
+              break;
+            }
+
+            throw new Error('User not found');
+
+          case 20:
+            return _context5.abrupt('return', true);
+
+          case 23:
+            _context5.prev = 23;
+            _context5.t0 = _context5['catch'](0);
+            return _context5.abrupt('return', { err: _context5.t0 });
+
+          case 26:
+          case 'end':
+            return _context5.stop();
+        }
+      }
+    }, _callee5, this, [[0, 23]]);
+  }));
+
+  return function updateUserPassword(_x7, _x8) {
+    return _ref5.apply(this, arguments);
+  };
+}();
+
+export { authenticateUser, findUserByEmail, registerUser, updateUserPassword, updateUserSecret };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mjhls/mjh-framework",
-  "version": "1.0.791-auth-test-v3",
+  "version": "1.0.791-auth-test-v4",
   "description": "Foundation Framework",
   "author": "mjh-framework",
   "license": "MIT",