From 41c948e806a73fdf49db042991bf57c75063008e Mon Sep 17 00:00:00 2001 From: Lncvrt Date: Thu, 22 Jan 2026 13:12:52 -0700 Subject: [PATCH] Fix login and register & improve some stuff --- Assets/Scripts/AccountMenu/AccountLoggedIn.cs | 32 +++------------ Assets/Scripts/AccountMenu/AccountLogin.cs | 41 +++++-------------- .../AccountMenu/AccountRefreshLogin.cs | 40 +++++------------- Assets/Scripts/AccountMenu/AccountRegister.cs | 32 +++------------ 4 files changed, 32 insertions(+), 113 deletions(-) diff --git a/Assets/Scripts/AccountMenu/AccountLoggedIn.cs b/Assets/Scripts/AccountMenu/AccountLoggedIn.cs index 70f57a7..b601d44 100644 --- a/Assets/Scripts/AccountMenu/AccountLoggedIn.cs +++ b/Assets/Scripts/AccountMenu/AccountLoggedIn.cs @@ -57,7 +57,7 @@ public class AccountLoggedIn : MonoBehaviour request.SetRequestHeader("ClientVersion", Application.version); request.SetRequestHeader("ClientPlatform", Application.platform.ToString()); await request.SendWebRequest(); - if (request.result != UnityWebRequest.Result.Success) + if (request.downloadHandler.text == null) { loggedInChangeUsernameButton.interactable = true; loggedInChangePasswordButton.interactable = true; @@ -69,34 +69,14 @@ public class AccountLoggedIn : MonoBehaviour Tools.UpdateStatusText(loggedInText, "Failed to make HTTP request", Color.red); return; } - string response = request.downloadHandler.text; - if (response == "-999") + var jsonResponse = JObject.Parse(request.downloadHandler.text); + if ((bool)jsonResponse["success"]) { - Tools.UpdateStatusText(loggedInText, "Server error while fetching data", Color.red); - } - else if (response == "-998") - { - Tools.UpdateStatusText(loggedInText, "Client version too outdated to access servers", Color.red); - } - else if (response == "-997") - { - Tools.UpdateStatusText(loggedInText, "Encryption/decryption issues", Color.red); - } - else if (response == "-996") - { - Tools.UpdateStatusText(loggedInText, "Can't send requests on self-built instance", Color.red); + Tools.UpdateStatusText(loggedInText, "Synced account", Color.green); } else { - var jsonResponse = JObject.Parse(response); - if ((bool)jsonResponse["success"]) - { - Tools.UpdateStatusText(loggedInText, "Synced account", Color.green); - } - else - { - Tools.UpdateStatusText(loggedInText, (string)jsonResponse["message"], Color.red); - } + Tools.UpdateStatusText(loggedInText, (string)jsonResponse["message"], Color.red); } loggedInChangeUsernameButton.interactable = true; loggedInChangePasswordButton.interactable = true; @@ -122,7 +102,7 @@ public class AccountLoggedIn : MonoBehaviour request.SetRequestHeader("ClientVersion", Application.version); request.SetRequestHeader("ClientPlatform", Application.platform.ToString()); await request.SendWebRequest(); - if (request.result != UnityWebRequest.Result.Success) + if (request.downloadHandler.text == null) { loggedInChangeUsernameButton.interactable = true; loggedInChangePasswordButton.interactable = true; diff --git a/Assets/Scripts/AccountMenu/AccountLogin.cs b/Assets/Scripts/AccountMenu/AccountLogin.cs index 66cf6af..fa41015 100644 --- a/Assets/Scripts/AccountMenu/AccountLogin.cs +++ b/Assets/Scripts/AccountMenu/AccountLogin.cs @@ -38,51 +38,30 @@ public class AccountLogin : MonoBehaviour WWWForm dataForm = new(); dataForm.AddField("username", loginUsernameInput.text); dataForm.AddField("password", loginPasswordInput.text); - dataForm.AddField("currentHighScore", BazookaManager.Instance.GetGameStoreHighScore().ToString()); - using UnityWebRequest request = UnityWebRequest.Post(SensitiveInfo.SERVER_DATABASE_PREFIX + "loginAccount.php", dataForm); + using UnityWebRequest request = UnityWebRequest.Post(Endpoints.ACCOUNT_LOGIN_ENDPOINT, dataForm); request.SetRequestHeader("Requester", "BerryDashClient"); request.SetRequestHeader("ClientVersion", Application.version); request.SetRequestHeader("ClientPlatform", Application.platform.ToString()); await request.SendWebRequest(); - if (request.result != UnityWebRequest.Result.Success) + if (request.downloadHandler.text == null) { loginBackButton.interactable = true; loginSubmitButton.interactable = true; Tools.UpdateStatusText(loginPanelStatusText, "Failed to make HTTP request", Color.red); return; } - string response = request.downloadHandler.text; - if (response == "-999") + var jsonResponse = JObject.Parse(request.downloadHandler.text); + if ((bool)jsonResponse["success"]) { - Tools.UpdateStatusText(loginPanelStatusText, "Server error while fetching data", Color.red); - } - else if (response == "-998") - { - Tools.UpdateStatusText(loginPanelStatusText, "Client version too outdated to access servers", Color.red); - } - else if (response == "-997") - { - Tools.UpdateStatusText(loginPanelStatusText, "Encryption/decryption issues", Color.red); - } - else if (response == "-996") - { - Tools.UpdateStatusText(loginPanelStatusText, "Can't send requests on self-built instance", Color.red); + BazookaManager.Instance.SetAccountSession((string)jsonResponse["data"]["session"]); + BazookaManager.Instance.SetAccountName((string)jsonResponse["data"]["username"]); + BazookaManager.Instance.SetAccountID(BigInteger.Parse((string)jsonResponse["data"]["id"])); + AccountHandler.instance.SwitchPanel(0); + Tools.UpdateStatusText(loginPanelStatusText, "", Color.red); } else { - var jsonResponse = JObject.Parse(response); - if ((bool)jsonResponse["success"]) - { - BazookaManager.Instance.SetAccountSession((string)jsonResponse["data"]["session"]); - BazookaManager.Instance.SetAccountName((string)jsonResponse["data"]["username"]); - BazookaManager.Instance.SetAccountID(BigInteger.Parse((string)jsonResponse["data"]["userid"])); - AccountHandler.instance.SwitchPanel(0); - Tools.UpdateStatusText(loginPanelStatusText, "", Color.red); - } - else - { - Tools.UpdateStatusText(loginPanelStatusText, (string)jsonResponse["message"], Color.red); - } + Tools.UpdateStatusText(loginPanelStatusText, (string)jsonResponse["message"], Color.red); } loginBackButton.interactable = true; loginSubmitButton.interactable = true; diff --git a/Assets/Scripts/AccountMenu/AccountRefreshLogin.cs b/Assets/Scripts/AccountMenu/AccountRefreshLogin.cs index 20be64a..3731f97 100644 --- a/Assets/Scripts/AccountMenu/AccountRefreshLogin.cs +++ b/Assets/Scripts/AccountMenu/AccountRefreshLogin.cs @@ -32,50 +32,30 @@ public class AccountRefreshLogin : MonoBehaviour WWWForm dataForm = new(); dataForm.AddField("username", refreshLoginUsernameInput.text); dataForm.AddField("password", refreshLoginPasswordInput.text); - using UnityWebRequest request = UnityWebRequest.Post(SensitiveInfo.SERVER_DATABASE_PREFIX + "loginAccount.php", dataForm); + using UnityWebRequest request = UnityWebRequest.Post(Endpoints.ACCOUNT_LOGIN_ENDPOINT, dataForm); request.SetRequestHeader("Requester", "BerryDashClient"); request.SetRequestHeader("ClientVersion", Application.version); request.SetRequestHeader("ClientPlatform", Application.platform.ToString()); await request.SendWebRequest(); - if (request.result != UnityWebRequest.Result.Success) + if (request.downloadHandler.text == null) { refreshLoginBackButton.interactable = true; refreshLoginSubmitButton.interactable = true; Tools.UpdateStatusText(refreshLoginStatusText, "Failed to make HTTP request", Color.red); return; } - string response = request.downloadHandler.text; - if (response == "-999") + var jsonResponse = JObject.Parse(request.downloadHandler.text); + if ((bool)jsonResponse["success"]) { - Tools.UpdateStatusText(refreshLoginStatusText, "Server error while fetching data", Color.red); - } - else if (response == "-998") - { - Tools.UpdateStatusText(refreshLoginStatusText, "Client version too outdated to access servers", Color.red); - } - else if (response == "-997") - { - Tools.UpdateStatusText(refreshLoginStatusText, "Encryption/decryption issues", Color.red); - } - else if (response == "-996") - { - Tools.UpdateStatusText(refreshLoginStatusText, "Can't send requests on self-built instance", Color.red); + BazookaManager.Instance.SetAccountSession((string)jsonResponse["data"]["session"]); + BazookaManager.Instance.SetAccountName((string)jsonResponse["data"]["username"]); + BazookaManager.Instance.SetAccountID(BigInteger.Parse((string)jsonResponse["data"]["id"])); + AccountHandler.instance.SwitchPanel(0); + Tools.UpdateStatusText(refreshLoginStatusText, "", Color.red); } else { - var jsonResponse = JObject.Parse(response); - if ((bool)jsonResponse["success"]) - { - BazookaManager.Instance.SetAccountSession((string)jsonResponse["data"]["session"]); - BazookaManager.Instance.SetAccountName((string)jsonResponse["data"]["username"]); - BazookaManager.Instance.SetAccountID(BigInteger.Parse((string)jsonResponse["data"]["userid"])); - AccountHandler.instance.SwitchPanel(0); - Tools.UpdateStatusText(refreshLoginStatusText, "", Color.red); - } - else - { - Tools.UpdateStatusText(refreshLoginStatusText, (string)jsonResponse["message"], Color.red); - } + Tools.UpdateStatusText(refreshLoginStatusText, (string)jsonResponse["message"], Color.red); } refreshLoginBackButton.interactable = true; refreshLoginSubmitButton.interactable = true; diff --git a/Assets/Scripts/AccountMenu/AccountRegister.cs b/Assets/Scripts/AccountMenu/AccountRegister.cs index ffc8cec..059ab18 100644 --- a/Assets/Scripts/AccountMenu/AccountRegister.cs +++ b/Assets/Scripts/AccountMenu/AccountRegister.cs @@ -60,46 +60,26 @@ public class AccountRegister : MonoBehaviour dataForm.AddField("username", registerUsernameInput.text); dataForm.AddField("email", registerEmailInput.text); dataForm.AddField("password", registerPasswordInput.text); - using UnityWebRequest request = UnityWebRequest.Post(SensitiveInfo.SERVER_DATABASE_PREFIX + "registerAccount.php", dataForm); + using UnityWebRequest request = UnityWebRequest.Post(Endpoints.ACCOUNT_REGISTER_ENDPOINT, dataForm); request.SetRequestHeader("Requester", "BerryDashClient"); request.SetRequestHeader("ClientVersion", Application.version); request.SetRequestHeader("ClientPlatform", Application.platform.ToString()); await request.SendWebRequest(); - if (request.result != UnityWebRequest.Result.Success) + if (request.downloadHandler.text == null) { registerBackButton.interactable = true; registerSubmitButton.interactable = true; Tools.UpdateStatusText(registerPanelStatusText, "Failed to make HTTP request", Color.red); return; } - string response = request.downloadHandler.text; - if (response == "-999") + var jsonResponse = JObject.Parse(request.downloadHandler.text); + if ((bool)jsonResponse["success"]) { - Tools.UpdateStatusText(registerPanelStatusText, "Server error while fetching data", Color.red); - } - else if (response == "-998") - { - Tools.UpdateStatusText(registerPanelStatusText, "Client version too outdated to access servers", Color.red); - } - else if (response == "-997") - { - Tools.UpdateStatusText(registerPanelStatusText, "Encryption/decryption issues", Color.red); - } - else if (response == "-996") - { - Tools.UpdateStatusText(registerPanelStatusText, "Can't send requests on self-built instance", Color.red); + AccountHandler.instance.SwitchPanel(2); } else { - var jsonResponse = JObject.Parse(response); - if ((bool)jsonResponse["success"]) - { - AccountHandler.instance.SwitchPanel(2); - } - else - { - Tools.UpdateStatusText(registerPanelStatusText, (string)jsonResponse["message"], Color.red); - } + Tools.UpdateStatusText(registerPanelStatusText, (string)jsonResponse["message"], Color.red); } registerBackButton.interactable = true; registerSubmitButton.interactable = true;