From 789173be98991a9347cbb41420ce74669d15bd70 Mon Sep 17 00:00:00 2001
From: William Wernert <william.wernert@securityonionsolutions.com>
Date: Sat, 18 Apr 2020 18:07:50 -0400
Subject: [PATCH] [refactor] Move collect_webuser_inputs to so-functions

---
 setup/so-functions | 23 +++++++++++++++++++++++
 setup/so-setup     | 25 -------------------------
 2 files changed, 23 insertions(+), 25 deletions(-)

diff --git a/setup/so-functions b/setup/so-functions
index 351a7fa8f..2b00f9781 100755
--- a/setup/so-functions
+++ b/setup/so-functions
@@ -291,6 +291,29 @@ clear_master() {
 
 }
 
+collect_webuser_inputs() {
+	# Get a password for the web admin user
+	VALIDUSER=no
+	while [ $VALIDUSER != yes ]; do
+		whiptail_create_web_user
+		if so-user valemail "$WEBUSER"; then
+			VALIDUSER=yes
+		else
+			whiptail_invalid_user_warning
+		fi
+	done
+
+	WPMATCH=no
+	while [ $WPMATCH != yes ]; do
+		whiptail_create_web_user_password1
+		if echo "$WEBPASSWD1" | so-user valpass; then
+			whiptail_create_web_user_password2
+			check_web_pass
+		else
+			whiptail_invalid_pass_warning
+		fi
+	done
+}
 configure_minion() {
 
   # You have to pass the TYPE to this function so it knows if its a master or not
diff --git a/setup/so-setup b/setup/so-setup
index f64c8ad8b..60772aba0 100755
--- a/setup/so-setup
+++ b/setup/so-setup
@@ -249,31 +249,6 @@ if (whiptail_you_sure) ; then
 
   fi
 
-  function collect_webuser_inputs() {
-    # Get a password for the web admin user
-    VALIDUSER=no
-    while [ $VALIDUSER != yes ]; do
-      whiptail_create_web_user
-      so-user valemail "$WEBUSER"
-      if [ $? == 0 ]; then
-        VALIDUSER=yes
-      else
-        whiptail_invalid_user_warning
-      fi
-    done
-
-    WPMATCH=no
-    while [ $WPMATCH != yes ]; do
-      whiptail_create_web_user_password1
-      echo "$WEBPASSWD1" | so-user valpass
-      if [ $? == 0 ]; then
-        whiptail_create_web_user_password2
-        check_web_pass
-      else
-        whiptail_invalid_pass_warning
-      fi
-    done
-  }
 
   ####################
   ##     Master     ##