Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Further Correct GameMasterLevel Handling #145

Merged
merged 4 commits into from
Nov 29, 2020
Merged

Further Correct GameMasterLevel Handling #145

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
45ec2b6
Remove Trailing Whitespace
TheMatt2 Nov 29, 2020
b6f8acd
Current GameMasterLevel Handling
TheMatt2 Nov 29, 2020
e988d82
Remove Trailing Whitespace
TheMatt2 Nov 29, 2020
b75d2e1
Check GameMasterLevel set via API
TheMatt2 Nov 29, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 22 additions & 28 deletions Uchu.Core/Handlers/Commands/StandardCommandHandler.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@ await UchuServer.Api.RunCommandAsync<BaseResponse>(
public static string AddUser(string[] arguments)
{
if (arguments == null)
throw new ArgumentNullException(nameof(arguments),
throw new ArgumentNullException(nameof(arguments),
ResourceStrings.StandardCommandHandler_AddUser_ArgumentsNullException);

if (arguments.Length != 1)
{
return "adduser <name>";
Expand Down Expand Up @@ -68,9 +68,9 @@ public static string AddUser(string[] arguments)
public static string RemoveUser(string[] arguments)
{
if (arguments == null)
throw new ArgumentNullException(nameof(arguments),
throw new ArgumentNullException(nameof(arguments),
ResourceStrings.StandardCommandHandler_RemoveUser_ArgumentsNullException);

if (arguments.Length != 1)
{
return "removeuser <name>";
Expand Down Expand Up @@ -100,9 +100,9 @@ public static string RemoveUser(string[] arguments)
public static async Task<string> BanUser(string[] arguments)
{
if (arguments == null)
throw new ArgumentNullException(nameof(arguments),
throw new ArgumentNullException(nameof(arguments),
ResourceStrings.StandardCommandHandler_BanUser_ArgumentsNullException);

if (arguments.Length != 2)
{
return $"{arguments[0]} <name> <reason>";
Expand Down Expand Up @@ -133,9 +133,9 @@ public static async Task<string> BanUser(string[] arguments)
public static async Task<string> PardonUser(string[] arguments)
{
if (arguments == null)
throw new ArgumentNullException(nameof(arguments),
throw new ArgumentNullException(nameof(arguments),
ResourceStrings.StandardCommandHandler_PardonUser_ArgumentsNullException);

if (arguments.Length != 1)
{
return $"{arguments[0]} <name>";
Expand Down Expand Up @@ -176,9 +176,9 @@ public static string GetUsers()
public static async Task<string> ApproveUsernames(string[] arguments)
{
if (arguments == null)
throw new ArgumentNullException(nameof(arguments),
throw new ArgumentNullException(nameof(arguments),
ResourceStrings.StandardCommandHandler_ApproveUsername_ArgumentsNullException);

await using var ctx = new UchuContext();
if (arguments.Length == 0 || arguments[0].ToLower() == "*" || string.IsNullOrEmpty(arguments[0]))
{
Expand Down Expand Up @@ -225,9 +225,9 @@ public static async Task<string> ApproveUsernames(string[] arguments)
public static async Task<string> RejectUserNames(string[] arguments)
{
if (arguments == null)
throw new ArgumentNullException(nameof(arguments),
throw new ArgumentNullException(nameof(arguments),
ResourceStrings.StandardCommandHandler_RejectUserNames_ArgumentsNullException);

await using var ctx = new UchuContext();
if (arguments.Length == 0 || arguments[0].ToLower() == "all")
{
Expand Down Expand Up @@ -267,9 +267,9 @@ public static async Task<string> RejectUserNames(string[] arguments)
public static async Task<string> SetGameMasterLevel(string[] arguments)
{
if (arguments == null)
throw new ArgumentNullException(nameof(arguments),
throw new ArgumentNullException(nameof(arguments),
ResourceStrings.StandardCommandHandler_SetGameMasterLevel_ArgumentsNullException);

if (arguments.Length != 2)
{
return "gamemaster <username> <level>";
Expand All @@ -286,24 +286,18 @@ public static async Task<string> SetGameMasterLevel(string[] arguments)
return $"No user with the username of: {username}";
}

if (!Enum.TryParse<GameMasterLevel>(arguments[1], out var level))
if (!Enum.TryParse<GameMasterLevel>(arguments[1], out var level) ||
!Enum.IsDefined(typeof(GameMasterLevel), level))
{
return "Invalid <level>";
}

if (Enum.IsDefined(typeof(GameMasterLevel), int.Parse(arguments[1])))
{
user.GameMasterLevel = (int) level;

await ctx.SaveChangesAsync().ConfigureAwait(false);
user.GameMasterLevel = (int) level;

return$"Successfully set {user.Username}'s Game Master " +
$"level to {(GameMasterLevel) user.GameMasterLevel}";
}
else
{
return "Invalid <level>";
}
await ctx.SaveChangesAsync().ConfigureAwait(false);

return$"Successfully set {user.Username}'s Game Master " +
$"level to {(GameMasterLevel) user.GameMasterLevel}";
}

private static string GetPassword()
Expand Down Expand Up @@ -333,4 +327,4 @@ private static string GetPassword()
return pwd.ToString();
}
}
}
}
29 changes: 15 additions & 14 deletions Uchu.Master/Api/AccountCommands.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,14 @@ public async Task<object> CreateAccount(string accountName, string accountPasswo
if (string.IsNullOrWhiteSpace(accountName))
{
response.FailedReason = "username null";

return response;
}

if (string.IsNullOrWhiteSpace(accountPassword))
{
response.FailedReason = "password null";

return response;
}

Expand All @@ -36,10 +36,10 @@ public async Task<object> CreateAccount(string accountName, string accountPasswo
if (duplicate)
{
response.FailedReason = "duplicate username";

return response;
}

var password = BCrypt.Net.BCrypt.EnhancedHashPassword(accountPassword);

await ctx.Users.AddAsync(new User
Expand All @@ -62,7 +62,7 @@ await ctx.Users.AddAsync(new User
response.Username = user.Username;
response.Hash = user.Password;
}

return response;
}

Expand All @@ -77,7 +77,7 @@ public async Task<object> DeleteAccount(string accountName)

return response;
}

await using (var ctx = new UchuContext())
{
var user = await ctx.Users.FirstOrDefaultAsync(u => u.Username == accountName);
Expand All @@ -99,12 +99,12 @@ public async Task<object> DeleteAccount(string accountName)

return response;
}

[ApiCommand("account/level")]
public async Task<object> AdminAccount(string accountName, string level)
{
var response = new AccountAdminResponse();

if (string.IsNullOrWhiteSpace(accountName))
{
response.FailedReason = "username null";
Expand All @@ -129,11 +129,12 @@ public async Task<object> AdminAccount(string accountName, string level)

return response;
}

if (!Enum.TryParse<GameMasterLevel>(level, out var gameMasterLevel))

if (!Enum.TryParse<GameMasterLevel>(level, out var gameMasterLevel) ||
!Enum.IsDefined(typeof(GameMasterLevel), gameMasterLevel))
{
response.FailedReason = "invalid level";

return response;
}

Expand Down Expand Up @@ -192,7 +193,7 @@ public async Task<object> BanAccount(string accountName, string reason)

return response;
}

[ApiCommand("account/pardon")]
public async Task<object> PardonAccount(string accountName)
{
Expand All @@ -204,7 +205,7 @@ public async Task<object> PardonAccount(string accountName)

return response;
}

await using (var ctx = new UchuContext())
{
var user = await ctx.Users.FirstOrDefaultAsync(u => u.Username == accountName);
Expand Down Expand Up @@ -267,7 +268,7 @@ public async Task<object> AccountInfo(string accountName)
public async Task<object> Accounts()
{
var response = new AccountListResponse();

await using var ctx = new UchuContext();

response.Success = true;
Expand Down