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

Fixed typo

Browse source
This commit is contained in:
high 2011-09-25 18:34:28 -04:00
parent 223a77340f
commit a5550ad3f7
4 changed files with 24 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

4
TShockAPI/Properties/AssemblyInfo.cs
View file

@ -36,5 +36,5 @@ using System.Runtime.InteropServices;
// [assembly: AssemblyVersion("1.0.*")] // [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("3.3.4.0924")] [assembly: AssemblyVersion("3.3.4.0925")]
[assembly: AssemblyFileVersion("3.3.4.0924")] [assembly: AssemblyFileVersion("3.3.4.0925")]

4
TShockAPI/Rest/RestCommand.cs
View file

@ -10,7 +10,7 @@ namespace Rests
public string UriVerbMatch { get; protected set; } public string UriVerbMatch { get; protected set; }
public string[] UriVerbs { get; protected set; } public string[] UriVerbs { get; protected set; }
public RestCommandD Callback { get; protected set; } public RestCommandD Callback { get; protected set; }
public bool RequiesToken { get; set; } public bool RequiresToken { get; set; }
/// <summary> /// <summary>
/// ///
@ -26,7 +26,7 @@ namespace Rests
var matches = Regex.Matches(uritemplate, "\\{([^\\{\\}]*)\\}"); var matches = Regex.Matches(uritemplate, "\\{([^\\{\\}]*)\\}");
UriVerbs = (from Match match in matches select match.Groups[1].Value).ToArray(); UriVerbs = (from Match match in matches select match.Groups[1].Value).ToArray();
Callback = callback; Callback = callback;
RequiesToken = true; RequiresToken = true;
} }
/// <summary> /// <summary>
/// ///

34
TShockAPI/Rest/RestManager.cs
View file

@ -19,27 +19,27 @@ namespace TShockAPI
public void RegisterRestfulCommands() public void RegisterRestfulCommands()
{ {
Rest.Register(new RestCommand("/status", Status) { RequiesToken = false }); Rest.Register(new RestCommand("/status", Status) { RequiresToken = false });
Rest.Register(new RestCommand("/tokentest", TokenTest) { RequiesToken = true }); Rest.Register(new RestCommand("/tokentest", TokenTest) { RequiresToken = true });
Rest.Register(new RestCommand("/users/read/{user}/info", UserInfo) { RequiesToken = true }); Rest.Register(new RestCommand("/users/read/{user}/info", UserInfo) { RequiresToken = true });
Rest.Register(new RestCommand("/users/destroy/{user}", UserDestroy) { RequiesToken = true }); Rest.Register(new RestCommand("/users/destroy/{user}", UserDestroy) { RequiresToken = true });
Rest.Register(new RestCommand("/users/update/{user}", UserUpdate) { RequiesToken = true }); Rest.Register(new RestCommand("/users/update/{user}", UserUpdate) { RequiresToken = true });
Rest.Register(new RestCommand("/bans/create", BanCreate) { RequiesToken = true }); Rest.Register(new RestCommand("/bans/create", BanCreate) { RequiresToken = true });
Rest.Register(new RestCommand("/bans/read/{user}/info", BanInfo) { RequiesToken = true }); Rest.Register(new RestCommand("/bans/read/{user}/info", BanInfo) { RequiresToken = true });
Rest.Register(new RestCommand("/bans/destroy/{user}", BanDestroy) { RequiesToken = true }); Rest.Register(new RestCommand("/bans/destroy/{user}", BanDestroy) { RequiresToken = true });
Rest.Register(new RestCommand("/lists/players", UserList) { RequiesToken = true }); Rest.Register(new RestCommand("/lists/players", UserList) { RequiresToken = true });
Rest.Register(new RestCommand("/world/read", WorldRead) { RequiesToken = true }); Rest.Register(new RestCommand("/world/read", WorldRead) { RequiresToken = true });
Rest.Register(new RestCommand("/world/meteor", WorldMeteor) { RequiesToken = true }); Rest.Register(new RestCommand("/world/meteor", WorldMeteor) { RequiresToken = true });
Rest.Register(new RestCommand("/world/bloodmoon/{bool}", WorldBloodmoon) { RequiesToken = true }); Rest.Register(new RestCommand("/world/bloodmoon/{bool}", WorldBloodmoon) { RequiresToken = true });
Rest.Register(new RestCommand("/players/read/{player}", PlayerRead) { RequiesToken = true }); Rest.Register(new RestCommand("/players/read/{player}", PlayerRead) { RequiresToken = true });
Rest.Register(new RestCommand("/players/{player}/kick", PlayerKick) { RequiesToken = true }); Rest.Register(new RestCommand("/players/{player}/kick", PlayerKick) { RequiresToken = true });
Rest.Register(new RestCommand("/players/{player}/ban", PlayerBan) { RequiesToken = true }); Rest.Register(new RestCommand("/players/{player}/ban", PlayerBan) { RequiresToken = true });
//RegisterExamples(); //RegisterExamples();
} }
@ -412,8 +412,8 @@ namespace TShockAPI
public void RegisterExamples() public void RegisterExamples()
{ {
Rest.Register(new RestCommand("/HelloWorld/name/{username}", UserTest) { RequiesToken = false }); Rest.Register(new RestCommand("/HelloWorld/name/{username}", UserTest) { RequiresToken = false });
Rest.Register(new RestCommand("/wizard/{username}", Wizard) { RequiesToken = false }); Rest.Register(new RestCommand("/wizard/{username}", Wizard) { RequiresToken = false });
} }
//The Wizard example, for demonstrating the response convention: //The Wizard example, for demonstrating the response convention:

6
TShockAPI/Rest/SecureRest.cs
View file

@ -23,8 +23,8 @@ namespace Rests
: base(ip, port) : base(ip, port)
{ {
Tokens = new Dictionary<string, object>(); Tokens = new Dictionary<string, object>();
Register(new RestCommand("/token/create/{username}/{password}", NewToken) { RequiesToken = false }); Register(new RestCommand("/token/create/{username}/{password}", NewToken) { RequiresToken = false });
Register(new RestCommand("/token/destroy/{token}", DestroyToken) { RequiesToken = true }); Register(new RestCommand("/token/destroy/{token}", DestroyToken) { RequiresToken = true });
} }
object DestroyToken(RestVerbs verbs, IParameterCollection parameters) object DestroyToken(RestVerbs verbs, IParameterCollection parameters)
@ -75,7 +75,7 @@ namespace Rests
protected override object ExecuteCommand(RestCommand cmd, RestVerbs verbs, IParameterCollection parms) protected override object ExecuteCommand(RestCommand cmd, RestVerbs verbs, IParameterCollection parms)
{ {
if (cmd.RequiesToken) if (cmd.RequiresToken)
{ {
var strtoken = parms["token"]; var strtoken = parms["token"];
if (strtoken == null) if (strtoken == null)