Skip to content

Commit de2fc43

Browse files
frasermolyneuxfrasermolyneux
committed
feat: Remove map pack management functionality and related UI components
1 parent 51ab0cb commit de2fc43

14 files changed

Lines changed: 1 addition & 453 deletions

File tree

‎docs/permissions/maps.md‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,6 @@ Roles / Claims:
1818
| Access Maps (`AccessMaps`) | ✓ | ✓ g | ✓ g | ✓ g | All admin levels via handler (not shown here if simple) |
1919
| Manage Maps (`ManageMaps`) | ✓ | ✓ g | ✗ | ✗ | Senior & Head only |
2020
| Access Map Manager Controller (`AccessMapManagerController`) | ✓ | ✓ g | ✗ | ✗ | Same group |
21-
| Create Map Pack (`CreateMapPack`) | ✓ | ✓ g | ✗ | ✗ | Senior & Head only |
22-
| Edit Map Pack (`EditMapPack`) | ✓ | ✓ g | ✗ | ✗ | Same group |
23-
| Delete Map Pack (`DeleteMapPack`) | ✓ | ✓ g | ✗ | ✗ | Same group |
2421
| Push Map To Remote (`PushMapToRemote`) | ✓ | ✓ g | ✗ | ✗ | Same group |
2522
| Delete Map From Host (`DeleteMapFromHost`) | ✓ | ✓ g | ✗ | ✗ | Same group |
2623

‎src/XtremeIdiots.Portal.Web/Auth/Constants/AuthPolicies.cs‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -60,9 +60,6 @@ public static class AuthPolicies
6060
public const string AccessMaps = nameof(AccessMaps);
6161
public const string AccessMapManagerController = nameof(AccessMapManagerController);
6262
public const string ManageMaps = nameof(ManageMaps);
63-
public const string CreateMapPack = nameof(CreateMapPack);
64-
public const string EditMapPack = nameof(EditMapPack);
65-
public const string DeleteMapPack = nameof(DeleteMapPack);
6663
public const string PushMapToRemote = nameof(PushMapToRemote);
6764
public const string DeleteMapFromHost = nameof(DeleteMapFromHost);
6865

‎src/XtremeIdiots.Portal.Web/Auth/Handlers/MapsAuthHandler.cs‎

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -30,15 +30,6 @@ public Task HandleAsync(AuthorizationHandlerContext context)
3030
case ManageMaps:
3131
HandleManageMaps(context, requirement);
3232
break;
33-
case CreateMapPack:
34-
HandleCreateMapPack(context, requirement);
35-
break;
36-
case EditMapPack:
37-
HandleEditMapPack(context, requirement);
38-
break;
39-
case DeleteMapPack:
40-
HandleDeleteMapPack(context, requirement);
41-
break;
4233
case PushMapToRemote:
4334
HandlePushMapToRemote(context, requirement);
4435
break;
@@ -70,21 +61,6 @@ private static void HandleManageMaps(AuthorizationHandlerContext context, IAutho
7061
BaseAuthorizationHelper.CheckSeniorOrGameAdminAccessWithResource(context, requirement);
7162
}
7263

