🐛 bugfix HttpContext is not available.

neozhu · Nov 2, 2024 · f464278 · f464278
1 parent 907e45d
commit f464278
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 40 deletions.
diff --git a/src/Server.UI/Components/Fusion/OnlineUsersTracker.razor b/src/Server.UI/Components/Fusion/OnlineUsersTracker.razor
@@ -70,7 +70,9 @@
 
     public override async ValueTask DisposeAsync()
     {
-        await OnlineUserTracker.Logout();
+        if (!string.IsNullOrEmpty(currentUserId)){
+            await OnlineUserTracker.Clear(currentUserId);
+        }
         GC.Collect();
     }
 }
diff --git a/src/Server.UI/Services/Fusion/IOnlineUserTracker.cs b/src/Server.UI/Services/Fusion/IOnlineUserTracker.cs
@@ -5,7 +5,6 @@ namespace CleanArchitecture.Blazor.Server.UI.Services.Fusion;
 public interface IOnlineUserTracker : IComputeService
 {
     Task Initial(SessionInfo sessionInfo,CancellationToken cancellationToken = default);
-    Task Logout(CancellationToken cancellationToken = default);
     Task Clear(string userId,CancellationToken cancellationToken = default);
     Task Update(string userId,string userName,string displayName,string profilePictureDataUrl, CancellationToken cancellationToken = default);
     [ComputeMethod]

diff --git a/src/Server.UI/Services/Fusion/OnlineUserTracker.cs b/src/Server.UI/Services/Fusion/OnlineUserTracker.cs
@@ -39,23 +39,7 @@ public virtual async Task Initial(SessionInfo sessionInfo, CancellationToken can
         }
     }
 
-    /// <summary>
-    /// Logs out the current user.
-    /// </summary>
-    /// <param name="cancellationToken">The cancellation token.</param>
-    public virtual async Task Logout(CancellationToken cancellationToken = default)
-    {
-        if (Invalidation.IsActive)
-            return;
-        var sessionInfo = await GetSessionInfo().ConfigureAwait(false);
-        var userSessions = _activeUserSessions.Where(s => s.UserId == sessionInfo.UserId).ToList();
-        foreach (var session in userSessions)
-        {
-            _activeUserSessions = _activeUserSessions.Remove(session);
-            using var invalidating = Invalidation.Begin();
-            _ = await GetOnlineUsers(cancellationToken).ConfigureAwait(false);
-        }
-    }
+
 
     /// <summary>
     /// Clears all sessions for a specific user.
@@ -109,25 +93,4 @@ public virtual Task<List<SessionInfo>> GetOnlineUsers(CancellationToken cancella
 
         return Task.FromResult(_activeUserSessions.ToList());
     }
-
-    /// <summary>
-    /// Gets the session information for the current user.
-    /// </summary>
-    /// <returns>The session information.</returns>
-    /// <exception cref="InvalidOperationException">Thrown when the HTTP context is not available.</exception>
-    private Task<SessionInfo> GetSessionInfo()
-    {
-        var httpContext = _httpContextAccessor.HttpContext;
-        if (httpContext == null)
-        {
-            throw new InvalidOperationException("HttpContext is not available.");
-        }
-        var httpUser = _httpContextAccessor.HttpContext?.User;
-        var ipAddress = _httpContextAccessor.HttpContext?.Connection.RemoteIpAddress?.ToString();
-        var userId = _httpContextAccessor.HttpContext?.User?.GetUserId();
-        var userName = _httpContextAccessor.HttpContext?.User?.GetUserName();
-        var displayName = _httpContextAccessor.HttpContext?.User?.GetDisplayName();
-        var tenantId = _httpContextAccessor.HttpContext?.User?.GetTenantId();
-        return Task.FromResult(new SessionInfo(userId, userName, displayName, ipAddress, tenantId, "", UserPresence.Available));
-    }
 }