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

All API requests now respond with a predictable template, for further troubleshooting.

Browse source
This commit is contained in:
Lucas Nicodemus 2011-09-05 01:37:56 -06:00
parent e4030d9e38
commit 1fa5c7236e
2 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
TShockAPI/Rest.cs
View file

@ -98,9 +98,9 @@ namespace TShockAPI
var obj = ExecuteCommand(com, verbs, e.Request.Parameters);
if (obj != null)
return obj;
}
return new Dictionary<string, string> { { "Error", "Invalid request" } };
return new Dictionary<string, string> { { "status", "404" }, {"error", "Specified API endpoint doesn't exist. Refer to the documentation for a list of valid endpoints."} };
}
protected virtual object ExecuteCommand(RestCommand cmd, RestVerbs verbs, IParameterCollection parms)

8
TShockAPI/SecureRest.cs
View file

@ -24,7 +24,7 @@ namespace TShockAPI
var pass = verbs["password"];
if (Verify != null && !Verify(user, pass))
return new Dictionary<string, string> { { "Error", "Failed to verify username/password" } };
return new Dictionary<string, string> { { "status", "401" } , { "error", "Invalid username/password combination provided. Please re-submit your query with a correct pair." } };
string hash = string.Empty;
var rand = new Random();
@ -37,7 +37,7 @@ namespace TShockAPI
Tokens.Add(hash, new Object());
return new Dictionary<string, string> { { "Token", hash } }; ;
return new Dictionary<string, string> { { "status", "200" } , { "token", hash } }; ;
}
protected override object ExecuteCommand(RestCommand cmd, RestVerbs verbs, IParameterCollection parms)
{
@ -45,11 +45,11 @@ namespace TShockAPI
{
var strtoken = parms["token"];
if (strtoken == null)
return new Dictionary<string, string> { { "Error", "Token Missing" } };
return new Dictionary<string, string> { { "status", "401" }, { "error", "Not authorized. The specified API endpoint requires a token." } };
object token;
if (!Tokens.TryGetValue(strtoken, out token))
return new Dictionary<string, string> { { "Error", "Token Invalid" } };
return new Dictionary<string, string> { { "status", "403" }, { "error", "Not authorized. The specified API endpoint requires a token, but the provided token was not valid." } };
}
return base.ExecuteCommand(cmd, verbs, parms);
}