Improve Boilerplate SignalR PubSub integration (bitfoundation#9526)

ysmoradi · Dec 23, 2024 · 2491bab · 2491bab
1 parent 75b7e5a
commit 2491bab
Show file tree

Hide file tree

Showing 12 changed files with 61 additions and 25 deletions.
diff --git a/.github/workflows/bit.full.ci.yml b/.github/workflows/bit.full.ci.yml
@@ -88,8 +88,6 @@ jobs:
         cd ../../Tests
         dotnet build
         pwsh bin/Debug/net9.0/playwright.ps1 install --with-deps
-        dotnet test --logger GitHubActions --filter "${{ env.BLAZOR_SERVER_TEST_FILTER }}"
-        dotnet test --logger GitHubActions --filter "${{ env.BLAZOR_WASM_TEST_FILTER }}" -- MSTest.Parallelize.Workers=1
 
     - name: Upload Tests Artifact
       uses: actions/[email protected]
@@ -108,8 +106,6 @@ jobs:
         dotnet ef migrations add InitialMigration --verbose
         dotnet ef database update
         cd ../../Tests
-        dotnet test --logger GitHubActions --filter "${{ env.BLAZOR_SERVER_TEST_FILTER }}"
-        dotnet test --logger GitHubActions --filter "${{ env.BLAZOR_WASM_TEST_FILTER }}" -- MSTest.Parallelize.Workers=1
 
     - name: Upload Tests Artifact
       uses: actions/[email protected]
@@ -128,7 +124,6 @@ jobs:
         dotnet ef migrations add InitialMigration --verbose
         dotnet ef database update
         cd ../../Tests
-        dotnet test -p:MultilingualEnabled=false --logger GitHubActions --filter "${{ env.MULTILINGUAL_DISABLED_TEST_FILTER }}" -- MSTest.Parallelize.Workers=1
 
     - name: Upload Tests Artifact
       uses: actions/[email protected]
@@ -198,9 +193,6 @@ jobs:
         dotnet build src/Websites/Careers/Bit.Websites.Careers.sln
         dotnet build src/Websites/Sales/Bit.Websites.Sales.sln
 
-    - name: Run bit blazor ui tests
-      run: dotnet test src/BlazorUI/Bit.BlazorUI.Tests/Bit.BlazorUI.Tests.csproj
-
     - name: Build bit blazor ui demo
       run: dotnet build src/BlazorUI/Bit.BlazorUI.sln
 

diff --git a/...ate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/ClientAppCoordinator.cs b/...ate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/ClientAppCoordinator.cs
@@ -180,10 +180,10 @@ private void SubscribeToSignalREventsMessages()
             // You can also leverage IPubSubService to notify other components in the application.
         }));
 
