From 5ff93a7752efa947893423a94e3a48e5b79379ef Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 16 Dec 2024 10:44:14 +0000 Subject: [PATCH 1/7] Bump Microsoft.Extensions.Configuration.Binder, Microsoft.Extensions.Http.Polly and Microsoft.Extensions.Logging.Abstractions Bumps [Microsoft.Extensions.Configuration.Binder](https://github.com/dotnet/runtime), [Microsoft.Extensions.Http.Polly](https://github.com/dotnet/aspnetcore) and [Microsoft.Extensions.Logging.Abstractions](https://github.com/dotnet/runtime). These dependencies needed to be updated together. Updates `Microsoft.Extensions.Configuration.Binder` from 9.0.0 to 9.0.0 - [Release notes](https://github.com/dotnet/runtime/releases) - [Commits](https://github.com/dotnet/runtime/compare/v9.0.0...v9.0.0) Updates `Microsoft.Extensions.Http.Polly` from 8.0.11 to 9.0.0 - [Release notes](https://github.com/dotnet/aspnetcore/releases) - [Changelog](https://github.com/dotnet/aspnetcore/blob/main/docs/ReleasePlanning.md) - [Commits](https://github.com/dotnet/aspnetcore/compare/v8.0.11...v9.0.0) Updates `Microsoft.Extensions.Logging.Abstractions` from 9.0.0 to 9.0.0 - [Release notes](https://github.com/dotnet/runtime/releases) - [Commits](https://github.com/dotnet/runtime/compare/v9.0.0...v9.0.0) --- updated-dependencies: - dependency-name: Microsoft.Extensions.Configuration.Binder dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: Microsoft.Extensions.Http.Polly dependency-type: direct:production update-type: version-update:semver-major - dependency-name: Microsoft.Extensions.Logging.Abstractions dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- BLAZAM/BLAZAM.csproj | 2 +- BLAZAMServices/BLAZAMServices.csproj | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/BLAZAM/BLAZAM.csproj b/BLAZAM/BLAZAM.csproj index de789bb6..c2f606be 100644 --- a/BLAZAM/BLAZAM.csproj +++ b/BLAZAM/BLAZAM.csproj @@ -67,7 +67,7 @@ - + diff --git a/BLAZAMServices/BLAZAMServices.csproj b/BLAZAMServices/BLAZAMServices.csproj index b6617ee8..584e8d8d 100644 --- a/BLAZAMServices/BLAZAMServices.csproj +++ b/BLAZAMServices/BLAZAMServices.csproj @@ -12,7 +12,7 @@ - + From 50d0d31d4fd10c8d16d8229177a6cb8be4b11765 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 16 Dec 2024 10:44:52 +0000 Subject: [PATCH 2/7] Bump System.Management from 8.0.0 to 9.0.0 Bumps [System.Management](https://github.com/dotnet/runtime) from 8.0.0 to 9.0.0. - [Release notes](https://github.com/dotnet/runtime/releases) - [Commits](https://github.com/dotnet/runtime/compare/v8.0.0...v9.0.0) --- updated-dependencies: - dependency-name: System.Management dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- BLAZAMActiveDirectory/BLAZAMActiveDirectory.csproj | 2 +- BLAZAMCommon/BLAZAMCommon.csproj | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/BLAZAMActiveDirectory/BLAZAMActiveDirectory.csproj b/BLAZAMActiveDirectory/BLAZAMActiveDirectory.csproj index 76658c34..053cb3c8 100644 --- a/BLAZAMActiveDirectory/BLAZAMActiveDirectory.csproj +++ b/BLAZAMActiveDirectory/BLAZAMActiveDirectory.csproj @@ -8,7 +8,7 @@ - + diff --git a/BLAZAMCommon/BLAZAMCommon.csproj b/BLAZAMCommon/BLAZAMCommon.csproj index b4c52a11..77d5fb5b 100644 --- a/BLAZAMCommon/BLAZAMCommon.csproj +++ b/BLAZAMCommon/BLAZAMCommon.csproj @@ -37,7 +37,7 @@ - + From e92c409b6e93c6b7bf16d51143bd157496b09949 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 16 Dec 2024 10:46:18 +0000 Subject: [PATCH 3/7] Bump Microsoft.Extensions.Hosting.Abstractions and Microsoft.Extensions.Logging.Abstractions Bumps [Microsoft.Extensions.Hosting.Abstractions](https://github.com/dotnet/runtime) and [Microsoft.Extensions.Logging.Abstractions](https://github.com/dotnet/runtime). These dependencies needed to be updated together. Updates `Microsoft.Extensions.Hosting.Abstractions` from 8.0.1 to 9.0.0 - [Release notes](https://github.com/dotnet/runtime/releases) - [Commits](https://github.com/dotnet/runtime/compare/v8.0.1...v9.0.0) Updates `Microsoft.Extensions.Logging.Abstractions` from 9.0.0 to 9.0.0 - [Release notes](https://github.com/dotnet/runtime/releases) - [Commits](https://github.com/dotnet/runtime/compare/v9.0.0...v9.0.0) --- updated-dependencies: - dependency-name: Microsoft.Extensions.Hosting.Abstractions dependency-type: direct:production update-type: version-update:semver-major - dependency-name: Microsoft.Extensions.Logging.Abstractions dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- BLAZAMServices/BLAZAMServices.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/BLAZAMServices/BLAZAMServices.csproj b/BLAZAMServices/BLAZAMServices.csproj index b6617ee8..ecb0dde0 100644 --- a/BLAZAMServices/BLAZAMServices.csproj +++ b/BLAZAMServices/BLAZAMServices.csproj @@ -11,7 +11,7 @@ - + From 69933cbec40ff3d6cba2ee8ed3aba6257bf8ded8 Mon Sep 17 00:00:00 2001 From: Chris Jacobsen Date: Wed, 18 Dec 2024 05:36:20 -0500 Subject: [PATCH 4/7] Possible fix for install redirect error loop --- BLAZAM/Pages/Index.razor | 1 + 1 file changed, 1 insertion(+) diff --git a/BLAZAM/Pages/Index.razor b/BLAZAM/Pages/Index.razor index 09b3338f..78018bfa 100644 --- a/BLAZAM/Pages/Index.razor +++ b/BLAZAM/Pages/Index.razor @@ -77,6 +77,7 @@ { if (Monitor.AppReady == ServiceConnectionState.Up) { + waitingForLoadToComplete = false; await Task.Delay(2500); // Initial delay Nav.NavigateTo("/install", true); } From 6256eb256b5df660f979758188e07568e25d8096 Mon Sep 17 00:00:00 2001 From: Chris Jacobsen Work Date: Wed, 18 Dec 2024 14:18:46 -0500 Subject: [PATCH 5/7] Fix email notification message content --- .../Notifications/EntryAssignedEmailMessage.razor | 12 ++++++++---- .../Notifications/EntryCreatedEmailMessage.razor | 2 +- .../Notifications/EntryUnassignedEmailMessage.razor | 8 ++++++-- .../Background/NotificationGenerationService.cs | 7 +++++-- 4 files changed, 20 insertions(+), 9 deletions(-) diff --git a/BLAZAMEmailMessage/Email/Notifications/EntryAssignedEmailMessage.razor b/BLAZAMEmailMessage/Email/Notifications/EntryAssignedEmailMessage.razor index f829b297..07de3138 100644 --- a/BLAZAMEmailMessage/Email/Notifications/EntryAssignedEmailMessage.razor +++ b/BLAZAMEmailMessage/Email/Notifications/EntryAssignedEmailMessage.razor @@ -7,7 +7,7 @@ - @EntryName @AppLocalization["has been assigned to"]) + @EntryName @AppLocalization["has been assigned to"]) @GroupName
@@ -17,11 +17,15 @@ @code{ [Parameter] public string EntryName { get; set; } - - public override string Render() => new ComponentRenderer() + + [Parameter] + public string GroupName { get; set; } + public override string Render() => new ComponentRenderer() .UseLayout() .AddServiceProvider(ApplicationInfo.services) - .Set(c => c.EntryName, EntryName).Render(); + .Set(c => c.EntryName, EntryName) + + .Set(c => c.GroupName, GroupName).Render(); } diff --git a/BLAZAMEmailMessage/Email/Notifications/EntryCreatedEmailMessage.razor b/BLAZAMEmailMessage/Email/Notifications/EntryCreatedEmailMessage.razor index 9abc47db..28b7bee3 100644 --- a/BLAZAMEmailMessage/Email/Notifications/EntryCreatedEmailMessage.razor +++ b/BLAZAMEmailMessage/Email/Notifications/EntryCreatedEmailMessage.razor @@ -7,7 +7,7 @@ - EntryName + AppLocalization[" has been created."]) + @EntryName @AppLocalization[" has been created."]
diff --git a/BLAZAMEmailMessage/Email/Notifications/EntryUnassignedEmailMessage.razor b/BLAZAMEmailMessage/Email/Notifications/EntryUnassignedEmailMessage.razor index 4b8c7d84..f08d15e2 100644 --- a/BLAZAMEmailMessage/Email/Notifications/EntryUnassignedEmailMessage.razor +++ b/BLAZAMEmailMessage/Email/Notifications/EntryUnassignedEmailMessage.razor @@ -7,7 +7,7 @@ - @EntryName @AppLocalization["has been unassigned from"]) + @EntryName @AppLocalization["has been unassigned from"] @GroupName
@@ -17,11 +17,15 @@ @code{ [Parameter] public string EntryName { get; set; } + [Parameter] + public string GroupName { get; set; } public override string Render() => new ComponentRenderer() .UseLayout() .AddServiceProvider(ApplicationInfo.services) - .Set(c => c.EntryName, EntryName).Render(); + .Set(c => c.EntryName, EntryName) + .Set(c => c.GroupName, GroupName) + .Render(); } diff --git a/BLAZAMServices/Background/NotificationGenerationService.cs b/BLAZAMServices/Background/NotificationGenerationService.cs index c5188181..54f80130 100644 --- a/BLAZAMServices/Background/NotificationGenerationService.cs +++ b/BLAZAMServices/Background/NotificationGenerationService.cs @@ -191,7 +191,8 @@ public void PackageNotification(IDirectoryEntryAdapter source, NotificationType notificationBody += _appLocalization["was removed from"] + " " + target.CanonicalName + " " + _appLocalization[" at "] + time; var groupMemberRemovedMessage = NotificationType.Unassign.ToNotification(); - groupMemberRemovedMessage.EntryName = source.CanonicalName; + groupMemberRemovedMessage.EntryName = source?.CanonicalName; + groupMemberRemovedMessage.GroupName = target?.CanonicalName; emailMessage = groupMemberRemovedMessage; break; case NotificationType.Assign: @@ -201,7 +202,9 @@ public void PackageNotification(IDirectoryEntryAdapter source, NotificationType notificationBody += _appLocalization["was assigned to"] + " " + target.CanonicalName + " " + _appLocalization[" at "] + time; var groupMemberAssignedMessage = NotificationType.Assign.ToNotification(); - groupMemberAssignedMessage.EntryName = source.CanonicalName; + groupMemberAssignedMessage.EntryName = source?.CanonicalName; + groupMemberAssignedMessage.GroupName = target?.CanonicalName; + emailMessage = groupMemberAssignedMessage; break; case NotificationType.PasswordChange: From bf11c95aa5384263968de5c75cf2509f4c1a9a7a Mon Sep 17 00:00:00 2001 From: Chris Jacobsen Date: Wed, 18 Dec 2024 18:03:29 -0500 Subject: [PATCH 6/7] Remove redundant homing --- BLAZAM/Pages/Index.razor | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/BLAZAM/Pages/Index.razor b/BLAZAM/Pages/Index.razor index 78018bfa..f2cb9516 100644 --- a/BLAZAM/Pages/Index.razor +++ b/BLAZAM/Pages/Index.razor @@ -96,7 +96,7 @@ protected override async Task OnInitializedAsync() { await base.OnInitializedAsync(); - Monitor.OnAppReadyChanged += AppReady; + //Monitor.OnAppReadyChanged += AppReady; } private void AppReady(ServiceConnectionState newStatus) From ecd78b4d7156982ecb3a91c926ce69975279f917 Mon Sep 17 00:00:00 2001 From: Chris Jacobsen Date: Wed, 18 Dec 2024 23:19:20 -0500 Subject: [PATCH 7/7] Increment fix version --- BLAZAM/BLAZAM.csproj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/BLAZAM/BLAZAM.csproj b/BLAZAM/BLAZAM.csproj index c2f606be..a0b8ecf0 100644 --- a/BLAZAM/BLAZAM.csproj +++ b/BLAZAM/BLAZAM.csproj @@ -5,8 +5,8 @@ enable enable false - 1.2.2 - 2024.12.14.0307 + 1.2.3 + 2024.12.19.0417 false BLAZAM True