Reworked user functions into methods, properly implemented account updating

1 files changed, 20 insertions, 24 deletions

diff --git a/go-src/windows.go b/go-src/windows.go
index b88c224..7401536 100644
--- a/go-src/windows.go
+++ b/go-src/windows.go
@@ -237,34 +237,30 @@ func accountWindow(...string) {
 	nextWindow := handleInputActions(input, true)
 
 	if nextWindow == nil {
-		editI, _ := strconv.Atoi(input)
-		switch editI {
-		case 1:
-			pass := formWindow("Editing", accountWindow,
-				[]formInput{
-					{"Current password", inputBackSpec, nil},
-					{"New password", "", stringValidPassword},
-				},
+		userProp, _ := strconv.Atoi(input)
+		inputs, updateSuccessful := []formInput{{currentPasswordInName, inputBackSpec, nil}}, false
+
+		switch UserProp(userProp) {
+		case passwordProp:
+			values := formWindow(editPasswordNavTitle, accountWindow,
+				append(inputs, formInput{newPasswordInName, passwordSpec, stringValidPassword}),
 			)
-			if !updatePassword(pass[0], pass[1]) {
-				defer showError(invalidArgument, accountWindow)
-			} else {
-				defer accountWindow()
-			}
-		case 2:
-			newName := formWindow("Editing", accountWindow,
-				[]formInput{
-					{"Current password", inputBackSpec, nil},
-					{"New name", "", stringValidName},
-				},
+			updateSuccessful = loggedInUser.UpdatePassword(values[0], values[1])
+		case nameProp:
+			values := formWindow(editNameNavTitle, accountWindow,
+				append(inputs, formInput{newNameInName, nameSpec, stringValidName}),
 			)
-			if !updateName(newName[0], newName[1]) {
-				defer showError(invalidArgument, accountWindow)
-			} else {
-				defer accountWindow()
-			}
+			updateSuccessful = loggedInUser.UpdateName(values[0], values[1])
+			loggedInUser.Name = utils.If(updateSuccessful).String(values[1], loggedInUser.Name)
 		default:
 			defer showError(invalidCommand, accountWindow)
+			return
+		}
+
+		if !updateSuccessful {
+			defer showError(invalidArgument, accountWindow)
+		} else {
+			defer accountWindow()
 		}
 	} else {
 		defer nextWindow()