themaster1970sf/TShock
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Removed error constructor. Added response property.

Browse source
This commit is contained in:
high 2011-09-05 14:05:16 -04:00
parent 89f5d13efb
commit a0da52e558
3 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

10
TShockAPI/Rest.cs
View file

@ -154,16 +154,16 @@ namespace TShockAPI
get { return SafeGet("error"); } get { return SafeGet("error"); }
set { SafeSet("error", value); } set { SafeSet("error", value); }
} }
public string Response
{
get { return SafeGet("response"); }
set { SafeSet("response", value); }
}
public RestObject(string status) public RestObject(string status)
{ {
Status = status; Status = status;
} }
public RestObject(string status, string error)
: this(status)
{
Error = error;
}
/// <summary> /// <summary>
/// Gets value safely. /// Gets value safely.

2
TShockAPI/SecureRest.cs
View file

@ -50,7 +50,7 @@ namespace TShockAPI
obj = Verify(user, pass); obj = Verify(user, pass);
if (obj == null) 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) if (obj.Error != null)
return obj; return obj;

8
TShockAPI/TShock.cs
View file

@ -222,20 +222,20 @@ namespace TShockAPI
var userAccount = TShock.Users.GetUserByName(username); var userAccount = TShock.Users.GetUserByName(username);
if (userAccount == null) 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()) 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") 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() public override void DeInitialize()