From 22c7e2f57015f36f2e2f817e5ffbd9d997303282 Mon Sep 17 00:00:00 2001 From: Lncvrt Date: Wed, 27 Aug 2025 22:29:55 -0700 Subject: [PATCH] Improvements & fixing potential bugs --- .../AccountMenu/AccountChangePassword.cs | 14 ++-- .../AccountMenu/AccountChangeUsername.cs | 11 +-- Assets/Scripts/AccountMenu/AccountLoggedIn.cs | 68 ++++++++----------- Assets/Scripts/AccountMenu/AccountLogin.cs | 12 +--- .../AccountMenu/AccountRefreshLogin.cs | 11 +-- Assets/Scripts/AccountMenu/AccountRegister.cs | 16 ++--- 6 files changed, 47 insertions(+), 85 deletions(-) diff --git a/Assets/Scripts/AccountMenu/AccountChangePassword.cs b/Assets/Scripts/AccountMenu/AccountChangePassword.cs index 4f531e0..69623b2 100644 --- a/Assets/Scripts/AccountMenu/AccountChangePassword.cs +++ b/Assets/Scripts/AccountMenu/AccountChangePassword.cs @@ -29,13 +29,13 @@ public class AccountChangePassword : MonoBehaviour async void ChangePassword() { - changePasswordBackButton.interactable = false; if (changePasswordNewPasswordInput.text != changePasswordRetypeNewPasswordInput.text) { - changePasswordBackButton.interactable = true; Tools.UpdateStatusText(changePasswordStatusText, "Passwords do not match", Color.red); return; } + changePasswordBackButton.interactable = false; + changePasswordSubmitButton.interactable = false; EncryptedWWWForm dataForm = new(); dataForm.AddField("oldpassword", changePasswordCurrentPasswordInput.text); dataForm.AddField("newpassword", changePasswordNewPasswordInput.text); @@ -49,33 +49,26 @@ public class AccountChangePassword : MonoBehaviour if (request.result != UnityWebRequest.Result.Success) { changePasswordBackButton.interactable = true; + changePasswordSubmitButton.interactable = true; Tools.UpdateStatusText(changePasswordStatusText, "Failed to make HTTP request", Color.red); return; } string response = SensitiveInfo.Decrypt(request.downloadHandler.text, SensitiveInfo.SERVER_RECEIVE_TRANSFER_KEY); if (response == "-999") { - changePasswordBackButton.interactable = true; Tools.UpdateStatusText(changePasswordStatusText, "Server error while fetching data", Color.red); - return; } else if (response == "-998") { - changePasswordBackButton.interactable = true; Tools.UpdateStatusText(changePasswordStatusText, "Client version too outdated to access servers", Color.red); - return; } else if (response == "-997") { - changePasswordBackButton.interactable = true; Tools.UpdateStatusText(changePasswordStatusText, "Encryption/decryption issues", Color.red); - return; } else if (response == "-996") { - changePasswordBackButton.interactable = true; Tools.UpdateStatusText(changePasswordStatusText, "Can't send requests on self-built instance", Color.red); - return; } else { @@ -92,5 +85,6 @@ public class AccountChangePassword : MonoBehaviour } } changePasswordBackButton.interactable = true; + changePasswordSubmitButton.interactable = true; } } \ No newline at end of file diff --git a/Assets/Scripts/AccountMenu/AccountChangeUsername.cs b/Assets/Scripts/AccountMenu/AccountChangeUsername.cs index b27b1a7..0864195 100644 --- a/Assets/Scripts/AccountMenu/AccountChangeUsername.cs +++ b/Assets/Scripts/AccountMenu/AccountChangeUsername.cs @@ -28,6 +28,7 @@ public class AccountChangeUsername : MonoBehaviour async void ChangeUsername() { changeUsernameBackButton.interactable = false; + changeUsernameSubmitButton.interactable = false; EncryptedWWWForm dataForm = new(); dataForm.AddField("oldusername", changeUsernameCurrentUsernameInput.text); dataForm.AddField("newusername", changeUsernameNewUsernameInput.text); @@ -41,33 +42,26 @@ public class AccountChangeUsername : MonoBehaviour if (request.result != UnityWebRequest.Result.Success) { changeUsernameBackButton.interactable = true; + changeUsernameSubmitButton.interactable = true; Tools.UpdateStatusText(changeUsernameStatusText, "Failed to make HTTP request", Color.red); return; } string response = SensitiveInfo.Decrypt(request.downloadHandler.text, SensitiveInfo.SERVER_RECEIVE_TRANSFER_KEY); if (response == "-999") { - changeUsernameBackButton.interactable = true; Tools.UpdateStatusText(changeUsernameStatusText, "Server error while fetching data", Color.red); - return; } else if (response == "-998") { - changeUsernameBackButton.interactable = true; Tools.UpdateStatusText(changeUsernameStatusText, "Client version too outdated to access servers", Color.red); - return; } else if (response == "-997") { - changeUsernameBackButton.interactable = true; Tools.UpdateStatusText(changeUsernameStatusText, "Encryption/decryption issues", Color.red); - return; } else if (response == "-996") { - changeUsernameBackButton.interactable = true; Tools.UpdateStatusText(changeUsernameStatusText, "Can't send requests on self-built instance", Color.red); - return; } else { @@ -84,5 +78,6 @@ public class AccountChangeUsername : MonoBehaviour } } changeUsernameBackButton.interactable = true; + changeUsernameSubmitButton.interactable = true; } } \ No newline at end of file diff --git a/Assets/Scripts/AccountMenu/AccountLoggedIn.cs b/Assets/Scripts/AccountMenu/AccountLoggedIn.cs index 1d55e89..3ddc039 100644 --- a/Assets/Scripts/AccountMenu/AccountLoggedIn.cs +++ b/Assets/Scripts/AccountMenu/AccountLoggedIn.cs @@ -44,8 +44,12 @@ public class AccountLoggedIn : MonoBehaviour async void SaveAccount() { - loggedInLoadButton.interactable = false; + loggedInChangeUsernameButton.interactable = false; + loggedInChangePasswordButton.interactable = false; loggedInSaveButton.interactable = false; + loggedInLoadButton.interactable = false; + loggedInRefreshLoginButton.interactable = false; + loggedInLogoutButton.interactable = false; loggedInBackButton.interactable = false; EncryptedWWWForm dataForm = new(); dataForm.AddField("username", BazookaManager.Instance.GetAccountName()); @@ -58,8 +62,12 @@ public class AccountLoggedIn : MonoBehaviour await request.SendWebRequest(); if (request.result != UnityWebRequest.Result.Success) { - loggedInLoadButton.interactable = true; + loggedInChangeUsernameButton.interactable = true; + loggedInChangePasswordButton.interactable = true; loggedInSaveButton.interactable = true; + loggedInLoadButton.interactable = true; + loggedInRefreshLoginButton.interactable = true; + loggedInLogoutButton.interactable = true; loggedInBackButton.interactable = true; Tools.UpdateStatusText(loggedInText, "Failed to make HTTP request", Color.red); return; @@ -67,35 +75,19 @@ public class AccountLoggedIn : MonoBehaviour string response = SensitiveInfo.Decrypt(request.downloadHandler.text, SensitiveInfo.SERVER_RECEIVE_TRANSFER_KEY); if (response == "-999") { - loggedInLoadButton.interactable = true; - loggedInSaveButton.interactable = true; - loggedInBackButton.interactable = true; Tools.UpdateStatusText(loggedInText, "Server error while fetching data", Color.red); - return; } else if (response == "-998") { - loggedInLoadButton.interactable = true; - loggedInSaveButton.interactable = true; - loggedInBackButton.interactable = true; Tools.UpdateStatusText(loggedInText, "Client version too outdated to access servers", Color.red); - return; } else if (response == "-997") { - loggedInLoadButton.interactable = true; - loggedInSaveButton.interactable = true; - loggedInBackButton.interactable = true; Tools.UpdateStatusText(loggedInText, "Encryption/decryption issues", Color.red); - return; } else if (response == "-996") { - loggedInLoadButton.interactable = true; - loggedInSaveButton.interactable = true; - loggedInBackButton.interactable = true; Tools.UpdateStatusText(loggedInText, "Can't send requests on self-built instance", Color.red); - return; } else { @@ -109,15 +101,23 @@ public class AccountLoggedIn : MonoBehaviour Tools.UpdateStatusText(loggedInText, (string)jsonResponse["message"], Color.red); } } - loggedInLoadButton.interactable = true; + loggedInChangeUsernameButton.interactable = true; + loggedInChangePasswordButton.interactable = true; loggedInSaveButton.interactable = true; + loggedInLoadButton.interactable = true; + loggedInRefreshLoginButton.interactable = true; + loggedInLogoutButton.interactable = true; loggedInBackButton.interactable = true; } async void LoadAccount() { - loggedInLoadButton.interactable = false; + loggedInChangeUsernameButton.interactable = false; + loggedInChangePasswordButton.interactable = false; loggedInSaveButton.interactable = false; + loggedInLoadButton.interactable = false; + loggedInRefreshLoginButton.interactable = false; + loggedInLogoutButton.interactable = false; loggedInBackButton.interactable = false; EncryptedWWWForm dataForm = new(); dataForm.AddField("token", BazookaManager.Instance.GetAccountSession()); @@ -129,8 +129,12 @@ public class AccountLoggedIn : MonoBehaviour await request.SendWebRequest(); if (request.result != UnityWebRequest.Result.Success) { - loggedInLoadButton.interactable = true; + loggedInChangeUsernameButton.interactable = true; + loggedInChangePasswordButton.interactable = true; loggedInSaveButton.interactable = true; + loggedInLoadButton.interactable = true; + loggedInRefreshLoginButton.interactable = true; + loggedInLogoutButton.interactable = true; loggedInBackButton.interactable = true; Tools.UpdateStatusText(loggedInText, "Failed to make HTTP request", Color.red); return; @@ -138,35 +142,19 @@ public class AccountLoggedIn : MonoBehaviour string response = SensitiveInfo.Decrypt(request.downloadHandler.text, SensitiveInfo.SERVER_RECEIVE_TRANSFER_KEY); if (response == "-999") { - loggedInLoadButton.interactable = true; - loggedInSaveButton.interactable = true; - loggedInBackButton.interactable = true; Tools.UpdateStatusText(loggedInText, "Server error while fetching data", Color.red); - return; } else if (response == "-998") { - loggedInLoadButton.interactable = true; - loggedInSaveButton.interactable = true; - loggedInBackButton.interactable = true; Tools.UpdateStatusText(loggedInText, "Client version too outdated to access servers", Color.red); - return; } else if (response == "-997") { - loggedInLoadButton.interactable = true; - loggedInSaveButton.interactable = true; - loggedInBackButton.interactable = true; Tools.UpdateStatusText(loggedInText, "Encryption/decryption issues", Color.red); - return; } else if (response == "-996") { - loggedInLoadButton.interactable = true; - loggedInSaveButton.interactable = true; - loggedInBackButton.interactable = true; Tools.UpdateStatusText(loggedInText, "Can't send requests on self-built instance", Color.red); - return; } else { @@ -181,8 +169,12 @@ public class AccountLoggedIn : MonoBehaviour Tools.UpdateStatusText(loggedInText, (string)jsonResponse["message"], Color.red); } } - loggedInLoadButton.interactable = true; + loggedInChangeUsernameButton.interactable = true; + loggedInChangePasswordButton.interactable = true; loggedInSaveButton.interactable = true; + loggedInLoadButton.interactable = true; + loggedInRefreshLoginButton.interactable = true; + loggedInLogoutButton.interactable = true; loggedInBackButton.interactable = true; } } \ No newline at end of file diff --git a/Assets/Scripts/AccountMenu/AccountLogin.cs b/Assets/Scripts/AccountMenu/AccountLogin.cs index a36eb3d..195c59d 100644 --- a/Assets/Scripts/AccountMenu/AccountLogin.cs +++ b/Assets/Scripts/AccountMenu/AccountLogin.cs @@ -1,5 +1,4 @@ using System.Numerics; -using Newtonsoft.Json; using Newtonsoft.Json.Linq; using TMPro; using UnityEngine; @@ -30,6 +29,7 @@ public class AccountLogin : MonoBehaviour async void SubmitLogin() { loginBackButton.interactable = false; + loginSubmitButton.interactable = false; if (loginUsernameInput.text == string.Empty || loginPasswordInput.text == string.Empty) { Tools.UpdateStatusText(loginPanelStatusText, "All input fields must be filled", Color.red); @@ -47,33 +47,26 @@ public class AccountLogin : MonoBehaviour if (request.result != UnityWebRequest.Result.Success) { loginBackButton.interactable = true; + loginSubmitButton.interactable = true; Tools.UpdateStatusText(loginPanelStatusText, "Failed to make HTTP request", Color.red); return; } string response = SensitiveInfo.Decrypt(request.downloadHandler.text, SensitiveInfo.SERVER_RECEIVE_TRANSFER_KEY); if (response == "-999") { - loginBackButton.interactable = true; Tools.UpdateStatusText(loginPanelStatusText, "Server error while fetching data", Color.red); - return; } else if (response == "-998") { - loginBackButton.interactable = true; Tools.UpdateStatusText(loginPanelStatusText, "Client version too outdated to access servers", Color.red); - return; } else if (response == "-997") { - loginBackButton.interactable = true; Tools.UpdateStatusText(loginPanelStatusText, "Encryption/decryption issues", Color.red); - return; } else if (response == "-996") { - loginBackButton.interactable = true; Tools.UpdateStatusText(loginPanelStatusText, "Can't send requests on self-built instance", Color.red); - return; } else { @@ -92,5 +85,6 @@ public class AccountLogin : MonoBehaviour } } loginBackButton.interactable = true; + loginSubmitButton.interactable = true; } } \ No newline at end of file diff --git a/Assets/Scripts/AccountMenu/AccountRefreshLogin.cs b/Assets/Scripts/AccountMenu/AccountRefreshLogin.cs index 0c4c074..dd9626c 100644 --- a/Assets/Scripts/AccountMenu/AccountRefreshLogin.cs +++ b/Assets/Scripts/AccountMenu/AccountRefreshLogin.cs @@ -28,6 +28,7 @@ public class AccountRefreshLogin : MonoBehaviour async void RefreshLogin() { refreshLoginBackButton.interactable = false; + refreshLoginSubmitButton.interactable = false; EncryptedWWWForm dataForm = new(); dataForm.AddField("username", refreshLoginUsernameInput.text); dataForm.AddField("password", refreshLoginPasswordInput.text); @@ -39,33 +40,26 @@ public class AccountRefreshLogin : MonoBehaviour if (request.result != UnityWebRequest.Result.Success) { refreshLoginBackButton.interactable = true; + refreshLoginSubmitButton.interactable = true; Tools.UpdateStatusText(refreshLoginStatusText, "Failed to make HTTP request", Color.red); return; } string response = SensitiveInfo.Decrypt(request.downloadHandler.text, SensitiveInfo.SERVER_RECEIVE_TRANSFER_KEY); if (response == "-999") { - refreshLoginBackButton.interactable = true; Tools.UpdateStatusText(refreshLoginStatusText, "Server error while fetching data", Color.red); - return; } else if (response == "-998") { - refreshLoginBackButton.interactable = true; Tools.UpdateStatusText(refreshLoginStatusText, "Client version too outdated to access servers", Color.red); - return; } else if (response == "-997") { - refreshLoginBackButton.interactable = true; Tools.UpdateStatusText(refreshLoginStatusText, "Encryption/decryption issues", Color.red); - return; } else if (response == "-996") { - refreshLoginBackButton.interactable = true; Tools.UpdateStatusText(refreshLoginStatusText, "Can't send requests on self-built instance", Color.red); - return; } else { @@ -84,5 +78,6 @@ public class AccountRefreshLogin : MonoBehaviour } } refreshLoginBackButton.interactable = true; + refreshLoginSubmitButton.interactable = true; } } \ No newline at end of file diff --git a/Assets/Scripts/AccountMenu/AccountRegister.cs b/Assets/Scripts/AccountMenu/AccountRegister.cs index ec9bac7..4faad8b 100644 --- a/Assets/Scripts/AccountMenu/AccountRegister.cs +++ b/Assets/Scripts/AccountMenu/AccountRegister.cs @@ -33,7 +33,6 @@ public class AccountRegister : MonoBehaviour async void SubmitRegister() { - registerBackButton.interactable = false; if ( registerUsernameInput.text == string.Empty || registerEmailInput.text == string.Empty || @@ -42,22 +41,21 @@ public class AccountRegister : MonoBehaviour registerRetypePasswordInput.text == string.Empty ) { - registerBackButton.interactable = true; Tools.UpdateStatusText(registerPanelStatusText, "All input fields must be filled", Color.red); return; } if (registerEmailInput.text != registerRetypeEmailInput.text) { - registerBackButton.interactable = true; Tools.UpdateStatusText(registerPanelStatusText, "Emails don't match", Color.red); return; } if (registerPasswordInput.text != registerRetypePasswordInput.text) { - registerBackButton.interactable = true; Tools.UpdateStatusText(registerPanelStatusText, "Passwords don't match", Color.red); return; } + registerBackButton.interactable = false; + registerSubmitButton.interactable = false; EncryptedWWWForm dataForm = new(); dataForm.AddField("username", registerUsernameInput.text); dataForm.AddField("email", registerEmailInput.text); @@ -70,33 +68,26 @@ public class AccountRegister : MonoBehaviour if (request.result != UnityWebRequest.Result.Success) { registerBackButton.interactable = true; + registerSubmitButton.interactable = true; Tools.UpdateStatusText(registerPanelStatusText, "Failed to make HTTP request", Color.red); return; } string response = SensitiveInfo.Decrypt(request.downloadHandler.text, SensitiveInfo.SERVER_RECEIVE_TRANSFER_KEY); if (response == "-999") { - registerBackButton.interactable = true; Tools.UpdateStatusText(registerPanelStatusText, "Server error while fetching data", Color.red); - return; } else if (response == "-998") { - registerBackButton.interactable = true; Tools.UpdateStatusText(registerPanelStatusText, "Client version too outdated to access servers", Color.red); - return; } else if (response == "-997") { - registerBackButton.interactable = true; Tools.UpdateStatusText(registerPanelStatusText, "Encryption/decryption issues", Color.red); - return; } else if (response == "-996") { - registerBackButton.interactable = true; Tools.UpdateStatusText(registerPanelStatusText, "Can't send requests on self-built instance", Color.red); - return; } else { @@ -111,5 +102,6 @@ public class AccountRegister : MonoBehaviour } } registerBackButton.interactable = true; + registerSubmitButton.interactable = true; } } \ No newline at end of file