From 764b8c103bb5802db438667d4a5ce4928f36b295 Mon Sep 17 00:00:00 2001
From: "Ean Milligan (Bastion)" <ean.milligan@gmail.com>
Date: Sun, 22 May 2022 17:16:01 -0400
Subject: [PATCH] Sonar Cleanup - Phase 7

---
 www/api/main.js | 30 +++++++++++++++++++++++-------
 1 file changed, 23 insertions(+), 7 deletions(-)

diff --git a/www/api/main.js b/www/api/main.js
index 2cc1f42..615c1ae 100644
--- a/www/api/main.js
+++ b/www/api/main.js
@@ -13,42 +13,58 @@ var submitField = document.getElementById("submit-field");
 var endpoint = "none";
 var apiStatus = "activate";
 
+function validateUserField() {
+	return !(userField.value > 0 && userField.checkValidity());
+}
+
+function validateEmailField() {
+	return !(emailField.value.length > 0 && emailField.checkValidity());
+}
+
+function validateApiField() {
+	return !(apiField.value.length > 0 && apiField.checkValidity());
+}
+
+function validateChannelField() {
+	return !(channelField.value > 0 && channelField.checkValidity());
+}
+
 // Checks if all fields needed for the selected endpoint are valid
 function validateFields() {
-	if (!(userField.value > 0 && userField.checkValidity())) {
+	if (validateUserField()) {
 		submitField.disabled = true;
 		return;
 	}
 	switch (endpoint) {
 		case "generate":
-			if (!(emailField.value.length > 0 && emailField.checkValidity())) {
+			if (validateEmailField()) {
 				submitField.disabled = true;
 				return;
 			}
 			break;
 		case "delete":
-			if (!(apiField.value.length > 0 && apiField.checkValidity())) {
+			if (validateApiField()) {
 				submitField.disabled = true;
 				return;
 			}
-			if (!(emailField.value.length > 0 && emailField.checkValidity())) {
+			if (validateEmailField()) {
 				submitField.disabled = true;
 				return;
 			}
 			break;
 		case "view":
-			if (!(apiField.value.length > 0 && apiField.checkValidity())) {
+			if (validateApiField()) {
 				submitField.disabled = true;
 				return;
 			}
 			break;
 		case "add":
 		case "activate":
-			if (!(apiField.value.length > 0 && apiField.checkValidity())) {
+			if (validateApiField()) {
 				submitField.disabled = true;
 				return;
 			}
-			if (!(channelField.value > 0 && channelField.checkValidity())) {
+			if (validateChannelField()) {
 				submitField.disabled = true;
 				return;
 			}