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

Removed FetchHashedPasswordAndGroup, now just uses GetUserByName

Browse source
This commit is contained in:
high 2011-08-07 02:49:09 -04:00
parent 56eca71853
commit 1f4792b71c
3 changed files with 9 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

9
TShockAPI/Commands.cs
View file

@ -316,10 +316,10 @@ namespace TShockAPI
try try
{ {
string encrPass = Tools.HashPassword(args.Parameters[1]); string encrPass = Tools.HashPassword(args.Parameters[1]);
string[] exr = TShock.Users.FetchHashedPasswordAndGroup(args.Parameters[0]); var user = TShock.Users.GetUserByName(args.Parameters[0]);
if (exr[0].ToUpper() == encrPass.ToUpper()) if (user.Password.ToUpper() == encrPass.ToUpper())
{ {
args.Player.Group = Tools.GetGroup(exr[1]); args.Player.Group = Tools.GetGroup(user.Group);
args.Player.UserAccountName = args.Parameters[0]; args.Player.UserAccountName = args.Parameters[0];
args.Player.UserID = TShock.Users.GetUserID(args.Player.UserAccountName); args.Player.UserID = TShock.Users.GetUserID(args.Player.UserAccountName);
args.Player.IsLoggedIn = true; args.Player.IsLoggedIn = true;
@ -351,8 +351,7 @@ namespace TShockAPI
{ {
var user = TShock.Users.GetUserByName(args.Player.UserAccountName); var user = TShock.Users.GetUserByName(args.Player.UserAccountName);
string encrPass = Tools.HashPassword(args.Parameters[0]); string encrPass = Tools.HashPassword(args.Parameters[0]);
string[] exr = TShock.Users.FetchHashedPasswordAndGroup(args.Player.UserAccountName); if (user.Password.ToUpper() == encrPass.ToUpper())
if (exr[0].ToUpper() == encrPass.ToUpper())
{ {
args.Player.SendMessage("You changed your password!", Color.Green); args.Player.SendMessage("You changed your password!", Color.Green);
TShock.Users.SetUserPassword(user, args.Parameters[1]); // SetUserPassword will hash it for you. TShock.Users.SetUserPassword(user, args.Parameters[1]); // SetUserPassword will hash it for you.

31
TShockAPI/DB/UserManager.cs
View file

@ -178,34 +178,6 @@ namespace TShockAPI.DB
} }
} }
/// <summary>
/// Fetches the hashed password and group for a given username
/// </summary>
/// <param name="username">string username</param>
/// <returns>string[] {password, group}</returns>
public string[] FetchHashedPasswordAndGroup(string username)
{
string[] returndata = new string[2];
try
{
using (var reader = database.QueryReader("SELECT * FROM Users WHERE Username=@0", username))
{
if (reader.Read())
{
returndata[0] = reader.Get<string>("Password");
returndata[1] = reader.Get<string>("UserGroup");
return returndata;
}
}
}
catch (Exception ex)
{
Log.ConsoleError("FetchHashedPasswordAndGroup SQL returned an error: " + ex);
}
return returndata;
}
public int GetUserID(string username) public int GetUserID(string username)
{ {
try try
@ -314,6 +286,9 @@ namespace TShockAPI.DB
{ {
user.ID = reader.Get<int>("ID"); user.ID = reader.Get<int>("ID");
user.Group = reader.Get<string>("Usergroup"); user.Group = reader.Get<string>("Usergroup");
user.Password = reader.Get<string>("Password");
user.Name = reader.Get<string>("Username");
user.Address = reader.Get<string>("IP");
return user; return user;
} }
} }

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.2.1.0806")] [assembly: AssemblyVersion("3.2.1.0807")]
[assembly: AssemblyFileVersion("3.2.1.0806")] [assembly: AssemblyFileVersion("3.2.1.0807")]