diff --git a/Lieb/Data/Constants.cs b/Lieb/Data/Constants.cs index 7fe0adc..8815a2d 100644 --- a/Lieb/Data/Constants.cs +++ b/Lieb/Data/Constants.cs @@ -2,28 +2,28 @@ { public static class Constants { - - public const string ClaimType = "Role"; + public static readonly int RaidEditPowerLevel = Roles.Moderator.PowerLevel; + public static class Roles { - public const string User = "User"; - public const string RaidLead = "RaidLead"; - public const string GuildLead = "GuildLead"; - public const string Admin = "Admin"; + public static readonly RoleConstant User = new RoleConstant("user", 20); + public static readonly RoleConstant RaidLead = new RoleConstant("RaidLead", 40); + public static readonly RoleConstant Moderator = new RoleConstant("Moderator", 70); + public static readonly RoleConstant Admin = new RoleConstant("Admin", 100); + } - public static List GetAllRoles() + public class RoleConstant + { + public readonly string Name; + public readonly int PowerLevel; + + public RoleConstant(string name, int powerLevel) { - return typeof(Roles).GetFields().Select(f => f.GetValue(f)).Cast().ToList(); + Name = name; + PowerLevel = powerLevel; } } - public static class RoleLevels - { - public const int UserLevel = 20; - public const int RaidLeadLevel = 55; - public const int GuildLeadLevel = 65; - public const int AdminLevel = 80; - } } } diff --git a/Lieb/Data/DbInitializer.cs b/Lieb/Data/DbInitializer.cs index 44d3250..f6bd481 100644 --- a/Lieb/Data/DbInitializer.cs +++ b/Lieb/Data/DbInitializer.cs @@ -10,21 +10,21 @@ namespace Lieb.Data public static void Initialize(LiebContext context) { //add special Roles - if (context.LiebRoles.FirstOrDefault(r => r.RoleName == Constants.Roles.Admin) == null) + if (context.LiebRoles.FirstOrDefault(r => r.RoleName == Constants.Roles.Admin.Name) == null) { - context.LiebRoles.Add(new LiebRole() { RoleName = Constants.Roles.Admin, IsSystemRole = true, Level = Constants.RoleLevels.AdminLevel, LevelToAssign = Constants.RoleLevels.AdminLevel }); + context.LiebRoles.Add(new LiebRole() { RoleName = Constants.Roles.Admin.Name, Type = RoleType.SystemRole, Level = Constants.Roles.Admin.PowerLevel, LevelToAssign = Constants.Roles.Admin.PowerLevel }); } - if (context.LiebRoles.FirstOrDefault(r => r.RoleName == Constants.Roles.GuildLead) == null) + if (context.LiebRoles.FirstOrDefault(r => r.RoleName == Constants.Roles.Moderator.Name) == null) { - context.LiebRoles.Add(new LiebRole() { RoleName = Constants.Roles.GuildLead, IsSystemRole = true, Level = Constants.RoleLevels.GuildLeadLevel, LevelToAssign = Constants.RoleLevels.AdminLevel }); + context.LiebRoles.Add(new LiebRole() { RoleName = Constants.Roles.Moderator.Name, Type = RoleType.SystemRole, Level = Constants.Roles.Moderator.PowerLevel, LevelToAssign = Constants.Roles.Admin.PowerLevel }); } - if (context.LiebRoles.FirstOrDefault(r => r.RoleName == Constants.Roles.RaidLead) == null) + if (context.LiebRoles.FirstOrDefault(r => r.RoleName == Constants.Roles.RaidLead.Name) == null) { - context.LiebRoles.Add(new LiebRole() { RoleName = Constants.Roles.RaidLead, IsSystemRole = true, Level = Constants.RoleLevels.RaidLeadLevel, LevelToAssign = Constants.RoleLevels.GuildLeadLevel }); + context.LiebRoles.Add(new LiebRole() { RoleName = Constants.Roles.RaidLead.Name, Type = RoleType.SystemRole, Level = Constants.Roles.RaidLead.PowerLevel, LevelToAssign = Constants.Roles.Moderator.PowerLevel }); } - if (context.LiebRoles.FirstOrDefault(r => r.RoleName == Constants.Roles.User) == null) + if (context.LiebRoles.FirstOrDefault(r => r.RoleName == Constants.Roles.User.Name) == null) { - context.LiebRoles.Add(new LiebRole() { RoleName = Constants.Roles.User, IsSystemRole = true, Level = Constants.RoleLevels.UserLevel, LevelToAssign = Constants.RoleLevels.AdminLevel + 1 }); + context.LiebRoles.Add(new LiebRole() { RoleName = Constants.Roles.User.Name, Type = RoleType.SystemRole, Level = Constants.Roles.User.PowerLevel, LevelToAssign = Constants.Roles.Admin.PowerLevel + 1 }); } context.SaveChanges(); @@ -52,10 +52,10 @@ namespace Lieb.Data context.SaveChanges(); - int AdminRoleId = context.LiebRoles.FirstOrDefault(x => x.RoleName == Constants.Roles.Admin).LiebRoleId; - int GuildLeadRoleId = context.LiebRoles.FirstOrDefault(x => x.RoleName == Constants.Roles.GuildLead).LiebRoleId; - int RaidLeadRoleId = context.LiebRoles.FirstOrDefault(x => x.RoleName == Constants.Roles.RaidLead).LiebRoleId; - int UserRoleId = context.LiebRoles.FirstOrDefault(x => x.RoleName == Constants.Roles.User).LiebRoleId; + int AdminRoleId = context.LiebRoles.FirstOrDefault(x => x.RoleName == Constants.Roles.Admin.Name).LiebRoleId; + int GuildLeadRoleId = context.LiebRoles.FirstOrDefault(x => x.RoleName == Constants.Roles.Moderator.Name).LiebRoleId; + int RaidLeadRoleId = context.LiebRoles.FirstOrDefault(x => x.RoleName == Constants.Roles.RaidLead.Name).LiebRoleId; + int UserRoleId = context.LiebRoles.FirstOrDefault(x => x.RoleName == Constants.Roles.User.Name).LiebRoleId; var assignments = new RoleAssignment[] { diff --git a/Lieb/Data/GuildWars2AccountService.cs b/Lieb/Data/GuildWars2AccountService.cs index a5ddc3a..2ef4a56 100644 --- a/Lieb/Data/GuildWars2AccountService.cs +++ b/Lieb/Data/GuildWars2AccountService.cs @@ -34,22 +34,12 @@ namespace Lieb.Data { user.GuildWars2Accounts.Add(account); } - await context.SaveChangesAsync(); } else { - GuildWars2Account? accountToChange = context.GuildWars2Accounts - .Include(a => a.EquippedBuilds) - .FirstOrDefault(a => a.GuildWars2AccountId == account.GuildWars2AccountId); - - if (accountToChange != null) - { - accountToChange.AccountName = account.AccountName; - accountToChange.ApiKey = account.ApiKey; - - await context.SaveChangesAsync(); - } + context.Update(account); } + await context.SaveChangesAsync(); } } diff --git a/Lieb/Data/GuildWars2BuildService.cs b/Lieb/Data/GuildWars2BuildService.cs index 9b8ce2d..7f36c0d 100644 --- a/Lieb/Data/GuildWars2BuildService.cs +++ b/Lieb/Data/GuildWars2BuildService.cs @@ -20,26 +20,12 @@ namespace Lieb.Data if (build.GuildWars2BuildId == 0) { context.GuildWars2Builds.Add(build); - await context.SaveChangesAsync(); } else { - GuildWars2Build? buildToChange = await context.GuildWars2Builds - .FirstOrDefaultAsync(r => r.GuildWars2BuildId == build.GuildWars2BuildId); - - if (buildToChange != null) - { - buildToChange.BuildName = build.BuildName; - buildToChange.Might = build.Might; - buildToChange.Quickness = build.Quickness; - buildToChange.Alacrity = build.Alacrity; - buildToChange.Heal = build.Heal; - buildToChange.Class = build.Class; - buildToChange.EliteSpecialization = build.EliteSpecialization; - - await context.SaveChangesAsync(); - } + context.Update(build); } + await context.SaveChangesAsync(); } } diff --git a/Lieb/Data/RaidService.cs b/Lieb/Data/RaidService.cs index c8bed68..ccdf98b 100644 --- a/Lieb/Data/RaidService.cs +++ b/Lieb/Data/RaidService.cs @@ -45,7 +45,7 @@ namespace Lieb.Data .FirstOrDefault(r => r.RaidId == raidId); } - public async Task AddOrEditRaid(Raid raid) + public async Task AddOrEditRaid(Raid raid, List rolesToDelete, List remindersToDelete) { if (raid != null) { @@ -57,54 +57,26 @@ namespace Lieb.Data } else { - Raid? raidToChange = await context.Raids - .Include(r => r.Roles) - .Include(r => r.SignUpHistory) - .Include(r => r.Reminders) - .Include(r => r.SignUps) - .FirstOrDefaultAsync(r => r.RaidId == raid.RaidId); - if (raidToChange != null) + context.Update(raid); + context.PlannedRaidRoles.RemoveRange(rolesToDelete); + context.RaidReminders.RemoveRange(remindersToDelete); + + //move users back to "Random" role + if (raid.RaidType != RaidType.Planned) { - raidToChange.Title = raid.Title; - raidToChange.Description = raid.Description; - raidToChange.StartTimeUTC = raid.StartTimeUTC; - raidToChange.EndTimeUTC = raid.EndTimeUTC; - raidToChange.Organizer = raid.Organizer; - raidToChange.Guild = raid.Guild; - raidToChange.VoiceChat = raid.VoiceChat; - raidToChange.RaidType = raid.RaidType; - raidToChange.RequiredRole = raid.RequiredRole; - raidToChange.FreeForAllTimeUTC = raid.FreeForAllTimeUTC; - raidToChange.DiscordMessageId = raid.DiscordMessageId; - raidToChange.DiscordChannelId = raid.DiscordChannelId; - raidToChange.DiscordGuildId = raid.DiscordGuildId; - - if (raidToChange.RaidType == RaidType.Planned) + int randomRoleId = raid.Roles.FirstOrDefault(r => r.IsRandomSignUpRole).PlannedRaidRoleId; + foreach (RaidSignUp signUp in raid.SignUps) { - EditRoles(raidToChange, raid, context); - } - else - { - if(!raidToChange.Roles.Where(r => r.IsRandomSignUpRole).Any()) + if (randomRoleId == 0) { - raidToChange.Roles.Add(raid.Roles.FirstOrDefault(r => r.IsRandomSignUpRole)); + signUp.PlannedRaidRole = raid.Roles.FirstOrDefault(r => r.IsRandomSignUpRole); } - int randomRoleId = raidToChange.Roles.FirstOrDefault(r => r.IsRandomSignUpRole).PlannedRaidRoleId; - foreach (RaidSignUp signUp in raidToChange.SignUps) + else { - if (randomRoleId == 0) - { - signUp.PlannedRaidRole = raidToChange.Roles.FirstOrDefault(r => r.IsRandomSignUpRole); - } - else - { - signUp.PlannedRaidRoleId = randomRoleId; - } + signUp.PlannedRaidRoleId = randomRoleId; } - context.PlannedRaidRoles.RemoveRange(raidToChange.Roles.Where(r => !r.IsRandomSignUpRole)); } - - EditReminders(raidToChange, raid, context); + context.PlannedRaidRoles.RemoveRange(raid.Roles.Where(r => !r.IsRandomSignUpRole)); } await context.SaveChangesAsync(); @@ -112,65 +84,7 @@ namespace Lieb.Data } } - private void EditRoles(Raid raidToEdit, Raid raid, LiebContext context) - { - List rolesToRemove = new List(); - foreach (PlannedRaidRole role in raidToEdit.Roles) - { - PlannedRaidRole? newRole = raid.Roles.FirstOrDefault(r => r.PlannedRaidRoleId == role.PlannedRaidRoleId); - if (newRole != null) - { - role.Spots = newRole.Spots; - role.Name = newRole.Name; - role.Description = newRole.Description; - } - else - { - rolesToRemove.Add(role); - } - } - foreach (PlannedRaidRole role in rolesToRemove) - { - raidToEdit.Roles.Remove(role); - context.PlannedRaidRoles.Remove(role); - } - foreach (PlannedRaidRole role in raid.Roles.Where(r => r.PlannedRaidRoleId == 0)) - { - raidToEdit.Roles.Add(role); - } - } - - private void EditReminders(Raid raidToEdit, Raid raid, LiebContext context) - { - List reminderToRemove = new List(); - foreach (RaidReminder reminder in raidToEdit.Reminders) - { - RaidReminder? newReminder = raid.Reminders.FirstOrDefault(r => r.RaidReminderId == reminder.RaidReminderId); - if (newReminder != null) - { - reminder.Type = newReminder.Type; - reminder.Message = newReminder.Message; - reminder.HoursBeforeRaid = newReminder.HoursBeforeRaid; - reminder.ChannelId = newReminder.ChannelId; - reminder.Sent = newReminder.Sent; - } - else - { - reminderToRemove.Add(reminder); - } - } - foreach (RaidReminder reminder in reminderToRemove) - { - raidToEdit.Reminders.Remove(reminder); - context.RaidReminders.Remove(reminder); - } - foreach (PlannedRaidRole role in raid.Roles.Where(r => r.PlannedRaidRoleId == 0)) - { - raidToEdit.Roles.Add(role); - } - } - - public async Task DeleteRaid(int raidId) + public async Task DeleteRaid(int raidId) { using var context = _contextFactory.CreateDbContext(); Raid raid = GetRaid(raidId); @@ -310,14 +224,14 @@ namespace Lieb.Data if (raid.RaidType == RaidType.Planned) { - //if (raid.MoveFlexAllowed) + if (raid.MoveFlexUsers) { return IsRoleSignUpAllowed(raid, liebUserId, plannedRoleId, signUpType, moveFlexUser, new List()).Result; } - //else - //{ - // return IsRoleSignUpAllowed(liebUserId, plannedRoleId, signUpType); - //} + else + { + return IsRoleSignUpAllowed(liebUserId, plannedRoleId, signUpType); + } } else { diff --git a/Lieb/Data/RaidTemplateService.cs b/Lieb/Data/RaidTemplateService.cs index e4cb8cf..455d1fb 100644 --- a/Lieb/Data/RaidTemplateService.cs +++ b/Lieb/Data/RaidTemplateService.cs @@ -31,7 +31,7 @@ namespace Lieb.Data .FirstOrDefault(t => t.RaidTemplateId == raidTemplateId); } - public async Task AddOrEditTemplate(RaidTemplate template) + public async Task AddOrEditTemplate(RaidTemplate template, List rolesToDelete, List remindersToDelete) { if (template != null) { @@ -39,39 +39,14 @@ namespace Lieb.Data if (template.RaidTemplateId == 0) { context.RaidTemplates.Add(template); - await context.SaveChangesAsync(); } else { - RaidTemplate raidToChange = await context.RaidTemplates - .Include(r => r.Roles) - .Include(r => r.Reminders) - .FirstOrDefaultAsync(r => r.RaidTemplateId == template.RaidTemplateId); - raidToChange.Title = template.Title; - raidToChange.Description = template.Description; - raidToChange.Organizer = template.Organizer; - raidToChange.Guild = template.Guild; - raidToChange.VoiceChat = template.VoiceChat; - raidToChange.RaidType = template.RaidType; - raidToChange.RequiredRole = template.RequiredRole; - raidToChange.DiscordChannelId = template.DiscordChannelId; - raidToChange.DiscordGuildId = template.DiscordGuildId; - raidToChange.StartTime = template.StartTime; - raidToChange.EndTime = template.EndTime; - raidToChange.FreeForAllTime = template.FreeForAllTime; - raidToChange.TimeZone = template.TimeZone; - raidToChange.Interval = template.Interval; - raidToChange.CreateDaysBefore = template.CreateDaysBefore; - - context.PlannedRaidRoles.RemoveRange(raidToChange.Roles); - context.RaidReminders.RemoveRange(raidToChange.Reminders); - raidToChange.Roles.Clear(); - raidToChange.Reminders.Clear(); - raidToChange.Roles = template.Roles; - raidToChange.Reminders = template.Reminders; - - await context.SaveChangesAsync(); + context.Update(template); + context.PlannedRaidRoles.RemoveRange(rolesToDelete); + context.RaidReminders.RemoveRange(remindersToDelete); } + await context.SaveChangesAsync(); } } diff --git a/Lieb/Data/UserService.cs b/Lieb/Data/UserService.cs index 89588e4..c4544ae 100644 --- a/Lieb/Data/UserService.cs +++ b/Lieb/Data/UserService.cs @@ -55,7 +55,7 @@ namespace Lieb.Data .FirstOrDefault(u => u.LiebUserId == userId); } - public LiebUser GetLiebUserSmall(ulong discordId) + public LiebUser GetLiebUserGW2AccountOnly(ulong discordId) { if (discordId > 0) { @@ -69,7 +69,7 @@ namespace Lieb.Data return new LiebUser(); } - public LiebUser GetLiebUserSmall(int userId) + public LiebUser GetLiebGW2AccountOnly(int userId) { using var context = _contextFactory.CreateDbContext(); return context.LiebUsers @@ -145,6 +145,36 @@ namespace Lieb.Data await context.SaveChangesAsync(); } + public int GetPowerLevel(int userId) + { + using var context = _contextFactory.CreateDbContext(); + LiebUser? user = context.LiebUsers + .Include(u => u.RoleAssignments) + .ThenInclude(r => r.LiebRole) + .AsNoTracking() + .FirstOrDefault(u => u.LiebUserId == userId); + if (user != null) + { + return user.RoleAssignments.Max(a => a.LiebRole.Level); + } + return 0; + } + + public int GetPowerLevel(ulong discordId) + { + using var context = _contextFactory.CreateDbContext(); + LiebUser? user = context.LiebUsers + .Include(u => u.RoleAssignments) + .ThenInclude(r => r.LiebRole) + .AsNoTracking() + .FirstOrDefault(u => u.DiscordUserId == discordId); + if (user != null) + { + return user.RoleAssignments.Max(a => a.LiebRole.Level); + } + return 0; + } + public List GetLiebRoles() { using var context = _contextFactory.CreateDbContext(); diff --git a/Lieb/DiscordOAuth2/DiscordHandler.cs b/Lieb/DiscordOAuth2/DiscordHandler.cs index a3af897..45dc7f5 100644 --- a/Lieb/DiscordOAuth2/DiscordHandler.cs +++ b/Lieb/DiscordOAuth2/DiscordHandler.cs @@ -61,7 +61,7 @@ namespace Discord.OAuth2 } else { - LiebRole standardRole = await _LiebDbcontext.LiebRoles.FirstOrDefaultAsync(m => m.RoleName == Constants.Roles.User); + LiebRole standardRole = await _LiebDbcontext.LiebRoles.FirstOrDefaultAsync(m => m.RoleName == Constants.Roles.User.Name); string userName = context.Identity.Claims.FirstOrDefault(x => x.Type == ClaimTypes.Name).Value; LiebUser newUser = new LiebUser() { @@ -78,7 +78,7 @@ namespace Discord.OAuth2 _LiebDbcontext.RoleAssignments.Add(roleAssignment); await _LiebDbcontext.SaveChangesAsync(); - context.Identity.AddClaim(new Claim(Constants.ClaimType, Constants.Roles.User)); + context.Identity.AddClaim(new Claim(Constants.ClaimType, Constants.Roles.User.Name)); } return context; } diff --git a/Lieb/Models/GuildWars2/Raid/RaidBase.cs b/Lieb/Models/GuildWars2/Raid/RaidBase.cs index b4f447c..73bf16a 100644 --- a/Lieb/Models/GuildWars2/Raid/RaidBase.cs +++ b/Lieb/Models/GuildWars2/Raid/RaidBase.cs @@ -29,6 +29,10 @@ namespace Lieb.Models.GuildWars2.Raid public string RequiredRole { get; set; } = String.Empty; + public bool MoveFlexUsers { get; set; } = true; + + public int RaidOwnerId { get; set; } + //role name, number of spots public ICollection Roles { get; set; } = new HashSet(); diff --git a/Lieb/Models/LiebRole.cs b/Lieb/Models/LiebRole.cs index b59b534..e6ea89b 100644 --- a/Lieb/Models/LiebRole.cs +++ b/Lieb/Models/LiebRole.cs @@ -2,6 +2,13 @@ namespace Lieb.Models { + public enum RoleType + { + GuildRole = 1, + SystemRole = 2, + UserDefinedRole = 3 + } + public class LiebRole { public int LiebRoleId { get; set; } @@ -10,7 +17,7 @@ namespace Lieb.Models [StringLength(40, ErrorMessage = "RoleName too long (40 character limit).")] public string RoleName { get; set; } = string.Empty; - public bool IsSystemRole { get; set; } = false; + public RoleType Type { get; set; } public int Level { get; set; } = 20; diff --git a/Lieb/Pages/GuildWars2/BuildEdit.razor b/Lieb/Pages/GuildWars2/BuildEdit.razor index a74080e..fab2a43 100644 --- a/Lieb/Pages/GuildWars2/BuildEdit.razor +++ b/Lieb/Pages/GuildWars2/BuildEdit.razor @@ -10,7 +10,7 @@

BuildEdit

- + diff --git a/Lieb/Pages/GuildWars2/BuildOverview.razor b/Lieb/Pages/GuildWars2/BuildOverview.razor index c92d2b5..aee8b60 100644 --- a/Lieb/Pages/GuildWars2/BuildOverview.razor +++ b/Lieb/Pages/GuildWars2/BuildOverview.razor @@ -7,7 +7,7 @@

BuildOverview

- +
diff --git a/Lieb/Pages/Raids/RaidDetails.razor b/Lieb/Pages/Raids/RaidDetails.razor index 7e7c3e0..e58bb0d 100644 --- a/Lieb/Pages/Raids/RaidDetails.razor +++ b/Lieb/Pages/Raids/RaidDetails.razor @@ -75,12 +75,14 @@
- - - - @if (_raid.RaidType != RaidType.Planned) + + @if (_raid.RaidOwnerId == _user.LiebUserId || _user.RoleAssignments.Max(a => a.LiebRole.Level) >= Constants.RaidEditPowerLevel) { - + + @if (_raid.RaidType != RaidType.Planned) + { + + } }
diff --git a/Lieb/Pages/Raids/RaidEdit.razor b/Lieb/Pages/Raids/RaidEdit.razor index 502aaaa..612f4c2 100644 --- a/Lieb/Pages/Raids/RaidEdit.razor +++ b/Lieb/Pages/Raids/RaidEdit.razor @@ -4,16 +4,18 @@ @using Lieb.Models @using Lieb.Models.GuildWars2.Raid @using System.ComponentModel.DataAnnotations +@using System.Security.Claims @inject RaidService RaidService @inject UserService UserService @inject TimeZoneService TimeZoneService @inject NavigationManager NavigationManager +@inject AuthenticationStateProvider AuthenticationStateProvider @inject IJSRuntime JsRuntime

CreateRaid

- + @{ @@ -70,7 +72,7 @@ @foreach(LiebRole role in UserService.GetLiebRoles()) { - if (!role.IsSystemRole) + if (role.Type != RoleType.SystemRole) { } @@ -151,11 +153,11 @@ @code { - [Parameter] public string raidId { get; set; } public Raid _raid; + private LiebUser _user; private string _errorMessage = string.Empty; @@ -165,18 +167,40 @@ private DateTimeOffset _freeForAllDate = DateTime.Now.Date; private DateTimeOffset _freeForAllTime; + private List _rolesToDelete = new List(); + protected override async Task OnInitializedAsync() { + var authState = await AuthenticationStateProvider.GetAuthenticationStateAsync(); + if (authState != null) + { + ulong discordId = ulong.Parse(authState.User.Claims.FirstOrDefault(c => c.Type == ClaimTypes.NameIdentifier).Value); + _user = UserService.GetLiebUser(discordId); + } + if(_user == null) + { + NavigationManager.NavigateTo(""); + } + if(!string.IsNullOrEmpty(raidId) && int.TryParse(raidId, out int parsedId)) { _raid = RaidService.GetRaid(parsedId); - _startTime = await TimeZoneService.GetLocalDateTime(_raid.StartTimeUTC); - _endTime = await TimeZoneService.GetLocalDateTime(_raid.EndTimeUTC); - _raidDate = _startTime.Date; - _freeForAllTime = await TimeZoneService.GetLocalDateTime(_raid.FreeForAllTimeUTC); - _freeForAllDate = _freeForAllTime.Date; + + if (_raid != null && (_raid.RaidOwnerId == _user.LiebUserId + || _user.RoleAssignments.Max(a => a.LiebRole.Level) >= Constants.RaidEditPowerLevel)) + { + _startTime = await TimeZoneService.GetLocalDateTime(_raid.StartTimeUTC); + _endTime = await TimeZoneService.GetLocalDateTime(_raid.EndTimeUTC); + _raidDate = _startTime.Date; + _freeForAllTime = await TimeZoneService.GetLocalDateTime(_raid.FreeForAllTimeUTC); + _freeForAllDate = _freeForAllTime.Date; + } + else + { + _raid = new Raid(); + } } else { @@ -192,6 +216,10 @@ async Task DeleteRoleClicked(PlannedRaidRole role) { + if(role.PlannedRaidRoleId != 0) + { + _rolesToDelete.Add(role); + } _raid.Roles.Remove(role); } @@ -209,7 +237,7 @@ { if(_raid.RaidType != RaidType.Planned) { - PlannedRaidRole role = _raid.Roles.FirstOrDefault(r => r.IsRandomSignUpRole); + PlannedRaidRole? role = _raid.Roles.FirstOrDefault(r => r.IsRandomSignUpRole); int randomRoleId = role != null ? role.PlannedRaidRoleId : 0; _raid.Roles.Clear(); _raid.Roles.Add(new PlannedRaidRole() @@ -228,8 +256,6 @@ return; } - //_raid.TimeZone = await TimeZoneService.GetUserTimeZone(); - _raid.StartTimeUTC = await TimeZoneService.GetUTCDateTime(_raidDate.Date + _startTime.TimeOfDay); if(_startTime.TimeOfDay > _endTime.TimeOfDay) { @@ -241,7 +267,12 @@ } _raid.FreeForAllTimeUTC = await TimeZoneService.GetUTCDateTime(_freeForAllDate.Date + _freeForAllTime.TimeOfDay); - await RaidService.AddOrEditRaid(_raid); + if (_raid.RaidOwnerId == 0) + { + _raid.RaidOwnerId = _user.LiebUserId; + } + + await RaidService.AddOrEditRaid(_raid, _rolesToDelete, new List()); NavigationManager.NavigateTo("raidoverview"); } } \ No newline at end of file diff --git a/Lieb/Pages/Raids/RaidOverview.razor b/Lieb/Pages/Raids/RaidOverview.razor index 76fecd4..434b383 100644 --- a/Lieb/Pages/Raids/RaidOverview.razor +++ b/Lieb/Pages/Raids/RaidOverview.razor @@ -11,7 +11,7 @@

RaidOverview

- +
Add Raid @@ -31,7 +31,7 @@ @foreach(LiebRole role in UserService.GetLiebRoles()) { - if (!role.IsSystemRole) + if (role.Type != RoleType.SystemRole) { } @@ -64,7 +64,7 @@ if (authState.User.Identity.IsAuthenticated) { ulong discordId = ulong.Parse(authState.User.Claims.FirstOrDefault(c => c.Type == ClaimTypes.NameIdentifier).Value); - _user = UserService.GetLiebUserSmall(discordId); + _user = UserService.GetLiebUser(discordId); } _raids = RaidService.GetRaids(); diff --git a/Lieb/Pages/Raids/RaidTemplateDetails.razor b/Lieb/Pages/Raids/RaidTemplateDetails.razor index b30e2e0..8ff21e6 100644 --- a/Lieb/Pages/Raids/RaidTemplateDetails.razor +++ b/Lieb/Pages/Raids/RaidTemplateDetails.razor @@ -5,6 +5,7 @@ @inject UserService UserService @inject RaidService RaidService @inject TimeZoneService TimeZoneService +@inject NavigationManager NavigationManager @inject RaidRandomizerService RaidRandomizerService @@ -58,21 +59,27 @@
- -
- @{string navLink = $"raidtemplateedit/{_template.RaidTemplateId}";} - - Edit - -
+ + @if (_template.RaidOwnerId == _user.LiebUserId || _user.RoleAssignments.Max(a => a.LiebRole.Level) >= Constants.RaidEditPowerLevel) + { + + } @code { [Parameter] public RaidTemplate _template { get; set; } + + [Parameter] + public LiebUser? _user { get; set; } protected override async Task OnParametersSetAsync() { } + + async Task EditClicked() + { + NavigationManager.NavigateTo($"raidtemplateedit/{_template.RaidTemplateId}"); + } } diff --git a/Lieb/Pages/Raids/RaidTemplateEdit.razor b/Lieb/Pages/Raids/RaidTemplateEdit.razor index 6734b12..d83d591 100644 --- a/Lieb/Pages/Raids/RaidTemplateEdit.razor +++ b/Lieb/Pages/Raids/RaidTemplateEdit.razor @@ -4,16 +4,18 @@ @using Lieb.Models @using Lieb.Models.GuildWars2.Raid @using System.ComponentModel.DataAnnotations +@using System.Security.Claims @inject RaidTemplateService RaidTemplateService @inject UserService UserService @inject TimeZoneService TimeZoneService @inject NavigationManager NavigationManager +@inject AuthenticationStateProvider AuthenticationStateProvider @inject IJSRuntime JsRuntime

CreateRaid

- + @{ @@ -83,7 +85,7 @@ @foreach(LiebRole role in UserService.GetLiebRoles()) { - if (!role.IsSystemRole) + if (role.Type != RoleType.SystemRole) { } @@ -177,6 +179,7 @@ public string raidId { get; set; } public RaidTemplate _template; + private LiebUser _user; private string _errorMessage = string.Empty; @@ -186,19 +189,40 @@ private DateTimeOffset _freeForAllDate = DateTime.Now.Date; private DateTimeOffset _freeForAllTime; private string _userTimeZone = string.Empty; - + + private List _rolesToDelete = new List(); protected override async Task OnInitializedAsync() { + var authState = await AuthenticationStateProvider.GetAuthenticationStateAsync(); + if (authState != null) + { + ulong discordId = ulong.Parse(authState.User.Claims.FirstOrDefault(c => c.Type == ClaimTypes.NameIdentifier).Value); + _user = UserService.GetLiebUser(discordId); + } + if(_user == null) + { + NavigationManager.NavigateTo(""); + } + if(!string.IsNullOrEmpty(raidId) && int.TryParse(raidId, out int parsedId)) { _template = RaidTemplateService.GetTemplate(parsedId); - _startTime = _template.StartTime; - _endTime = _template.EndTime; - _raidDate = _startTime.Date; - _freeForAllTime = _template.FreeForAllTime; - _freeForAllDate = _freeForAllTime.Date; + + if (_template != null && (_template.RaidOwnerId == _user.LiebUserId + || _user.RoleAssignments.Max(a => a.LiebRole.Level) >= Constants.RaidEditPowerLevel)) + { + _startTime = _template.StartTime; + _endTime = _template.EndTime; + _raidDate = _startTime.Date; + _freeForAllTime = _template.FreeForAllTime; + _freeForAllDate = _freeForAllTime.Date; + } + else + { + _template = new RaidTemplate(); + } } else { @@ -215,6 +239,10 @@ async Task DeleteRoleClicked(PlannedRaidRole role) { + if(role.PlannedRaidRoleId != 0) + { + _rolesToDelete.Add(role); + } _template.Roles.Remove(role); } @@ -260,7 +288,12 @@ } _template.FreeForAllTime = _freeForAllDate.Date + _freeForAllTime.TimeOfDay; - await RaidTemplateService.AddOrEditTemplate(_template); + if (_template.RaidOwnerId == 0) + { + _template.RaidOwnerId = _user.LiebUserId; + } + + await RaidTemplateService.AddOrEditTemplate(_template, _rolesToDelete, new List()); NavigationManager.NavigateTo("raidtemplateoverview"); } } \ No newline at end of file diff --git a/Lieb/Pages/Raids/RaidTemplateOverview.razor b/Lieb/Pages/Raids/RaidTemplateOverview.razor index 03bd60f..23ce61f 100644 --- a/Lieb/Pages/Raids/RaidTemplateOverview.razor +++ b/Lieb/Pages/Raids/RaidTemplateOverview.razor @@ -11,7 +11,7 @@

RaidTemplateOverview

- +
Add Raid @@ -22,17 +22,23 @@ @foreach (var raid in _templates.OrderBy(r => r.StartTime)) {
- + } - - @code { private List _templates; + private LiebUser? _user; protected override async Task OnInitializedAsync() { _templates = RaidTemplateService.GetTemplates(); + var authState = await AuthenticationStateProvider.GetAuthenticationStateAsync(); + + if (authState.User.Identity.IsAuthenticated) + { + ulong discordId = ulong.Parse(authState.User.Claims.FirstOrDefault(c => c.Type == ClaimTypes.NameIdentifier).Value); + _user = UserService.GetLiebUser(discordId); + } } } diff --git a/Lieb/Pages/User/ManageAccount.razor b/Lieb/Pages/User/ManageAccount.razor index 39f94e0..6686a88 100644 --- a/Lieb/Pages/User/ManageAccount.razor +++ b/Lieb/Pages/User/ManageAccount.razor @@ -70,7 +70,7 @@ var authState = await AuthenticationStateProvider.GetAuthenticationStateAsync(); ulong discordId = ulong.Parse(authState.User.Claims.FirstOrDefault(c => c.Type == ClaimTypes.NameIdentifier).Value); - _user = UserService.GetLiebUserSmall(discordId); + _user = UserService.GetLiebUserGW2AccountOnly(discordId); } diff --git a/Lieb/Pages/User/ManageGuildWars2Account.razor b/Lieb/Pages/User/ManageGuildWars2Account.razor index d77656c..d849153 100644 --- a/Lieb/Pages/User/ManageGuildWars2Account.razor +++ b/Lieb/Pages/User/ManageGuildWars2Account.razor @@ -115,7 +115,7 @@ { var authState = await AuthenticationStateProvider.GetAuthenticationStateAsync(); ulong discordId = ulong.Parse(authState.User.Claims.FirstOrDefault(c => c.Type == ClaimTypes.NameIdentifier).Value); - _user = UserService.GetLiebUserSmall(discordId); + _user = UserService.GetLiebUserGW2AccountOnly(discordId); if(!string.IsNullOrEmpty(gw2Id) && int.TryParse(gw2Id, out int parsedId) && _user.GuildWars2Accounts.Where(a => a.GuildWars2AccountId == parsedId).Any()) { diff --git a/Lieb/Pages/User/RoleEdit.razor b/Lieb/Pages/User/RoleEdit.razor index 2196114..007240a 100644 --- a/Lieb/Pages/User/RoleEdit.razor +++ b/Lieb/Pages/User/RoleEdit.razor @@ -8,20 +8,19 @@

Role Edit

- + - - - @foreach(LiebRole role in _roles) - { - - - - - } +
@if(!role.IsSystemRole) - { - - }@role.RoleName
+ @foreach(LiebRole role in _roles) + { + + + + + }
@role.RoleName@if(role.Type == RoleType.UserDefinedRole) + { + + }

@_submitMessage

@@ -44,21 +44,18 @@ Role - IsSystemRole + Type @foreach (LiebRole role in _roles) { @{ bool hasRole = _user.RoleAssignments.Where(a => a.LiebRoleId == role.LiebRoleId).Any(); - bool disabled = _editingUserRights < role.LevelToAssign; + bool disabled = _editingUserRights < role.LevelToAssign || role.Type == RoleType.GuildRole; } @role.RoleName - @if(@role.IsSystemRole) - { - True - } + @role.Type.ToString() } diff --git a/Lieb/Pages/User/UserOverview.razor b/Lieb/Pages/User/UserOverview.razor index c48814a..5455c0d 100644 --- a/Lieb/Pages/User/UserOverview.razor +++ b/Lieb/Pages/User/UserOverview.razor @@ -8,7 +8,7 @@

UserOverview

- +
diff --git a/Lieb/Program.cs b/Lieb/Program.cs index c0005d5..4453030 100644 --- a/Lieb/Program.cs +++ b/Lieb/Program.cs @@ -47,10 +47,17 @@ builder.Services.AddAuthentication(opt => builder.Services.AddAuthorization(options => { - foreach(string role in Constants.Roles.GetAllRoles()) - { - options.AddPolicy(role, policy => policy.RequireClaim(Constants.ClaimType, role)); - } + options.AddPolicy(Constants.Roles.User.Name, policy => policy.RequireClaim(Constants.ClaimType, new List(){ + Constants.Roles.User.Name, Constants.Roles.RaidLead.Name, Constants.Roles.Moderator.Name, Constants.Roles.Admin.Name})); + + options.AddPolicy(Constants.Roles.RaidLead.Name, policy => policy.RequireClaim(Constants.ClaimType, new List() { + Constants.Roles.RaidLead.Name, Constants.Roles.Moderator.Name, Constants.Roles.Admin.Name })); + + options.AddPolicy(Constants.Roles.Moderator.Name, policy => policy.RequireClaim(Constants.ClaimType, new List() { + Constants.Roles.Moderator.Name, Constants.Roles.Admin.Name })); + + options.AddPolicy(Constants.Roles.Admin.Name, policy => policy.RequireClaim(Constants.ClaimType, new List() { + Constants.Roles.Admin.Name })); }); diff --git a/Lieb/Shared/NavMenu.razor b/Lieb/Shared/NavMenu.razor index 14e0c2a..19fd94a 100644 --- a/Lieb/Shared/NavMenu.razor +++ b/Lieb/Shared/NavMenu.razor @@ -20,7 +20,7 @@ Raid Overview
- +
@@ -38,7 +38,7 @@
- +
@@ -56,7 +56,7 @@
- +