@mjhls/mjh-framework 1.0.1002 → 1.0.1003

package/README.md

@@ -1,4 +1,4 @@
-# mjh-framework v. 1.0.1002
+# mjh-framework v. 1.0.1003
 
 [![NPM](https://img.shields.io/npm/v/mjh-framework.svg)](https://www.npmjs.com/package/mjh-framework) [![JavaScript Style Guide](https://img.shields.io/badge/code_style-standard-brightgreen.svg)](https://standardjs.com)
 

package/dist/cjs/faundadb.js

@@ -200,68 +200,145 @@ var authenticateUser = function () {
     return _ref3.apply(this, arguments);
   };
 }();
+var authenticateUserByForm = function () {
+  var _ref4 = asyncToGenerator._asyncToGenerator( /*#__PURE__*/asyncToGenerator.regenerator.mark(function _callee4(email, password, form_name) {
+    var secret = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : 'fnAEG3Bb7AACAC0BiSQFYGBLFUtHjn3QOTKE1iBX';
+    var client, result, hashedPassword, isAuth;
+    return asyncToGenerator.regenerator.wrap(function _callee4$(_context4) {
+      while (1) {
+        switch (_context4.prev = _context4.next) {
+          case 0:
+            _context4.prev = 0;
+            client = new faunadb.Client({ secret: secret });
+            _context4.next = 4;
+            return client.query(q.Get(q.Match(q.Index('Email_and_FormName'), [email, form_name])));
+
+          case 4:
+            result = _context4.sent;
+            hashedPassword = result.data.Password;
+            _context4.next = 8;
+            return comparePassword(password, hashedPassword);
+
+          case 8:
+            isAuth = _context4.sent;
+            return _context4.abrupt('return', isAuth ? { email: email } : false);
+
+          case 12:
+            _context4.prev = 12;
+            _context4.t0 = _context4['catch'](0);
+
+            console.log(_context4.t0);
+            return _context4.abrupt('return', false);
+
+          case 16:
+          case 'end':
+            return _context4.stop();
+        }
+      }
+    }, _callee4, this, [[0, 12]]);
+  }));
+
+  return function authenticateUserByForm(_x8, _x9, _x10) {
+    return _ref4.apply(this, arguments);
+  };
+}();
+
+var findUserByEmailAndForm = function () {
+  var _ref5 = asyncToGenerator._asyncToGenerator( /*#__PURE__*/asyncToGenerator.regenerator.mark(function _callee5(email, form_name) {
+    var secret = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 'fnAEG3Bb7AACAC0BiSQFYGBLFUtHjn3QOTKE1iBX';
+    var client, result;
+    return asyncToGenerator.regenerator.wrap(function _callee5$(_context5) {
+      while (1) {
+        switch (_context5.prev = _context5.next) {
+          case 0:
+            _context5.prev = 0;
+            client = new faunadb.Client({ secret: secret });
+            _context5.next = 4;
+            return client.query(q.Get(q.Match(q.Index('Email_and_FormName'), [email, form_name])));
+
+          case 4:
+            result = _context5.sent;
+            return _context5.abrupt('return', result ? true : false);
+
+          case 8:
+            _context5.prev = 8;
+            _context5.t0 = _context5['catch'](0);
+            return _context5.abrupt('return', false);
+
+          case 11:
+          case 'end':
+            return _context5.stop();
+        }
+      }
+    }, _callee5, this, [[0, 8]]);
+  }));
+
+  return function findUserByEmailAndForm(_x12, _x13) {
+    return _ref5.apply(this, arguments);
+  };
+}();
 
 var updateUserSecret = function () {
-  var _ref4 = asyncToGenerator._asyncToGenerator( /*#__PURE__*/asyncToGenerator.regenerator.mark(function _callee4(email, hash) {
+  var _ref6 = asyncToGenerator._asyncToGenerator( /*#__PURE__*/asyncToGenerator.regenerator.mark(function _callee6(email, hash) {
     var secret = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 'fnAEG3Bb7AACAC0BiSQFYGBLFUtHjn3QOTKE1iBX';
     var expiration, client, result;
-    return asyncToGenerator.regenerator.wrap(function _callee4$(_context4) {
+    return asyncToGenerator.regenerator.wrap(function _callee6$(_context6) {
       while (1) {
-        switch (_context4.prev = _context4.next) {
+        switch (_context6.prev = _context6.next) {
           case 0:
             expiration = new Date().getTime() + 43200000; //1day
 
-            _context4.prev = 1;
+            _context6.prev = 1;
 
             console.log(email, hash, expiration);
             client = new faunadb.Client({ secret: secret });
-            _context4.next = 6;
+            _context6.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);
+            result = _context6.sent;
+            return _context6.abrupt('return', result ? true : false);
 
           case 10:
-            _context4.prev = 10;
-            _context4.t0 = _context4['catch'](1);
+            _context6.prev = 10;
+            _context6.t0 = _context6['catch'](1);
 
-            console.log(_context4.t0);
-            return _context4.abrupt('return', false);
+            console.log(_context6.t0);
+            return _context6.abrupt('return', false);
 
           case 14:
           case 'end':
-            return _context4.stop();
+            return _context6.stop();
         }
       }
-    }, _callee4, this, [[1, 10]]);
+    }, _callee6, this, [[1, 10]]);
   }));
 
-  return function updateUserSecret(_x8, _x9) {
-    return _ref4.apply(this, arguments);
+  return function updateUserSecret(_x15, _x16) {
+    return _ref6.apply(this, arguments);
   };
 }();
 
 var updateUserPassword = function () {
-  var _ref5 = asyncToGenerator._asyncToGenerator( /*#__PURE__*/asyncToGenerator.regenerator.mark(function _callee5(hash, newPassword) {
+  var _ref7 = asyncToGenerator._asyncToGenerator( /*#__PURE__*/asyncToGenerator.regenerator.mark(function _callee7(hash, newPassword) {
     var secret = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 'fnAEG3Bb7AACAC0BiSQFYGBLFUtHjn3QOTKE1iBX';
     var now, client, result, expiration, password, updatePassword;
-    return asyncToGenerator.regenerator.wrap(function _callee5$(_context5) {
+    return asyncToGenerator.regenerator.wrap(function _callee7$(_context7) {
       while (1) {
-        switch (_context5.prev = _context5.next) {
+        switch (_context7.prev = _context7.next) {
           case 0:
-            _context5.prev = 0;
+            _context7.prev = 0;
             now = Date.now();
             client = new faunadb.Client({ secret: secret });
-            _context5.next = 5;
+            _context7.next = 5;
             return client.query(q.Get(q.Match(q.Index('SecretKey'), hash)));
 
           case 5:
-            result = _context5.sent;
+            result = _context7.sent;
             expiration = result.data.secretExpiration;
 
             if (!(now > expiration)) {
-              _context5.next = 9;
+              _context7.next = 9;
               break;
             }
 
@@ -269,23 +346,23 @@ var updateUserPassword = function () {
 
           case 9:
             if (!(now < expiration)) {
-              _context5.next = 18;
+              _context7.next = 18;
               break;
             }
 
-            _context5.next = 12;
+            _context7.next = 12;
             return encrypt(newPassword);
 
           case 12:
-            password = _context5.sent;
-            _context5.next = 15;
+            password = _context7.sent;
+            _context7.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;
+            updatePassword = _context7.sent;
 
             if (updatePassword) {
-              _context5.next = 18;
+              _context7.next = 18;
               break;
             }
 
@@ -293,35 +370,37 @@ var updateUserPassword = function () {
 
           case 18:
             if (!(!result || result.error)) {
-              _context5.next = 20;
+              _context7.next = 20;
               break;
             }
 
             throw new Error('User not found');
 
           case 20:
-            return _context5.abrupt('return', true);
+            return _context7.abrupt('return', true);
 
           case 23:
-            _context5.prev = 23;
-            _context5.t0 = _context5['catch'](0);
-            return _context5.abrupt('return', { err: _context5.t0 });
+            _context7.prev = 23;
+            _context7.t0 = _context7['catch'](0);
+            return _context7.abrupt('return', { err: _context7.t0 });
 
           case 26:
           case 'end':
-            return _context5.stop();
+            return _context7.stop();
         }
       }
-    }, _callee5, this, [[0, 23]]);
+    }, _callee7, this, [[0, 23]]);
   }));
 
-  return function updateUserPassword(_x11, _x12) {
-    return _ref5.apply(this, arguments);
+  return function updateUserPassword(_x18, _x19) {
+    return _ref7.apply(this, arguments);
   };
 }();
 
 exports.authenticateUser = authenticateUser;
+exports.authenticateUserByForm = authenticateUserByForm;
 exports.findUserByEmail = findUserByEmail;
+exports.findUserByEmailAndForm = findUserByEmailAndForm;
 exports.registerUser = registerUser;
 exports.updateUserPassword = updateUserPassword;
 exports.updateUserSecret = updateUserSecret;

package/dist/esm/faundadb.js

@@ -196,68 +196,145 @@ var authenticateUser = function () {
     return _ref3.apply(this, arguments);
   };
 }();
+var authenticateUserByForm = function () {
+  var _ref4 = _asyncToGenerator( /*#__PURE__*/regenerator.mark(function _callee4(email, password, form_name) {
+    var secret = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : 'fnAEG3Bb7AACAC0BiSQFYGBLFUtHjn3QOTKE1iBX';
+    var client, result, hashedPassword, isAuth;
+    return regenerator.wrap(function _callee4$(_context4) {
+      while (1) {
+        switch (_context4.prev = _context4.next) {
+          case 0:
+            _context4.prev = 0;
+            client = new faunadb.Client({ secret: secret });
+            _context4.next = 4;
+            return client.query(q.Get(q.Match(q.Index('Email_and_FormName'), [email, form_name])));
+
+          case 4:
+            result = _context4.sent;
+            hashedPassword = result.data.Password;
+            _context4.next = 8;
+            return comparePassword(password, hashedPassword);
+
+          case 8:
+            isAuth = _context4.sent;
+            return _context4.abrupt('return', isAuth ? { email: email } : false);
+
+          case 12:
+            _context4.prev = 12;
+            _context4.t0 = _context4['catch'](0);
+
+            console.log(_context4.t0);
+            return _context4.abrupt('return', false);
+
+          case 16:
+          case 'end':
+            return _context4.stop();
+        }
+      }
+    }, _callee4, this, [[0, 12]]);
+  }));
+
+  return function authenticateUserByForm(_x8, _x9, _x10) {
+    return _ref4.apply(this, arguments);
+  };
+}();
+
+var findUserByEmailAndForm = function () {
+  var _ref5 = _asyncToGenerator( /*#__PURE__*/regenerator.mark(function _callee5(email, form_name) {
+    var secret = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 'fnAEG3Bb7AACAC0BiSQFYGBLFUtHjn3QOTKE1iBX';
+    var client, result;
+    return regenerator.wrap(function _callee5$(_context5) {
+      while (1) {
+        switch (_context5.prev = _context5.next) {
+          case 0:
+            _context5.prev = 0;
+            client = new faunadb.Client({ secret: secret });
+            _context5.next = 4;
+            return client.query(q.Get(q.Match(q.Index('Email_and_FormName'), [email, form_name])));
+
+          case 4:
+            result = _context5.sent;
+            return _context5.abrupt('return', result ? true : false);
+
+          case 8:
+            _context5.prev = 8;
+            _context5.t0 = _context5['catch'](0);
+            return _context5.abrupt('return', false);
+
+          case 11:
+          case 'end':
+            return _context5.stop();
+        }
+      }
+    }, _callee5, this, [[0, 8]]);
+  }));
+
+  return function findUserByEmailAndForm(_x12, _x13) {
+    return _ref5.apply(this, arguments);
+  };
+}();
 
 var updateUserSecret = function () {
-  var _ref4 = _asyncToGenerator( /*#__PURE__*/regenerator.mark(function _callee4(email, hash) {
+  var _ref6 = _asyncToGenerator( /*#__PURE__*/regenerator.mark(function _callee6(email, hash) {
     var secret = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 'fnAEG3Bb7AACAC0BiSQFYGBLFUtHjn3QOTKE1iBX';
     var expiration, client, result;
-    return regenerator.wrap(function _callee4$(_context4) {
+    return regenerator.wrap(function _callee6$(_context6) {
       while (1) {
-        switch (_context4.prev = _context4.next) {
+        switch (_context6.prev = _context6.next) {
           case 0:
             expiration = new Date().getTime() + 43200000; //1day
 
-            _context4.prev = 1;
+            _context6.prev = 1;
 
             console.log(email, hash, expiration);
             client = new faunadb.Client({ secret: secret });
-            _context4.next = 6;
+            _context6.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);
+            result = _context6.sent;
+            return _context6.abrupt('return', result ? true : false);
 
           case 10:
-            _context4.prev = 10;
-            _context4.t0 = _context4['catch'](1);
+            _context6.prev = 10;
+            _context6.t0 = _context6['catch'](1);
 
-            console.log(_context4.t0);
-            return _context4.abrupt('return', false);
+            console.log(_context6.t0);
+            return _context6.abrupt('return', false);
 
           case 14:
           case 'end':
-            return _context4.stop();
+            return _context6.stop();
         }
       }
-    }, _callee4, this, [[1, 10]]);
+    }, _callee6, this, [[1, 10]]);
   }));
 
-  return function updateUserSecret(_x8, _x9) {
-    return _ref4.apply(this, arguments);
+  return function updateUserSecret(_x15, _x16) {
+    return _ref6.apply(this, arguments);
   };
 }();
 
 var updateUserPassword = function () {
-  var _ref5 = _asyncToGenerator( /*#__PURE__*/regenerator.mark(function _callee5(hash, newPassword) {
+  var _ref7 = _asyncToGenerator( /*#__PURE__*/regenerator.mark(function _callee7(hash, newPassword) {
     var secret = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 'fnAEG3Bb7AACAC0BiSQFYGBLFUtHjn3QOTKE1iBX';
     var now, client, result, expiration, password, updatePassword;
-    return regenerator.wrap(function _callee5$(_context5) {
+    return regenerator.wrap(function _callee7$(_context7) {
       while (1) {
-        switch (_context5.prev = _context5.next) {
+        switch (_context7.prev = _context7.next) {
           case 0:
-            _context5.prev = 0;
+            _context7.prev = 0;
             now = Date.now();
             client = new faunadb.Client({ secret: secret });
-            _context5.next = 5;
+            _context7.next = 5;
             return client.query(q.Get(q.Match(q.Index('SecretKey'), hash)));
 
           case 5:
-            result = _context5.sent;
+            result = _context7.sent;
             expiration = result.data.secretExpiration;
 
             if (!(now > expiration)) {
-              _context5.next = 9;
+              _context7.next = 9;
               break;
             }
 
@@ -265,23 +342,23 @@ var updateUserPassword = function () {
 
           case 9:
             if (!(now < expiration)) {
-              _context5.next = 18;
+              _context7.next = 18;
               break;
             }
 
-            _context5.next = 12;
+            _context7.next = 12;
             return encrypt(newPassword);
 
           case 12:
-            password = _context5.sent;
-            _context5.next = 15;
+            password = _context7.sent;
+            _context7.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;
+            updatePassword = _context7.sent;
 
             if (updatePassword) {
-              _context5.next = 18;
+              _context7.next = 18;
               break;
             }
 
@@ -289,31 +366,31 @@ var updateUserPassword = function () {
 
           case 18:
             if (!(!result || result.error)) {
-              _context5.next = 20;
+              _context7.next = 20;
               break;
             }
 
             throw new Error('User not found');
 
           case 20:
-            return _context5.abrupt('return', true);
+            return _context7.abrupt('return', true);
 
           case 23:
-            _context5.prev = 23;
-            _context5.t0 = _context5['catch'](0);
-            return _context5.abrupt('return', { err: _context5.t0 });
+            _context7.prev = 23;
+            _context7.t0 = _context7['catch'](0);
+            return _context7.abrupt('return', { err: _context7.t0 });
 
           case 26:
           case 'end':
-            return _context5.stop();
+            return _context7.stop();
         }
       }
-    }, _callee5, this, [[0, 23]]);
+    }, _callee7, this, [[0, 23]]);
   }));
 
-  return function updateUserPassword(_x11, _x12) {
-    return _ref5.apply(this, arguments);
+  return function updateUserPassword(_x18, _x19) {
+    return _ref7.apply(this, arguments);
   };
 }();
 
-export { authenticateUser, findUserByEmail, registerUser, updateUserPassword, updateUserSecret };
+export { authenticateUser, authenticateUserByForm, findUserByEmail, findUserByEmailAndForm, registerUser, updateUserPassword, updateUserSecret };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mjhls/mjh-framework",
-  "version": "1.0.1002",
+  "version": "1.0.1003",
   "description": "Foundation Framework",
   "author": "mjh-framework",
   "license": "MIT",