lancommander-ref/LANCommander
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Allow key allocation via user

Browse source
This commit is contained in:
Pat Hartl 2024-09-03 19:57:39 -05:00
parent 58a291635f
commit 0fa0960ef5
6 changed files with 2603 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

104
LANCommander.Server/Controllers/Api/KeysController.cs
View file

@ -6,6 +6,8 @@ using LANCommander.Server.Services;
using LANCommander.SDK.Models;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.Identity;
using LANCommander.Server.Models;
namespace LANCommander.Server.Controllers.Api
{
@ -16,14 +18,20 @@ namespace LANCommander.Server.Controllers.Api
{
private readonly IMapper Mapper;
private readonly KeyService KeyService;
private readonly GameService GameService;
private readonly UserManager<Data.Models.User> UserManager;
public KeysController(
ILogger<KeysController> logger,
IMapper mapper,
KeyService keyService) : base(logger)
KeyService keyService,
GameService gameService,
UserManager<Data.Models.User> userManager) : base(logger)
{
Mapper = mapper;
KeyService = keyService;
GameService = gameService;
UserManager = userManager;
}
[HttpPost]
@ -32,43 +40,102 @@ namespace LANCommander.Server.Controllers.Api
return Mapper.Map<SDK.Models.Key>(KeyService.Get(k => k.AllocationMethod == Data.Models.KeyAllocationMethod.MacAddress && k.ClaimedByMacAddress == keyRequest.MacAddress).First());
}
/// <summary>
/// Get allocated key (or allocate new key) based on game's key allocation method
/// </summary>
/// <param name="id">ID of the game</param>
/// <param name="keyRequest"></param>
/// <returns>Allocated key</returns>
[HttpPost("GetAllocated/{id}")]
public async Task<SDK.Models.Key> GetAllocated(Guid id, KeyRequest keyRequest)
{
var existing = KeyService.Get(k => k.Game.Id == id && k.AllocationMethod == Data.Models.KeyAllocationMethod.MacAddress && k.ClaimedByMacAddress == keyRequest.MacAddress).FirstOrDefault();
Data.Models.Key key = null;
if (existing != null)
return Mapper.Map<SDK.Models.Key>(existing);
var user = await UserManager.FindByNameAsync(User.Identity.Name);
var game = await GameService.Get(id);
switch (game.KeyAllocationMethod)
{
case Data.Models.KeyAllocationMethod.MacAddress:
key = game.Keys.FirstOrDefault(k => k.AllocationMethod == Data.Models.KeyAllocationMethod.MacAddress && k.ClaimedByMacAddress == keyRequest.MacAddress);
break;
case Data.Models.KeyAllocationMethod.UserAccount:
key = game.Keys.FirstOrDefault(k => k.AllocationMethod == Data.Models.KeyAllocationMethod.UserAccount && k.ClaimedByUser?.Id == user.Id);
break;
}
if (key != null)
return Mapper.Map<SDK.Models.Key>(key);
else
return Mapper.Map<SDK.Models.Key>(await AllocateNewKey(id, keyRequest));
return Mapper.Map<SDK.Models.Key>(await AllocateNewKey(id, keyRequest, game.KeyAllocationMethod));
}
/// <summary>
/// Allocate a new key based on game's key allocation method
/// </summary>
/// <param name="id">ID of the game</param>
/// <param name="keyRequest"></param>
/// <returns>Newly allocated key</returns>
[HttpPost("Allocate/{id}")]
public async Task<SDK.Models.Key> Allocate(Guid id, KeyRequest keyRequest)
{
var existing = KeyService.Get(k => k.Game.Id == id && k.AllocationMethod == Data.Models.KeyAllocationMethod.MacAddress && keyRequest.MacAddress == keyRequest.MacAddress).FirstOrDefault();
Data.Models.Key key = null;
var availableKey = KeyService.Get(k => k.Game.Id == id)
.Where(k =>
var user = await UserManager.FindByNameAsync(User.Identity.Name);
var game = await GameService.Get(id);
switch (game.KeyAllocationMethod)
{
case Data.Models.KeyAllocationMethod.MacAddress:
key = game.Keys.FirstOrDefault(k => k.AllocationMethod == Data.Models.KeyAllocationMethod.MacAddress && k.ClaimedByMacAddress == keyRequest.MacAddress);
break;
case Data.Models.KeyAllocationMethod.UserAccount:
key = game.Keys.FirstOrDefault(k => k.AllocationMethod == Data.Models.KeyAllocationMethod.UserAccount && k.ClaimedByUser?.Id == user.Id);
break;
}
var availableKey = game.Keys.FirstOrDefault(k =>
(k.AllocationMethod == Data.Models.KeyAllocationMethod.MacAddress && String.IsNullOrWhiteSpace(k.ClaimedByMacAddress))
||
(k.AllocationMethod == Data.Models.KeyAllocationMethod.UserAccount && k.ClaimedByUser == null))
.FirstOrDefault();
(k.AllocationMethod == Data.Models.KeyAllocationMethod.UserAccount && k.ClaimedByUser == null));
if (availableKey == null && existing != null)
return Mapper.Map<SDK.Models.Key>(existing);
if (availableKey == null && key != null)
return Mapper.Map<SDK.Models.Key>(key);
else if (availableKey == null)
return null;
else
{
await KeyService.Release(existing.Id);
if (key != null)
await KeyService.Release(key.Id);
return Mapper.Map<SDK.Models.Key>(await KeyService.Allocate(availableKey, keyRequest.MacAddress));
switch (game.KeyAllocationMethod)
{
case Data.Models.KeyAllocationMethod.MacAddress:
key = await KeyService.Allocate(availableKey, keyRequest.MacAddress);
break;
case Data.Models.KeyAllocationMethod.UserAccount:
key = await KeyService.Allocate(availableKey, user);
break;
}
return Mapper.Map<SDK.Models.Key>(key);
}
}
private async Task<SDK.Models.Key> AllocateNewKey(Guid id, KeyRequest keyRequest)
/// <summary>
/// Allocate a new key using specified allocation method
/// </summary>
/// <param name="id">The ID of the game</param>
/// <param name="keyRequest"></param>
/// <param name="keyAllocationMethod"></param>
/// <returns>Allocated key</returns>
private async Task<SDK.Models.Key> AllocateNewKey(Guid id, KeyRequest keyRequest, Data.Models.KeyAllocationMethod keyAllocationMethod)
{
var user = await UserManager.FindByNameAsync(User.Identity.Name);
var availableKey = KeyService.Get(k => k.Game.Id == id)
.Where(k =>
(k.AllocationMethod == Data.Models.KeyAllocationMethod.MacAddress && String.IsNullOrWhiteSpace(k.ClaimedByMacAddress))
@ -79,7 +146,12 @@ namespace LANCommander.Server.Controllers.Api
if (availableKey == null)
return null;
return Mapper.Map<SDK.Models.Key>(await KeyService.Allocate(availableKey, keyRequest.MacAddress));
if (keyAllocationMethod == Data.Models.KeyAllocationMethod.MacAddress)
return Mapper.Map<SDK.Models.Key>(await KeyService.Allocate(availableKey, keyRequest.MacAddress));
else if (keyAllocationMethod == Data.Models.KeyAllocationMethod.UserAccount)
return Mapper.Map<SDK.Models.Key>(await KeyService.Allocate(availableKey, user));
else
return null;
}
}
}

