Berry-Dash/source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix login and register & improve some stuff

Browse Source
This commit is contained in:
Travis
2026-01-22 13:12:52 -07:00
parent 4aedf1059a
commit 41c948e806
4 changed files with 32 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
Assets/Scripts/AccountMenu/AccountLoggedIn.cs
View File

@@ -57,7 +57,7 @@ public class AccountLoggedIn : MonoBehaviour
request.SetRequestHeader("ClientVersion", Application.version); request.SetRequestHeader("ClientVersion", Application.version);
request.SetRequestHeader("ClientPlatform", Application.platform.ToString()); request.SetRequestHeader("ClientPlatform", Application.platform.ToString());
await request.SendWebRequest(); await request.SendWebRequest();
if (request.result != UnityWebRequest.Result.Success) if (request.downloadHandler.text == null)
{ {
loggedInChangeUsernameButton.interactable = true; loggedInChangeUsernameButton.interactable = true;
loggedInChangePasswordButton.interactable = true; loggedInChangePasswordButton.interactable = true;
@@ -69,34 +69,14 @@ public class AccountLoggedIn : MonoBehaviour
Tools.UpdateStatusText(loggedInText, "Failed to make HTTP request", Color.red); Tools.UpdateStatusText(loggedInText, "Failed to make HTTP request", Color.red);
return; return;
} }
string response = request.downloadHandler.text; var jsonResponse = JObject.Parse(request.downloadHandler.text);
if (response == "-999") if ((bool)jsonResponse["success"])
{ {
Tools.UpdateStatusText(loggedInText, "Server error while fetching data", Color.red); Tools.UpdateStatusText(loggedInText, "Synced account", Color.green);
}
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 else
{ {
var jsonResponse = JObject.Parse(response); Tools.UpdateStatusText(loggedInText, (string)jsonResponse["message"], Color.red);
if ((bool)jsonResponse["success"])
{
Tools.UpdateStatusText(loggedInText, "Synced account", Color.green);
}
else
{
Tools.UpdateStatusText(loggedInText, (string)jsonResponse["message"], Color.red);
}
} }
loggedInChangeUsernameButton.interactable = true; loggedInChangeUsernameButton.interactable = true;
loggedInChangePasswordButton.interactable = true; loggedInChangePasswordButton.interactable = true;
@@ -122,7 +102,7 @@ public class AccountLoggedIn : MonoBehaviour
request.SetRequestHeader("ClientVersion", Application.version); request.SetRequestHeader("ClientVersion", Application.version);
request.SetRequestHeader("ClientPlatform", Application.platform.ToString()); request.SetRequestHeader("ClientPlatform", Application.platform.ToString());
await request.SendWebRequest(); await request.SendWebRequest();
if (request.result != UnityWebRequest.Result.Success) if (request.downloadHandler.text == null)
{ {
loggedInChangeUsernameButton.interactable = true; loggedInChangeUsernameButton.interactable = true;
loggedInChangePasswordButton.interactable = true; loggedInChangePasswordButton.interactable = true;

41
Assets/Scripts/AccountMenu/AccountLogin.cs
View File

@@ -38,51 +38,30 @@ public class AccountLogin : MonoBehaviour
WWWForm dataForm = new(); WWWForm dataForm = new();
dataForm.AddField("username", loginUsernameInput.text); dataForm.AddField("username", loginUsernameInput.text);
dataForm.AddField("password", loginPasswordInput.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("Requester", "BerryDashClient");
request.SetRequestHeader("ClientVersion", Application.version); request.SetRequestHeader("ClientVersion", Application.version);
request.SetRequestHeader("ClientPlatform", Application.platform.ToString()); request.SetRequestHeader("ClientPlatform", Application.platform.ToString());
await request.SendWebRequest(); await request.SendWebRequest();
if (request.result != UnityWebRequest.Result.Success) if (request.downloadHandler.text == null)
{ {
loginBackButton.interactable = true; loginBackButton.interactable = true;
loginSubmitButton.interactable = true; loginSubmitButton.interactable = true;
Tools.UpdateStatusText(loginPanelStatusText, "Failed to make HTTP request", Color.red); Tools.UpdateStatusText(loginPanelStatusText, "Failed to make HTTP request", Color.red);
return; return;
} }
string response = request.downloadHandler.text; var jsonResponse = JObject.Parse(request.downloadHandler.text);
if (response == "-999") if ((bool)jsonResponse["success"])
{ {
Tools.UpdateStatusText(loginPanelStatusText, "Server error while fetching data", Color.red); BazookaManager.Instance.SetAccountSession((string)jsonResponse["data"]["session"]);
} BazookaManager.Instance.SetAccountName((string)jsonResponse["data"]["username"]);
else if (response == "-998") BazookaManager.Instance.SetAccountID(BigInteger.Parse((string)jsonResponse["data"]["id"]));
{ AccountHandler.instance.SwitchPanel(0);
Tools.UpdateStatusText(loginPanelStatusText, "Client version too outdated to access servers", Color.red); Tools.UpdateStatusText(loginPanelStatusText, "", 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 else
{ {
var jsonResponse = JObject.Parse(response); Tools.UpdateStatusText(loginPanelStatusText, (string)jsonResponse["message"], Color.red);
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);
}
} }
loginBackButton.interactable = true; loginBackButton.interactable = true;
loginSubmitButton.interactable = true; loginSubmitButton.interactable = true;

40
Assets/Scripts/AccountMenu/AccountRefreshLogin.cs
View File

@@ -32,50 +32,30 @@ public class AccountRefreshLogin : MonoBehaviour
WWWForm dataForm = new(); WWWForm dataForm = new();
dataForm.AddField("username", refreshLoginUsernameInput.text); dataForm.AddField("username", refreshLoginUsernameInput.text);
dataForm.AddField("password", refreshLoginPasswordInput.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("Requester", "BerryDashClient");
request.SetRequestHeader("ClientVersion", Application.version); request.SetRequestHeader("ClientVersion", Application.version);
request.SetRequestHeader("ClientPlatform", Application.platform.ToString()); request.SetRequestHeader("ClientPlatform", Application.platform.ToString());
await request.SendWebRequest(); await request.SendWebRequest();
if (request.result != UnityWebRequest.Result.Success) if (request.downloadHandler.text == null)
{ {
refreshLoginBackButton.interactable = true; refreshLoginBackButton.interactable = true;
refreshLoginSubmitButton.interactable = true; refreshLoginSubmitButton.interactable = true;
Tools.UpdateStatusText(refreshLoginStatusText, "Failed to make HTTP request", Color.red); Tools.UpdateStatusText(refreshLoginStatusText, "Failed to make HTTP request", Color.red);
return; return;
} }
string response = request.downloadHandler.text; var jsonResponse = JObject.Parse(request.downloadHandler.text);
if (response == "-999") if ((bool)jsonResponse["success"])
{ {
Tools.UpdateStatusText(refreshLoginStatusText, "Server error while fetching data", Color.red); BazookaManager.Instance.SetAccountSession((string)jsonResponse["data"]["session"]);
} BazookaManager.Instance.SetAccountName((string)jsonResponse["data"]["username"]);
else if (response == "-998") BazookaManager.Instance.SetAccountID(BigInteger.Parse((string)jsonResponse["data"]["id"]));
{ AccountHandler.instance.SwitchPanel(0);
Tools.UpdateStatusText(refreshLoginStatusText, "Client version too outdated to access servers", Color.red); Tools.UpdateStatusText(refreshLoginStatusText, "", 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 else
{ {
var jsonResponse = JObject.Parse(response); Tools.UpdateStatusText(refreshLoginStatusText, (string)jsonResponse["message"], Color.red);
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);
}
} }
refreshLoginBackButton.interactable = true; refreshLoginBackButton.interactable = true;
refreshLoginSubmitButton.interactable = true; refreshLoginSubmitButton.interactable = true;

32
Assets/Scripts/AccountMenu/AccountRegister.cs
View File

@@ -60,46 +60,26 @@ public class AccountRegister : MonoBehaviour
dataForm.AddField("username", registerUsernameInput.text); dataForm.AddField("username", registerUsernameInput.text);
dataForm.AddField("email", registerEmailInput.text); dataForm.AddField("email", registerEmailInput.text);
dataForm.AddField("password", registerPasswordInput.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("Requester", "BerryDashClient");
request.SetRequestHeader("ClientVersion", Application.version); request.SetRequestHeader("ClientVersion", Application.version);
request.SetRequestHeader("ClientPlatform", Application.platform.ToString()); request.SetRequestHeader("ClientPlatform", Application.platform.ToString());
await request.SendWebRequest(); await request.SendWebRequest();
if (request.result != UnityWebRequest.Result.Success) if (request.downloadHandler.text == null)
{ {
registerBackButton.interactable = true; registerBackButton.interactable = true;
registerSubmitButton.interactable = true; registerSubmitButton.interactable = true;
Tools.UpdateStatusText(registerPanelStatusText, "Failed to make HTTP request", Color.red); Tools.UpdateStatusText(registerPanelStatusText, "Failed to make HTTP request", Color.red);
return; return;
} }
string response = request.downloadHandler.text; var jsonResponse = JObject.Parse(request.downloadHandler.text);
if (response == "-999") if ((bool)jsonResponse["success"])
{ {
Tools.UpdateStatusText(registerPanelStatusText, "Server error while fetching data", Color.red); AccountHandler.instance.SwitchPanel(2);
}
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 else
{ {
var jsonResponse = JObject.Parse(response); Tools.UpdateStatusText(registerPanelStatusText, (string)jsonResponse["message"], Color.red);
if ((bool)jsonResponse["success"])
{
AccountHandler.instance.SwitchPanel(2);
}
else
{
Tools.UpdateStatusText(registerPanelStatusText, (string)jsonResponse["message"], Color.red);
}
} }
registerBackButton.interactable = true; registerBackButton.interactable = true;
registerSubmitButton.interactable = true; registerSubmitButton.interactable = true;