73-
private static void HandleCreateMapPack(AuthorizationHandlerContext context, IAuthorizationRequirement requirement)
74-
{
75-
BaseAuthorizationHelper.CheckSeniorOrGameAdminAccessWithResource(context, requirement);
76-
}
77-
78-
private static void HandleEditMapPack(AuthorizationHandlerContext context, IAuthorizationRequirement requirement)
79-
{
80-
BaseAuthorizationHelper.CheckSeniorOrGameAdminAccessWithResource(context, requirement);
81-
}
82-
83-
private static void HandleDeleteMapPack(AuthorizationHandlerContext context, IAuthorizationRequirement requirement)
84-
{
85-
BaseAuthorizationHelper.CheckSeniorOrGameAdminAccessWithResource(context, requirement);
86-
}
87-
8864
private static void HandlePushMapToRemote(AuthorizationHandlerContext context, IAuthorizationRequirement requirement)
8965
{
9066
BaseAuthorizationHelper.CheckSeniorOrGameAdminAccessWithResource(context, requirement);

‎src/XtremeIdiots.Portal.Web/Auth/Requirements/MapsAuthRequirements.cs‎

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -23,27 +23,6 @@ public class ManageMaps : IAuthorizationRequirement
2323
{
2424
}
2525

26-
/// <summary>
27-
/// Authorization requirement for creating map packs
28-
/// </summary>
29-
public class CreateMapPack : IAuthorizationRequirement
30-
{
31-
}
32-
33-
/// <summary>
34-
/// Authorization requirement for editing map packs
35-
/// </summary>
36-
public class EditMapPack : IAuthorizationRequirement
37-
{
38-
}
39-
40-
/// <summary>
41-
/// Authorization requirement for deleting map packs
42-
/// </summary>
43-
public class DeleteMapPack : IAuthorizationRequirement
44-
{
45-
}
46-
4726
/// <summary>
4827
/// Authorization requirement for pushing maps to remote servers
4928
/// </summary>

‎src/XtremeIdiots.Portal.Web/Controllers/MapManagerController.cs‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@ public async Task<IActionResult> Manage(Guid id, CancellationToken cancellationT
5151

5252
var getServerMapsResult = await serversApiClient.Rcon.V1.GetServerMaps(id).ConfigureAwait(false);
5353
var getLoadedServerMapsFromHostResult = await serversApiClient.Maps.V1.GetLoadedServerMapsFromHost(id).ConfigureAwait(false);
54-
var mapPacks = await repositoryApiClient.MapPacks.V1.GetMapPacks(null, [id], null, 0, 50, MapPacksOrder.Title).ConfigureAwait(false);
5554

5655
var mapsCollectionApiResponse = await repositoryApiClient.Maps.V1.GetMaps(
5756
gameServerData!.GameType,
@@ -62,8 +61,7 @@ public async Task<IActionResult> Manage(Guid id, CancellationToken cancellationT
6261
{
6362
Maps = mapsCollectionApiResponse.Result?.Data?.Items?.ToList() ?? [],
6463
ServerMaps = getLoadedServerMapsFromHostResult.Result?.Data?.Items?.ToList() ?? [],
65-
RconMaps = getServerMapsResult.Result?.Data?.Items?.ToList() ?? [],
66-
MapPacks = mapPacks.Result?.Data?.Items?.ToList() ?? []
64+
RconMaps = getServerMapsResult.Result?.Data?.Items?.ToList() ?? []
6765
};
6866

6967
return View(viewModel);

‎src/XtremeIdiots.Portal.Web/Controllers/MapPacksController.cs‎

Lines changed: 0 additions & 156 deletions
This file was deleted.

‎src/XtremeIdiots.Portal.Web/Extensions/PolicyExtensions.cs‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,9 +53,6 @@ public static void AddXtremeIdiotsPolicies(this AuthorizationOptions options)
5353
options.AddPolicy(AuthPolicies.AccessMaps, policy => policy.Requirements.Add(new AccessMaps()));
5454
options.AddPolicy(AuthPolicies.AccessMapManagerController, policy => policy.Requirements.Add(new AccessMapManagerController()));
5555
options.AddPolicy(AuthPolicies.ManageMaps, policy => policy.Requirements.Add(new ManageMaps()));
56-
options.AddPolicy(AuthPolicies.CreateMapPack, policy => policy.Requirements.Add(new CreateMapPack()));
57-
options.AddPolicy(AuthPolicies.EditMapPack, policy => policy.Requirements.Add(new EditMapPack()));
58-
options.AddPolicy(AuthPolicies.DeleteMapPack, policy => policy.Requirements.Add(new DeleteMapPack()));
5956
options.AddPolicy(AuthPolicies.PushMapToRemote, policy => policy.Requirements.Add(new PushMapToRemote()));
6057
options.AddPolicy(AuthPolicies.DeleteMapFromHost, policy => policy.Requirements.Add(new DeleteMapFromHost()));
6158

‎src/XtremeIdiots.Portal.Web/Extensions/TelemetryExtensions.cs‎

Lines changed: 0 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
using XtremeIdiots.Portal.Repository.Abstractions.Models.V1.BanFileMonitors;
55
using XtremeIdiots.Portal.Repository.Abstractions.Models.V1.Demos;
66
using XtremeIdiots.Portal.Repository.Abstractions.Models.V1.GameServers;
7-
using XtremeIdiots.Portal.Repository.Abstractions.Models.V1.MapPacks;
87
using XtremeIdiots.Portal.Repository.Abstractions.Models.V1.Players;
98
using XtremeIdiots.Portal.Repository.Abstractions.Models.V1.Tags;
109
using XtremeIdiots.Portal.Repository.Abstractions.Models.V1.UserProfiles;
@@ -90,21 +89,6 @@ public static EventTelemetry Enrich(this EventTelemetry eventTelemetry, DemoDto
9089
return eventTelemetry;
9190
}
9291

93-
public static EventTelemetry Enrich(this EventTelemetry eventTelemetry, MapPackDto mapPackDto)
94-
{
95-
eventTelemetry.Properties.TryAdd("MapPackId", mapPackDto.MapPackId.ToString());
96-
eventTelemetry.Properties.TryAdd("GameServerId", mapPackDto.GameServerId.ToString());
97-
98-
return eventTelemetry;
99-
}
100-
101-
public static EventTelemetry Enrich(this EventTelemetry eventTelemetry, CreateMapPackDto createMapPackDto)
102-
{
103-
eventTelemetry.Properties.TryAdd("GameServerId", createMapPackDto.GameServerId.ToString());
104-
105-
return eventTelemetry;
106-
}
107-
10892
public static EventTelemetry Enrich(this EventTelemetry eventTelemetry, TagDto tagDto)
10993
{
11094
eventTelemetry.Properties.TryAdd("TagId", tagDto.TagId.ToString());
@@ -200,21 +184,6 @@ public static ExceptionTelemetry Enrich(this ExceptionTelemetry exceptionTelemet
200184
return exceptionTelemetry;
201185
}
202186

203-
public static ExceptionTelemetry Enrich(this ExceptionTelemetry exceptionTelemetry, MapPackDto mapPackDto)
204-
{
205-
exceptionTelemetry.Properties.TryAdd("MapPackId", mapPackDto.MapPackId.ToString());
206-
exceptionTelemetry.Properties.TryAdd("GameServerId", mapPackDto.GameServerId.ToString());
207-
208-
return exceptionTelemetry;
209-
}
210-
211-
public static ExceptionTelemetry Enrich(this ExceptionTelemetry exceptionTelemetry, CreateMapPackDto createMapPackDto)
212-
{
213-
exceptionTelemetry.Properties.TryAdd("GameServerId", createMapPackDto.GameServerId.ToString());
214-
215-
return exceptionTelemetry;
216-
}
217-
218187
public static ExceptionTelemetry Enrich(this ExceptionTelemetry exceptionTelemetry, TagDto tagDto)
219188
{
220189
exceptionTelemetry.Properties.TryAdd("TagId", tagDto.TagId.ToString());

‎src/XtremeIdiots.Portal.Web/Models/ActivityLog/ActivityLogEventMap.cs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,6 @@ public static class ActivityLogEventMap
7070
// Maps
7171
["MapDeletedFromHost"] = (ActivityLogCategory.Maps, true),
7272
["MapPushedToRemote"] = (ActivityLogCategory.Maps, true),
73-
["MapPackCreated"] = (ActivityLogCategory.Maps, true),
7473
["MapsListRetrieved"] = (ActivityLogCategory.Maps, false),
7574
["MapLoaded"] = (ActivityLogCategory.Maps, false),
7675
["MapImageRetrieved"] = (ActivityLogCategory.Maps, false),

‎src/XtremeIdiots.Portal.Web/ViewModels/CreateMapPackViewModel.cs‎

Lines changed: 0 additions & 44 deletions
This file was deleted.

0 commit comments

Comments
 (0)