From 0f34aa03e8c8c2985fd4bbf54b3ccdf387da45a3 Mon Sep 17 00:00:00 2001 From: CoderCow Date: Fri, 2 Aug 2013 10:31:54 +0200 Subject: [PATCH] Moved all new REST endpoints to "/v3"as "/v2" was incompatible. --- TShockAPI/Rest/RestManager.cs | 12 ++++++------ TShockAPI/Rest/SecureRest.cs | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/TShockAPI/Rest/RestManager.cs b/TShockAPI/Rest/RestManager.cs index 03154587..ed7267a8 100644 --- a/TShockAPI/Rest/RestManager.cs +++ b/TShockAPI/Rest/RestManager.cs @@ -43,21 +43,21 @@ namespace TShockAPI { Rest.Register(new SecureRestCommand("/v2/server/status", ServerStatusV2)); Rest.Register(new SecureRestCommand("/status", ServerStatus)); - Rest.Register(new SecureRestCommand("/v2/server/motd", ServerMotd)); - Rest.Register(new SecureRestCommand("/v2/server/rules", ServerRules)); + Rest.Register(new SecureRestCommand("/v3/server/motd", ServerMotd)); + Rest.Register(new SecureRestCommand("/v3/server/rules", ServerRules)); } else { Rest.Register(new RestCommand("/v2/server/status", (a, b) => this.ServerStatusV2(a, b, SecureRest.TokenData.None))); Rest.Register(new RestCommand("/status", (a, b) => this.ServerStatusV2(a, b, SecureRest.TokenData.None))); - Rest.Register(new RestCommand("/v2/server/motd", (a, b) => this.ServerMotd(a, b, SecureRest.TokenData.None))); - Rest.Register(new RestCommand("/v2/server/rules", (a, b) => this.ServerRules(a, b, SecureRest.TokenData.None))); + Rest.Register(new RestCommand("/v3/server/motd", (a, b) => this.ServerMotd(a, b, SecureRest.TokenData.None))); + Rest.Register(new RestCommand("/v3/server/rules", (a, b) => this.ServerRules(a, b, SecureRest.TokenData.None))); } Rest.Register(new SecureRestCommand("/v2/server/broadcast", ServerBroadcast)); - Rest.Register(new SecureRestCommand("/v2/server/reload", ServerReload, RestPermissions.restcfg)); + Rest.Register(new SecureRestCommand("/v3/server/reload", ServerReload, RestPermissions.restcfg)); Rest.Register(new SecureRestCommand("/v2/server/off", ServerOff, RestPermissions.restmaintenance)); - Rest.Register(new SecureRestCommand("/v2/server/restart", ServerRestart, RestPermissions.restmaintenance)); + Rest.Register(new SecureRestCommand("/v3/server/restart", ServerRestart, RestPermissions.restmaintenance)); Rest.Register(new SecureRestCommand("/v2/server/rawcmd", ServerCommand, RestPermissions.restrawcommand)); Rest.Register(new SecureRestCommand("/v3/server/rawcmd", ServerCommandV3, RestPermissions.restrawcommand)); Rest.Register(new SecureRestCommand("/tokentest", ServerTokenTest)); diff --git a/TShockAPI/Rest/SecureRest.cs b/TShockAPI/Rest/SecureRest.cs index e052696e..0c547138 100644 --- a/TShockAPI/Rest/SecureRest.cs +++ b/TShockAPI/Rest/SecureRest.cs @@ -46,7 +46,7 @@ namespace Rests Register(new RestCommand("/token/create/{username}/{password}", NewToken) { DoLog = false }); Register(new RestCommand("/v2/token/create/{password}", NewTokenV2) { DoLog = false }); Register(new SecureRestCommand("/token/destroy/{token}", DestroyToken)); - Register(new SecureRestCommand("/v2/token/destroy/all", DestroyAllTokens, RestPermissions.restmanage)); + Register(new SecureRestCommand("/v3/token/destroy/all", DestroyAllTokens, RestPermissions.restmanage)); foreach (KeyValuePair t in TShockAPI.TShock.RESTStartupTokens) {