From 563b8c6cd23bb5a2c5422ec6cec244783adf8bf8 Mon Sep 17 00:00:00 2001
From: David Baldwynn <shorerydr10@live.com>
Date: Tue, 21 Nov 2017 12:37:57 -0800
Subject: [PATCH] Modified setup script to search for admin user by email AND
 username

---
 scripts/setup.js           |  2 +-
 scripts/setup_constants.js | 23 +++++++++--------------
 2 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/scripts/setup.js b/scripts/setup.js
index 3cc3ee6f..031e9207 100644
--- a/scripts/setup.js
+++ b/scripts/setup.js
@@ -63,7 +63,7 @@ var createOrUpdateAdminUser = function(username, email, password, cb){
 		setDefaultsOnInsert: true
 	}
 
-	User.findOneAndUpdate({ username: username }, updateObj, options, function (err, result) {
+	User.findOneAndUpdate({ username: username, email: email }, updateObj, options, function (err, result) {
 		if (err) {
 			return cb(err);
 		}
diff --git a/scripts/setup_constants.js b/scripts/setup_constants.js
index 54b2102a..235350c9 100644
--- a/scripts/setup_constants.js
+++ b/scripts/setup_constants.js
@@ -1,19 +1,19 @@
 var constants = require('../app/libs/constants');
 
-var createRegexValidator = function(regex){
+var createRegexValidator = function(regex, message){
 	return function(value) {
 		var isValid = new RegExp(regex, 'g').test(value);
 
 		if(!isValid){
-			return 'Please enter a valid email'
+			return message
 		} else {
 			return true;
 		}
 	}
 }
 
-var validateEmail = createRegexValidator(constants.regex.email);
-var validateUsername = createRegexValidator(constants.regex.username);
+var validateEmail = createRegexValidator(constants.regex.email, 'Please enter a valid email');
+var validateUsername = createRegexValidator(constants.regex.username, 'Usernames can only contain alphanumeric characters and \'-\'');
 
 module.exports = {
 		replaceENVQuestion: {
@@ -105,11 +105,6 @@ module.exports = {
 				type: 'password',
 				name: 'MAILER_PASSWORD',
 				message: 'What is your SMTP password?'
-			},
-			{
-				type: 'input',
-				name: 'MAILER_FROM',
-				message: 'What do you want the default "from" email address to be?'
 			}
 		],
 
@@ -143,16 +138,16 @@ module.exports = {
 				type: 'password',
 				name: 'MAILER_PASSWORD',
 				message: 'What is your SMTP password?'
-			},
+			}
+		],
+
+		questionsPart2: [
 			{
 				type: 'input',
 				name: 'MAILER_FROM',
 				message: 'What do you want the default "from" email address to be?',
 				validate: validateEmail
-			}
-		],
-
-		questionsPart2: [
+			},
 			{
 				type: 'input',
 				name: 'MONGODB_URI',