Merge userManagement branch to master

Packages/active-entry/lib/ActiveEntry.js

@@ -22,17 +22,31 @@ if (Meteor.isClient) {
     },
     themeColors: {
       primary: ""
+    },
+    passwordOptions: {
+      showPasswordStrengthIndicator: true,
+      requireRegexValidation: true,
+      //requireStrongPasswords: false
+      passwordHistoryCount: 6,
+      failedAttemptsLimit: 5
     }
+
   });
 }
 
+// requireRegexValidation toggles regex
+// reqiureStrongPasswords toggles zxcvbn
 
 if (Meteor.isClient) {
   ActiveEntry.errorMessages = new ReactiveDict('errorMessages');
   ActiveEntry.errorMessages.set('signInError', false);
 
-}
+  // Success messages
+  ActiveEntry.successMessages = new ReactiveDict('successMessages');
 
+  // Change password warning message according to whether zxcvbn is turned on
+  Session.set('passwordWarning', 'Password must have at least 8 characters. It must contain at least 1 uppercase, 1 lowercase, 1 number and 1 special character.');
+}
 
 ActiveEntry.configure = function (configObject) {
   if (Meteor.isClient) {
@@ -40,62 +54,101 @@ ActiveEntry.configure = function (configObject) {
   }
 };
 
-
-
-
 ActiveEntry.verifyPassword = function (password) {
   if (password.length === 0) {
     ActiveEntry.errorMessages.set('password', 'Password is required');
-  } else if (password.length < 8) {
-    ActiveEntry.errorMessages.set('password', 'Password is weak');
-  } else if (password.length >= 8) {
-    ActiveEntry.errorMessages.set('password', 'Password present');
+    ActiveEntry.successMessages.set('password', null);
+  } else if (!checkPasswordStrength(password)) {
+    ActiveEntry.errorMessages.set('password', Session.get('passwordWarning'));
+    ActiveEntry.successMessages.set('password', null);
+  } else {
+    ActiveEntry.errorMessages.set('password', null);
+    ActiveEntry.successMessages.set('password', 'Password present');
   }
 };
-ActiveEntry.verifyConfirmPassword = function (password, confirmPassword) {
-  if (confirmPassword.length === 0) {
-    ActiveEntry.errorMessages.set('confirm', 'Password is required');
-  } else if (confirmPassword.length < 8) {
-    ActiveEntry.errorMessages.set('confirm', 'Password is weak');
-  }
 
-  if (confirmPassword === password) {
-    ActiveEntry.errorMessages.set('confirm', 'Passwords match');
+ActiveEntry.verifyConfirmPassword = function (password, confirmPassword) {
+  // we have two different logic checks happening in this function
+  // would be reasonable to separate them out into separate functions
+  if (confirmPassword === "") {
+    ActiveEntry.errorMessages.set('confirm', 'Password is required');
+    ActiveEntry.successMessages.set('confirm', null);
+  } else if (confirmPassword === password) {
+    ActiveEntry.errorMessages.set('confirm', null);
+    ActiveEntry.successMessages.set('confirm', 'Passwords match');
+  } else {
+    ActiveEntry.errorMessages.set('confirm', 'Passwords do not match');
+    ActiveEntry.successMessages.set('confirm', null);
   }
 };
+
 ActiveEntry.verifyEmail = function (email) {
   if (email.length === 0) {
     ActiveEntry.errorMessages.set('email', 'Email is required');
+    ActiveEntry.successMessages.set('email', null);
   } else if (email.indexOf("@") === -1){
     ActiveEntry.errorMessages.set('email', 'Email is poorly formatted');
+    ActiveEntry.successMessages.set('email', null);
   } else if (email.indexOf("@") >= 0){
-    ActiveEntry.errorMessages.set('email', 'Email present');
+    ActiveEntry.errorMessages.set('email', null);
+    ActiveEntry.successMessages.set('email', 'Email present');
   }
 };
+
 ActiveEntry.verifyFullName = function (fullName) {
   if (fullName.length === 0) {
     ActiveEntry.errorMessages.set('fullName', 'Name is required');
+    ActiveEntry.successMessages.set('fullName', null);
   } else if (fullName.indexOf(" ") === -1){
     ActiveEntry.errorMessages.set('fullName', 'Name is probably not complete');
+    ActiveEntry.successMessages.set('fullName', null);
   } else if (fullName.indexOf(" ") >= 0){
-    ActiveEntry.errorMessages.set('fullName', 'Name present');
+    //ActiveEntry.errorMessages.set('fullName', 'Name present');
+    ActiveEntry.errorMessages.set('fullName', null);
+    ActiveEntry.successMessages.set('fullName', 'Name present');
   }
 };
 
 ActiveEntry.signIn = function (emailValue, passwordValue){
   ActiveEntry.verifyPassword(passwordValue);
   ActiveEntry.verifyEmail(emailValue);
+  var ActiveEntryConfig = Session.get('Photonic.ActiveEntry');
+  var failedAttemptsLimit = ActiveEntryConfig && ActiveEntryConfig.passwordOptions && ActiveEntryConfig.passwordOptions.failedAttemptsLimit || 5;
 
-  Meteor.loginWithPassword({email: emailValue}, passwordValue, function (error, result) {
+  Meteor.call("getFailedAttemptsCount", emailValue, function(error, failedAttemptsCount) {
     if (error) {
-      ActiveEntry.errorMessages.set('signInError', error.message);
+      console.warn(error.message);
     } else {
-      console.log('result', result);
-      var ActiveEntryConfig = Session.get('Photonic.ActiveEntry');
-      console.log('ActiveEntryConfig', JSON.stringify(ActiveEntryConfig));
-      Router.go(ActiveEntryConfig.signIn.destination);
+      if (failedAttemptsCount != failedAttemptsLimit) {
+        Meteor.loginWithPassword({email: emailValue}, passwordValue, function (error, result) {
+          if (error) {
+            // Login failed
+            Meteor.call("updateFailedAttempts", [emailValue, failedAttemptsLimit], function(error, failedAttemptCount) {
+              if (error) {
+                console.warn(error);
+              } else {
+                if (failedAttemptCount == failedAttemptsLimit) {
+                  ActiveEntry.errorMessages.set('signInError', "Too many failed login attempts. Your account has been locked.");
+
+                } else {
+                  ActiveEntry.errorMessages.set('signInError', (failedAttemptsLimit - failedAttemptCount) + " attempts remaining.");
+
+                }
+              }
+            });
+          } else {
+            console.log('result', result);
+            Meteor.call("resetFailedAttempts", emailValue);
+            Router.go(ActiveEntryConfig.signIn.destination);
+          }
+        });
+      } else {
+        ActiveEntry.errorMessages.set('signInError', "Your account has been locked.");
+      }
     }
+
   });
+
 };
 
 ActiveEntry.signUp = function (emailValue, passwordValue, confirmPassword, fullName){
@@ -103,18 +156,36 @@ ActiveEntry.signUp = function (emailValue, passwordValue, confirmPassword, fullN
   ActiveEntry.verifyPassword(passwordValue);
   ActiveEntry.verifyConfirmPassword(passwordValue, confirmPassword);
   ActiveEntry.verifyFullName(fullName);
+  ActiveEntry.errorMessages.set('signInError', null);
+
+  var errorIsFound = false;
+  Object.keys(ActiveEntry.errorMessages.keys).forEach(function(key) {
+    if (ActiveEntry.errorMessages.get(key) !== "null" && ActiveEntry.errorMessages.get(key) !== null) {
+      errorIsFound = true;
+    }
+  });
+
+  if(errorIsFound) {
+    return;
+  }
 
   Accounts.createUser({
     email: emailValue,
     password: passwordValue,
     profile: {
       fullName: fullName
+    },
+    testCase: {
+      createdAt: new Date()
     }
   }, function (error, result) {
     if (error) {
       console.log(error);
       ActiveEntry.errorMessages.set('signInError', error.message);
     } else {
+      // Add password in previous password field
+      ActiveEntry.insertHashedPassword(passwordValue);
+      ActiveEntry.updatePasswordCreatedDate();
       var ActiveEntryConfig = Session.get('Photonic.ActiveEntry');
       Router.go(ActiveEntryConfig.signUp.destination);
     }
@@ -134,17 +205,31 @@ ActiveEntry.signUp = function (emailValue, passwordValue, confirmPassword, fullN
   //   Router.go(ActiveEntryConfig.signIn.destination);
   // });
 };
+
+// Insert hashed password in previousPasswords fields
+ActiveEntry.insertHashedPassword =  function(passwordValue) {
+  var ActiveEntryConfig = Session.get('Photonic.ActiveEntry');
+  var passwordHistoryCount = ActiveEntryConfig && ActiveEntryConfig.passwordOptions && ActiveEntryConfig.passwordOptions.passwordHistoryCount || 6;
+  Meteor.call("insertHashedPassword", [new String(passwordValue).hashCode(),passwordHistoryCount]);
+};
+
+ActiveEntry.updatePasswordCreatedDate = function() {
+  Meteor.call("updatePasswordCreatedDate");
+};
+
 ActiveEntry.signOut = function (){
   Meteor.logout();
 };
 
 ActiveEntry.reset = function (){
+  ActiveEntry.errorMessages.set('signInError', false);
   ActiveEntry.errorMessages.set('fullName', false);
   ActiveEntry.errorMessages.set('email', false);
   ActiveEntry.errorMessages.set('confirm', false);
   ActiveEntry.errorMessages.set('password', false);
 };
+
 ActiveEntry.logoIsDisplayed = function (){
   var ActiveEntryConfig = Session.get('Photonic.ActiveEntry');
   return ActiveEntryConfig.logo.displayed;
-}
+};