From 213fa3026d3ee2ac48193207e58bb7a4b1d7faa6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Elias=20H=C3=B6rner?= Date: Sat, 21 Mar 2026 21:43:08 +0100 Subject: [PATCH 01/12] fix --- src/Turnierplan.App/Client/src/app/i18n/de.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Turnierplan.App/Client/src/app/i18n/de.ts b/src/Turnierplan.App/Client/src/app/i18n/de.ts index e32ef191..d507cac4 100644 --- a/src/Turnierplan.App/Client/src/app/i18n/de.ts +++ b/src/Turnierplan.App/Client/src/app/i18n/de.ts @@ -224,7 +224,7 @@ export const de = { Name: 'Name', References: { Header: 'Verwendungen', - Tooltip: 'Gibt an, von wie vielen Turnieren wird dieses Bild verwendet wird', + Tooltip: 'Gibt an, von wie vielen Turnieren dieses Bild verwendet wird', None: 'keine' }, NoImages: 'Es sind aktuell keine Bilder vorhanden.', From ffdf4f390904b3db8da4a1c5f3b6bfd9b269f79c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Elias=20H=C3=B6rner?= Date: Sun, 12 Apr 2026 13:19:59 +0200 Subject: [PATCH 02/12] Some code fixes + test for rbac scope helper --- .../Scenarios.cs | 7 ++- .../TestServer.cs | 15 ++++- .../Helpers/RbacScopeHelperTest.cs | 56 +++++++++++++++++++ .../Mapping/Rules/TournamentMappingRule.cs | 2 +- src/Turnierplan.App/Pages/Tournament.cshtml | 4 +- .../GroupResultsNthRankedSelectorTest.cs | 44 +++------------ .../GroupResultsNthRankedSelector.cs | 2 +- .../Renderer/ReceiptsRendererTest.cs | 2 +- .../Renderer/RendererTestBase.cs | 50 +++++++++++++---- .../Renderer/MatchPlanRenderer.cs | 43 ++++++-------- 10 files changed, 147 insertions(+), 78 deletions(-) create mode 100644 src/Turnierplan.App.Test.Unit/Helpers/RbacScopeHelperTest.cs diff --git a/src/Turnierplan.App.Test.Functional/Scenarios.cs b/src/Turnierplan.App.Test.Functional/Scenarios.cs index 16ca2de7..6a7b8e8c 100644 --- a/src/Turnierplan.App.Test.Functional/Scenarios.cs +++ b/src/Turnierplan.App.Test.Functional/Scenarios.cs @@ -14,7 +14,7 @@ namespace Turnierplan.App.Test.Functional; -public sealed class Scenarios +public sealed class Scenarios : IDisposable { private readonly TestServer _testServer = new(); @@ -98,6 +98,11 @@ await userClient.Organizations.PostAsync( } } + public void Dispose() + { + _testServer.Dispose(); + } + private static async Task ExpectApiErrorAsync(Func func, HttpStatusCode code) { ApiException? exception = null; diff --git a/src/Turnierplan.App.Test.Functional/TestServer.cs b/src/Turnierplan.App.Test.Functional/TestServer.cs index bab42a07..231f19f8 100644 --- a/src/Turnierplan.App.Test.Functional/TestServer.cs +++ b/src/Turnierplan.App.Test.Functional/TestServer.cs @@ -14,9 +14,10 @@ namespace Turnierplan.App.Test.Functional; -internal sealed class TestServer +internal sealed class TestServer : IDisposable { private readonly WebApplicationFactory _application; + private readonly List _httpClientRequestAdapters = []; public TestServer() { @@ -59,6 +60,8 @@ public async Task CreateClientForUserAsync(string username, s var httpClientRequestAdapter = new HttpClientRequestAdapter(authenticationProvider, httpClient: httpClient); var client = new TurnierplanClient(httpClientRequestAdapter); + _httpClientRequestAdapters.Add(httpClientRequestAdapter); + var loginResponse = await client.Api.Identity.Login.PostAsync(new LoginEndpointRequest { UserName = username, @@ -81,4 +84,14 @@ public T ExecuteContextAction(Func action) using var scope = _application.Services.CreateScope(); return action(scope.ServiceProvider.GetRequiredService()); } + + public void Dispose() + { + foreach (var httpClientRequestAdapter in _httpClientRequestAdapters) + { + httpClientRequestAdapter.Dispose(); + } + + _application.Dispose(); + } } diff --git a/src/Turnierplan.App.Test.Unit/Helpers/RbacScopeHelperTest.cs b/src/Turnierplan.App.Test.Unit/Helpers/RbacScopeHelperTest.cs new file mode 100644 index 00000000..ea55a7e7 --- /dev/null +++ b/src/Turnierplan.App.Test.Unit/Helpers/RbacScopeHelperTest.cs @@ -0,0 +1,56 @@ +using FluentAssertions; +using Turnierplan.App.Helpers; +using Turnierplan.Core.ApiKey; +using Turnierplan.Core.Folder; +using Turnierplan.Core.Image; +using Turnierplan.Core.Organization; +using Turnierplan.Core.PlanningRealm; +using Turnierplan.Core.PublicId; +using Turnierplan.Core.Tournament; +using Turnierplan.Core.Venue; +using Xunit; + +namespace Turnierplan.App.Test.Unit.Helpers; + +public sealed class RbacScopeHelperTest +{ + [Fact] + public void RbacScopeHelper___GetScopeId___Returns_Expected_Value() + { + var organization = new Organization("Test"); + var tournament = new Tournament(organization, "Test", Visibility.Public); + + var organizationId = organization.PublicId.ToString(); + var tournamentId = tournament.PublicId.ToString(); + + organization.GetScopeId().Should().Be($"Organization:{organizationId}"); + tournament.GetScopeId().Should().Be($"Tournament:{tournamentId}"); + } + + [Theory] + [InlineData("ApiKey:NobBmcA2jNc", nameof(ApiKey))] + [InlineData("Folder:NobBmcA2jNc", nameof(Folder))] + [InlineData("Image:NobBmcA2jNc", nameof(Image))] + [InlineData("Organization:NobBmcA2jNc", nameof(Organization))] + [InlineData("PlanningRealm:NobBmcA2jNc", nameof(PlanningRealm))] + [InlineData("Tournament:NobBmcA2jNc", nameof(Tournament))] + [InlineData("Venue:NobBmcA2jNc", nameof(Venue))] + public void RbacScopeHelper___TryParseScopeId___Works_As_Expected(string scopeId, string expectedTypeName) + { + RbacScopeHelper.TryParseScopeId(scopeId, out var actualTypeName, out var objectId).Should().BeTrue(); + + actualTypeName.Should().Be(expectedTypeName); + objectId.Should().Be(new PublicId("NobBmcA2jNc")); + } + + [Theory] + [InlineData("InvitationLink:NobBmcA2jNc")] + [InlineData("ApiKey:NobBmcA2jN")] + public void RbacScopeHelper___TryParseScopeId_With_Invalid_Scope_Id___Works_As_Expected(string scopeId) + { + RbacScopeHelper.TryParseScopeId(scopeId, out var actualTypeName, out var objectId).Should().BeFalse(); + + actualTypeName.Should().BeNull(); + objectId.Should().Be(PublicId.Empty); + } +} diff --git a/src/Turnierplan.App/Mapping/Rules/TournamentMappingRule.cs b/src/Turnierplan.App/Mapping/Rules/TournamentMappingRule.cs index 45955029..8b30f96a 100644 --- a/src/Turnierplan.App/Mapping/Rules/TournamentMappingRule.cs +++ b/src/Turnierplan.App/Mapping/Rules/TournamentMappingRule.cs @@ -143,7 +143,7 @@ protected override TournamentDto Map(IMapper mapper, MappingContext context, Tou FirstMatchKickoff = source.MatchPlanConfiguration?.ScheduleConfig?.FirstMatchKickoff, GroupPhaseConfig = MapGroupRoundConfiguration(source.MatchPlanConfiguration?.GroupRoundConfig, source.MatchPlanConfiguration?.ScheduleConfig), PauseBetweenGroupAndFinalsPhase = - source.MatchPlanConfiguration?.GroupRoundConfig is not null && source.MatchPlanConfiguration?.FinalsRoundConfig is not null + source.MatchPlanConfiguration?.GroupRoundConfig is not null && source.MatchPlanConfiguration.FinalsRoundConfig is not null ? source.MatchPlanConfiguration.ScheduleConfig?.PauseBetweenGroupAndFinalsPhase : null, FinalsPhaseConfig = MapFinalsRoundConfiguration(source.MatchPlanConfiguration?.FinalsRoundConfig, source.MatchPlanConfiguration?.ScheduleConfig) diff --git a/src/Turnierplan.App/Pages/Tournament.cshtml b/src/Turnierplan.App/Pages/Tournament.cshtml index 94236a5b..b47e48f2 100644 --- a/src/Turnierplan.App/Pages/Tournament.cshtml +++ b/src/Turnierplan.App/Pages/Tournament.cshtml @@ -88,11 +88,11 @@ } - if (displayVenueTile && tournament.Venue is not null) + if (displayVenueTile) { // The 'd-none class is replaced with 'd-flex' when the user requests the data to be shown
-
@tournament.Venue.Name
+
@tournament.Venue!.Name
@if (!string.IsNullOrWhiteSpace(tournament.Venue.Description)) { diff --git a/src/Turnierplan.Core.Test.Unit/Tournament/TeamSelectors/GroupResultsNthRankedSelectorTest.cs b/src/Turnierplan.Core.Test.Unit/Tournament/TeamSelectors/GroupResultsNthRankedSelectorTest.cs index db6f7d9e..880d4c4a 100644 --- a/src/Turnierplan.Core.Test.Unit/Tournament/TeamSelectors/GroupResultsNthRankedSelectorTest.cs +++ b/src/Turnierplan.Core.Test.Unit/Tournament/TeamSelectors/GroupResultsNthRankedSelectorTest.cs @@ -48,44 +48,18 @@ public void GroupResultsNthRankedSelector___Equals___Returns_Correct_Result(int[ #pragma warning restore xUnit1026 ) { - // Arrange var instance1 = new GroupResultsNthRankedSelector(targetGroupIds, ordinalNumber, placementRank); var instance2 = new GroupResultsNthRankedSelector(targetGroupIds.Reverse().ToArray(), ordinalNumber, placementRank); - // Act - var hashCodeEquals = instance1.GetHashCode() == instance2.GetHashCode(); - var results = new [] - { - instance1.Equals(instance1), - instance2.Equals(instance2), - instance1.Equals(instance2), - instance2.Equals(instance1), - Equals(instance1, instance2), - Equals(instance2, instance1), - ((TeamSelectorBase)instance1).Equals(instance1), - ((TeamSelectorBase)instance1).Equals(instance2), - ((TeamSelectorBase)instance2).Equals(instance2), - ((object)instance1).Equals(instance1), - ((object)instance1).Equals(instance2), - ((object)instance2).Equals(instance2) - }; - var resultsWithNull = new [] - { - instance1.Equals(null), - instance2.Equals(null), - Equals(instance1, null), - Equals(instance2, null), - Equals(null, instance1), - Equals(null, instance2), - ((TeamSelectorBase)instance1!).Equals(null), - ((TeamSelectorBase)instance2!).Equals(null), - ((object)instance1!).Equals(null), - ((object)instance2!).Equals(null) - }; + instance1.GetHashCode().Should().Be(instance2.GetHashCode()); - // Assert - results.Should().AllSatisfy(x => x.Should().BeTrue()); - resultsWithNull.Should().AllSatisfy(x => x.Should().BeFalse()); - hashCodeEquals.Should().BeTrue(); + instance1.Equals(instance1).Should().BeTrue(); + instance2.Equals(instance2).Should().BeTrue(); + instance1.Equals(instance2).Should().BeTrue(); + instance2.Equals(instance1).Should().BeTrue(); + Equals(instance1, instance2).Should().BeTrue(); + + instance1.Equals(null).Should().BeFalse(); + instance2.Equals(null).Should().BeFalse(); } } diff --git a/src/Turnierplan.Core/Tournament/TeamSelectors/GroupResultsNthRankedSelector.cs b/src/Turnierplan.Core/Tournament/TeamSelectors/GroupResultsNthRankedSelector.cs index 4650ac7a..56786af2 100644 --- a/src/Turnierplan.Core/Tournament/TeamSelectors/GroupResultsNthRankedSelector.cs +++ b/src/Turnierplan.Core/Tournament/TeamSelectors/GroupResultsNthRankedSelector.cs @@ -67,6 +67,6 @@ public override int GetHashCode() var groupIdsHashCode = TargetGroupIds.Order() .Aggregate(TargetGroupIds.Length, (current, groupId) => unchecked(current * 31 + groupId)); - return (groupIdsHashCode, OrdinalNumber, PlacementRank).GetHashCode(); + return HashCode.Combine(groupIdsHashCode, OrdinalNumber, PlacementRank); } } diff --git a/src/Turnierplan.PdfRendering.Test.Unit/Renderer/ReceiptsRendererTest.cs b/src/Turnierplan.PdfRendering.Test.Unit/Renderer/ReceiptsRendererTest.cs index 629f4fa6..8a800db5 100644 --- a/src/Turnierplan.PdfRendering.Test.Unit/Renderer/ReceiptsRendererTest.cs +++ b/src/Turnierplan.PdfRendering.Test.Unit/Renderer/ReceiptsRendererTest.cs @@ -108,7 +108,7 @@ public void ReceiptsRenderer___GenerateReceipts___Returns_Correct_Result(string[ { TeamName = data.Name, TeamCount = data.Count, - Amount = 10 * data.Count + Amount = 10.0 * data.Count })); } } diff --git a/src/Turnierplan.PdfRendering.Test.Unit/Renderer/RendererTestBase.cs b/src/Turnierplan.PdfRendering.Test.Unit/Renderer/RendererTestBase.cs index bae2eb06..40b8339c 100644 --- a/src/Turnierplan.PdfRendering.Test.Unit/Renderer/RendererTestBase.cs +++ b/src/Turnierplan.PdfRendering.Test.Unit/Renderer/RendererTestBase.cs @@ -17,45 +17,57 @@ namespace Turnierplan.PdfRendering.Test.Unit.Renderer; -public abstract partial class RendererTestBase +public abstract partial class RendererTestBase : IDisposable where TRenderer : IDocumentRenderer { - // ReSharper disable StaticMemberInGenericType private static readonly string[] __languageCodes = ["de"]; - private static readonly IServiceProvider __serviceProvider; - // ReSharper restore StaticMemberInGenericType static RendererTestBase() { QuestPDF.Settings.License = LicenseType.Community; + } + + private readonly ITestOutputHelper _testOutputHelper; + private readonly TelemetryConfiguration _telemetryConfiguration; + private readonly ServiceProvider _serviceProvider; + private bool _disposed; + + protected RendererTestBase(ITestOutputHelper testOutputHelper) + { + _testOutputHelper = testOutputHelper; + _telemetryConfiguration = new TelemetryConfiguration(); var serviceCollection = new ServiceCollection(); serviceCollection.AddLogging(); - serviceCollection.AddSingleton(new TelemetryClient(new TelemetryConfiguration())); + serviceCollection.AddSingleton(new TelemetryClient(_telemetryConfiguration)); serviceCollection.AddTurnierplanLocalization(); serviceCollection.AddTurnierplanDocumentRendering(); serviceCollection.AddSingleton(); - __serviceProvider = serviceCollection.BuildServiceProvider(); + _serviceProvider = serviceCollection.BuildServiceProvider(); } - private readonly ITestOutputHelper _testOutputHelper; + ~RendererTestBase() + { + Dispose(false); + } - protected RendererTestBase(ITestOutputHelper testOutputHelper) + public void Dispose() { - _testOutputHelper = testOutputHelper; + Dispose(true); + GC.SuppressFinalize(this); } protected TRenderer GetRenderer() { - return (TRenderer)__serviceProvider.GetRequiredService>().Single(x => x.GetType() == typeof(TRenderer)); + return (TRenderer)_serviceProvider.GetRequiredService>().Single(x => x.GetType() == typeof(TRenderer)); } protected void AssertRender(Tournament tournament, IDocumentConfiguration configuration) { foreach(var languageCode in __languageCodes) { - __serviceProvider.GetRequiredService().TryGetLocalization(languageCode, out var localization).Should().BeTrue(); + _serviceProvider.GetRequiredService().TryGetLocalization(languageCode, out var localization).Should().BeTrue(); using var stream = new MemoryStream(); GetRenderer().Render(tournament, configuration, new LocalizationWrapper(localization!), stream); @@ -72,6 +84,22 @@ protected void AssertRender(Tournament tournament, IDocumentConfiguration config } } + protected virtual void Dispose(bool disposing) + { + if (_disposed) + { + return; + } + + if (disposing) + { + _telemetryConfiguration.Dispose(); + _serviceProvider.Dispose(); + } + + _disposed = true; + } + private void SaveGeneratedPdf(string name, string languageCode, byte[] pdfData) { const string outputDirectory = "pdf-output"; diff --git a/src/Turnierplan.PdfRendering/Renderer/MatchPlanRenderer.cs b/src/Turnierplan.PdfRendering/Renderer/MatchPlanRenderer.cs index 8c486b33..95188a5c 100644 --- a/src/Turnierplan.PdfRendering/Renderer/MatchPlanRenderer.cs +++ b/src/Turnierplan.PdfRendering/Renderer/MatchPlanRenderer.cs @@ -73,7 +73,7 @@ string GetSectionHeader(string key) if (firstGroupMatch is not null && tournament.MatchPlanConfiguration?.ScheduleConfig is not null) { - column.Item().PaddingTop(16).AlignCenter().MatchTimeSection(firstGroupMatch.Kickoff, tournament.MatchPlanConfiguration.ScheduleConfig?.GroupPhasePlayTime, tournament.MatchPlanConfiguration.ScheduleConfig?.GroupPhasePauseTime, localization); + column.Item().PaddingTop(16).AlignCenter().MatchTimeSection(firstGroupMatch.Kickoff, tournament.MatchPlanConfiguration.ScheduleConfig.GroupPhasePlayTime, tournament.MatchPlanConfiguration.ScheduleConfig.GroupPhasePauseTime, localization); } column.Item().PaddingVertical(16).Text(GetSectionHeader("Documents.MatchPlan.Sections.Participants")).Underline(); @@ -111,7 +111,7 @@ string GetSectionHeader(string key) if (tournament.MatchPlanConfiguration?.ScheduleConfig is not null) { var firstFinalsMatch = decidingMatches.MinBy(x => x.Kickoff); - column2.Item().PaddingBottom(16).AlignCenter().MatchTimeSection(firstFinalsMatch!.Kickoff, tournament.MatchPlanConfiguration.ScheduleConfig?.FinalsPhasePlayTime, tournament.MatchPlanConfiguration.ScheduleConfig?.FinalsPhasePauseTime, localization); + column2.Item().PaddingBottom(16).AlignCenter().MatchTimeSection(firstFinalsMatch!.Kickoff, tournament.MatchPlanConfiguration.ScheduleConfig.FinalsPhasePlayTime, tournament.MatchPlanConfiguration.ScheduleConfig.FinalsPhasePauseTime, localization); } // All matches of each group should appear on the same page. I.e. there shall be no page breaks between matches with the same "color" @@ -288,9 +288,8 @@ private static IEnumerable GetHeaderRows(Tournament tournament, MatchPla _ => "Documents.MatchPlan.TournamentKickoff.DateAndDayOfWeekEvening" }, kickoff); break; - case MatchPlanDateFormat.NoDate: default: - throw new InvalidOperationException($"Date format is invalid: {configuration.DateFormat}"); + throw new InvalidOperationException($"Encountered unexpected date format: {configuration.DateFormat}"); } } } @@ -361,7 +360,7 @@ public void Groups(Tournament tournament, ILocalization localization, MatchPlanO extension(IContainer container) { - public void MatchTimeSection(DateTime? kickoff, TimeSpan? playTime, TimeSpan? pauseTime, ILocalization localization) + public void MatchTimeSection(DateTime? kickoff, TimeSpan playTime, TimeSpan pauseTime, ILocalization localization) { container.Row(row => { @@ -377,29 +376,23 @@ public void MatchTimeSection(DateTime? kickoff, TimeSpan? playTime, TimeSpan? pa }); } - if (playTime.HasValue) + row.AutoItem().Text(text => { - row.AutoItem().Text(text => - { - text.Span(localization.Get("Documents.MatchPlan.MatchTimes.PlayTimePre")); - var minutes = (int)playTime.Value.TotalMinutes; - var seconds = (int)playTime.Value.TotalSeconds - minutes * 60; - text.Span(localization.Get("Documents.MatchPlan.MatchTimes.PlayTime", minutes, seconds)).Underline().Bold(); - text.Span(localization.Get($"Documents.MatchPlan.MatchTimes.PlayTimePost.{(minutes == 1 && seconds == 0 ? "One" : "Many")}")); - }); - } + text.Span(localization.Get("Documents.MatchPlan.MatchTimes.PlayTimePre")); + var minutes = (int)playTime.TotalMinutes; + var seconds = (int)playTime.TotalSeconds - minutes * 60; + text.Span(localization.Get("Documents.MatchPlan.MatchTimes.PlayTime", minutes, seconds)).Underline().Bold(); + text.Span(localization.Get($"Documents.MatchPlan.MatchTimes.PlayTimePost.{(minutes == 1 && seconds == 0 ? "One" : "Many")}")); + }); - if (pauseTime.HasValue) + row.AutoItem().Text(text => { - row.AutoItem().Text(text => - { - text.Span(localization.Get("Documents.MatchPlan.MatchTimes.PauseTimePre")); - var minutes = (int)pauseTime.Value.TotalMinutes; - var seconds = (int)pauseTime.Value.TotalSeconds - minutes * 60; - text.Span(localization.Get("Documents.MatchPlan.MatchTimes.PauseTime", minutes, seconds)).Underline().Bold(); - text.Span(localization.Get($"Documents.MatchPlan.MatchTimes.PauseTimePost.{(minutes == 1 && seconds == 0 ? "One" : "Many")}")); - }); - } + text.Span(localization.Get("Documents.MatchPlan.MatchTimes.PauseTimePre")); + var minutes = (int)pauseTime.TotalMinutes; + var seconds = (int)pauseTime.TotalSeconds - minutes * 60; + text.Span(localization.Get("Documents.MatchPlan.MatchTimes.PauseTime", minutes, seconds)).Underline().Bold(); + text.Span(localization.Get($"Documents.MatchPlan.MatchTimes.PauseTimePost.{(minutes == 1 && seconds == 0 ? "One" : "Many")}")); + }); }); } From 119b1f61aca3bc38d2c1dbf4656e5221317e5957 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Elias=20H=C3=B6rner?= Date: Sun, 12 Apr 2026 13:58:19 +0200 Subject: [PATCH 03/12] More code fixes + refactorings for try/catch stmts --- .../delete-widget/delete-widget.component.ts | 2 +- .../move-tournament-to-folder.component.html | 2 +- .../Converters/JsonPublicIdConverter.cs | 10 +-- .../Endpoints/Identity/RefreshEndpoint.cs | 80 ++++++++++++------- .../Pages/InvitationForm.cshtml.cs | 13 +-- .../Pages/Tournament.cshtml.cs | 13 +-- .../Pages/TournamentFullscreen.cshtml.cs | 13 +-- .../Security/ApiKeyAuthenticationHandler.cs | 13 +-- .../Security/JwtAuthenticationHandler.cs | 69 ++++++++-------- .../Security/SigningKeyProvider.cs | 2 +- .../Local/LocalImageStorage.cs | 2 +- .../Renderer/DocumentRendererBase.cs | 3 +- 12 files changed, 109 insertions(+), 113 deletions(-) diff --git a/src/Turnierplan.App/Client/src/app/portal/components/delete-widget/delete-widget.component.ts b/src/Turnierplan.App/Client/src/app/portal/components/delete-widget/delete-widget.component.ts index ca814369..819caf41 100644 --- a/src/Turnierplan.App/Client/src/app/portal/components/delete-widget/delete-widget.component.ts +++ b/src/Turnierplan.App/Client/src/app/portal/components/delete-widget/delete-widget.component.ts @@ -1,4 +1,4 @@ -import { Component, EventEmitter, Input, Output, TemplateRef } from '@angular/core'; +import { Component, EventEmitter, Input, Output } from '@angular/core'; import { TranslateDirective, TranslatePipe } from '@ngx-translate/core'; import { NgClass } from '@angular/common'; import { FormsModule } from '@angular/forms'; diff --git a/src/Turnierplan.App/Client/src/app/portal/components/move-tournament-to-folder/move-tournament-to-folder.component.html b/src/Turnierplan.App/Client/src/app/portal/components/move-tournament-to-folder/move-tournament-to-folder.component.html index 36f6e331..2a109fb5 100644 --- a/src/Turnierplan.App/Client/src/app/portal/components/move-tournament-to-folder/move-tournament-to-folder.component.html +++ b/src/Turnierplan.App/Client/src/app/portal/components/move-tournament-to-folder/move-tournament-to-folder.component.html @@ -1,4 +1,4 @@ -
+
diff --git a/src/Turnierplan.App/Converters/JsonPublicIdConverter.cs b/src/Turnierplan.App/Converters/JsonPublicIdConverter.cs index aeb9cccf..7f0310cd 100644 --- a/src/Turnierplan.App/Converters/JsonPublicIdConverter.cs +++ b/src/Turnierplan.App/Converters/JsonPublicIdConverter.cs @@ -10,14 +10,12 @@ public override PublicId Read(ref Utf8JsonReader reader, Type typeToConvert, Jso { var representation = reader.GetString() ?? throw new InvalidOperationException("Expected string for public ID."); - try + if (PublicId.TryParse(representation, out var publicId)) { - return new PublicId(representation); - } - catch (Exception ex) - { - throw new JsonException("The string does not contain a valid public ID representation.", ex); + return publicId; } + + throw new JsonException("The string does not contain a valid public ID representation."); } public override void Write(Utf8JsonWriter writer, PublicId value, JsonSerializerOptions options) diff --git a/src/Turnierplan.App/Endpoints/Identity/RefreshEndpoint.cs b/src/Turnierplan.App/Endpoints/Identity/RefreshEndpoint.cs index ad2b2f1c..1f7a88e9 100644 --- a/src/Turnierplan.App/Endpoints/Identity/RefreshEndpoint.cs +++ b/src/Turnierplan.App/Endpoints/Identity/RefreshEndpoint.cs @@ -1,9 +1,11 @@ using System.IdentityModel.Tokens.Jwt; +using System.Security.Claims; using Microsoft.Extensions.Options; using Microsoft.IdentityModel.Tokens; using Turnierplan.App.Options; using Turnierplan.App.Security; using Turnierplan.Dal.Repositories; +using ClaimTypes = Turnierplan.App.Security.ClaimTypes; namespace Turnierplan.App.Endpoints.Identity; @@ -27,46 +29,68 @@ private async Task Handle( IUserRepository userRepository, CancellationToken cancellationToken) { - Guid userIdFromToken; - Guid securityStampFromToken; + string? token = null; - try + foreach (var (cookieName, cookieValue) in context.Request.Cookies) { - var cookie = context.Request.Cookies.Single(x => x.Key.Equals(CookieNames.RefreshTokenCookieName)); - - var tokenHandler = new JwtSecurityTokenHandler(); - - var signingKey = await _signingKeyProvider.GetSigningKeyAsync(cancellationToken); - var validationParameters = new TokenValidationParameters - { - ValidateIssuerSigningKey = true, - IssuerSigningKey = signingKey, - ValidateIssuer = false, - ValidateAudience = false, - ValidateLifetime = true, - ClockSkew = TimeSpan.Zero - }; - - var claimsPrincipal = tokenHandler.ValidateToken(cookie.Value, validationParameters, out _); - - var tokenType = claimsPrincipal.Claims.Single(x => x.Type.Equals(ClaimTypes.TokenType)).Value; - if (!tokenType.Equals(JwtTokenTypes.Refresh)) + if (cookieName.Equals(CookieNames.RefreshTokenCookieName)) { - return Results.Unauthorized(); + token = cookieValue; + break; } + } - userIdFromToken = Guid.Parse(claimsPrincipal.Claims.Single(x => x.Type.Equals(ClaimTypes.UserId)).Value); - securityStampFromToken = Guid.Parse(claimsPrincipal.Claims.Single(x => x.Type.Equals(ClaimTypes.SecurityStamp)).Value); + if (string.IsNullOrEmpty(token)) + { + return Results.Unauthorized(); } - catch + + var tokenHandler = new JwtSecurityTokenHandler(); + + var signingKey = await _signingKeyProvider.GetSigningKeyAsync(cancellationToken); + var validationParameters = new TokenValidationParameters + { + ValidateIssuerSigningKey = true, + IssuerSigningKey = signingKey, + ValidateIssuer = false, + ValidateAudience = false, + ValidateLifetime = true, + ClockSkew = TimeSpan.Zero + }; + + ClaimsPrincipal claimsPrincipal; + + try + { + claimsPrincipal = tokenHandler.ValidateToken(token, validationParameters, out _); + } + catch (SecurityTokenException) + { + return Results.Unauthorized(); + } + + var tokenType = claimsPrincipal.Claims.FirstOrDefault(x => x.Type.Equals(ClaimTypes.TokenType))?.Value; + + if (!Equals(tokenType, JwtTokenTypes.Refresh)) + { + return Results.Unauthorized(); + } + + var userIdFromToken = claimsPrincipal.Claims.FirstOrDefault(x => x.Type.Equals(ClaimTypes.UserId))?.Value; + var securityStampFromToken = claimsPrincipal.Claims.FirstOrDefault(x => x.Type.Equals(ClaimTypes.SecurityStamp))?.Value; + + if (string.IsNullOrWhiteSpace(userIdFromToken) + || string.IsNullOrWhiteSpace(securityStampFromToken) + || !Guid.TryParse(userIdFromToken, out var userIdFromTokenGuid) + || !Guid.TryParse(securityStampFromToken, out var securityStampFromTokenGuid)) { return Results.Unauthorized(); } - var user = await userRepository.GetByIdAsync(userIdFromToken); + var user = await userRepository.GetByIdAsync(userIdFromTokenGuid); // If the security stamp has changed, that means the user has changed their password since the reset token was issued - if (user is null || user.SecurityStamp != securityStampFromToken) + if (user is null || user.SecurityStamp != securityStampFromTokenGuid) { return Results.Ok(new RefreshEndpointResponse { diff --git a/src/Turnierplan.App/Pages/InvitationForm.cshtml.cs b/src/Turnierplan.App/Pages/InvitationForm.cshtml.cs index 1413e0d6..6f82a7c0 100644 --- a/src/Turnierplan.App/Pages/InvitationForm.cshtml.cs +++ b/src/Turnierplan.App/Pages/InvitationForm.cshtml.cs @@ -119,18 +119,7 @@ public async Task OnPost() private async Task LoadInvitationLink() { - if (string.IsNullOrEmpty(Id)) - { - return; - } - - PublicId publicId; - - try - { - publicId = new PublicId(Id); - } - catch + if (string.IsNullOrEmpty(Id) || !PublicId.TryParse(Id, out var publicId)) { return; } diff --git a/src/Turnierplan.App/Pages/Tournament.cshtml.cs b/src/Turnierplan.App/Pages/Tournament.cshtml.cs index 6f433311..b4110830 100644 --- a/src/Turnierplan.App/Pages/Tournament.cshtml.cs +++ b/src/Turnierplan.App/Pages/Tournament.cshtml.cs @@ -21,18 +21,7 @@ public Tournament(ITournamentRepository repository) public async Task OnGetAsync() { - if (string.IsNullOrEmpty(Id)) - { - return; - } - - PublicId publicId; - - try - { - publicId = new PublicId(Id); - } - catch + if (string.IsNullOrEmpty(Id) || !PublicId.TryParse(Id, out var publicId)) { return; } diff --git a/src/Turnierplan.App/Pages/TournamentFullscreen.cshtml.cs b/src/Turnierplan.App/Pages/TournamentFullscreen.cshtml.cs index d8e83b95..1d0fff4e 100644 --- a/src/Turnierplan.App/Pages/TournamentFullscreen.cshtml.cs +++ b/src/Turnierplan.App/Pages/TournamentFullscreen.cshtml.cs @@ -35,18 +35,7 @@ public TournamentFullscreen(ITournamentRepository repository) public async Task OnGetAsync() { - if (string.IsNullOrEmpty(Id)) - { - return; - } - - PublicId publicId; - - try - { - publicId = new PublicId(Id); - } - catch + if (string.IsNullOrEmpty(Id) || !PublicId.TryParse(Id, out var publicId)) { return; } diff --git a/src/Turnierplan.App/Security/ApiKeyAuthenticationHandler.cs b/src/Turnierplan.App/Security/ApiKeyAuthenticationHandler.cs index beb3b6e2..fb04aeb0 100644 --- a/src/Turnierplan.App/Security/ApiKeyAuthenticationHandler.cs +++ b/src/Turnierplan.App/Security/ApiKeyAuthenticationHandler.cs @@ -37,14 +37,17 @@ public ApiKeyAuthenticationHandler( protected override async Task HandleAuthenticateAsync() { - string apiKeyId, apiKeySecret; + string? apiKeyId, apiKeySecret; - try + if (Request.Headers.TryGetValue(ApiKeyIdHeaderName, out var apiKeyIdHeaderValue) + && Request.Headers.TryGetValue(ApiKeySecretHeaderName, out var apiKeySecretHeaderValue) + && apiKeyIdHeaderValue.Count == 1 + && apiKeySecretHeaderValue.Count == 1) { - apiKeyId = Request.Headers[ApiKeyIdHeaderName][0]!; - apiKeySecret = Request.Headers[ApiKeySecretHeaderName][0]!; + apiKeyId = apiKeyIdHeaderValue.Single(); + apiKeySecret = apiKeyIdHeaderValue.Single(); } - catch + else { return AuthenticateResult.NoResult(); } diff --git a/src/Turnierplan.App/Security/JwtAuthenticationHandler.cs b/src/Turnierplan.App/Security/JwtAuthenticationHandler.cs index 695fbeb8..12658a4d 100644 --- a/src/Turnierplan.App/Security/JwtAuthenticationHandler.cs +++ b/src/Turnierplan.App/Security/JwtAuthenticationHandler.cs @@ -1,4 +1,5 @@ using System.IdentityModel.Tokens.Jwt; +using System.Security.Claims; using System.Text.Encodings.Web; using Microsoft.AspNetCore.Authentication; using Microsoft.Extensions.Options; @@ -28,53 +29,55 @@ protected override async Task HandleAuthenticateAsync() return AuthenticateResult.NoResult(); } - string token; + string? token = null; - try - { - token = Request.Cookies.Single(x => x.Key.Equals(CookieNames.AccessTokenCookieName)).Value; - } - catch + foreach (var (cookieName, cookieValue) in Request.Cookies) { - return AuthenticateResult.Fail("Missing or malformed access token cookie."); + if (cookieName.Equals(CookieNames.AccessTokenCookieName)) + { + token = cookieValue; + break; + } } if (string.IsNullOrEmpty(token)) { - return AuthenticateResult.Fail("Empty access token cookie."); + return AuthenticateResult.Fail("Missing or empty access token cookie."); } - try - { - var tokenHandler = new JwtSecurityTokenHandler(); + var tokenHandler = new JwtSecurityTokenHandler(); - var signingKey = await _signingKeyProvider.GetSigningKeyAsync(CancellationToken.None); - var validationParameters = new TokenValidationParameters - { - ValidateIssuerSigningKey = true, - IssuerSigningKey = signingKey, - ValidateIssuer = false, - ValidateAudience = false, - ValidateLifetime = true, - ClockSkew = TimeSpan.Zero - }; - - var claimsPrincipal = tokenHandler.ValidateToken(token, validationParameters, out _); + var signingKey = await _signingKeyProvider.GetSigningKeyAsync(CancellationToken.None); + var validationParameters = new TokenValidationParameters + { + ValidateIssuerSigningKey = true, + IssuerSigningKey = signingKey, + ValidateIssuer = false, + ValidateAudience = false, + ValidateLifetime = true, + ClockSkew = TimeSpan.Zero + }; - var tokenType = claimsPrincipal.Claims.Single(x => x.Type.Equals(ClaimTypes.TokenType)).Value; + ClaimsPrincipal claimsPrincipal; - if (!tokenType.Equals(JwtTokenTypes.Access)) - { - return AuthenticateResult.Fail("Incorrect token type."); - } + try + { + claimsPrincipal = tokenHandler.ValidateToken(token, validationParameters, out _); + } + catch (SecurityTokenException ex) + { + return AuthenticateResult.Fail($"Token validation failed: {ex.Message}"); + } - var ticket = new AuthenticationTicket(claimsPrincipal, Scheme.Name); + var tokenType = claimsPrincipal.Claims.FirstOrDefault(x => x.Type.Equals(ClaimTypes.TokenType))?.Value; - return AuthenticateResult.Success(ticket); - } - catch (Exception ex) + if (!Equals(tokenType, JwtTokenTypes.Access)) { - return AuthenticateResult.Fail($"Invalid token: {ex.Message}"); + return AuthenticateResult.Fail("Incorrect token type."); } + + var ticket = new AuthenticationTicket(claimsPrincipal, Scheme.Name); + + return AuthenticateResult.Success(ticket); } } diff --git a/src/Turnierplan.App/Security/SigningKeyProvider.cs b/src/Turnierplan.App/Security/SigningKeyProvider.cs index ccfeb3e6..5473ebc6 100644 --- a/src/Turnierplan.App/Security/SigningKeyProvider.cs +++ b/src/Turnierplan.App/Security/SigningKeyProvider.cs @@ -97,7 +97,7 @@ private void InitializeSigningKeyFromAppConfig() { signingKey = Convert.FromBase64String(_options.SigningKey); } - catch (Exception ex) + catch (FormatException ex) { _logger.LogCritical(ex, "Signing key from app configuration could not be decoded."); return; diff --git a/src/Turnierplan.ImageStorage/Local/LocalImageStorage.cs b/src/Turnierplan.ImageStorage/Local/LocalImageStorage.cs index 3534a99a..e4b12d11 100644 --- a/src/Turnierplan.ImageStorage/Local/LocalImageStorage.cs +++ b/src/Turnierplan.ImageStorage/Local/LocalImageStorage.cs @@ -109,7 +109,7 @@ public void Dispose() private string GetImageFullPath(Image image) { - return Path.Combine(_storagePath, image.CreatedAt.Year.ToString(CultureInfo.InvariantCulture), GetImageFileName(image)); + return Path.Join(_storagePath, image.CreatedAt.Year.ToString(CultureInfo.InvariantCulture), GetImageFileName(image)); } private static string GetImageFileName(Image image) diff --git a/src/Turnierplan.PdfRendering/Renderer/DocumentRendererBase.cs b/src/Turnierplan.PdfRendering/Renderer/DocumentRendererBase.cs index ad43f622..dab8e36f 100644 --- a/src/Turnierplan.PdfRendering/Renderer/DocumentRendererBase.cs +++ b/src/Turnierplan.PdfRendering/Renderer/DocumentRendererBase.cs @@ -10,6 +10,7 @@ namespace Turnierplan.PdfRendering.Renderer; public abstract class DocumentRendererBase : IDocumentRenderer where T : IDocumentConfiguration { + private readonly Lock _lock = new(); private bool _renderCalled; private protected DocumentRendererBase() @@ -22,7 +23,7 @@ private protected DocumentRendererBase() public void Render(Tournament tournament, IDocumentConfiguration configuration, ILocalization localization, Stream destination) { - lock (this) + lock (_lock) { if (_renderCalled) { From 703fe861700b07d3e4bf05d893c6b9939cf7a584 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Elias=20H=C3=B6rner?= Date: Mon, 13 Apr 2026 19:47:31 +0200 Subject: [PATCH 04/12] Npm audit fix --- src/Turnierplan.App/Client/package-lock.json | 643 ++++++++++++++++--- 1 file changed, 564 insertions(+), 79 deletions(-) diff --git a/src/Turnierplan.App/Client/package-lock.json b/src/Turnierplan.App/Client/package-lock.json index 57207337..1ac1292d 100644 --- a/src/Turnierplan.App/Client/package-lock.json +++ b/src/Turnierplan.App/Client/package-lock.json @@ -1,12 +1,12 @@ { "name": "turnierplan-net", - "version": "0.0.0", + "version": "2026.2.0", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "turnierplan-net", - "version": "0.0.0", + "version": "2026.2.0", "license": "AGPL-3.0-only", "dependencies": { "@angular/common": "~20.3.18", @@ -274,13 +274,13 @@ } }, "node_modules/@angular-devkit/architect": { - "version": "0.2003.21", - "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.2003.21.tgz", - "integrity": "sha512-cdtiGFRW5Sgd8QkEAGw5daYT3Eh0hQtXFkUtnkU1HASpKrLdNLdfEUWho1y6A9bNlXL7fNVCvHOnK+G6Fd++rw==", + "version": "0.2003.23", + "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.2003.23.tgz", + "integrity": "sha512-o9fzWCxcLcUPxd7xP0gA10cQAwg9kNrS4VHFCjJ7+kB6pi8GSZqqEw/N1BB0s/+zpJ4bQ4EC82hDC6Cu5Fpv9Q==", "dev": true, "license": "MIT", "dependencies": { - "@angular-devkit/core": "20.3.21", + "@angular-devkit/core": "20.3.23", "rxjs": "7.8.2" }, "engines": { @@ -290,16 +290,16 @@ } }, "node_modules/@angular-devkit/core": { - "version": "20.3.21", - "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-20.3.21.tgz", - "integrity": "sha512-+flPAkPPn6MLVOa4ereSo6M5QRqxElKvDL6rCJWOJHRzH7K4CcfA269vr5mQSlImI5ZZc/EAPpm9rwEfWZRwew==", + "version": "20.3.23", + "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-20.3.23.tgz", + "integrity": "sha512-NOcoT8FMXHAiqvfTb5LCmT7/mtsYwQ+p5a49bo2uWYeKdSwniAdGGR+7yDxLdYXJpe8dc/epo/uiAq/coi+7YA==", "dev": true, "license": "MIT", "dependencies": { "ajv": "8.18.0", "ajv-formats": "3.0.1", "jsonc-parser": "3.3.1", - "picomatch": "4.0.3", + "picomatch": "4.0.4", "rxjs": "7.8.2", "source-map": "0.7.6" }, @@ -318,13 +318,13 @@ } }, "node_modules/@angular-devkit/schematics": { - "version": "20.3.21", - "resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-20.3.21.tgz", - "integrity": "sha512-CFX8TrZvvm4G398DpbcJ2GY8kwR81M8ssyIVYn19gD4Kr2UmeiCT3/dtUpx2FvSvSHbNwLmU6Ym0Rkh+E7p9bQ==", + "version": "20.3.23", + "resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-20.3.23.tgz", + "integrity": "sha512-GASRHzFcakcdhw7br2Bc9u7SmWNwnWVWTIC9w0MZfDT2QLU3iYpHsHgW84x02PRXJSyaGhIg8jlnD2ebPEP5Gg==", "dev": true, "license": "MIT", "dependencies": { - "@angular-devkit/core": "20.3.21", + "@angular-devkit/core": "20.3.23", "jsonc-parser": "3.3.1", "magic-string": "0.30.17", "ora": "8.2.0", @@ -337,14 +337,14 @@ } }, "node_modules/@angular/build": { - "version": "20.3.21", - "resolved": "https://registry.npmjs.org/@angular/build/-/build-20.3.21.tgz", - "integrity": "sha512-jh9QqMPmAO4CLozGena08IPVnK95G7SwWKiVvMXVPQTxvPRfg8o0okmXvO55V2cMx/87H30AWMtRiNdE9Eoqfg==", + "version": "20.3.23", + "resolved": "https://registry.npmjs.org/@angular/build/-/build-20.3.23.tgz", + "integrity": "sha512-fNUWoTmbOQONorl9pPkzzsHEMlo5k2DHfUWQ9vNj5oNLBA+46gaTkTLCr8qfRxY3nHTwo3pKlAOx5HzrHjOWFg==", "dev": true, "license": "MIT", "dependencies": { "@ampproject/remapping": "2.3.0", - "@angular-devkit/architect": "0.2003.21", + "@angular-devkit/architect": "0.2003.23", "@babel/core": "7.28.3", "@babel/helper-annotate-as-pure": "7.27.3", "@babel/helper-split-export-declaration": "7.24.7", @@ -360,14 +360,14 @@ "magic-string": "0.30.17", "mrmime": "2.0.1", "parse5-html-rewriting-stream": "8.0.0", - "picomatch": "4.0.3", + "picomatch": "4.0.4", "piscina": "5.1.3", "rollup": "4.59.0", "sass": "1.90.0", "semver": "7.7.2", "source-map-support": "0.5.21", "tinyglobby": "0.2.14", - "vite": "7.1.11", + "vite": "7.3.2", "watchpack": "2.4.4" }, "engines": { @@ -386,7 +386,7 @@ "@angular/platform-browser": "^20.0.0", "@angular/platform-server": "^20.0.0", "@angular/service-worker": "^20.0.0", - "@angular/ssr": "^20.3.21", + "@angular/ssr": "^20.3.23", "karma": "^6.4.0", "less": "^4.2.0", "ng-packagr": "^20.0.0", @@ -436,19 +436,19 @@ } }, "node_modules/@angular/cli": { - "version": "20.3.21", - "resolved": "https://registry.npmjs.org/@angular/cli/-/cli-20.3.21.tgz", - "integrity": "sha512-6i+qhtPsHk2uF4IoFi3Q9Rs4Wd2cxSodfND3wansld9MIRbTFDo8MGfhxaXqS0WwUlHZtp3Lt84q50xaF9Y7Yg==", + "version": "20.3.23", + "resolved": "https://registry.npmjs.org/@angular/cli/-/cli-20.3.23.tgz", + "integrity": "sha512-84Q3sM6owpl6qZfqlb7VZARZOD2C7mma9PGMh9nfn/RW+I31Sx4dOhb9MaGlOT+eASEaQFkQ+SFcRmAKhTIHOg==", "dev": true, "license": "MIT", "dependencies": { - "@angular-devkit/architect": "0.2003.21", - "@angular-devkit/core": "20.3.21", - "@angular-devkit/schematics": "20.3.21", + "@angular-devkit/architect": "0.2003.23", + "@angular-devkit/core": "20.3.23", + "@angular-devkit/schematics": "20.3.23", "@inquirer/prompts": "7.8.2", "@listr2/prompt-adapter-inquirer": "3.0.1", "@modelcontextprotocol/sdk": "1.26.0", - "@schematics/angular": "20.3.21", + "@schematics/angular": "20.3.23", "@yarnpkg/lockfile": "1.1.0", "algoliasearch": "5.35.0", "ini": "5.0.0", @@ -709,6 +709,7 @@ "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.28.3.tgz", "integrity": "sha512-yDBHV9kQNcr2/sUr9jghVyz9C3Y5G2zUM2H2lo+9mKv4sFgbA8s8Z9t8D1jiTkGoO/NoIfKMyKWr4s6CN23ZwQ==", "license": "MIT", + "peer": true, "dependencies": { "@ampproject/remapping": "^2.2.0", "@babel/code-frame": "^7.27.1", @@ -1442,9 +1443,9 @@ } }, "node_modules/@hono/node-server": { - "version": "1.19.11", - "resolved": "https://registry.npmjs.org/@hono/node-server/-/node-server-1.19.11.tgz", - "integrity": "sha512-dr8/3zEaB+p0D2n/IUrlPF1HZm586qgJNXK1a9fhg/PzdtkK7Ksd5l312tJX2yBuALqDYBlG20QEbayqPyxn+g==", + "version": "1.19.14", + "resolved": "https://registry.npmjs.org/@hono/node-server/-/node-server-1.19.14.tgz", + "integrity": "sha512-GwtvgtXxnWsucXvbQXkRgqksiH2Qed37H9xHZocE5sA3N8O8O8/8FA3uclQXxXVzc9XBZuEOMK7+r02FmSpHtw==", "dev": true, "license": "MIT", "engines": { @@ -2629,9 +2630,9 @@ } }, "node_modules/@npmcli/package-json/node_modules/brace-expansion": { - "version": "5.0.4", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-5.0.4.tgz", - "integrity": "sha512-h+DEnpVvxmfVefa4jFbCf5HdH5YMDXRsmKflpf1pILZWRFlTbJpxeU55nJl4Smt5HQaGzg1o6RHFPJaOqnmBDg==", + "version": "5.0.5", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-5.0.5.tgz", + "integrity": "sha512-VZznLgtwhn+Mact9tfiwx64fA9erHH/MCXEUfB/0bX/6Fz6ny5EGTXYltMocqg4xFAQZtnO3DHWWXi8RiuN7cQ==", "dev": true, "license": "MIT", "dependencies": { @@ -3457,14 +3458,14 @@ ] }, "node_modules/@schematics/angular": { - "version": "20.3.21", - "resolved": "https://registry.npmjs.org/@schematics/angular/-/angular-20.3.21.tgz", - "integrity": "sha512-RzF+y4QOrerJ8H/7DrAnP/T3TzHeaNuBx5JweYYOwyx2/caDxN5uwjw/rQnUpQwUlSaM8NKve9FETUn7E7t0pw==", + "version": "20.3.23", + "resolved": "https://registry.npmjs.org/@schematics/angular/-/angular-20.3.23.tgz", + "integrity": "sha512-o9DWt5MZvEe69Byj2EKRNk/Pe7fSihvnvBOnPDzAi86jmMiKwjfa0rsk4vTXiDu4HLw9wJ6IKZ/lQKTfJbVnUg==", "dev": true, "license": "MIT", "dependencies": { - "@angular-devkit/core": "20.3.21", - "@angular-devkit/schematics": "20.3.21", + "@angular-devkit/core": "20.3.23", + "@angular-devkit/schematics": "20.3.23", "jsonc-parser": "3.3.1" }, "engines": { @@ -3633,9 +3634,9 @@ } }, "node_modules/@tufjs/models/node_modules/brace-expansion": { - "version": "5.0.4", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-5.0.4.tgz", - "integrity": "sha512-h+DEnpVvxmfVefa4jFbCf5HdH5YMDXRsmKflpf1pILZWRFlTbJpxeU55nJl4Smt5HQaGzg1o6RHFPJaOqnmBDg==", + "version": "5.0.5", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-5.0.5.tgz", + "integrity": "sha512-VZznLgtwhn+Mact9tfiwx64fA9erHH/MCXEUfB/0bX/6Fz6ny5EGTXYltMocqg4xFAQZtnO3DHWWXi8RiuN7cQ==", "dev": true, "license": "MIT", "dependencies": { @@ -3964,9 +3965,9 @@ } }, "node_modules/anymatch/node_modules/picomatch": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz", - "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==", + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.2.tgz", + "integrity": "sha512-V7+vQEJ06Z+c5tSye8S+nHUfI51xoXIXjHQ99cQtKUkQqqO1kO/KCJUfZXuB47h/YBlDhah2H3hdUGXn8ie0oA==", "dev": true, "license": "MIT", "engines": { @@ -4120,9 +4121,9 @@ "license": "MIT" }, "node_modules/brace-expansion": { - "version": "1.1.12", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.12.tgz", - "integrity": "sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==", + "version": "1.1.14", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.14.tgz", + "integrity": "sha512-MWPGfDxnyzKU7rNOW9SP/c50vi3xrmrua/+6hfPbCS2ABNWfx24vPidzvC7krjU/RTo235sV776ymlsMtGKj8g==", "dev": true, "license": "MIT", "dependencies": { @@ -4227,9 +4228,9 @@ } }, "node_modules/cacache/node_modules/brace-expansion": { - "version": "5.0.4", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-5.0.4.tgz", - "integrity": "sha512-h+DEnpVvxmfVefa4jFbCf5HdH5YMDXRsmKflpf1pILZWRFlTbJpxeU55nJl4Smt5HQaGzg1o6RHFPJaOqnmBDg==", + "version": "5.0.5", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-5.0.5.tgz", + "integrity": "sha512-VZznLgtwhn+Mact9tfiwx64fA9erHH/MCXEUfB/0bX/6Fz6ny5EGTXYltMocqg4xFAQZtnO3DHWWXi8RiuN7cQ==", "dev": true, "license": "MIT", "dependencies": { @@ -5639,9 +5640,9 @@ "license": "ISC" }, "node_modules/handlebars": { - "version": "4.7.8", - "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.7.8.tgz", - "integrity": "sha512-vafaFqs8MZkRrSX7sFVUdo3ap/eNiLnb4IakshzvP56X5Nr1iGKAIqdX6tMlm6HcNRIkr6AxO5jFEoJzzpT8aQ==", + "version": "4.7.9", + "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.7.9.tgz", + "integrity": "sha512-4E71E0rpOaQuJR2A3xDZ+GM1HyWYv1clR58tC8emQNeQe3RH7MAzSbat+V0wG78LQBo6m6bzSG/L4pBuCsgnUQ==", "dev": true, "license": "MIT", "dependencies": { @@ -5723,9 +5724,9 @@ } }, "node_modules/hono": { - "version": "4.12.8", - "resolved": "https://registry.npmjs.org/hono/-/hono-4.12.8.tgz", - "integrity": "sha512-VJCEvtrezO1IAR+kqEYnxUOoStaQPGrCmX3j4wDTNOcD1uRPFpGlwQUIW8niPuvHXaTUxeOUl5MMDGrl+tmO9A==", + "version": "4.12.12", + "resolved": "https://registry.npmjs.org/hono/-/hono-4.12.12.tgz", + "integrity": "sha512-p1JfQMKaceuCbpJKAPKVqyqviZdS0eUxH9v82oWo1kb9xjQ5wA6iP3FNVAPDFlz5/p7d45lO+BpSk1tuSZMF4Q==", "dev": true, "license": "MIT", "peer": true, @@ -5908,9 +5909,9 @@ } }, "node_modules/ignore-walk/node_modules/brace-expansion": { - "version": "5.0.4", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-5.0.4.tgz", - "integrity": "sha512-h+DEnpVvxmfVefa4jFbCf5HdH5YMDXRsmKflpf1pILZWRFlTbJpxeU55nJl4Smt5HQaGzg1o6RHFPJaOqnmBDg==", + "version": "5.0.5", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-5.0.5.tgz", + "integrity": "sha512-VZznLgtwhn+Mact9tfiwx64fA9erHH/MCXEUfB/0bX/6Fz6ny5EGTXYltMocqg4xFAQZtnO3DHWWXi8RiuN7cQ==", "dev": true, "license": "MIT", "dependencies": { @@ -6656,9 +6657,9 @@ "license": "MIT" }, "node_modules/karma/node_modules/picomatch": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz", - "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==", + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.2.tgz", + "integrity": "sha512-V7+vQEJ06Z+c5tSye8S+nHUfI51xoXIXjHQ99cQtKUkQqqO1kO/KCJUfZXuB47h/YBlDhah2H3hdUGXn8ie0oA==", "dev": true, "license": "MIT", "engines": { @@ -6897,9 +6898,9 @@ } }, "node_modules/lodash": { - "version": "4.17.23", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.23.tgz", - "integrity": "sha512-LgVTMpQtIopCi79SJeDiP0TfWi5CNEc/L/aRdTh3yIvmZXTnheWpKjSZhnvMl8iXbC1tFg9gdHHDMLoV7CnG+w==", + "version": "4.18.1", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.18.1.tgz", + "integrity": "sha512-dMInicTPVE8d1e5otfwmmjlxkZoUpiVLwyeTdUsi/Caj/gfzzblBcCE5sRHV/AsjuCmxWrte2TNGSYuCeCq+0Q==", "dev": true, "license": "MIT" }, @@ -8096,9 +8097,9 @@ } }, "node_modules/path-to-regexp": { - "version": "8.3.0", - "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-8.3.0.tgz", - "integrity": "sha512-7jdwVIRtsP8MYpdXSwOS0YdD0Du+qOoF/AEPIt88PcCFrZCzx41oxku1jD88hZBwbNUIEfpqvuhjFaMAqMTWnA==", + "version": "8.4.2", + "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-8.4.2.tgz", + "integrity": "sha512-qRcuIdP69NPm4qbACK+aDogI5CBDMi1jKe0ry5rSQJz8JVLsC7jV8XpiJjGRLLol3N+R5ihGYcrPLTno6pAdBA==", "dev": true, "license": "MIT", "funding": { @@ -8113,9 +8114,9 @@ "license": "ISC" }, "node_modules/picomatch": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.3.tgz", - "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==", + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.4.tgz", + "integrity": "sha512-QP88BAKvMam/3NxH6vj2o21R6MjxZUAd6nlwAS/pnGvN9IVLocLHxGYIzFhg6fUQ+5th6P4dv4eW9jX3DSIj7A==", "license": "MIT", "engines": { "node": ">=12" @@ -8504,9 +8505,9 @@ } }, "node_modules/replace-in-file/node_modules/brace-expansion": { - "version": "5.0.4", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-5.0.4.tgz", - "integrity": "sha512-h+DEnpVvxmfVefa4jFbCf5HdH5YMDXRsmKflpf1pILZWRFlTbJpxeU55nJl4Smt5HQaGzg1o6RHFPJaOqnmBDg==", + "version": "5.0.5", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-5.0.5.tgz", + "integrity": "sha512-VZznLgtwhn+Mact9tfiwx64fA9erHH/MCXEUfB/0bX/6Fz6ny5EGTXYltMocqg4xFAQZtnO3DHWWXi8RiuN7cQ==", "dev": true, "license": "MIT", "dependencies": { @@ -9642,14 +9643,14 @@ } }, "node_modules/vite": { - "version": "7.1.11", - "resolved": "https://registry.npmjs.org/vite/-/vite-7.1.11.tgz", - "integrity": "sha512-uzcxnSDVjAopEUjljkWh8EIrg6tlzrjFUfMcR1EVsRDGwf/ccef0qQPRyOrROwhrTDaApueq+ja+KLPlzR/zdg==", + "version": "7.3.2", + "resolved": "https://registry.npmjs.org/vite/-/vite-7.3.2.tgz", + "integrity": "sha512-Bby3NOsna2jsjfLVOHKes8sGwgl4TT0E6vvpYgnAYDIF/tie7MRaFthmKuHx1NSXjiTueXH3do80FMQgvEktRg==", "dev": true, "license": "MIT", "peer": true, "dependencies": { - "esbuild": "^0.25.0", + "esbuild": "^0.27.0", "fdir": "^6.5.0", "picomatch": "^4.0.3", "postcss": "^8.5.6", @@ -9717,6 +9718,490 @@ } } }, + "node_modules/vite/node_modules/@esbuild/aix-ppc64": { + "version": "0.27.7", + "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.27.7.tgz", + "integrity": "sha512-EKX3Qwmhz1eMdEJokhALr0YiD0lhQNwDqkPYyPhiSwKrh7/4KRjQc04sZ8db+5DVVnZ1LmbNDI1uAMPEUBnQPg==", + "cpu": [ + "ppc64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "aix" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/vite/node_modules/@esbuild/android-arm": { + "version": "0.27.7", + "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.27.7.tgz", + "integrity": "sha512-jbPXvB4Yj2yBV7HUfE2KHe4GJX51QplCN1pGbYjvsyCZbQmies29EoJbkEc+vYuU5o45AfQn37vZlyXy4YJ8RQ==", + "cpu": [ + "arm" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "android" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/vite/node_modules/@esbuild/android-arm64": { + "version": "0.27.7", + "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.27.7.tgz", + "integrity": "sha512-62dPZHpIXzvChfvfLJow3q5dDtiNMkwiRzPylSCfriLvZeq0a1bWChrGx/BbUbPwOrsWKMn8idSllklzBy+dgQ==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "android" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/vite/node_modules/@esbuild/android-x64": { + "version": "0.27.7", + "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.27.7.tgz", + "integrity": "sha512-x5VpMODneVDb70PYV2VQOmIUUiBtY3D3mPBG8NxVk5CogneYhkR7MmM3yR/uMdITLrC1ml/NV1rj4bMJuy9MCg==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "android" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/vite/node_modules/@esbuild/darwin-arm64": { + "version": "0.27.7", + "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.27.7.tgz", + "integrity": "sha512-5lckdqeuBPlKUwvoCXIgI2D9/ABmPq3Rdp7IfL70393YgaASt7tbju3Ac+ePVi3KDH6N2RqePfHnXkaDtY9fkw==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/vite/node_modules/@esbuild/darwin-x64": { + "version": "0.27.7", + "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.27.7.tgz", + "integrity": "sha512-rYnXrKcXuT7Z+WL5K980jVFdvVKhCHhUwid+dDYQpH+qu+TefcomiMAJpIiC2EM3Rjtq0sO3StMV/+3w3MyyqQ==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/vite/node_modules/@esbuild/freebsd-arm64": { + "version": "0.27.7", + "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.27.7.tgz", + "integrity": "sha512-B48PqeCsEgOtzME2GbNM2roU29AMTuOIN91dsMO30t+Ydis3z/3Ngoj5hhnsOSSwNzS+6JppqWsuhTp6E82l2w==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "freebsd" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/vite/node_modules/@esbuild/freebsd-x64": { + "version": "0.27.7", + "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.27.7.tgz", + "integrity": "sha512-jOBDK5XEjA4m5IJK3bpAQF9/Lelu/Z9ZcdhTRLf4cajlB+8VEhFFRjWgfy3M1O4rO2GQ/b2dLwCUGpiF/eATNQ==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "freebsd" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/vite/node_modules/@esbuild/linux-arm": { + "version": "0.27.7", + "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.27.7.tgz", + "integrity": "sha512-RkT/YXYBTSULo3+af8Ib0ykH8u2MBh57o7q/DAs3lTJlyVQkgQvlrPTnjIzzRPQyavxtPtfg0EopvDyIt0j1rA==", + "cpu": [ + "arm" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/vite/node_modules/@esbuild/linux-arm64": { + "version": "0.27.7", + "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.27.7.tgz", + "integrity": "sha512-RZPHBoxXuNnPQO9rvjh5jdkRmVizktkT7TCDkDmQ0W2SwHInKCAV95GRuvdSvA7w4VMwfCjUiPwDi0ZO6Nfe9A==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/vite/node_modules/@esbuild/linux-ia32": { + "version": "0.27.7", + "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.27.7.tgz", + "integrity": "sha512-GA48aKNkyQDbd3KtkplYWT102C5sn/EZTY4XROkxONgruHPU72l+gW+FfF8tf2cFjeHaRbWpOYa/uRBz/Xq1Pg==", + "cpu": [ + "ia32" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/vite/node_modules/@esbuild/linux-loong64": { + "version": "0.27.7", + "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.27.7.tgz", + "integrity": "sha512-a4POruNM2oWsD4WKvBSEKGIiWQF8fZOAsycHOt6JBpZ+JN2n2JH9WAv56SOyu9X5IqAjqSIPTaJkqN8F7XOQ5Q==", + "cpu": [ + "loong64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/vite/node_modules/@esbuild/linux-mips64el": { + "version": "0.27.7", + "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.27.7.tgz", + "integrity": "sha512-KabT5I6StirGfIz0FMgl1I+R1H73Gp0ofL9A3nG3i/cYFJzKHhouBV5VWK1CSgKvVaG4q1RNpCTR2LuTVB3fIw==", + "cpu": [ + "mips64el" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/vite/node_modules/@esbuild/linux-ppc64": { + "version": "0.27.7", + "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.27.7.tgz", + "integrity": "sha512-gRsL4x6wsGHGRqhtI+ifpN/vpOFTQtnbsupUF5R5YTAg+y/lKelYR1hXbnBdzDjGbMYjVJLJTd2OFmMewAgwlQ==", + "cpu": [ + "ppc64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/vite/node_modules/@esbuild/linux-riscv64": { + "version": "0.27.7", + "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.27.7.tgz", + "integrity": "sha512-hL25LbxO1QOngGzu2U5xeXtxXcW+/GvMN3ejANqXkxZ/opySAZMrc+9LY/WyjAan41unrR3YrmtTsUpwT66InQ==", + "cpu": [ + "riscv64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/vite/node_modules/@esbuild/linux-s390x": { + "version": "0.27.7", + "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.27.7.tgz", + "integrity": "sha512-2k8go8Ycu1Kb46vEelhu1vqEP+UeRVj2zY1pSuPdgvbd5ykAw82Lrro28vXUrRmzEsUV0NzCf54yARIK8r0fdw==", + "cpu": [ + "s390x" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/vite/node_modules/@esbuild/linux-x64": { + "version": "0.27.7", + "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.27.7.tgz", + "integrity": "sha512-hzznmADPt+OmsYzw1EE33ccA+HPdIqiCRq7cQeL1Jlq2gb1+OyWBkMCrYGBJ+sxVzve2ZJEVeePbLM2iEIZSxA==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/vite/node_modules/@esbuild/netbsd-arm64": { + "version": "0.27.7", + "resolved": "https://registry.npmjs.org/@esbuild/netbsd-arm64/-/netbsd-arm64-0.27.7.tgz", + "integrity": "sha512-b6pqtrQdigZBwZxAn1UpazEisvwaIDvdbMbmrly7cDTMFnw/+3lVxxCTGOrkPVnsYIosJJXAsILG9XcQS+Yu6w==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "netbsd" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/vite/node_modules/@esbuild/netbsd-x64": { + "version": "0.27.7", + "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.27.7.tgz", + "integrity": "sha512-OfatkLojr6U+WN5EDYuoQhtM+1xco+/6FSzJJnuWiUw5eVcicbyK3dq5EeV/QHT1uy6GoDhGbFpprUiHUYggrw==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "netbsd" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/vite/node_modules/@esbuild/openbsd-arm64": { + "version": "0.27.7", + "resolved": "https://registry.npmjs.org/@esbuild/openbsd-arm64/-/openbsd-arm64-0.27.7.tgz", + "integrity": "sha512-AFuojMQTxAz75Fo8idVcqoQWEHIXFRbOc1TrVcFSgCZtQfSdc1RXgB3tjOn/krRHENUB4j00bfGjyl2mJrU37A==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "openbsd" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/vite/node_modules/@esbuild/openbsd-x64": { + "version": "0.27.7", + "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.27.7.tgz", + "integrity": "sha512-+A1NJmfM8WNDv5CLVQYJ5PshuRm/4cI6WMZRg1by1GwPIQPCTs1GLEUHwiiQGT5zDdyLiRM/l1G0Pv54gvtKIg==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "openbsd" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/vite/node_modules/@esbuild/openharmony-arm64": { + "version": "0.27.7", + "resolved": "https://registry.npmjs.org/@esbuild/openharmony-arm64/-/openharmony-arm64-0.27.7.tgz", + "integrity": "sha512-+KrvYb/C8zA9CU/g0sR6w2RBw7IGc5J2BPnc3dYc5VJxHCSF1yNMxTV5LQ7GuKteQXZtspjFbiuW5/dOj7H4Yw==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "openharmony" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/vite/node_modules/@esbuild/sunos-x64": { + "version": "0.27.7", + "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.27.7.tgz", + "integrity": "sha512-ikktIhFBzQNt/QDyOL580ti9+5mL/YZeUPKU2ivGtGjdTYoqz6jObj6nOMfhASpS4GU4Q/Clh1QtxWAvcYKamA==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "sunos" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/vite/node_modules/@esbuild/win32-arm64": { + "version": "0.27.7", + "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.27.7.tgz", + "integrity": "sha512-7yRhbHvPqSpRUV7Q20VuDwbjW5kIMwTHpptuUzV+AA46kiPze5Z7qgt6CLCK3pWFrHeNfDd1VKgyP4O+ng17CA==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/vite/node_modules/@esbuild/win32-ia32": { + "version": "0.27.7", + "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.27.7.tgz", + "integrity": "sha512-SmwKXe6VHIyZYbBLJrhOoCJRB/Z1tckzmgTLfFYOfpMAx63BJEaL9ExI8x7v0oAO3Zh6D/Oi1gVxEYr5oUCFhw==", + "cpu": [ + "ia32" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/vite/node_modules/@esbuild/win32-x64": { + "version": "0.27.7", + "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.27.7.tgz", + "integrity": "sha512-56hiAJPhwQ1R4i+21FVF7V8kSD5zZTdHcVuRFMW0hn753vVfQN8xlx4uOPT4xoGH0Z/oVATuR82AiqSTDIpaHg==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/vite/node_modules/esbuild": { + "version": "0.27.7", + "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.27.7.tgz", + "integrity": "sha512-IxpibTjyVnmrIQo5aqNpCgoACA/dTKLTlhMHihVHhdkxKyPO1uBBthumT0rdHmcsk9uMonIWS0m4FljWzILh3w==", + "dev": true, + "hasInstallScript": true, + "license": "MIT", + "bin": { + "esbuild": "bin/esbuild" + }, + "engines": { + "node": ">=18" + }, + "optionalDependencies": { + "@esbuild/aix-ppc64": "0.27.7", + "@esbuild/android-arm": "0.27.7", + "@esbuild/android-arm64": "0.27.7", + "@esbuild/android-x64": "0.27.7", + "@esbuild/darwin-arm64": "0.27.7", + "@esbuild/darwin-x64": "0.27.7", + "@esbuild/freebsd-arm64": "0.27.7", + "@esbuild/freebsd-x64": "0.27.7", + "@esbuild/linux-arm": "0.27.7", + "@esbuild/linux-arm64": "0.27.7", + "@esbuild/linux-ia32": "0.27.7", + "@esbuild/linux-loong64": "0.27.7", + "@esbuild/linux-mips64el": "0.27.7", + "@esbuild/linux-ppc64": "0.27.7", + "@esbuild/linux-riscv64": "0.27.7", + "@esbuild/linux-s390x": "0.27.7", + "@esbuild/linux-x64": "0.27.7", + "@esbuild/netbsd-arm64": "0.27.7", + "@esbuild/netbsd-x64": "0.27.7", + "@esbuild/openbsd-arm64": "0.27.7", + "@esbuild/openbsd-x64": "0.27.7", + "@esbuild/openharmony-arm64": "0.27.7", + "@esbuild/sunos-x64": "0.27.7", + "@esbuild/win32-arm64": "0.27.7", + "@esbuild/win32-ia32": "0.27.7", + "@esbuild/win32-x64": "0.27.7" + } + }, "node_modules/vite/node_modules/fsevents": { "version": "2.3.3", "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz", From ce8197b482e7b8e2d764073fe1be10c6d3956c7e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Elias=20H=C3=B6rner?= Date: Mon, 13 Apr 2026 20:46:51 +0200 Subject: [PATCH 05/12] Fix --- .../TurnierplanAdapterTest.cs | 2 +- src/Turnierplan.Adapter/TurnierplanClient.cs | 7 ++++++- .../Security/ApiKeyAuthenticationHandler.cs | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/src/Turnierplan.Adapter.Test.Functional/TurnierplanAdapterTest.cs b/src/Turnierplan.Adapter.Test.Functional/TurnierplanAdapterTest.cs index d2b79e60..fd1019cc 100644 --- a/src/Turnierplan.Adapter.Test.Functional/TurnierplanAdapterTest.cs +++ b/src/Turnierplan.Adapter.Test.Functional/TurnierplanAdapterTest.cs @@ -334,7 +334,7 @@ public async Task Turnierplan_Client_Throws_Exception_When_Version_Does_Not_Matc if (sendHeader) { - response.Headers.Add("x-turnierplan-version", "2024.0.0"); // old version that does not exist + response.Headers.Add("X-Turnierplan-Version", "2024.0.0"); // old version that does not exist } return response; diff --git a/src/Turnierplan.Adapter/TurnierplanClient.cs b/src/Turnierplan.Adapter/TurnierplanClient.cs index d3913dc0..9931c9a5 100644 --- a/src/Turnierplan.Adapter/TurnierplanClient.cs +++ b/src/Turnierplan.Adapter/TurnierplanClient.cs @@ -76,6 +76,7 @@ public async Task GetTournament(string tournamentId) var request = new HttpRequestMessage(HttpMethod.Get, $"/api/tournaments/{tournamentId}"); var response = await _httpClient.SendAsync(request).ConfigureAwait(false); + EnsureSuccessResponse(response); VerifyServerVersion(response); return await Deserialize(response).ConfigureAwait(false); @@ -99,6 +100,7 @@ public async Task> GetTournaments(string folderId) var request = new HttpRequestMessage(HttpMethod.Get, $"/api/tournaments{query}"); var response = await _httpClient.SendAsync(request).ConfigureAwait(false); + EnsureSuccessResponse(response); VerifyServerVersion(response); return await Deserialize>(response).ConfigureAwait(false); @@ -153,13 +155,16 @@ private static void VerifyServerVersion(HttpResponseMessage response) } } - private static async Task Deserialize(HttpResponseMessage response) + private static void EnsureSuccessResponse(HttpResponseMessage response) { if (response.StatusCode != HttpStatusCode.OK) { throw new TurnierplanClientException($"API returned unexpected status code: {response.StatusCode}"); } + } + private static async Task Deserialize(HttpResponseMessage response) + { var data = await response.Content.ReadFromJsonAsync(__serializerOptions).ConfigureAwait(false); return data ?? throw new TurnierplanClientException($"Failed to deserialize API response of type '{typeof(T).Name}'."); diff --git a/src/Turnierplan.App/Security/ApiKeyAuthenticationHandler.cs b/src/Turnierplan.App/Security/ApiKeyAuthenticationHandler.cs index b568db90..0d72c0d8 100644 --- a/src/Turnierplan.App/Security/ApiKeyAuthenticationHandler.cs +++ b/src/Turnierplan.App/Security/ApiKeyAuthenticationHandler.cs @@ -41,7 +41,7 @@ protected override async Task HandleAuthenticateAsync() && apiKeySecretHeaderValue.Count == 1) { apiKeyId = apiKeyIdHeaderValue.Single(); - apiKeySecret = apiKeyIdHeaderValue.Single(); + apiKeySecret = apiKeySecretHeaderValue.Single(); } else { From 984b9dab003cdb3ad1878ead7e70135fc2285f40 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Elias=20H=C3=B6rner?= Date: Mon, 13 Apr 2026 20:50:38 +0200 Subject: [PATCH 06/12] Fix test --- .../TurnierplanAdapterTest.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Turnierplan.Adapter.Test.Functional/TurnierplanAdapterTest.cs b/src/Turnierplan.Adapter.Test.Functional/TurnierplanAdapterTest.cs index fd1019cc..20bc4754 100644 --- a/src/Turnierplan.Adapter.Test.Functional/TurnierplanAdapterTest.cs +++ b/src/Turnierplan.Adapter.Test.Functional/TurnierplanAdapterTest.cs @@ -330,7 +330,7 @@ public async Task Turnierplan_Client_Throws_Exception_When_Version_Does_Not_Matc using var httpClient = new HttpClient(new MockHttpMessageHandler(_ => { var response = new HttpResponseMessage(); - response.StatusCode = HttpStatusCode.Unauthorized; + response.StatusCode = HttpStatusCode.OK; if (sendHeader) { From b39404263daf03af81ce3da8a67308486fd1ad13 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Elias=20H=C3=B6rner?= Date: Mon, 13 Apr 2026 21:17:15 +0200 Subject: [PATCH 07/12] Improve header logic in api key auth handler --- .../Security/ApiKeyAuthenticationHandler.cs | 20 ++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/src/Turnierplan.App/Security/ApiKeyAuthenticationHandler.cs b/src/Turnierplan.App/Security/ApiKeyAuthenticationHandler.cs index 0d72c0d8..e3b74a69 100644 --- a/src/Turnierplan.App/Security/ApiKeyAuthenticationHandler.cs +++ b/src/Turnierplan.App/Security/ApiKeyAuthenticationHandler.cs @@ -3,6 +3,7 @@ using Microsoft.AspNetCore.Authentication; using Microsoft.AspNetCore.Identity; using Microsoft.Extensions.Options; +using Microsoft.Extensions.Primitives; using Turnierplan.Core.ApiKey; using Turnierplan.Core.PublicId; using Turnierplan.Core.RoleAssignment; @@ -33,21 +34,22 @@ public ApiKeyAuthenticationHandler( protected override async Task HandleAuthenticateAsync() { - string? apiKeyId, apiKeySecret; + var hasApiKeyIdHeader = Request.Headers.TryGetValue(ApiKeyIdHeaderName, out var apiKeyIdHeaderValue); + var hasApiKeySecretHeader = Request.Headers.TryGetValue(ApiKeySecretHeaderName, out var apiKeySecretHeaderValue); - if (Request.Headers.TryGetValue(ApiKeyIdHeaderName, out var apiKeyIdHeaderValue) - && Request.Headers.TryGetValue(ApiKeySecretHeaderName, out var apiKeySecretHeaderValue) - && apiKeyIdHeaderValue.Count == 1 - && apiKeySecretHeaderValue.Count == 1) + if (!hasApiKeyIdHeader && !hasApiKeySecretHeader) { - apiKeyId = apiKeyIdHeaderValue.Single(); - apiKeySecret = apiKeySecretHeaderValue.Single(); + return AuthenticateResult.NoResult(); } - else + + if (apiKeyIdHeaderValue.Count != 1 || apiKeySecretHeaderValue.Count != 1) { - return AuthenticateResult.NoResult(); + return AuthenticateResult.Fail("The API key ID and secret headers must each be specified exactly once."); } + var apiKeyId = apiKeyIdHeaderValue.Single(); + var apiKeySecret = apiKeySecretHeaderValue.Single(); + if (string.IsNullOrEmpty(apiKeyId) || string.IsNullOrEmpty(apiKeySecret) || !PublicId.TryParse(apiKeyId, out var apiKeyIdParsed)) { return AuthenticateResult.Fail("There exists no valid API key with the specified ID and secret."); From 79ab73be68b3fd83aca33a96e80b7e0f1949a1aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Elias=20H=C3=B6rner?= Date: Mon, 13 Apr 2026 21:36:10 +0200 Subject: [PATCH 08/12] Fix logic bug and missing exception type --- .../Endpoints/Identity/RefreshEndpoint.cs | 4 ++++ .../Security/JwtAuthenticationHandler.cs | 18 +++++++++++------- 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/src/Turnierplan.App/Endpoints/Identity/RefreshEndpoint.cs b/src/Turnierplan.App/Endpoints/Identity/RefreshEndpoint.cs index 1f7a88e9..8108b1fa 100644 --- a/src/Turnierplan.App/Endpoints/Identity/RefreshEndpoint.cs +++ b/src/Turnierplan.App/Endpoints/Identity/RefreshEndpoint.cs @@ -64,6 +64,10 @@ private async Task Handle( { claimsPrincipal = tokenHandler.ValidateToken(token, validationParameters, out _); } + catch (SecurityTokenArgumentException) + { + return Results.Unauthorized(); + } catch (SecurityTokenException) { return Results.Unauthorized(); diff --git a/src/Turnierplan.App/Security/JwtAuthenticationHandler.cs b/src/Turnierplan.App/Security/JwtAuthenticationHandler.cs index 12658a4d..71aac91b 100644 --- a/src/Turnierplan.App/Security/JwtAuthenticationHandler.cs +++ b/src/Turnierplan.App/Security/JwtAuthenticationHandler.cs @@ -24,11 +24,6 @@ public JwtAuthenticationHandler( protected override async Task HandleAuthenticateAsync() { - if (!Request.Cookies.ContainsKey(CookieNames.AccessTokenCookieName)) - { - return AuthenticateResult.NoResult(); - } - string? token = null; foreach (var (cookieName, cookieValue) in Request.Cookies) @@ -40,9 +35,14 @@ protected override async Task HandleAuthenticateAsync() } } - if (string.IsNullOrEmpty(token)) + if (token is null) { - return AuthenticateResult.Fail("Missing or empty access token cookie."); + return AuthenticateResult.NoResult(); + } + + if (string.IsNullOrWhiteSpace(token)) + { + return AuthenticateResult.Fail("Invalid authentication token provided"); } var tokenHandler = new JwtSecurityTokenHandler(); @@ -64,6 +64,10 @@ protected override async Task HandleAuthenticateAsync() { claimsPrincipal = tokenHandler.ValidateToken(token, validationParameters, out _); } + catch (SecurityTokenArgumentException ex) + { + return AuthenticateResult.Fail($"Token validation failed: {ex.Message}"); + } catch (SecurityTokenException ex) { return AuthenticateResult.Fail($"Token validation failed: {ex.Message}"); From c0f4b2e89f4be80afe1488579c19a1a02d23b2c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Elias=20H=C3=B6rner?= Date: Wed, 15 Apr 2026 22:50:04 +0200 Subject: [PATCH 09/12] Remove using --- src/Turnierplan.App/Security/ApiKeyAuthenticationHandler.cs | 1 - 1 file changed, 1 deletion(-) diff --git a/src/Turnierplan.App/Security/ApiKeyAuthenticationHandler.cs b/src/Turnierplan.App/Security/ApiKeyAuthenticationHandler.cs index e3b74a69..bc93f63a 100644 --- a/src/Turnierplan.App/Security/ApiKeyAuthenticationHandler.cs +++ b/src/Turnierplan.App/Security/ApiKeyAuthenticationHandler.cs @@ -3,7 +3,6 @@ using Microsoft.AspNetCore.Authentication; using Microsoft.AspNetCore.Identity; using Microsoft.Extensions.Options; -using Microsoft.Extensions.Primitives; using Turnierplan.Core.ApiKey; using Turnierplan.Core.PublicId; using Turnierplan.Core.RoleAssignment; From bca24bf5adfb7a2fdb5daa49d6aa712e06b855cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Elias=20H=C3=B6rner?= Date: Sun, 19 Apr 2026 09:27:29 +0200 Subject: [PATCH 10/12] Run audit fix again --- src/Turnierplan.App/Client/package-lock.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/Turnierplan.App/Client/package-lock.json b/src/Turnierplan.App/Client/package-lock.json index 1ac1292d..75e94110 100644 --- a/src/Turnierplan.App/Client/package-lock.json +++ b/src/Turnierplan.App/Client/package-lock.json @@ -5408,9 +5408,9 @@ "license": "ISC" }, "node_modules/follow-redirects": { - "version": "1.15.11", - "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.11.tgz", - "integrity": "sha512-deG2P0JfjrTxl50XGCDyfI97ZGVCxIpfKYmfyrQ54n5FO/0gfIES8C/Psl6kWVDolizcaaxZJnTS0QSMxvnsBQ==", + "version": "1.16.0", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.16.0.tgz", + "integrity": "sha512-y5rN/uOsadFT/JfYwhxRS5R7Qce+g3zG97+JrtFZlC9klX/W5hD7iiLzScI4nZqUS7DNUdhPgw4xI8W2LuXlUw==", "dev": true, "funding": [ { @@ -5724,9 +5724,9 @@ } }, "node_modules/hono": { - "version": "4.12.12", - "resolved": "https://registry.npmjs.org/hono/-/hono-4.12.12.tgz", - "integrity": "sha512-p1JfQMKaceuCbpJKAPKVqyqviZdS0eUxH9v82oWo1kb9xjQ5wA6iP3FNVAPDFlz5/p7d45lO+BpSk1tuSZMF4Q==", + "version": "4.12.14", + "resolved": "https://registry.npmjs.org/hono/-/hono-4.12.14.tgz", + "integrity": "sha512-am5zfg3yu6sqn5yjKBNqhnTX7Cv+m00ox+7jbaKkrLMRJ4rAdldd1xPd/JzbBWspqaQv6RSTrgFN95EsfhC+7w==", "dev": true, "license": "MIT", "peer": true, From 02f22b1a47818456d037f19c8f394256a8901bc0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Elias=20H=C3=B6rner?= Date: Sun, 19 Apr 2026 09:35:07 +0200 Subject: [PATCH 11/12] Backend updates --- src/Turnierplan.App/Turnierplan.App.csproj | 8 ++++---- src/Turnierplan.AppHost/Turnierplan.AppHost.csproj | 7 ++++--- src/Turnierplan.Dal/Turnierplan.Dal.csproj | 2 +- .../Turnierplan.ImageStorage.csproj | 4 ++-- .../Turnierplan.PdfRendering.csproj | 2 +- src/Turnierplan.Test.Common.props | 4 ++-- 6 files changed, 14 insertions(+), 13 deletions(-) diff --git a/src/Turnierplan.App/Turnierplan.App.csproj b/src/Turnierplan.App/Turnierplan.App.csproj index 5aa6a738..4615faf5 100644 --- a/src/Turnierplan.App/Turnierplan.App.csproj +++ b/src/Turnierplan.App/Turnierplan.App.csproj @@ -13,7 +13,7 @@ - + all