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

Removed ip address from users, as well as changed /user add syntax to be '/user add username password group' instead of colon bullshit.

Browse source
This commit is contained in:
Zack Piispanen 2013-09-21 17:11:22 -04:00
parent d7da68a262
commit ba42fb08df
7 changed files with 34 additions and 166 deletions
Download patch file Download diff file Expand all files Collapse all files

7
TShockAPI/Rest/RestManager.cs
View file

@ -289,7 +289,6 @@ namespace TShockAPI
{"name", p.Name},
{"id", p.ID},
{"group", p.Group},
{"ip", p.Address},
}) } };
}
@ -308,7 +307,7 @@ namespace TShockAPI
return RestMissingParam("password");
// NOTE: ip can be blank
User user = new User(parameters["ip"], username, password, group);
User user = new User(username, password, group);
try
{
TShock.Users.AddUser(user);
@ -802,10 +801,6 @@ namespace TShockAPI
break;
case "id":
user = TShock.Users.GetUserByID(Convert.ToInt32(name));
break;
case "ip":
user = TShock.Users.GetUserByIP(name);
break;
default:
return RestError("Invalid Type: '" + type + "'");

5
TShockAPI/Rest/SecureRest.cs
View file

@ -129,9 +129,8 @@ namespace Rests
private RestObject NewTokenInternal(string username, string password)
{
User userAccount = TShock.Users.GetUserByName(username);
if (userAccount == null || !string.IsNullOrWhiteSpace(userAccount.Address))
return new RestObject("401")
{ Error = "Invalid username/password combination provided. Please re-submit your query with a correct pair." };
if (userAccount == null)
return new RestObject("401") { Error = "Invalid username/password combination provided. Please re-submit your query with a correct pair." };
if (!TShock.Utils.HashPassword(password).Equals(userAccount.Password, StringComparison.InvariantCultureIgnoreCase))
return new RestObject("401")