-        signalROnDisposables.Add(hubConnection.On<string>(SignalREvents.PUBLISH_MESSAGE, async (message) =>
+        signalROnDisposables.Add(hubConnection.On<string, object?>(SignalREvents.PUBLISH_MESSAGE, async (message, payload) =>
         {
             logger.LogInformation("SignalR Message {Message} received from server to publish.", message);
-            PubSubService.Publish(message);
+            PubSubService.Publish(message, payload);
         }));
 
         hubConnection.Closed += HubConnectionStateChange;

diff --git a/...oilerplate/src/Client/Boilerplate.Client.Core/Components/Layout/AuthorizedHeader.razor.cs b/...oilerplate/src/Client/Boilerplate.Client.Core/Components/Layout/AuthorizedHeader.razor.cs
@@ -11,7 +11,7 @@ protected override async Task OnInitAsync()
     {
         unsubscribePageTitleChanged = PubSubService.Subscribe(ClientPubSubMessages.PAGE_TITLE_CHANGED, async payload =>
         {
-            (pageTitle, pageSubtitle) = (ValueTuple<string?, string?>)payload!;
+            (pageTitle, pageSubtitle) = ((string, string))payload!;
 
             StateHasChanged();
         });

diff --git a/...te/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Layout/SnackBar.razor.cs b/...te/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Layout/SnackBar.razor.cs
@@ -10,7 +10,7 @@ protected override Task OnInitAsync()
     {
         unsubscribe = PubSubService.Subscribe(ClientPubSubMessages.SHOW_SNACK, async args =>
         {
-            var (title, body, color) = (ValueTuple<string, string, BitColor>)args!;
+            var (title, body, color) = ((string, string, BitColor))args!;
 
             await snackbarRef.Show(title, body, color);
         });

diff --git a/...te/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Layout/UserMenu.razor.cs b/...te/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Layout/UserMenu.razor.cs
@@ -39,7 +39,9 @@ protected override async Task OnInitAsync()
         {
             if (payload is null) return;
 
-            user = (UserDto)payload;
+            user = payload is JsonElement jsonDocument 
+                ? jsonDocument.Deserialize(JsonSerializerOptions.GetTypeInfo<UserDto>())! // PROFILE_UPDATED can be invoked from server through SignalR
+                : (UserDto)payload;
 
             await InvokeAsync(StateHasChanged);
         });

diff --git a/...ient/Boilerplate.Client.Core/Components/Pages/Authorized/Dashboard/DashboardPage.razor.cs b/...ient/Boilerplate.Client.Core/Components/Pages/Authorized/Dashboard/DashboardPage.razor.cs
@@ -18,7 +18,7 @@ public partial class DashboardPage
     protected async override Task OnInitAsync()
     {
         //#if (signalR == true)
-        unsubscribe = PubSubService.Subscribe(SharedPubSubMessages.DASHBOARD_DATA_CHANGED, async _ =>
+        unsubscribe = PubSubService.Subscribe(ClientPubSubMessages.DASHBOARD_DATA_CHANGED, async _ =>
         {
             NavigationManager.NavigateTo(Urls.DashboardPage, replace: true);
         });

diff --git a/...plate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Services/ClientPubSubMessages.cs b/...plate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Services/ClientPubSubMessages.cs
@@ -3,7 +3,7 @@
 
 namespace Boilerplate.Client.Core.Services;
 
-public static partial class ClientPubSubMessages
+public partial class ClientPubSubMessages : SharedPubSubMessages
 {
     public const string SHOW_SNACK = nameof(SHOW_SNACK);
     public const string SHOW_MODAL = nameof(SHOW_MODAL);
@@ -12,7 +12,6 @@ public static partial class ClientPubSubMessages
     public const string THEME_CHANGED = nameof(THEME_CHANGED);
     public const string OPEN_NAV_PANEL = nameof(OPEN_NAV_PANEL);
     public const string CULTURE_CHANGED = nameof(CULTURE_CHANGED);
-    public const string PROFILE_UPDATED = nameof(PROFILE_UPDATED);
     /// <summary>
     /// <inheritdoc cref="Parameters.IsOnline"/>
     /// </summary>

diff --git a/...ate/Bit.Boilerplate/src/Server/Boilerplate.Server.Api/Controllers/AttachmentController.cs b/...ate/Bit.Boilerplate/src/Server/Boilerplate.Server.Api/Controllers/AttachmentController.cs
@@ -1,16 +1,24 @@
-using Boilerplate.Server.Api.Models.Identity;
-using FluentStorage.Blobs;
+//+:cnd:noEmit
 using ImageMagick;
+using FluentStorage.Blobs;
+//#if (signalR == true)
+using Microsoft.AspNetCore.SignalR;
+using Boilerplate.Server.Api.SignalR;
+//#endif
+using Boilerplate.Shared.Dtos.Identity;
+using Boilerplate.Server.Api.Models.Identity;
 
 namespace Boilerplate.Server.Api.Controllers;
 
 [Route("api/[controller]/[action]")]
 [ApiController]
 public partial class AttachmentController : AppControllerBase
 {
-    [AutoInject] private UserManager<User> userManager = default!;
-
     [AutoInject] private IBlobStorage blobStorage = default!;
+    [AutoInject] private UserManager<User> userManager = default!;
+    //#if (signalR == true)
+    [AutoInject] private IHubContext<AppHub> appHubContext = default!;
+    //#endif
 
     [HttpPost]
     [RequestSizeLimit(11 * 1024 * 1024 /*11MB*/)]
@@ -63,6 +71,10 @@ public async Task UploadProfileImage(IFormFile? file, CancellationToken cancella
 
             throw;
         }
+
+        //#if (signalR == true)
+        await PublishUserProfileUpdated(user.Map(), cancellationToken);
+        //#endif
     }
 
     [HttpDelete]
@@ -87,6 +99,10 @@ public async Task RemoveProfileImage(CancellationToken cancellationToken)
             throw new ResourceValidationException(result.Errors.Select(err => new LocalizedString(err.Code, err.Description)).ToArray());
 
         await blobStorage.DeleteAsync(filePath, cancellationToken);
+
+        //#if (signalR == true)
+        await PublishUserProfileUpdated(user.Map(), cancellationToken);
+        //#endif
     }
 
     [AllowAnonymous]
@@ -106,4 +122,17 @@ public async Task<IActionResult> GetProfileImage(Guid userId, CancellationToken
 
         return File(await blobStorage.OpenReadAsync(filePath, cancellationToken), "image/webp", enableRangeProcessing: true);
     }
+
+    //#if (signalR == true)
+    private async Task PublishUserProfileUpdated(UserDto user, CancellationToken cancellationToken)
+    {
+        // Notify other sessions of the user that user's info has been updated, so they'll update their UI.
+        var currentUserSessionId = User.GetSessionId();
+        var userSessionIdsExceptCurrentUserSessionId = await DbContext.UserSessions
+            .Where(us => us.UserId == user.Id && us.Id != currentUserSessionId && us.SignalRConnectionId != null)
+        .Select(us => us.SignalRConnectionId!)
+            .ToArrayAsync(cancellationToken);
+        await appHubContext.Clients.Clients(userSessionIdsExceptCurrentUserSessionId).SendAsync(SignalREvents.PUBLISH_MESSAGE, SharedPubSubMessages.PROFILE_UPDATED, user, cancellationToken);
+    }
+    //#endif
 }
diff --git a/...oilerplate/src/Server/Boilerplate.Server.Api/Controllers/Categories/CategoryController.cs b/...oilerplate/src/Server/Boilerplate.Server.Api/Controllers/Categories/CategoryController.cs
@@ -100,7 +100,7 @@ private async Task PublishDashboardDataChanged(CancellationToken cancellationTok
     {
         // Checkout AppHub's comments for more info.
         // In order to exclude current user session, gets its signalR connection id from database and use GroupExcept instead.
-        await appHubContext.Clients.Group("AuthenticatedClients").SendAsync(SignalREvents.PUBLISH_MESSAGE, SharedPubSubMessages.DASHBOARD_DATA_CHANGED, cancellationToken);
+        await appHubContext.Clients.Group("AuthenticatedClients").SendAsync(SignalREvents.PUBLISH_MESSAGE, SharedPubSubMessages.DASHBOARD_DATA_CHANGED, null, cancellationToken);
     }
     //#endif
 }

diff --git a/.../Bit.Boilerplate/src/Server/Boilerplate.Server.Api/Controllers/Identity/UserController.cs b/.../Bit.Boilerplate/src/Server/Boilerplate.Server.Api/Controllers/Identity/UserController.cs
@@ -88,7 +88,7 @@ public async Task RevokeSession(Guid id, CancellationToken cancellationToken)
         // Checkout AppHub's comments for more info.
         if (userSession.SignalRConnectionId is not null)
         {
-            await appHubContext.Clients.Client(userSession.SignalRConnectionId).SendAsync(SignalREvents.PUBLISH_MESSAGE, SharedPubSubMessages.SESSION_REVOKED, cancellationToken);
+            await appHubContext.Clients.Client(userSession.SignalRConnectionId).SendAsync(SignalREvents.PUBLISH_MESSAGE, SharedPubSubMessages.SESSION_REVOKED, null, cancellationToken);
         }
         //#endif
     }
@@ -107,7 +107,19 @@ public async Task<UserDto> Update(EditUserDto userDto, CancellationToken cancell
         if (result.Succeeded is false)
             throw new ResourceValidationException(result.Errors.Select(err => new LocalizedString(err.Code, err.Description)).ToArray());
 
-        return await GetCurrentUser(cancellationToken);
+        var updatedUser = await GetCurrentUser(cancellationToken);
+
+        //#if (signalR == true)
+        // Notify other sessions of the user that user's info has been updated, so they'll update their UI.
+        var currentUserSessionId = User.GetSessionId();
+        var userSessionIdsExceptCurrentUserSessionId = await DbContext.UserSessions
+            .Where(us => us.UserId == user.Id && us.Id != currentUserSessionId && us.SignalRConnectionId != null)
+            .Select(us => us.SignalRConnectionId!)
+            .ToArrayAsync(cancellationToken);
+        await appHubContext.Clients.Clients(userSessionIdsExceptCurrentUserSessionId).SendAsync(SignalREvents.PUBLISH_MESSAGE, SharedPubSubMessages.PROFILE_UPDATED, updatedUser, cancellationToken);
+        //#endif
+
+        return updatedUser;
     }
 
     [HttpPost]

diff --git a/...t.Boilerplate/src/Server/Boilerplate.Server.Api/Controllers/Products/ProductController.cs b/...t.Boilerplate/src/Server/Boilerplate.Server.Api/Controllers/Products/ProductController.cs
@@ -95,7 +95,7 @@ private async Task PublishDashboardDataChanged(CancellationToken cancellationTok
     {
         // Checkout AppHub's comments for more info.
         // In order to exclude current user session, gets its signalR connection id from database and use GroupExcept instead.
-        await appHubContext.Clients.Group("AuthenticatedClients").SendAsync(SignalREvents.PUBLISH_MESSAGE, SharedPubSubMessages.DASHBOARD_DATA_CHANGED, cancellationToken);
+        await appHubContext.Clients.Group("AuthenticatedClients").SendAsync(SignalREvents.PUBLISH_MESSAGE, SharedPubSubMessages.DASHBOARD_DATA_CHANGED, null, cancellationToken);
     }
     //#endif
 }

diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Shared/Services/SharedPubSubMessages.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Shared/Services/SharedPubSubMessages.cs
@@ -6,13 +6,15 @@ namespace Boilerplate.Shared.Services;
 /// message keys used for pub/sub messaging between server and client through SignalR.
 /// For client-only pub/sub messages, refer to the ClientPubSubMessages class in the Client/Core project.
 /// </summary>
-public static partial class SharedPubSubMessages
+public partial class SharedPubSubMessages
 {
     //#if (sample == "Admin")
     public const string DASHBOARD_DATA_CHANGED = nameof(DASHBOARD_DATA_CHANGED);
     //#endif
 
     public const string SESSION_REVOKED = nameof(SESSION_REVOKED);
+
+    public const string PROFILE_UPDATED = nameof(PROFILE_UPDATED);
 }
 
 public static partial class SignalREvents