Merge branch 'develop' into develop

Author: abarz722

roles/lib/files/FWO.Api.Client/GraphQlApiConnection.cs

@@ -1,4 +1,4 @@
-using System.Text.Json;
+using System.Text.Json;
 using GraphQL;
 using GraphQL.Client.Http;
 using GraphQL.Client.Serializer.SystemTextJson;

roles/lib/files/FWO.Services/EventMediator/Events/UserSessionClosedEvent.cs

@@ -0,0 +1,15 @@
+using FWO.Services.EventMediator.Interfaces;
+
+namespace FWO.Services.EventMediator.Events
+{
+    public class UserSessionClosedEvent(UserSessionClosedEventArgs? eventArgs = default) : IEvent
+    {
+        public UserSessionClosedEventArgs? EventArgs { get; set; } = eventArgs ?? new UserSessionClosedEventArgs();
+
+        IEventArgs? IEvent.EventArgs
+        {
+            get => EventArgs;
+            set => EventArgs = value as UserSessionClosedEventArgs;
+        }
+    }
+}

roles/lib/files/FWO.Services/EventMediator/Events/UserSessionClosedEventArgs.cs

@@ -0,0 +1,11 @@
+using FWO.Data;
+using FWO.Services.EventMediator.Interfaces;
+
+namespace FWO.Services.EventMediator.Events
+{
+    public class UserSessionClosedEventArgs(string userName = "", string? userDn = "") : IEventArgs
+    {
+        public string? UserName { get; set; } = userName;
+        public string? UserDn { get; set; } = userDn;
+    }
+}

roles/ui/files/FWO.UI/Data/UIMessage.cs

@@ -2,7 +2,7 @@
 
 namespace FWO.Ui.Data
 {
-    public class UIMessage
+    public class UIMessage : IDisposable
     {
         public string Id { get; } = Guid.NewGuid().ToString();
         public string? Title { get; set; }
@@ -35,11 +35,27 @@ private static string GetCSSClass(MessageType messageType)
                 case MessageType.Error:
                     cssClass += " alert alert-danger";
                     break;
-                default:                    
+                default:
                     break;
             }
 
             return cssClass;
         }
+
+        public void Dispose()
+        {
+            Dispose(true);
+            GC.SuppressFinalize(this);
+        }
+
+        protected virtual void Dispose(bool disposing)
+        {
+            if(ShowTimer != null)
+            {
+                ShowTimer.Stop();
+                ShowTimer.Dispose();
+                ShowTimer = null;
+            }
+        }
     }
 }

roles/ui/files/FWO.UI/Services/CircuitHandlerService.cs

@@ -1,25 +1,33 @@
-using System.Collections.Generic;
-using System.Threading;
-using System.Threading.Tasks;
 using Microsoft.AspNetCore.Components.Server.Circuits;
 using FWO.Logging;
-using FWO.Basics;
 using FWO.Data;
-using System.Collections.Concurrent;
+using FWO.Services.EventMediator.Interfaces;
+using FWO.Services.EventMediator.Events;
 
 namespace FWO.Ui.Services
 {
-    public class CircuitHandlerService : CircuitHandler
+    public class CircuitHandlerService(IEventMediator eventMediator) : CircuitHandler
     {
         public UiUser? User { get; set; }
 
+        private readonly UserSessionClosedEvent OnUserSessionClosed = new();
+
         public override Task OnCircuitClosedAsync(Circuit circuit, CancellationToken cancellationToken)
         {
             if (User != null)
             {
                 Log.WriteAudit($"Session of \"{User.Name}\" closed", $"Session of user \"{User.Name}\" (last logged in) with DN: \"{User.Dn}\" was closed.");
+
+                OnUserSessionClosed.EventArgs = new UserSessionClosedEventArgs
+                {
+                    UserDn = User.Dn,
+                    UserName = User.Name,
+                };
+
+                eventMediator.Publish(nameof(CircuitHandlerService), OnUserSessionClosed);
             }
+
             return base.OnCircuitClosedAsync(circuit, cancellationToken);
         }
-	}
+    }
 }

roles/ui/files/FWO.UI/Shared/MainLayout.razor

@@ -1,5 +1,8 @@
 @inherits LayoutComponentBase
 @using FWO.Middleware.Client