2
LANCommander.Server/Data/Models/Game.cs
View file

@ -21,6 +21,8 @@ namespace LANCommander.Server.Data.Models
public virtual ICollection<Action>? Actions { get; set; } = new List<Action>();
public KeyAllocationMethod KeyAllocationMethod { get; set; } = KeyAllocationMethod.UserAccount;
public GameType Type { get; set; }
public Guid? BaseGameId { get; set; }
[ForeignKey(nameof(BaseGameId))]

2475
LANCommander.Server/Migrations/20240904002809_AddGameKeyAllocationMethod.Designer.cs generated Normal file
View file

File diff suppressed because it is too large Load diff

29
LANCommander.Server/Migrations/20240904002809_AddGameKeyAllocationMethod.cs Normal file
View file

@ -0,0 +1,29 @@
using Microsoft.EntityFrameworkCore.Migrations;
#nullable disable
namespace LANCommander.Migrations
{
/// <inheritdoc />
public partial class AddGameKeyAllocationMethod : Migration
{
/// <inheritdoc />
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.AddColumn<int>(
name: "KeyAllocationMethod",
table: "Games",
type: "INTEGER",
nullable: false,
defaultValue: 0);
}
/// <inheritdoc />
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropColumn(
name: "KeyAllocationMethod",
table: "Games");
}
}
}

3
LANCommander.Server/Migrations/DatabaseContextModelSnapshot.cs
View file

@ -412,6 +412,9 @@ namespace LANCommander.Migrations
b.Property<long?>("IGDBId")
.HasColumnType("INTEGER");
b.Property<int>("KeyAllocationMethod")
.HasColumnType("INTEGER");
b.Property<string>("Notes")
.HasColumnType("TEXT");

6
LANCommander.Server/UI/Pages/Games/Edit.razor
View file

@ -160,6 +160,12 @@
</Select>
</FormItem>
}
<FormItem Label="Key Allocation Method">
<Select @bind-Value="@context.KeyAllocationMethod" TItem="KeyAllocationMethod" TItemValue="KeyAllocationMethod" DataSource="Enum.GetValues<KeyAllocationMethod>()">
<LabelTemplate Context="Value">@Value.GetDisplayName()</LabelTemplate>
<ItemTemplate Context="Value">@Value.GetDisplayName()</ItemTemplate>
</Select>
</FormItem>
<FormItem Label="Released On">
<DatePicker TValue="DateTime?" @bind-Value="@context.ReleasedOn" Picker="@DatePickerType.Date" />
</FormItem>