diff --git a/TShockAPI/Properties/AssemblyInfo.cs b/TShockAPI/Properties/AssemblyInfo.cs index 1a5d136b..5fe32952 100644 --- a/TShockAPI/Properties/AssemblyInfo.cs +++ b/TShockAPI/Properties/AssemblyInfo.cs @@ -36,5 +36,5 @@ using System.Runtime.InteropServices; // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("3.3.4.0924")] -[assembly: AssemblyFileVersion("3.3.4.0924")] +[assembly: AssemblyVersion("3.3.4.0925")] +[assembly: AssemblyFileVersion("3.3.4.0925")] diff --git a/TShockAPI/Rest/RestCommand.cs b/TShockAPI/Rest/RestCommand.cs index 82ca22b1..5409282f 100644 --- a/TShockAPI/Rest/RestCommand.cs +++ b/TShockAPI/Rest/RestCommand.cs @@ -10,7 +10,7 @@ namespace Rests public string UriVerbMatch { get; protected set; } public string[] UriVerbs { get; protected set; } public RestCommandD Callback { get; protected set; } - public bool RequiesToken { get; set; } + public bool RequiresToken { get; set; } /// /// @@ -26,7 +26,7 @@ namespace Rests var matches = Regex.Matches(uritemplate, "\\{([^\\{\\}]*)\\}"); UriVerbs = (from Match match in matches select match.Groups[1].Value).ToArray(); Callback = callback; - RequiesToken = true; + RequiresToken = true; } /// /// diff --git a/TShockAPI/Rest/RestManager.cs b/TShockAPI/Rest/RestManager.cs index 6a70516c..4c11b64e 100644 --- a/TShockAPI/Rest/RestManager.cs +++ b/TShockAPI/Rest/RestManager.cs @@ -19,27 +19,27 @@ namespace TShockAPI public void RegisterRestfulCommands() { - Rest.Register(new RestCommand("/status", Status) { RequiesToken = false }); - Rest.Register(new RestCommand("/tokentest", TokenTest) { RequiesToken = true }); + Rest.Register(new RestCommand("/status", Status) { RequiresToken = false }); + Rest.Register(new RestCommand("/tokentest", TokenTest) { RequiresToken = true }); - Rest.Register(new RestCommand("/users/read/{user}/info", UserInfo) { RequiesToken = true }); - Rest.Register(new RestCommand("/users/destroy/{user}", UserDestroy) { RequiesToken = true }); - Rest.Register(new RestCommand("/users/update/{user}", UserUpdate) { RequiesToken = true }); + Rest.Register(new RestCommand("/users/read/{user}/info", UserInfo) { RequiresToken = true }); + Rest.Register(new RestCommand("/users/destroy/{user}", UserDestroy) { RequiresToken = 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/read/{user}/info", BanInfo) { RequiesToken = true }); - Rest.Register(new RestCommand("/bans/destroy/{user}", BanDestroy) { RequiesToken = true }); + Rest.Register(new RestCommand("/bans/create", BanCreate) { RequiresToken = true }); + Rest.Register(new RestCommand("/bans/read/{user}/info", BanInfo) { RequiresToken = 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/meteor", WorldMeteor) { RequiesToken = true }); - Rest.Register(new RestCommand("/world/bloodmoon/{bool}", WorldBloodmoon) { RequiesToken = true }); + Rest.Register(new RestCommand("/world/read", WorldRead) { RequiresToken = true }); + Rest.Register(new RestCommand("/world/meteor", WorldMeteor) { RequiresToken = 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/{player}/kick", PlayerKick) { RequiesToken = true }); - Rest.Register(new RestCommand("/players/{player}/ban", PlayerBan) { RequiesToken = true }); + Rest.Register(new RestCommand("/players/read/{player}", PlayerRead) { RequiresToken = true }); + Rest.Register(new RestCommand("/players/{player}/kick", PlayerKick) { RequiresToken = true }); + Rest.Register(new RestCommand("/players/{player}/ban", PlayerBan) { RequiresToken = true }); //RegisterExamples(); } @@ -412,8 +412,8 @@ namespace TShockAPI public void RegisterExamples() { - Rest.Register(new RestCommand("/HelloWorld/name/{username}", UserTest) { RequiesToken = false }); - Rest.Register(new RestCommand("/wizard/{username}", Wizard) { RequiesToken = false }); + Rest.Register(new RestCommand("/HelloWorld/name/{username}", UserTest) { RequiresToken = false }); + Rest.Register(new RestCommand("/wizard/{username}", Wizard) { RequiresToken = false }); } //The Wizard example, for demonstrating the response convention: diff --git a/TShockAPI/Rest/SecureRest.cs b/TShockAPI/Rest/SecureRest.cs index 4d77c9b9..db12f1fe 100644 --- a/TShockAPI/Rest/SecureRest.cs +++ b/TShockAPI/Rest/SecureRest.cs @@ -23,8 +23,8 @@ namespace Rests : base(ip, port) { Tokens = new Dictionary(); - Register(new RestCommand("/token/create/{username}/{password}", NewToken) { RequiesToken = false }); - Register(new RestCommand("/token/destroy/{token}", DestroyToken) { RequiesToken = true }); + Register(new RestCommand("/token/create/{username}/{password}", NewToken) { RequiresToken = false }); + Register(new RestCommand("/token/destroy/{token}", DestroyToken) { RequiresToken = true }); } object DestroyToken(RestVerbs verbs, IParameterCollection parameters) @@ -75,7 +75,7 @@ namespace Rests protected override object ExecuteCommand(RestCommand cmd, RestVerbs verbs, IParameterCollection parms) { - if (cmd.RequiesToken) + if (cmd.RequiresToken) { var strtoken = parms["token"]; if (strtoken == null)