From 2bd1598a01044a60e4df85c419686c07f7d49f94 Mon Sep 17 00:00:00 2001
From: David Baldwynn <shorerydr10@live.com>
Date: Tue, 21 Nov 2017 10:11:53 -0800
Subject: [PATCH] Handled case in setup script where admin user already exists

---
 .gitignore       |   1 +
 dump.rdb         | Bin 76 -> 0 bytes
 scripts/setup.js |  20 +++++++++++++++-----
 3 files changed, 16 insertions(+), 5 deletions(-)
 delete mode 100644 dump.rdb

diff --git a/.gitignore b/.gitignore
index 91df1f8d..bbc3c9f2 100755
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
+selenium
 dist
 .vagrant
 npm-debug.*
diff --git a/dump.rdb b/dump.rdb
deleted file mode 100644
index c6e61e2af22236acfff1aa86fad52a75ef8fba48..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 76
zcmWG?b@2=~FfcIx#aWb^l3A=<mRiJWtY@TW@rw&0kd#?ce8AxsYjR0uZt9_s8Q&v+
dag-LPrs(FT<{tVmlaJwlbtKc?<?UOx0suOcAA0}*

diff --git a/scripts/setup.js b/scripts/setup.js
index 70c005ef..ba5015af 100644
--- a/scripts/setup.js
+++ b/scripts/setup.js
@@ -254,21 +254,31 @@ var createENVFile = function() {
 
 		    console.log(chalk.green('Successfully created .env file'));
 
-				user = new User({
+				var updateObj = {
 					firstName: 'Admin',
 					lastName: 'Account',
-					email: email,
 					username: username,
+					email: email,
 					password: pass,
 					provider: 'local',
 					roles: ['admin', 'user']
-				});
+				}
 
-				user.save(function (userSaveErr) {
-					if (err) {
+				var options = {
+					upsert: true,
+					new: true, 
+					setDefaultsOnInsert: true
+				}
+
+				User.findOneAndUpdate({ username: username }, updateObj, options, function (userSaveErr, result) {
+					if (err || !result) {
 						return console.error(chalk.red(userSaveErr));
 					}
 
+					delete pass;
+					delete email;
+					delete username;
+
 					console.log(chalk.green('Successfully created user'));
 
 					exitProcess();