+@using FWO.Services.EventMediator
+@using FWO.Services.EventMediator.Events
+@using FWO.Services.EventMediator.Interfaces
 @using FWO.Ui.Auth
 @using FWO.Ui.Data
 @using FWO.Ui.Services
@@ -17,6 +20,9 @@
 @inject AuthenticationStateProvider authenticationProvider
 @inject ProtectedSessionStorage sessionStorage
 @inject CircuitHandler circuitHandler
+@inject IEventMediator EventMediator
+
+@implements IDisposable
 
 <NavigationMenu @bind-ShowAlert="showAlert" />
 
@@ -27,7 +33,7 @@
         <button type="button" @onclick="@(() => ShowMessage("warning", "warning", MessageType.Warning))">warning</button>
         <button type="button" @onclick="@(() => ShowMessage("error", "error", MessageType.Error))">error</button>
         <button type="button" @onclick="@(() => ShowMessage("success", "success", MessageType.Success))">success</button>
-        <button type="button" @onclick="@(() => {  UIMessageQue.Clear(); UIMessages.Clear(); })">clear</button> *@    
+        <button type="button" @onclick="@(() => {  UIMessageQue.Clear(); UIMessages.Clear(); })">clear</button> *@
         <CascadingValue Value="@DisplayMessageInUiFunction">
             @Body
         </CascadingValue>
@@ -118,13 +124,24 @@
         UIMessageQueTimer = new()
             {
                 AutoReset = true,
-                Enabled = true,
-                Interval = 150
+                Enabled = false,
+                Interval = 500
             };
 
         UIMessageQueTimer.Elapsed += OnUIMessageTimerTick;
+
+        EventMediator.Subscribe<UserSessionClosedEvent>(nameof(CircuitHandlerService), _ => OnUserSessionClosedEvent(_.EventArgs));
     }
 
+    private void OnUserSessionClosedEvent(UserSessionClosedEventArgs? e)
+    {
+        if (e == null || string.IsNullOrEmpty(e.UserDn))
+        {
+            return;
+        }
+
+        JwtEventService.RemoveJwtTimers(e.UserDn);
+    }
 
     private async Task KeyHandler(KeyboardEventArgs ev)
     {
@@ -250,6 +267,8 @@
             {
                 UIMessageQue.Enqueue(uiMessage);
             }
+
+            UIMessageQueTimer?.Start();
         }
     }
 
@@ -260,6 +279,17 @@
 
     private void OnUIMessageTimerTick(object? _, ElapsedEventArgs __)
     {
+        if(UIMessageQueTimer is null)
+        {
+            return;
+        }
+
+        if(UIMessageQue == null || UIMessageQue.Count == 0)
+        {
+            UIMessageQueTimer.Stop();
+            return;
+        }
+
         if (UIMessageQue.Count > 0 && UIMessages.Count < userConfig.MaxMessages)
         {
             UIMessage uiMessage = UIMessageQue.Dequeue();
@@ -271,6 +301,15 @@
 
     private void HideUIMessage(string messageId)
     {
+        UIMessage? uiMessage = UIMessages.FirstOrDefault(_ => _.Id == messageId);
+
+        if (uiMessage is null)
+        {
+            return;
+        }
+
+        uiMessage.Dispose();
+
         UIMessages.RemoveAll(_ => _.Id == messageId);
 
         InvokeAsync(StateHasChanged);
@@ -433,5 +472,23 @@
         {
             Log.WriteError("Acknowledge Alert", $"Could not acknowledge alert for ui: ", exception);
         }
-    }
+	}
+
+	public void Dispose()
+    {
+        JwtEventService.OnPermissionChanged -= OnPermissionsChanged;
+        JwtEventService.OnJwtAboutToExpire -= OnJwtAboutToExpire;
+        JwtEventService.OnJwtExpired -= OnJwtExpired;
+
+        if(UIMessageQueTimer is not null)
+        {
+            UIMessageQueTimer.Stop();
+            UIMessageQueTimer.Elapsed -= OnUIMessageTimerTick;
+            UIMessageQueTimer.Dispose();
+        }
+
+        alertSubscription?.Dispose();
+
+		EventMediator.Unsubscribe<UserSessionClosedEvent>(nameof(CircuitHandlerService));
+	}
 }