Fix login and register & improve some stuff

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,26 +69,7 @@ public class AccountLoggedIn : MonoBehaviour
             Tools.UpdateStatusText(loggedInText, "Failed to make HTTP request", Color.red);
             return;
         }
-        string response = request.downloadHandler.text;
+        var jsonResponse = JObject.Parse(request.downloadHandler.text);
-        if (response == "-999")
-        {
-            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);
-        }
-        else
-        {
-            var jsonResponse = JObject.Parse(response);
         if ((bool)jsonResponse["success"])
         {
             Tools.UpdateStatusText(loggedInText, "Synced account", Color.green);
@@ -97,7 +78,6 @@ public class AccountLoggedIn : MonoBehaviour
         {
             Tools.UpdateStatusText(loggedInText, (string)jsonResponse["message"], Color.red);
         }
-        }
         loggedInChangeUsernameButton.interactable = true;
         loggedInChangePasswordButton.interactable = true;
         loggedInSaveButton.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;

Assets/Scripts/AccountMenu/AccountLogin.cs

@@ -38,44 +38,24 @@ 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(Endpoints.ACCOUNT_LOGIN_ENDPOINT, dataForm);
-        using UnityWebRequest request = UnityWebRequest.Post(SensitiveInfo.SERVER_DATABASE_PREFIX + "loginAccount.php", 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;
+        var jsonResponse = JObject.Parse(request.downloadHandler.text);
-        if (response == "-999")
-        {
-            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);
-        }
-        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"]));
+            BazookaManager.Instance.SetAccountID(BigInteger.Parse((string)jsonResponse["data"]["id"]));
             AccountHandler.instance.SwitchPanel(0);
             Tools.UpdateStatusText(loginPanelStatusText, "", Color.red);
         }
@@ -83,7 +63,6 @@ public class AccountLogin : MonoBehaviour
         {
             Tools.UpdateStatusText(loginPanelStatusText, (string)jsonResponse["message"], Color.red);
         }
-        }
         loginBackButton.interactable = true;
         loginSubmitButton.interactable = true;
     }

Assets/Scripts/AccountMenu/AccountRefreshLogin.cs

@@ -32,43 +32,24 @@ 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;
+        var jsonResponse = JObject.Parse(request.downloadHandler.text);
-        if (response == "-999")
-        {
-            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);
-        }
-        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"]));
+            BazookaManager.Instance.SetAccountID(BigInteger.Parse((string)jsonResponse["data"]["id"]));
             AccountHandler.instance.SwitchPanel(0);
             Tools.UpdateStatusText(refreshLoginStatusText, "", Color.red);
         }
@@ -76,7 +57,6 @@ public class AccountRefreshLogin : MonoBehaviour
         {
             Tools.UpdateStatusText(refreshLoginStatusText, (string)jsonResponse["message"], Color.red);
         }
-        }
         refreshLoginBackButton.interactable = true;
         refreshLoginSubmitButton.interactable = true;
     }

Assets/Scripts/AccountMenu/AccountRegister.cs

@@ -60,38 +60,19 @@ 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;
+        var jsonResponse = JObject.Parse(request.downloadHandler.text);
-        if (response == "-999")
-        {
-            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);
-        }
-        else
-        {
-            var jsonResponse = JObject.Parse(response);
         if ((bool)jsonResponse["success"])
         {
             AccountHandler.instance.SwitchPanel(2);
@@ -100,7 +81,6 @@ public class AccountRegister : MonoBehaviour
         {
             Tools.UpdateStatusText(registerPanelStatusText, (string)jsonResponse["message"], Color.red);
         }
-        }
         registerBackButton.interactable = true;
         registerSubmitButton.interactable = true;
     }