Sarah/Lieb-Website
1
0
Fork 1
Code Issues Pull requests Projects Releases Packages Wiki Activity

Added user rights management

Browse source
This commit is contained in:
t.ruspekhofer 2022-02-27 14:24:39 +01:00
parent f00418d23c
commit d472889ae1
9 changed files with 419 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Lieb/Data/Constants.cs
View file

@ -17,5 +17,13 @@
return typeof(Roles).GetFields().Select(f => f.GetValue(f)).Cast<string>().ToList();
}
}
public static class RoleLevels
{
public const int UserLevel = 20;
public const int RaidLeadLevel = 55;
public const int GuildLeadLevel = 65;
public const int AdminLevel = 80;
}
}
}

27
Lieb/Data/DbInitializer.cs
View file

@ -9,22 +9,25 @@ namespace Lieb.Data
{
public static void Initialize(LiebContext context)
{
//add new Roles
List<LiebRole> roles = new List<LiebRole>();
foreach (string roleName in Constants.Roles.GetAllRoles())
//add special Roles
if (context.LiebRoles.FirstOrDefault(r => r.RoleName == Constants.Roles.Admin) == null)
{
if (context.LiebRoles.FirstOrDefault(r => r.RoleName == roleName) == null)
{
roles.Add(new LiebRole()
{
RoleName = roleName
});
}
context.LiebRoles.Add(new LiebRole() { RoleName = Constants.Roles.Admin, IsSystemRole = true, Level = Constants.RoleLevels.AdminLevel, LevelToAssign = Constants.RoleLevels.AdminLevel });
}
if (context.LiebRoles.FirstOrDefault(r => r.RoleName == Constants.Roles.GuildLead) == null)
{
context.LiebRoles.Add(new LiebRole() { RoleName = Constants.Roles.GuildLead, IsSystemRole = true, Level = Constants.RoleLevels.GuildLeadLevel, LevelToAssign = Constants.RoleLevels.AdminLevel });
}
if (context.LiebRoles.FirstOrDefault(r => r.RoleName == Constants.Roles.RaidLead) == null)
{
context.LiebRoles.Add(new LiebRole() { RoleName = Constants.Roles.RaidLead, IsSystemRole = true, Level = Constants.RoleLevels.RaidLeadLevel, LevelToAssign = Constants.RoleLevels.GuildLeadLevel });
}
if (context.LiebRoles.FirstOrDefault(r => r.RoleName == Constants.Roles.User) == null)
{
context.LiebRoles.Add(new LiebRole() { RoleName = Constants.Roles.User, IsSystemRole = true, Level = Constants.RoleLevels.UserLevel, LevelToAssign = Constants.RoleLevels.AdminLevel + 1 });
}
context.LiebRoles.AddRange(roles);
context.SaveChanges();
// Look for any LiebUsers.
if (context.LiebUsers.Any())
{

107
Lieb/Data/UserService.cs
View file

@ -13,23 +13,48 @@ namespace Lieb.Data
_contextFactory = contextFactory;
}
public async Task<LiebUser> GetLiebUser(ulong discordId)
public List<LiebUser> GetLiebUsers()
{
using var context = _contextFactory.CreateDbContext();
return context.LiebUsers
.Include(u => u.GuildWars2Accounts)
.ThenInclude(a => a.EquippedBuilds)
.ThenInclude(b => b.GuildWars2Build)
.Include(u => u.RoleAssignments)
.ThenInclude(r => r.LiebRole)
.ToList();
}
public LiebUser GetLiebUser(ulong discordId)
{
if (discordId > 0)
{
using var context = _contextFactory.CreateDbContext();
return await context.LiebUsers
return context.LiebUsers
.Include(u => u.GuildWars2Accounts)
.ThenInclude(a => a.EquippedBuilds)
.ThenInclude(b => b.GuildWars2Build)
.Include(u => u.RoleAssignments)
.ThenInclude(r => r.LiebRole)
.FirstOrDefaultAsync(u => u.DiscordUserId == discordId);
.FirstOrDefault(u => u.DiscordUserId == discordId);
}
else
return new LiebUser();
}
public LiebUser GetLiebUser(int userId)
{
using var context = _contextFactory.CreateDbContext();
return context.LiebUsers
.Include(u => u.GuildWars2Accounts)
.ThenInclude(a => a.EquippedBuilds)
.ThenInclude(b => b.GuildWars2Build)
.Include(u => u.RoleAssignments)
.ThenInclude(r => r.LiebRole)
.AsNoTracking()
.FirstOrDefault(u => u.LiebUserId == userId);
}
public LiebUser GetLiebUserSmall(ulong discordId)
{
if (discordId > 0)
@ -43,6 +68,14 @@ namespace Lieb.Data
return new LiebUser();
}
public LiebUser GetLiebUserSmall(int userId)
{
using var context = _contextFactory.CreateDbContext();
return context.LiebUsers
.Include(u => u.GuildWars2Accounts)
.FirstOrDefault(u => u.LiebUserId == userId);
}
public async Task<int> GetLiebUserId(ulong discordId)
{
if (discordId > 0)
@ -69,5 +102,73 @@ namespace Lieb.Data
}
await context.SaveChangesAsync();
}
public async Task EditUserRoles(LiebUser user)
{
if (user != null)
{
using var context = _contextFactory.CreateDbContext();
LiebUser? userToChange = await context.LiebUsers
.Include(u => u.RoleAssignments)
.FirstOrDefaultAsync(u => u.LiebUserId == user.LiebUserId);
if (userToChange == null)
return;
userToChange.BannedUntil = user.BannedUntil;
List<RoleAssignment> toDelete = new List<RoleAssignment>();
foreach (RoleAssignment assignment in userToChange.RoleAssignments)
{
RoleAssignment? newAssignment = user.RoleAssignments.FirstOrDefault(r => r.RoleAssignmentId == assignment.RoleAssignmentId);
if (newAssignment == null)
{
toDelete.Add(assignment);
}
}
foreach (RoleAssignment assignment in toDelete)
{
userToChange.RoleAssignments.Remove(assignment);
context.RoleAssignments.Remove(assignment);
}
foreach (RoleAssignment assignment in user.RoleAssignments.Where(r => r.RoleAssignmentId == 0))
{
userToChange.RoleAssignments.Add(assignment);
}
await context.SaveChangesAsync();
}
}
public List<LiebRole> GetLiebRoles()
{
using var context = _contextFactory.CreateDbContext();
return context.LiebRoles
.Include(u => u.RoleAssignments)
.ThenInclude(r => r.LiebUser)
.ToList();
}
public async Task AddRole(LiebRole role)
{
using var context = _contextFactory.CreateDbContext();
if (context.LiebRoles.FirstOrDefault(r => r.RoleName == role.RoleName) == null)
{
context.LiebRoles.Add(role);
}
await context.SaveChangesAsync();
}
public async Task DeleteRole(int roleId)
{
using var context = _contextFactory.CreateDbContext();
LiebRole role = context.LiebRoles.FirstOrDefault(r => r.LiebRoleId == roleId);
if (role != null)
{
context.LiebRoles.Remove(role);
await context.SaveChangesAsync();
}
}
}
}