-
-
Notifications
You must be signed in to change notification settings - Fork 232
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
feat(templates): improve SignalR implementation in Boilerplate (#8557) (
- Loading branch information
Showing
15 changed files
with
180 additions
and
182 deletions.
There are no files selected for viewing
157 changes: 157 additions & 0 deletions
157
...ilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/AppInitializer.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,157 @@ | ||
| //+:cnd:noEmit | ||
| using Microsoft.Extensions.Logging; | ||
| //#if (signalr == true) | ||
| using Microsoft.AspNetCore.SignalR.Client; | ||
| //#endif | ||
|
|
||
| namespace Boilerplate.Client.Core.Components; | ||
|
|
||
| public partial class AppInitializer : AppComponentBase | ||
| { | ||
| //#if (signalr == true) | ||
| private HubConnection? hubConnection; | ||
| //#endif | ||
|
|
||
| [AutoInject] private MessageBoxService messageBoxService = default!; | ||
| [AutoInject] private AuthenticationManager authManager = default!; | ||
| [AutoInject] private IJSRuntime jsRuntime = default!; | ||
| [AutoInject] private IBitDeviceCoordinator bitDeviceCoordinator = default!; | ||
| [AutoInject] private IStorageService storageService = default!; | ||
| [AutoInject] private CultureInfoManager cultureInfoManager = default!; | ||
| [AutoInject] private ILogger<AuthenticationManager> authLogger = default!; | ||
|
|
||
| protected async override Task OnInitAsync() | ||
| { | ||
| AuthenticationManager.AuthenticationStateChanged += AuthenticationStateChanged; | ||
|
|
||
| AuthenticationStateChanged(AuthenticationManager.GetAuthenticationStateAsync()); | ||
|
|
||
| if (AppPlatform.IsBlazorHybrid) | ||
| { | ||
| if (CultureInfoManager.MultilingualEnabled) | ||
| { | ||
| cultureInfoManager.SetCurrentCulture(await storageService.GetItem("Culture") ?? // 1- User settings | ||
| CultureInfo.CurrentUICulture.Name); // 2- OS settings | ||
| } | ||
|
|
||
| await SetupBodyClasses(); | ||
| } | ||
|
|
||
| await base.OnInitAsync(); | ||
| } | ||
|
|
||
| protected override async Task OnAfterFirstRenderAsync() | ||
| { | ||
| await base.OnAfterFirstRenderAsync(); | ||
|
|
||
| if (AppPlatform.IsBlazorHybrid is false) | ||
| { | ||
| AppPlatform.OSDescription = await jsRuntime.GetBrowserPlatform(); | ||
| } | ||
| } | ||
|
|
||
| private async void AuthenticationStateChanged(Task<AuthenticationState> task) | ||
| { | ||
| try | ||
| { | ||
| var user = (await AuthenticationStateTask).User; | ||
|
|
||
| var (isUserAuthenticated, userId, userName, email, sessionId) = user.IsAuthenticated() ? (user.IsAuthenticated(), user.GetUserId().ToString(), user.GetUserName(), user.GetEmail(), user.GetSessionId()) : default; | ||
|
|
||
| LogAuthenticationState(authLogger, isUserAuthenticated, userId, userName, email, sessionId); | ||
|
|
||
| //#if (signalr == true) | ||
| if (InPrerenderSession is false) | ||
| { | ||
| await ConnectSignalR(); | ||
| } | ||
| //#endif | ||
| } | ||
| catch (Exception exp) | ||
| { | ||
| ExceptionHandler.Handle(exp); | ||
| } | ||
| } | ||
|
|
||
| [LoggerMessage(Level = LogLevel.Information, Message = "Authentication State: {IsUserAuthenticated}, {UserId}, {UserName}, {Email}, {UserSessionId}")] | ||
| private static partial void LogAuthenticationState(ILogger logger, bool isUserAuthenticated, string userId, string userName, string? email, string? userSessionId); | ||
|
|
||
| //#if (signalr == true) | ||
| private async Task ConnectSignalR() | ||
| { | ||
| if (hubConnection is not null) | ||
| { | ||
| await hubConnection.DisposeAsync(); | ||
| } | ||
|
|
||
| var access_token = await AuthTokenProvider.GetAccessTokenAsync(); | ||
|
|
||
| hubConnection = new HubConnectionBuilder() | ||
| .WithUrl($"{Configuration.GetServerAddress()}/app-hub?access_token={access_token}") | ||
| .Build(); | ||
|
|
||
| hubConnection.On<string>("TwoFactorToken", async (token) => | ||
| { | ||
| await messageBoxService.Show(Localizer[nameof(AppStrings.TwoFactorTokenPushText), token]); | ||
|
|
||
| // The following code block is not required for Bit.BlazorUI components to perform UI changes. However, it may be necessary in other scenarios. | ||
| /*await InvokeAsync(async () => | ||
| { | ||
| StateHasChanged(); | ||
| });*/ | ||
|
|
||
| // You can also leverage IPubSubService to notify other components in the application. | ||
| }); | ||
|
|
||
| await hubConnection.StartAsync(CurrentCancellationToken); | ||
| } | ||
| //#endif | ||
|
|
||
| private async Task SetupBodyClasses() | ||
| { | ||
| var cssClasses = new List<string> { }; | ||
|
|
||
| if (AppPlatform.IsWindows) | ||
| { | ||
| cssClasses.Add("bit-windows"); | ||
| } | ||
| else if (AppPlatform.IsMacOS) | ||
| { | ||
| cssClasses.Add("bit-macos"); | ||
| } | ||
| else if (AppPlatform.IsIOS) | ||
| { | ||
| cssClasses.Add("bit-ios"); | ||
| } | ||
| else if (AppPlatform.IsAndroid) | ||
| { | ||
| cssClasses.Add("bit-android"); | ||
| } | ||
|
|
||
| var cssVariables = new Dictionary<string, string>(); | ||
| var statusBarHeight = bitDeviceCoordinator.GetStatusBarHeight(); | ||
|
|
||
| if (AppPlatform.IsMacOS is false) | ||
| { | ||
| //For iOS this is handled in css using safe-area env() variables | ||
| //For Android there's an issue with keyboard in fullscreen mode. more info: https://github.com/bitfoundation/bitplatform/issues/5626 | ||
| //For Windows there's an issue with TitleBar. more info: https://github.com/bitfoundation/bitplatform/issues/5695 | ||
| statusBarHeight = 0; | ||
| } | ||
|
|
||
| cssVariables.Add("--bit-status-bar-height", $"{statusBarHeight.ToString("F3", CultureInfo.InvariantCulture)}px"); | ||
| await jsRuntime.ApplyBodyElementClasses(cssClasses, cssVariables); | ||
| } | ||
|
|
||
| //#if (signalr == true) | ||
| protected override async ValueTask DisposeAsync(bool disposing) | ||
| { | ||
| if (hubConnection is not null) | ||
| { | ||
| await hubConnection.DisposeAsync(); | ||
| } | ||
|
|
||
| await base.DisposeAsync(disposing); | ||
| } | ||
| //#endif | ||
| } |
36 changes: 0 additions & 36 deletions
36
...it.Boilerplate/src/Client/Boilerplate.Client.Core/Components/AuthenticationStateLogger.cs
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Routes.razor
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.