diff --git a/TShockAPI/Rest.cs b/TShockAPI/Rest.cs index 7a98b7a6..2c14d087 100644 --- a/TShockAPI/Rest.cs +++ b/TShockAPI/Rest.cs @@ -154,16 +154,16 @@ namespace TShockAPI get { return SafeGet("error"); } set { SafeSet("error", value); } } + public string Response + { + get { return SafeGet("response"); } + set { SafeSet("response", value); } + } public RestObject(string status) { Status = status; } - public RestObject(string status, string error) - : this(status) - { - Error = error; - } /// /// Gets value safely. diff --git a/TShockAPI/SecureRest.cs b/TShockAPI/SecureRest.cs index 8aff3c48..712fa51a 100644 --- a/TShockAPI/SecureRest.cs +++ b/TShockAPI/SecureRest.cs @@ -50,7 +50,7 @@ namespace TShockAPI obj = Verify(user, pass); if (obj == null) - obj = new RestObject("401", "Invalid username/password combination provided. Please re-submit your query with a correct pair."); + obj = new RestObject("401") { Error = "Invalid username/password combination provided. Please re-submit your query with a correct pair." }; if (obj.Error != null) return obj; diff --git a/TShockAPI/TShock.cs b/TShockAPI/TShock.cs index 7f69c9ee..63dd9931 100644 --- a/TShockAPI/TShock.cs +++ b/TShockAPI/TShock.cs @@ -222,20 +222,20 @@ namespace TShockAPI var userAccount = TShock.Users.GetUserByName(username); if (userAccount == null) { - return new RestObject("401", "Invalid username/password combination provided. Please re-submit your query with a correct pair."); + return new RestObject("401") { Error = "Invalid username/password combination provided. Please re-submit your query with a correct pair." }; } if (Tools.HashPassword(password).ToUpper() != userAccount.Password.ToUpper()) { - return new RestObject("401", "Invalid username/password combination provided. Please re-submit your query with a correct pair."); + return new RestObject("401") { Error = "Invalid username/password combination provided. Please re-submit your query with a correct pair." }; } if (!Tools.GetGroup(userAccount.Group).HasPermission("api") && userAccount.Group != "superadmin") { - return new RestObject("403", "Although your account was successfully found and identified, your account lacks the permission required to use the API. (api)"); + return new RestObject("403") { Error = "Although your account was successfully found and identified, your account lacks the permission required to use the API. (api)" }; } - return new RestObject("200"); //Maybe return some user info too? + return new RestObject("200") { Response = "Successful login" }; //Maybe return some user info too? } public override void DeInitialize()