From 12ae57dd9c5303f6c4d92933ec77d32fc580a997 Mon Sep 17 00:00:00 2001 From: White Date: Thu, 7 Apr 2016 19:01:49 +0930 Subject: [PATCH] Marked NewToken as obsolete. Fixed route issues with NewTokenV2 --- TShockAPI/Rest/SecureRest.cs | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/TShockAPI/Rest/SecureRest.cs b/TShockAPI/Rest/SecureRest.cs index 082a1f7b..5ba2574a 100644 --- a/TShockAPI/Rest/SecureRest.cs +++ b/TShockAPI/Rest/SecureRest.cs @@ -46,7 +46,7 @@ namespace Rests AppTokens = new Dictionary(); Register(new RestCommand("/token/create/{username}/{password}", NewToken) { DoLog = false }); - Register(new RestCommand("/v2/token/create/{password}", NewTokenV2) { DoLog = false }); + Register(new RestCommand("/v2/token/create", NewTokenV2) { DoLog = false }); Register(new SecureRestCommand("/token/destroy/{token}", DestroyToken)); Register(new SecureRestCommand("/v3/token/destroy/all", DestroyAllTokens, RestPermissions.restmanage)); @@ -123,12 +123,13 @@ namespace Rests private object NewTokenV2(RestRequestArgs args) { var user = args.Parameters["username"]; - var pass = args.Verbs["password"]; + var pass = args.Parameters["password"]; var context = args.Context; return this.NewTokenInternal(user, pass, context); } + [Obsolete("Please use NewTokenV2. This endpoint will be removed in release 4.3.13.")] private object NewToken(RestRequestArgs args) { var user = args.Verbs["username"]; @@ -136,7 +137,7 @@ namespace Rests var context = args.Context; RestObject response = this.NewTokenInternal(user, pass, context); - response["deprecated"] = "This endpoint is depracted and will be removed in the future."; + response["deprecated"] = "This endpoint is deprecated and will be removed in release 4.3.13."; return response; }