diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/LoadingComponent.razor.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/LoadingComponent.razor.cs
index 0b86f459bf..cdffb31c3e 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/LoadingComponent.razor.cs
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/LoadingComponent.razor.cs
@@ -1,6 +1,38 @@
-namespace Boilerplate.Client.Core.Components;
+
+namespace Boilerplate.Client.Core.Components;
public partial class LoadingComponent
{
[Parameter] public string Color { get; set; } = "#123456";
+
+ ///
+ /// Renders the Loading component in full-screen mode that renders over all other components.
+ ///
+ [Parameter] public bool FullScreen { get; set; }
+
+ ///
+ /// This component is used in different parts of the application under varying conditions.
+ ///
+ /// 1. In App.razor, for non-prerendered applications, this component displays minimal content before
+ /// Blazor fully loads. Since it doesn’t automatically get removed after the app loads, the z-index is set to -1
+ /// to ensure that once Blazor renders the main components, the loader falls behind the main content and becomes hidden.
+ /// Additionally, the z-index will not change because @rendermode in App.razor is null, which prevents the OnAfterRender
+ /// method from being invoked.
+ ///
+ /// 2. In other parts of the project, like during Authorizing and Navigating, the component is automatically
+ /// removed from the screen, so a negative z-index is unnecessary and could actually cause it to be invisible.
+ /// In these cases, it needs a higher z-index to ensure it appears above other components. The new z-index value
+ /// is applied in the OnAfterRender lifecycle method.
+ ///
+ private string zIndex = "-1";
+ protected override void OnAfterRender(bool firstRender)
+ {
+ if (firstRender)
+ {
+ zIndex = "999999";
+ StateHasChanged();
+ }
+
+ base.OnAfterRender(firstRender);
+ }
}
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Pages/AppPageBase.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Pages/AppPageBase.cs
index 3cfdab7f62..1434a202ae 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Pages/AppPageBase.cs
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Pages/AppPageBase.cs
@@ -20,7 +20,7 @@ protected override async Task OnAfterRenderAsync(bool firstRender)
{
// Because Blazor router doesn't support regex, the '/{culture?}/' captures some irrelevant routes
// such as non existing routes like /some-invalid-url, we need to make sure that the first segment of the route is a valid culture name.
- NavigationManager.NavigateTo($"{Urls.NotFoundPage}?url={NavigationManager.ToBaseRelativePath(NavigationManager.Uri)}");
+ NavigationManager.NavigateTo($"{Urls.NotFoundPage}?url={NavigationManager.ToBaseRelativePath(NavigationManager.Uri)}", replace: true);
}
}
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Pages/Authorized/Categories/AddOrEditCategoryPage.razor b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Pages/Authorized/Categories/AddOrEditCategoryPage.razor
index 879b3a31ec..b6af81d804 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Pages/Authorized/Categories/AddOrEditCategoryPage.razor
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Pages/Authorized/Categories/AddOrEditCategoryPage.razor
@@ -1,5 +1,6 @@
@attribute [Route(Urls.AddOrEditCategoryPage + "/{Id:guid?}")]
@attribute [Route("{culture?}" + Urls.AddOrEditCategoryPage + "/{Id:guid?}")]
+@attribute [Authorize]
@inherits AppPageBase
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Pages/Authorized/Categories/AddOrEditCategoryPage.razor.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Pages/Authorized/Categories/AddOrEditCategoryPage.razor.cs
index 6fa4711de5..a6d2d5a09e 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Pages/Authorized/Categories/AddOrEditCategoryPage.razor.cs
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Pages/Authorized/Categories/AddOrEditCategoryPage.razor.cs
@@ -3,7 +3,6 @@
namespace Boilerplate.Client.Core.Components.Pages.Authorized.Categories;
-[Authorize]
public partial class AddOrEditCategoryPage
{
protected override string? Title => Localizer[nameof(AppStrings.Category)];
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Pages/Authorized/Offline/OfflineEditProfilePage.razor b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Pages/Authorized/Offline/OfflineEditProfilePage.razor
index 6a32773b9c..7cafa588a3 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Pages/Authorized/Offline/OfflineEditProfilePage.razor
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Pages/Authorized/Offline/OfflineEditProfilePage.razor
@@ -1,14 +1,18 @@
-@attribute [Route(Urls.OfflineEditProfilePage)]
+@attribute [Route(Urls.OfflineEditProfilePage)]
@attribute [Route("{culture?}" + Urls.OfflineEditProfilePage)]
@attribute [Authorize]
@inherits AppPageBase
-@Localizer[nameof(AppStrings.EditProfileTitle)]
+@Localizer[nameof(AppStrings.OfflineEditProfileTitle)]
- @Localizer[nameof(AppStrings.EditProfileTitle)]
+ @Localizer[nameof(AppStrings.OfflineEditProfileTitle)]
+
+
+
+ @Localizer[nameof(AppStrings.OfflineEditProfileMessage)]
@if (isLoading)
@@ -16,7 +20,7 @@
}
-
+
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Pages/Authorized/Offline/OfflineEditProfilePage.razor.scss b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Pages/Authorized/Offline/OfflineEditProfilePage.razor.scss
index 7b1d922f13..1ec5d1823d 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Pages/Authorized/Offline/OfflineEditProfilePage.razor.scss
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Pages/Authorized/Offline/OfflineEditProfilePage.razor.scss
@@ -1,8 +1,2 @@
section {
}
-
-::deep {
- form {
- width: min(25rem, 100%);
- }
-}
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Pages/Authorized/Products/AddOrEditProductModal.razor.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Pages/Authorized/Products/AddOrEditProductModal.razor.cs
index df7bb6c2af..a49e5ea436 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Pages/Authorized/Products/AddOrEditProductModal.razor.cs
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Pages/Authorized/Products/AddOrEditProductModal.razor.cs
@@ -1,5 +1,5 @@
using Boilerplate.Shared.Controllers.Categories;
-using Boilerplate.Shared.Controllers.Product;
+using Boilerplate.Shared.Controllers.Products;
using Boilerplate.Shared.Dtos.Products;
namespace Boilerplate.Client.Core.Components.Pages.Authorized.Products;
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Pages/Authorized/Products/ProductsPage.razor.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Pages/Authorized/Products/ProductsPage.razor.cs
index 055df432d0..4158d651e2 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Pages/Authorized/Products/ProductsPage.razor.cs
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Pages/Authorized/Products/ProductsPage.razor.cs
@@ -1,5 +1,5 @@
//-:cnd:noEmit
-using Boilerplate.Shared.Controllers.Product;
+using Boilerplate.Shared.Controllers.Products;
using Boilerplate.Shared.Dtos.Products;
namespace Boilerplate.Client.Core.Components.Pages.Authorized.Products;
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Pages/Authorized/Settings/Accordion.razor b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Pages/Authorized/Settings/Accordion.razor
index 50d3ebaa07..d8c6dcbed3 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Pages/Authorized/Settings/Accordion.razor
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Pages/Authorized/Settings/Accordion.razor
@@ -1,6 +1,8 @@
@inherits AppComponentBase
-
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Pages/Authorized/Settings/ChangeEmailSection.razor b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Pages/Authorized/Settings/ChangeEmailSection.razor
index ec7c7557e1..e70b0803d6 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Pages/Authorized/Settings/ChangeEmailSection.razor
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Pages/Authorized/Settings/ChangeEmailSection.razor
@@ -4,7 +4,7 @@
@if (showConfirmation is false)
{
-
+
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Pages/Authorized/Settings/ChangeEmailSection.razor.scss b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Pages/Authorized/Settings/ChangeEmailSection.razor.scss
index ca0af593d5..7fca1eb544 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Pages/Authorized/Settings/ChangeEmailSection.razor.scss
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Pages/Authorized/Settings/ChangeEmailSection.razor.scss
@@ -1,10 +1,3 @@
section {
width: 100%;
}
-
-::deep {
- form {
- width: 100%;
- max-width: 27rem;
- }
-}
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Pages/Authorized/Settings/ChangePhoneNumberSection.razor b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Pages/Authorized/Settings/ChangePhoneNumberSection.razor
index 7df89cd0f7..38771ad1e6 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Pages/Authorized/Settings/ChangePhoneNumberSection.razor
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Pages/Authorized/Settings/ChangePhoneNumberSection.razor
@@ -4,7 +4,7 @@
@if (showConfirmation is false)
{
-
+
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Pages/Authorized/Settings/ChangePhoneNumberSection.razor.scss b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Pages/Authorized/Settings/ChangePhoneNumberSection.razor.scss
index ca0af593d5..7fca1eb544 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Pages/Authorized/Settings/ChangePhoneNumberSection.razor.scss
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Pages/Authorized/Settings/ChangePhoneNumberSection.razor.scss
@@ -1,10 +1,3 @@
section {
width: 100%;
}
-
-::deep {
- form {
- width: 100%;
- max-width: 27rem;
- }
-}
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Pages/Authorized/Settings/DeleteAccountSection.razor b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Pages/Authorized/Settings/DeleteAccountSection.razor
index 984e417909..83eb2987f9 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Pages/Authorized/Settings/DeleteAccountSection.razor
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Pages/Authorized/Settings/DeleteAccountSection.razor
@@ -1,15 +1,15 @@
@inherits AppComponentBase
-
+
@Localizer[nameof(AppStrings.DeleteAccount)]
-
+
@Localizer[nameof(AppStrings.DeleteAccountPrompt)]
-
+
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Pages/Authorized/Settings/DeleteAccountSection.razor.scss b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Pages/Authorized/Settings/DeleteAccountSection.razor.scss
index ec82ca4dcc..00b117f7f7 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Pages/Authorized/Settings/DeleteAccountSection.razor.scss
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Pages/Authorized/Settings/DeleteAccountSection.razor.scss
@@ -3,9 +3,3 @@ section {
display: flex;
justify-content: center;
}
-
-::deep {
- .stack {
- max-width: 27rem;
- }
-}
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Pages/Authorized/Settings/ProfileSection.razor b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Pages/Authorized/Settings/ProfileSection.razor
index a2d677d5c8..a96b81ffa0 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Pages/Authorized/Settings/ProfileSection.razor
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Pages/Authorized/Settings/ProfileSection.razor
@@ -54,7 +54,7 @@
}
-
+
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Pages/Authorized/Settings/ProfileSection.razor.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Pages/Authorized/Settings/ProfileSection.razor.cs
index 1eaea48056..da318e973f 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Pages/Authorized/Settings/ProfileSection.razor.cs
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Pages/Authorized/Settings/ProfileSection.razor.cs
@@ -26,9 +26,8 @@ protected override async Task OnInitAsync()
removeProfileImageHttpUrl = $"api/Attachment/RemoveProfileImage?access_token={access_token}";
- var serverAddress = Configuration.GetServerAddress();
- profileImageUrl = $"{serverAddress}/api/Attachment/GetProfileImage?access_token={access_token}";
- profileImageUploadUrl = $"{serverAddress}/api/Attachment/UploadProfileImage?access_token={access_token}";
+ profileImageUrl = new Uri(AbsoluteServerAddress, $"/api/Attachment/GetProfileImage?access_token={access_token}").ToString();
+ profileImageUploadUrl = new Uri(AbsoluteServerAddress, $"/api/Attachment/UploadProfileImage?access_token={access_token}").ToString();
await base.OnInitAsync();
}
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Pages/Authorized/Settings/ProfileSection.razor.scss b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Pages/Authorized/Settings/ProfileSection.razor.scss
index ca0af593d5..7fca1eb544 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Pages/Authorized/Settings/ProfileSection.razor.scss
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Pages/Authorized/Settings/ProfileSection.razor.scss
@@ -1,10 +1,3 @@
section {
width: 100%;
}
-
-::deep {
- form {
- width: 100%;
- max-width: 27rem;
- }
-}
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Pages/Authorized/Settings/SettingsPage.razor b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Pages/Authorized/Settings/SettingsPage.razor
index 317b02acfe..d4dea84563 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Pages/Authorized/Settings/SettingsPage.razor
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Pages/Authorized/Settings/SettingsPage.razor
@@ -12,13 +12,15 @@
-
-
@@ -39,13 +41,15 @@
-
-
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Pages/Authorized/Settings/SettingsPage.razor.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Pages/Authorized/Settings/SettingsPage.razor.cs
index 4f9869aa37..6ac9471092 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Pages/Authorized/Settings/SettingsPage.razor.cs
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Pages/Authorized/Settings/SettingsPage.razor.cs
@@ -32,9 +32,8 @@ protected override async Task OnInitAsync()
{
user = await userController.GetCurrentUser(CurrentCancellationToken);
- var serverAddress = Configuration.GetServerAddress();
var access_token = await PrerenderStateService.GetValue(AuthTokenProvider.GetAccessToken);
- profileImageUrl = $"{serverAddress}/api/Attachment/GetProfileImage?access_token={access_token}";
+ profileImageUrl = new Uri(AbsoluteServerAddress, $"/api/Attachment/GetProfileImage?access_token={access_token}").ToString();
}
finally
{
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Pages/HomePage.razor b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Pages/HomePage.razor
index c05631ff55..bdec845cc6 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Pages/HomePage.razor
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Pages/HomePage.razor
@@ -23,7 +23,93 @@
Href="https://github.com/bitfoundation/bitplatform/tree/develop/src/Templates/Boilerplate">
@Localizer[nameof(AppStrings.GitHubRepo)]
-
+
+
+
+
+
+ @if (isLoading)
+ {
+
+ }
+ else if (gitHubStats is not null)
+ {
+
+
+ Name:
+ @gitHubStats.Name
+
+
+ Description:
+ @gitHubStats.Description
+
+
+ Homepage:
+ @gitHubStats.Homepage
+
+
+ Total stars:
+ @gitHubStats.StargazersCount.ToString("N0")
+
+
+ Forks count:
+ @gitHubStats.ForksCount.ToString("N0")
+
+
+ Open issues count:
+ @gitHubStats.OpenIssuesCount.ToString("N0")
+
+
+ Default branch:
+ @gitHubStats.DefaultBranch
+
+
+ }
+ else
+ {
+ Stats could not be loaded.
+ }
+
+
+ @if (isLoading)
+ {
+
+ }
+ else if (nugetStats is not null)
+ {
+ var data = nugetStats.Data[0];
+
+
+ Package id:
+ @data.Id
+
+
+ Version:
+ @data.Version
+
+
+ Title:
+ @data.Title
+
+
+ Project url:
+ @data.ProjectUrl
+
+
+ Total downloads:
+ @data.TotalDownloads.ToString("N0")
+
+
+ }
+ else
+ {
+ Stats could not be loaded.
+ }
+
+
+
+
@@ -36,6 +122,9 @@
+
+
+
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Pages/HomePage.razor.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Pages/HomePage.razor.cs
index 6ce99ea79c..d77a5634ee 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Pages/HomePage.razor.cs
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Pages/HomePage.razor.cs
@@ -1,10 +1,40 @@
-namespace Boilerplate.Client.Core.Components.Pages;
+using Boilerplate.Shared.Controllers.Statistics;
+using Boilerplate.Shared.Dtos.Statistics;
+
+namespace Boilerplate.Client.Core.Components.Pages;
public partial class HomePage
{
protected override string? Title => Localizer[nameof(AppStrings.Home)];
protected override string? Subtitle => string.Empty;
-
[CascadingParameter] private BitDir? currentDir { get; set; }
+
+ [AutoInject] private IStatisticsController statisticsController = default!;
+
+ private bool isLoading = true;
+ private GitHubStats? gitHubStats;
+ private NugetStatsDto? nugetStats;
+
+ protected override async Task OnInitAsync()
+ {
+ await base.OnInitAsync();
+
+ try
+ {
+ (nugetStats, gitHubStats) = await (
+ statisticsController.GetNugetStats(packageId: "Bit.BlazorUI", CurrentCancellationToken),
+ statisticsController.GetGitHubStats(CurrentCancellationToken));
+ }
+ catch
+ {
+ // If required, you should typically manage the authorization header for external APIs in **AuthDelegatingHandler.cs** and handle error extraction from failed responses in **ExceptionDelegatingHandler.cs**.
+ // These external API calls are provided as sample references for anonymous API usage in pre-rendering anonymous pages, and comprehensive exception handling is not intended for these examples.
+ // However, the logic in other HTTP message handlers, such as **LoggingDelegatingHandler** and **RetryDelegatingHandler**, effectively addresses most scenarios.
+ }
+ finally
+ {
+ isLoading = false;
+ }
+ }
}
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Pages/Identity/ConfirmPage.razor b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Pages/Identity/ConfirmPage.razor
index 944fa04ae3..2c1d96c3b6 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Pages/Identity/ConfirmPage.razor
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Pages/Identity/ConfirmPage.razor
@@ -7,148 +7,150 @@
- @Localizer[nameof(AppStrings.ConfirmTitle)]
-
-
- @if (showEmailConfirmation)
- {
-
-
- @if (isEmailConfirmed is false)
- {
-
- @Localizer[nameof(AppStrings.ConfirmEmailSubtitle)]
- @Localizer[nameof(AppStrings.ConfirmEmailMessage)]
-
-
-
-
-
-
-
-
-
-
-
-
-
- @Localizer[nameof(AppStrings.EmailTokenConfirmButtonText)]
-
-
-
-
-
- @Localizer[nameof(AppStrings.NotReceivedEmailMessage)]
-
-
-
- @Localizer[nameof(AppStrings.CheckSpamMailMessage)]
-
-
-
- @Localizer[nameof(AppStrings.ResendEmailTokenButtonText)]
-
- }
- else
- {
-
- @Localizer[nameof(AppStrings.EmailConfirmationSuccessTitle), emailModel.Email!]
-
-
-
- @Localizer[nameof(AppStrings.EmailConfirmationSuccessMessage)]
-
-
- @Localizer[nameof(AppStrings.SignIn)]
- }
-
-
- }
-
- @if (showPhoneConfirmation)
- {
-
-
- @if (isPhoneConfirmed is false)
- {
-
- @Localizer[nameof(AppStrings.ConfirmPhoneSubtitle)]
- @Localizer[nameof(AppStrings.ConfirmPhoneMessage)]
-
-
-
-
-
-
-
-
-
-
-
-
-
- @Localizer[nameof(AppStrings.PhoneTokenConfirmButtonText)]
-
-
-
-
-
- @Localizer[nameof(AppStrings.NotReceivedPhoneMessage)]
-
-
-
- @Localizer[nameof(AppStrings.ResendPhoneTokenButtonText)]
-
- }
- else
- {
-
- @Localizer[nameof(AppStrings.PhoneConfirmationSuccessTitle), phoneModel.PhoneNumber!]
-
-
-
- @Localizer[nameof(AppStrings.PhoneConfirmationSuccessMessage)]
-
-
- @Localizer[nameof(AppStrings.SignIn)]
- }
-
-
- }
-
-
-
- @Localizer[nameof(AppStrings.SignIn)]
- @Localizer[nameof(AppStrings.Or)]
- @Localizer[nameof(AppStrings.SignUp)]
+
+ @Localizer[nameof(AppStrings.ConfirmTitle)]
+
+
+ @if (showEmailConfirmation)
+ {
+
+
+ @if (isEmailConfirmed is false)
+ {
+
+ @Localizer[nameof(AppStrings.ConfirmEmailSubtitle)]
+ @Localizer[nameof(AppStrings.ConfirmEmailMessage)]
+
+
+
+
+
+
+
+
+
+
+
+
+
+ @Localizer[nameof(AppStrings.EmailTokenConfirmButtonText)]
+
+
+
+
+
+ @Localizer[nameof(AppStrings.NotReceivedEmailMessage)]
+
+
+
+ @Localizer[nameof(AppStrings.CheckSpamMailMessage)]
+
+
+
+ @Localizer[nameof(AppStrings.ResendEmailTokenButtonText)]
+
+ }
+ else
+ {
+
+ @Localizer[nameof(AppStrings.EmailConfirmationSuccessTitle), emailModel.Email!]
+
+
+
+ @Localizer[nameof(AppStrings.EmailConfirmationSuccessMessage)]
+
+
+ @Localizer[nameof(AppStrings.SignIn)]
+ }
+
+
+ }
+
+ @if (showPhoneConfirmation)
+ {
+
+
+ @if (isPhoneConfirmed is false)
+ {
+
+ @Localizer[nameof(AppStrings.ConfirmPhoneSubtitle)]
+ @Localizer[nameof(AppStrings.ConfirmPhoneMessage)]
+
+
+
+
+
+
+
+
+
+
+
+
+
+ @Localizer[nameof(AppStrings.PhoneTokenConfirmButtonText)]
+
+
+
+
+
+ @Localizer[nameof(AppStrings.NotReceivedPhoneMessage)]
+
+
+
+ @Localizer[nameof(AppStrings.ResendPhoneTokenButtonText)]
+
+ }
+ else
+ {
+
+ @Localizer[nameof(AppStrings.PhoneConfirmationSuccessTitle), phoneModel.PhoneNumber!]
+
+
+
+ @Localizer[nameof(AppStrings.PhoneConfirmationSuccessMessage)]
+
+
+ @Localizer[nameof(AppStrings.SignIn)]
+ }
+
+
+ }
+
+
+
+ @Localizer[nameof(AppStrings.SignIn)]
+ @Localizer[nameof(AppStrings.Or)]
+ @Localizer[nameof(AppStrings.SignUp)]
+
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Pages/Identity/ConfirmPage.razor.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Pages/Identity/ConfirmPage.razor.cs
index ef0fd495cf..0a30948be9 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Pages/Identity/ConfirmPage.razor.cs
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Pages/Identity/ConfirmPage.razor.cs
@@ -77,7 +77,7 @@ await WrapRequest(async () =>
{
var signInResponse = await identityController.ConfirmEmail(new() { Email = emailModel.Email, Token = emailModel.Token }, CurrentCancellationToken);
- await AuthenticationManager.OnNewToken(signInResponse, true);
+ await AuthenticationManager.StoreTokens(signInResponse, true);
NavigationManager.NavigateTo(Urls.HomePage, replace: true);
@@ -103,7 +103,7 @@ await WrapRequest(async () =>
{
var signInResponse = await identityController.ConfirmPhone(new() { PhoneNumber = phoneModel.PhoneNumber, Token = phoneModel.Token }, CurrentCancellationToken);
- await AuthenticationManager.OnNewToken(signInResponse, true);
+ await AuthenticationManager.StoreTokens(signInResponse, true);
NavigationManager.NavigateTo(Urls.HomePage, replace: true);
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Pages/Identity/ConfirmPage.razor.scss b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Pages/Identity/ConfirmPage.razor.scss
index 189bd821d2..17d0d236ed 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Pages/Identity/ConfirmPage.razor.scss
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Pages/Identity/ConfirmPage.razor.scss
@@ -4,9 +4,3 @@ section {
width: 100%;
height: 100%;
}
-
-::deep {
- .confirm-pivot {
- width: 304px;
- }
-}
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Pages/Identity/ForgotPasswordPage.razor b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Pages/Identity/ForgotPasswordPage.razor
index 502e669d22..f7ac8faac2 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Pages/Identity/ForgotPasswordPage.razor
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Pages/Identity/ForgotPasswordPage.razor
@@ -7,55 +7,57 @@
- @Localizer[nameof(AppStrings.ForgotPasswordTitle)]
+
+ @Localizer[nameof(AppStrings.ForgotPasswordTitle)]
-
- @Localizer[nameof(AppStrings.ForgotPasswordMessage)]
-
-
-
-
-
-
-
-
-
-
-
+
+ @Localizer[nameof(AppStrings.ForgotPasswordMessage)]
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
+
+
+ @Localizer[nameof(AppStrings.Submit)]
+
-
- @Localizer[nameof(AppStrings.Submit)]
-
-
-
-
-
- @Localizer[nameof(AppStrings.ResetPasswordMessageInForgot)]
- @Localizer[nameof(AppStrings.ResetPassword)]
-
+
+
+
+ @Localizer[nameof(AppStrings.ResetPasswordMessageInForgot)]
+ @Localizer[nameof(AppStrings.ResetPassword)]
+
-
- @Localizer[nameof(AppStrings.SignIn)]
- @Localizer[nameof(AppStrings.Or)]
- @Localizer[nameof(AppStrings.SignUp)]
+
+ @Localizer[nameof(AppStrings.SignIn)]
+ @Localizer[nameof(AppStrings.Or)]
+ @Localizer[nameof(AppStrings.SignUp)]
+
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Pages/Identity/ForgotPasswordPage.razor.scss b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Pages/Identity/ForgotPasswordPage.razor.scss
index 0fb1d9708a..17d0d236ed 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Pages/Identity/ForgotPasswordPage.razor.scss
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Pages/Identity/ForgotPasswordPage.razor.scss
@@ -4,9 +4,3 @@ section {
width: 100%;
height: 100%;
}
-
-::deep {
- form {
- width: 304px;
- }
-}
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Pages/Identity/ResetPasswordPage.razor b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Pages/Identity/ResetPasswordPage.razor
index 731f87cb61..2fa2de5f3c 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Pages/Identity/ResetPasswordPage.razor
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Pages/Identity/ResetPasswordPage.razor
@@ -6,149 +6,151 @@
- @Localizer[nameof(AppStrings.ResetPasswordTitle)]
+
+ @Localizer[nameof(AppStrings.ResetPasswordTitle)]
- @if (isPasswordChanged is false)
- {
-
- @Localizer[nameof(AppStrings.ResetPasswordSubtitle)]
- @Localizer[nameof(AppStrings.ResetPasswordMessage)]
-
-
-
-
+ @if (isPasswordChanged is false)
+ {
+
+ @Localizer[nameof(AppStrings.ResetPasswordSubtitle)]
+ @Localizer[nameof(AppStrings.ResetPasswordMessage)]
+
+
+
+
-
- @if (isTokenEntered is false)
- {
-
- @if (showEmail && showPhone)
- {
-
-
-
-
-
+
+ @if (isTokenEntered is false)
+ {
+
+ @if (showEmail && showPhone)
+ {
+
+
+
+
+
-
-
-
-
-
- }
- else if (showEmail)
+
+
+
+
+
+ }
+ else if (showEmail)
+ {
+
+
+ }
+ else if (showPhone)
+ {
+
+
+ }
+
+
+
+
+
+
+ @Localizer[nameof(AppStrings.Continue)]
+
+
+ @if (selectedKey == EmailKey)
{
-
-
+
+ @Localizer[nameof(AppStrings.NotReceivedEmailMessage)]
+
+ @Localizer[nameof(AppStrings.CheckSpamMailMessage)]
+
}
- else if (showPhone)
+ else
{
-
-
+
+ @Localizer[nameof(AppStrings.NotReceivedPhoneMessage)]
+
}
-
-
-
-
-
- @Localizer[nameof(AppStrings.Continue)]
-
-
- @if (selectedKey == EmailKey)
- {
-
- @Localizer[nameof(AppStrings.NotReceivedEmailMessage)]
-
- @Localizer[nameof(AppStrings.CheckSpamMailMessage)]
-
+
+ @Localizer[nameof(AppStrings.Resend)]
+
}
else
{
-
- @Localizer[nameof(AppStrings.NotReceivedPhoneMessage)]
-
- }
+
+
+
+
+
+
+
+
+
+
-
- @Localizer[nameof(AppStrings.Resend)]
-
- }
- else
- {
-
-
-
-
-
-
-
-
-
-
+
+ @Localizer[nameof(AppStrings.ResetPasswordButtonText)]
+
+ }
+
+
+ }
+ else
+ {
+
+ @Localizer[nameof(AppStrings.ResetPasswordSuccessTitle), model.PhoneNumber!]
+
-
- @Localizer[nameof(AppStrings.ResetPasswordButtonText)]
-
- }
-
-
- }
- else
- {
-
- @Localizer[nameof(AppStrings.ResetPasswordSuccessTitle), model.PhoneNumber!]
-
+
+ @Localizer[nameof(AppStrings.ResetPasswordSuccessBody)]
+
+ }
+
+
+ @Localizer[nameof(AppStrings.SignIn)]
+ @Localizer[nameof(AppStrings.Or)]
+ @Localizer[nameof(AppStrings.SignUp)]
+
-
- @Localizer[nameof(AppStrings.ResetPasswordSuccessBody)]
-
- }
-
-
- @Localizer[nameof(AppStrings.SignIn)]
- @Localizer[nameof(AppStrings.Or)]
- @Localizer[nameof(AppStrings.SignUp)]
-
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Pages/Identity/ResetPasswordPage.razor.scss b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Pages/Identity/ResetPasswordPage.razor.scss
index 0fb1d9708a..ac4f4f5252 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Pages/Identity/ResetPasswordPage.razor.scss
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Pages/Identity/ResetPasswordPage.razor.scss
@@ -3,10 +3,4 @@
section {
width: 100%;
height: 100%;
-}
-
-::deep {
- form {
- width: 304px;
- }
-}
+}
\ No newline at end of file
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Pages/Identity/SignIn/SignInPage.razor b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Pages/Identity/SignIn/SignInPage.razor
index 0536df2943..0abf13e725 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Pages/Identity/SignIn/SignInPage.razor
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Pages/Identity/SignIn/SignInPage.razor
@@ -7,13 +7,13 @@
-
+
@if (requiresTwoFactor is false)
{
- @if (isOtpSent is false)
+ @if (isOtpRequested is false)
{
}
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Pages/Identity/SignIn/SignInPage.razor.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Pages/Identity/SignIn/SignInPage.razor.cs
index 0cc06ee91e..a70d77046e 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Pages/Identity/SignIn/SignInPage.razor.cs
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Pages/Identity/SignIn/SignInPage.razor.cs
@@ -1,7 +1,6 @@
//+:cnd:noEmit
-using Boilerplate.Shared.Controllers.Identity;
using Boilerplate.Shared.Dtos.Identity;
-using Microsoft.AspNetCore.Components.Forms;
+using Boilerplate.Shared.Controllers.Identity;
namespace Boilerplate.Client.Core.Components.Pages.Identity.SignIn;
@@ -33,7 +32,7 @@ public partial class SignInPage : IDisposable
private bool isWaiting;
- private bool isOtpSent;
+ private bool isOtpRequested;
private bool requiresTwoFactor;
private readonly SignInRequestDto model = new();
private Action unsubscribeIdentityHeaderBackLinkClicked = default!;
@@ -76,7 +75,7 @@ protected override async Task OnInitAsync()
if (source == OtpPayload)
{
- isOtpSent = false;
+ isOtpRequested = false;
model.Otp = null;
}
@@ -112,7 +111,7 @@ private async Task SocialSignIn(string provider)
private async Task DoSignIn()
{
if (isWaiting) return;
- if (isOtpSent && string.IsNullOrWhiteSpace(model.Otp)) return;
+ if (isOtpRequested && string.IsNullOrWhiteSpace(model.Otp)) return;
isWaiting = true;
@@ -162,14 +161,14 @@ private async Task SendOtp(bool resend)
var request = new IdentityRequestDto { UserName = model.UserName, Email = model.Email, PhoneNumber = model.PhoneNumber };
- _ = identityController.SendOtp(request, ReturnUrlQueryString, CurrentCancellationToken);
-
if (resend is false)
{
- isOtpSent = true;
+ isOtpRequested = true;
PubSubService.Publish(ClientPubSubMessages.UPDATE_IDENTITY_HEADER_BACK_LINK, OtpPayload);
}
+
+ await identityController.SendOtp(request, ReturnUrlQueryString, CurrentCancellationToken);
}
private async Task SendTfaToken()
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Pages/Identity/SignIn/SignInPage.razor.scss b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Pages/Identity/SignIn/SignInPage.razor.scss
index c1250519ac..265a370b27 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Pages/Identity/SignIn/SignInPage.razor.scss
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Pages/Identity/SignIn/SignInPage.razor.scss
@@ -4,20 +4,3 @@ section {
width: 100%;
height: 100%;
}
-
-.form-forgot-password {
- font-size: 14px;
- line-height: 24px;
- margin-bottom: 20px;
-}
-
-.tfa-otp-container {
- gap: 4px;
-}
-
-
-::deep {
- form {
- max-width: 460px;
- }
-}
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Pages/Identity/SignUp/SignUpPage.razor b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Pages/Identity/SignUp/SignUpPage.razor
index af6bc32736..d6fbcea999 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Pages/Identity/SignUp/SignUpPage.razor
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Pages/Identity/SignUp/SignUpPage.razor
@@ -7,25 +7,26 @@
-
- @Localizer[nameof(AppStrings.SignUpPanelTitle)]
+
+
+ @Localizer[nameof(AppStrings.SignUpPanelTitle)]
-
- @Localizer[nameof(AppStrings.SignUpPanelSubtitle)]
-
-
+
+ @Localizer[nameof(AppStrings.SignUpPanelSubtitle)]
+
+
-
+
- @Localizer[AppStrings.Or]
- @Localizer[AppStrings.Or]
+ @Localizer[AppStrings.Or]
+ @Localizer[AppStrings.Or]
-
-
+
+
-
-
-
+
+
+
@*
*@
-
-
-
-
+
+
+
+
-
-
-
-
-
+
+
+
+
+
-
-
-
+
+
+
@*#if (captcha == "reCaptcha")*@
-
+
@*#endif*@
-
- @Localizer[nameof(AppStrings.SignUp)]
-
-
-
-
-
- @Localizer[nameof(AppStrings.SignInMessageInSignUp)]
- @Localizer[nameof(AppStrings.SignIn)]
- @Localizer[nameof(AppStrings.Or)]
-
- @Localizer[nameof(AppStrings.Confirm)]
-
-
-
- By signing up, you agree to our @Localizer[nameof(AppStrings.Terms)]
-
+
+ @Localizer[nameof(AppStrings.SignUp)]
+
+
+
+
+
+ @Localizer[nameof(AppStrings.SignInMessageInSignUp)]
+ @Localizer[nameof(AppStrings.SignIn)]
+ @Localizer[nameof(AppStrings.Or)]
+
+ @Localizer[nameof(AppStrings.Confirm)]
+
+
+
+ By signing up, you agree to our @Localizer[nameof(AppStrings.Terms)]
+
+
\ No newline at end of file
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Pages/Identity/SignUp/SignUpPage.razor.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Pages/Identity/SignUp/SignUpPage.razor.cs
index 9d356140e4..9d3068a43d 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Pages/Identity/SignUp/SignUpPage.razor.cs
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Pages/Identity/SignUp/SignUpPage.razor.cs
@@ -46,7 +46,7 @@ private async Task DoSignUp()
queryParams.Add("phoneNumber", signUpModel.PhoneNumber);
}
var confirmUrl = NavigationManager.GetUriWithQueryParameters(Urls.ConfirmPage, queryParams);
- NavigationManager.NavigateTo(confirmUrl);
+ NavigationManager.NavigateTo(confirmUrl, replace: true);
}
catch (KnownException e)
{
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Pages/NotAuthorizedPage.razor b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Pages/NotAuthorizedPage.razor
index 2f0047c280..658228b47a 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Pages/NotAuthorizedPage.razor
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Pages/NotAuthorizedPage.razor
@@ -4,18 +4,27 @@
@Localizer[nameof(AppStrings.NotAuthorizedPageTitle)]
-
-
-
-
-
-
- @Localizer[nameof(AppStrings.ForbiddenException)]
-
+@if (isRefreshingToken)
+{
+
+}
+else
+{
+
+
+
+
+
- @Localizer[nameof(AppStrings.YouAreSignInAs)] @user.GetDisplayName()
+
+ @Localizer[nameof(AppStrings.ForbiddenException)]
+
- @Localizer[nameof(AppStrings.SignInAsDifferentUser)]
-
-
-
\ No newline at end of file
+ @Localizer[nameof(AppStrings.YouAreSignInAs)] @user.GetDisplayName()
+
+ @Localizer[nameof(AppStrings.SignInAsDifferentUser)]
+
+
+
+
+}
\ No newline at end of file
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Pages/NotAuthorizedPage.razor.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Pages/NotAuthorizedPage.razor.cs
index 9d76ecf3ec..b53a0b4c07 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Pages/NotAuthorizedPage.razor.cs
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Pages/NotAuthorizedPage.razor.cs
@@ -1,15 +1,12 @@
-using Microsoft.Extensions.Logging;
-
-namespace Boilerplate.Client.Core.Components.Pages;
+namespace Boilerplate.Client.Core.Components.Pages;
public partial class NotAuthorizedPage
{
+ private bool isRefreshingToken;
private ClaimsPrincipal user = default!;
[SupplyParameterFromQuery(Name = "return-url"), Parameter] public string? ReturnUrl { get; set; }
- [AutoInject] private ILogger logger = default!;
-
protected override async Task OnParamsSetAsync()
{
user = (await AuthenticationStateTask).User;
@@ -19,46 +16,44 @@ protected override async Task OnParamsSetAsync()
protected override async Task OnAfterFirstRenderAsync()
{
- string? refresh_token = await StorageService.GetItem("refresh_token");
+ var refresh_token = await StorageService.GetItem("refresh_token");
// Let's update the access token by refreshing it when a refresh token is available.
// Following this procedure, the newly acquired access token may now include the necessary roles or claims.
- // To prevent infinitie redirect loop, let's append try_refreshing_token=false to the url, so we only redirect in case no try_refreshing_token=false is present
+ // To prevent infinities redirect loop, let's append try_refreshing_token=false to the url, so we only redirect in case no try_refreshing_token=false is present
if (string.IsNullOrEmpty(refresh_token) is false && ReturnUrl?.Contains("try_refreshing_token=false", StringComparison.InvariantCulture) is null or false)
{
- await AuthenticationManager.RefreshToken();
-
- logger.LogInformation("Refreshing access token.");
-
- if ((await AuthenticationStateTask).User.IsAuthenticated())
+ isRefreshingToken = true;
+ StateHasChanged();
+ try
{
- if (ReturnUrl is not null)
+ var access_token = await AuthenticationManager.RefreshToken(requestedBy: nameof(NotAuthorizedPage), CurrentCancellationToken);
+ if (string.IsNullOrEmpty(access_token) is false && ReturnUrl is not null)
{
var @char = ReturnUrl.Contains('?') ? '&' : '?'; // The RedirectUrl may already include a query string.
- NavigationManager.NavigateTo($"{ReturnUrl}{@char}try_refreshing_token=false");
+ NavigationManager.NavigateTo($"{ReturnUrl}{@char}try_refreshing_token=false", replace: true);
+ return;
}
}
+ finally
+ {
+ isRefreshingToken = false;
+ StateHasChanged();
+ }
}
if ((await AuthenticationStateTask).User.IsAuthenticated() is false)
{
- // If neither the refresh_token nor the access_token is present, proceed to the sign-in page.
- RedirectToSignInPage();
+ await SignOut();
}
await base.OnAfterFirstRenderAsync();
}
- private async Task SignIn()
+ private async Task SignOut()
{
await AuthenticationManager.SignOut(CurrentCancellationToken);
-
- RedirectToSignInPage();
- }
-
- private void RedirectToSignInPage()
- {
var returnUrl = ReturnUrl ?? NavigationManager.ToBaseRelativePath(NavigationManager.Uri);
NavigationManager.NavigateTo(Urls.SignInPage + (string.IsNullOrEmpty(returnUrl) ? string.Empty : $"?return-url={returnUrl}"));
}
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Parameters.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Parameters.cs
index 8c0f5a830e..dd7464d93b 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Parameters.cs
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Parameters.cs
@@ -1,4 +1,6 @@
-namespace Boilerplate.Client.Core.Components;
+using Boilerplate.Client.Core.Services.HttpMessageHandlers;
+
+namespace Boilerplate.Client.Core.Components;
public class Parameters
{
@@ -9,15 +11,17 @@ public class Parameters
public const string CurrentRouteData = nameof(CurrentRouteData);
///
- /// If the current page is part of the cross-layout pages that are rendered in multiple layouts.
+ /// The cross-layout pages are the pages that are getting rendered in multiple layouts (authenticated and unauthenticated).
+ /// The Terms and Home pages are examples of cross-layout pages that.
///
public const string IsCrossLayoutPage = nameof(IsCrossLayoutPage);
///
- /// Determines the connection status, with default behavior based on SignalR connection status.
- /// If SignalR is not added to the project during initial project creation, this value will always be null by default.
- /// Alternatively, you can implement custom logic to control this value.
- /// true => Online, false => Offline, null => Unknown
+ /// Indicates the connection status, with default behavior tied to the SignalR connection status.
+ /// For projects without SignalR, allows this value to be updated based on server responses:
+ /// - When the first response is received from the server, this value becomes true (Online).
+ /// - When a server connection exception occurs, it becomes false (Offline).
+ /// By default, this value is null (Unknown).
///
public const string IsOnline = nameof(IsOnline);
}
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Data/CompiledModel/OfflineDbContextAssemblyAttributes.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Data/CompiledModel/OfflineDbContextAssemblyAttributes.cs
new file mode 100644
index 0000000000..491acb9707
--- /dev/null
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Data/CompiledModel/OfflineDbContextAssemblyAttributes.cs
@@ -0,0 +1,8 @@
+//
+using Boilerplate.Client.Core.Data;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+[assembly: DbContextModel(typeof(OfflineDbContext), typeof(OfflineDbContextModel))]
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Data/CompiledModel/OfflineDbContextModel.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Data/CompiledModel/OfflineDbContextModel.cs
new file mode 100644
index 0000000000..5b072f4673
--- /dev/null
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Data/CompiledModel/OfflineDbContextModel.cs
@@ -0,0 +1,47 @@
+//
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Metadata;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace Boilerplate.Client.Core.Data
+{
+ [DbContext(typeof(OfflineDbContext))]
+ public partial class OfflineDbContextModel : RuntimeModel
+ {
+ private static readonly bool _useOldBehavior31751 =
+ System.AppContext.TryGetSwitch("Microsoft.EntityFrameworkCore.Issue31751", out var enabled31751) && enabled31751;
+
+ static OfflineDbContextModel()
+ {
+ var model = new OfflineDbContextModel();
+
+ if (_useOldBehavior31751)
+ {
+ model.Initialize();
+ }
+ else
+ {
+ var thread = new System.Threading.Thread(RunInitialization, 10 * 1024 * 1024);
+ thread.Start();
+ thread.Join();
+
+ void RunInitialization()
+ {
+ model.Initialize();
+ }
+ }
+
+ model.Customize();
+ _instance = (OfflineDbContextModel)model.FinalizeModel();
+ }
+
+ private static OfflineDbContextModel _instance;
+ public static IModel Instance => _instance;
+
+ partial void Initialize();
+
+ partial void Customize();
+ }
+}
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Data/CompiledModel/OfflineDbContextModelBuilder.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Data/CompiledModel/OfflineDbContextModelBuilder.cs
new file mode 100644
index 0000000000..b2282d4809
--- /dev/null
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Data/CompiledModel/OfflineDbContextModelBuilder.cs
@@ -0,0 +1,27 @@
+//
+using System;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Metadata;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace Boilerplate.Client.Core.Data
+{
+ public partial class OfflineDbContextModel
+ {
+ private OfflineDbContextModel()
+ : base(skipDetectChanges: false, modelId: new Guid("b97b95bd-89b9-4be0-a574-d2035391c0c8"), entityTypeCount: 1)
+ {
+ }
+
+ partial void Initialize()
+ {
+ var userDto = UserDtoEntityType.Create(this);
+
+ UserDtoEntityType.CreateAnnotations(userDto);
+
+ AddAnnotation("ProductVersion", "9.0.0");
+ }
+ }
+}
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Data/CompiledModel/UserDtoEntityType.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Data/CompiledModel/UserDtoEntityType.cs
new file mode 100644
index 0000000000..a898c0d728
--- /dev/null
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Data/CompiledModel/UserDtoEntityType.cs
@@ -0,0 +1,111 @@
+//
+using System;
+using System.Reflection;
+using Boilerplate.Shared.Dtos.Identity;
+using Boilerplate.Shared.Enums;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Metadata;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+
+#pragma warning disable 219, 612, 618
+#nullable disable
+
+namespace Boilerplate.Client.Core.Data
+{
+ [EntityFrameworkInternal]
+ public partial class UserDtoEntityType
+ {
+ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType baseEntityType = null)
+ {
+ var runtimeEntityType = model.AddEntityType(
+ "Boilerplate.Shared.Dtos.Identity.UserDto",
+ typeof(UserDto),
+ baseEntityType,
+ propertyCount: 9,
+ keyCount: 1);
+
+ var id = runtimeEntityType.AddProperty(
+ "Id",
+ typeof(Guid),
+ propertyInfo: typeof(UserDto).GetProperty("Id", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+ fieldInfo: typeof(UserDto).GetField("k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+ valueGenerated: ValueGenerated.OnAdd,
+ afterSaveBehavior: PropertySaveBehavior.Throw,
+ sentinel: new Guid("00000000-0000-0000-0000-000000000000"));
+
+ var birthDate = runtimeEntityType.AddProperty(
+ "BirthDate",
+ typeof(DateTimeOffset?),
+ propertyInfo: typeof(UserDto).GetProperty("BirthDate", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+ fieldInfo: typeof(UserDto).GetField("k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+ nullable: true,
+ valueConverter: new DateTimeOffsetToBinaryConverter());
+
+ var email = runtimeEntityType.AddProperty(
+ "Email",
+ typeof(string),
+ propertyInfo: typeof(UserDto).GetProperty("Email", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+ fieldInfo: typeof(UserDto).GetField("k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+ nullable: true);
+
+ var fullName = runtimeEntityType.AddProperty(
+ "FullName",
+ typeof(string),
+ propertyInfo: typeof(UserDto).GetProperty("FullName", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+ fieldInfo: typeof(UserDto).GetField("k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+ var gender = runtimeEntityType.AddProperty(
+ "Gender",
+ typeof(Gender?),
+ propertyInfo: typeof(UserDto).GetProperty("Gender", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+ fieldInfo: typeof(UserDto).GetField("k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+ nullable: true);
+
+ var password = runtimeEntityType.AddProperty(
+ "Password",
+ typeof(string),
+ propertyInfo: typeof(UserDto).GetProperty("Password", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+ fieldInfo: typeof(UserDto).GetField("k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+ var phoneNumber = runtimeEntityType.AddProperty(
+ "PhoneNumber",
+ typeof(string),
+ propertyInfo: typeof(UserDto).GetProperty("PhoneNumber", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+ fieldInfo: typeof(UserDto).GetField("k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+ nullable: true);
+
+ var profileImageName = runtimeEntityType.AddProperty(
+ "ProfileImageName",
+ typeof(string),
+ propertyInfo: typeof(UserDto).GetProperty("ProfileImageName", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+ fieldInfo: typeof(UserDto).GetField("k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+ nullable: true);
+
+ var userName = runtimeEntityType.AddProperty(
+ "UserName",
+ typeof(string),
+ propertyInfo: typeof(UserDto).GetProperty("UserName", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly),
+ fieldInfo: typeof(UserDto).GetField("k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly));
+
+ var key = runtimeEntityType.AddKey(
+ new[] { id });
+ runtimeEntityType.SetPrimaryKey(key);
+
+ return runtimeEntityType;
+ }
+
+ public static void CreateAnnotations(RuntimeEntityType runtimeEntityType)
+ {
+ runtimeEntityType.AddAnnotation("Relational:FunctionName", null);
+ runtimeEntityType.AddAnnotation("Relational:Schema", null);
+ runtimeEntityType.AddAnnotation("Relational:SqlQuery", null);
+ runtimeEntityType.AddAnnotation("Relational:TableName", "Users");
+ runtimeEntityType.AddAnnotation("Relational:ViewName", null);
+ runtimeEntityType.AddAnnotation("Relational:ViewSchema", null);
+
+ Customize(runtimeEntityType);
+ }
+
+ static partial void Customize(RuntimeEntityType runtimeEntityType);
+ }
+}
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Data/Migrations/20241030140343_InitialMigration.Designer.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Data/Migrations/20241030140343_InitialMigration.Designer.cs
index 046b42efe0..27ff3c7e8a 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Data/Migrations/20241030140343_InitialMigration.Designer.cs
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Data/Migrations/20241030140343_InitialMigration.Designer.cs
@@ -15,7 +15,7 @@ partial class InitialMigration
protected override void BuildTargetModel(ModelBuilder modelBuilder)
{
#pragma warning disable 612, 618
- modelBuilder.HasAnnotation("ProductVersion", "8.0.0");
+ modelBuilder.HasAnnotation("ProductVersion", "9.0.0");
modelBuilder.Entity("Boilerplate.Shared.Dtos.Identity.UserDto", b =>
{
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Data/Migrations/OfflineDbContextModelSnapshot.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Data/Migrations/OfflineDbContextModelSnapshot.cs
index 13cca205c7..f277e593fa 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Data/Migrations/OfflineDbContextModelSnapshot.cs
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Data/Migrations/OfflineDbContextModelSnapshot.cs
@@ -12,7 +12,7 @@ partial class OfflineDbContextModelSnapshot : ModelSnapshot
protected override void BuildModel(ModelBuilder modelBuilder)
{
#pragma warning disable 612, 618
- modelBuilder.HasAnnotation("ProductVersion", "8.0.0");
+ modelBuilder.HasAnnotation("ProductVersion", "9.0.0");
modelBuilder.Entity("Boilerplate.Shared.Dtos.Identity.UserDto", b =>
{
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Data/OfflineDbContext.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Data/OfflineDbContext.cs
index e19d864706..c88dc5e81c 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Data/OfflineDbContext.cs
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Data/OfflineDbContext.cs
@@ -4,16 +4,8 @@
namespace Boilerplate.Client.Core.Data;
-public partial class OfflineDbContext(DbContextOptions options) : DbContext(options)
+public partial class OfflineDbContext : DbContext
{
- static OfflineDbContext()
- {
- if (AppPlatform.IsBrowser)
- {
- AppContext.SetSwitch("Microsoft.EntityFrameworkCore.Issue31751", true);
- }
- }
-
public virtual DbSet Users { get; set; }
protected override void OnModelCreating(ModelBuilder modelBuilder)
@@ -40,4 +32,31 @@ protected override void ConfigureConventions(ModelConfigurationBuilder configura
configurationBuilder.Properties().HaveConversion();
configurationBuilder.Properties().HaveConversion();
}
+
+ protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
+ {
+ var isRunningInsideDocker = Directory.Exists("/container_volume"); // Blazor Server - Docker (It's supposed to be a mounted volume named /container_volume)
+ var dirPath = isRunningInsideDocker ? "/container_volume"
+ : AppPlatform.IsBlazorHybridOrBrowser ? Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData), "AC87AA5B-4B37-4E52-8468-2D5DF24AF256")
+ : Directory.GetCurrentDirectory(); // Blazor server (Non docker Linux, macOS or Windows)
+
+ dirPath = Path.Combine(dirPath, "App_Data");
+
+ Directory.CreateDirectory(dirPath);
+
+ var dbPath = Path.Combine(dirPath, "Offline.db");
+
+ optionsBuilder
+ .UseSqlite($"Data Source={dbPath}");
+
+ if (AppEnvironment.IsProd())
+ {
+ optionsBuilder.UseModel(OfflineDbContextModel.Instance);
+ }
+
+ optionsBuilder.EnableSensitiveDataLogging(AppEnvironment.IsDev())
+ .EnableDetailedErrors(AppEnvironment.IsDev());
+
+ base.OnConfiguring(optionsBuilder);
+ }
}
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Data/README.md b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Data/README.md
index b10ecd210f..660082f762 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Data/README.md
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Data/README.md
@@ -1,11 +1,9 @@
-## bit entity framework core sqlite (bit Besql)
+## bit entity framework core sqlite (bit Besql)
How to use `Bit.Besql`:
The usage of `Bit.Besql` is exactly the same as the regular usage of `Microsoft.EntityFrameworkCore.Sqlite` with [IDbContextFactory](https://learn.microsoft.com/en-us/aspnet/core/blazor/blazor-ef-core?view=aspnetcore-8.0#new-dbcontext-instances).
-To get start, simply install `Bit.Besql` and use `services.AddBesqlDbContextFactory` instead of `services.AddDbContextFactory`.
-
In order to download sqlite db file from browser cache storage in blazor WebAssembly run the followings in browser console:
```js
const cache = await caches.open('Bit-Besql');
@@ -16,11 +14,11 @@ URL.createObjectURL(blob);
**Migration**
-Set `Server` as the Startup Project in solution explorer and set `Client.Core` it as the Default Project in Package Manager Console and run the following commands:
+Set `Server.Web` as the Startup Project in solution explorer and set `Client.Core` it as the Default Project in Package Manager Console and run the following commands:
```powershell
Add-Migration InitialMigration -OutputDir Data\Migrations -Context OfflineDbContext
```
-Or open a terminal in your Server project directory and run followings:
+Or open a terminal in your Server.Web project directory and run followings:
```bash
dotnet ef migrations add InitialMigration --context OfflineDbContext --output-dir Data/Migrations --project ../Client/Boilerplate.Client.Core/Boilerplate.Client.Core.csproj
```
@@ -35,7 +33,7 @@ To enhance the performance of your models, consider compiling them using EF Core
To implement this optimization, follow these steps in the Package Manager Console:
-1. Make sure `Boilerplate.Server` is set as the default startup project, and `Boilerplate.Client.Core` is the default project in the Package Manager Console.
+1. Make sure `Server.Web` is set as the default startup project, and `Client.Core` is the default project in the Package Manager Console.
2. Run the following command:
@@ -43,10 +41,4 @@ To implement this optimization, follow these steps in the Package Manager Consol
Optimize-DbContext -Context OfflineDbContext -OutputDir Data/CompiledModel -Namespace Boilerplate.Client.Core.Data
```
-3. Uncomment the following line in the `Boilerplate.Client.Core/Extensions/IServiceCollectionExtensions.cs` file:
-
- ```csharp
- .UseModel(OfflineDbContextModel.Instance)
- ```
-
By adhering to these steps, you leverage EF Core compiled models to boost the performance of your application, ensuring an optimized and efficient data access method.
\ No newline at end of file
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Extensions/IClientCoreServiceCollectionExtensions.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Extensions/IClientCoreServiceCollectionExtensions.cs
index b0b74618df..a1dda1fb46 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Extensions/IClientCoreServiceCollectionExtensions.cs
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Extensions/IClientCoreServiceCollectionExtensions.cs
@@ -1,7 +1,6 @@
//+:cnd:noEmit
//#if (offlineDb == true)
using Boilerplate.Client.Core.Data;
-using Microsoft.EntityFrameworkCore;
//#endif
//#if (appInsights == true)
using BlazorApplicationInsights;
@@ -10,7 +9,6 @@
using Boilerplate.Client.Core;
using System.Diagnostics.CodeAnalysis;
using Microsoft.AspNetCore.Components.WebAssembly.Services;
-using Boilerplate.Client.Core.Components;
using Boilerplate.Client.Core.Services.HttpMessageHandlers;
namespace Microsoft.Extensions.DependencyInjection;
@@ -30,6 +28,7 @@ public static IServiceCollection AddClientCoreProjectServices(this IServiceColle
services.AddScoped();
services.AddScoped();
services.AddScoped();
+ services.AddScoped(sp => new() { GetAddress = () => sp.GetRequiredService().BaseAddress! /* Read AbsoluteServerAddressProvider's comments for more info. */ });
// The following services must be unique to each app session.
// Defining them as singletons would result in them being shared across all users in Blazor Server and during pre-rendering.
@@ -58,14 +57,16 @@ public static IServiceCollection AddClientCoreProjectServices(this IServiceColle
// handlers, such as ASP.NET Core's `HttpMessageHandler` from the Test Host, which is useful for integration tests.
services.AddScoped(serviceProvider => transportHandler =>
{
- var constructedHttpMessageHandler = ActivatorUtilities.CreateInstance(serviceProvider,
+ var constructedHttpMessageHandler = ActivatorUtilities.CreateInstance(serviceProvider,
+ [ActivatorUtilities.CreateInstance(serviceProvider,
[ActivatorUtilities.CreateInstance(serviceProvider,
[ActivatorUtilities.CreateInstance(serviceProvider,
- [ActivatorUtilities.CreateInstance(serviceProvider, [transportHandler])])])]);
+ [ActivatorUtilities.CreateInstance(serviceProvider, [transportHandler])])])])]);
return constructedHttpMessageHandler;
});
services.AddScoped();
services.AddScoped();
+ services.AddScoped();
services.AddScoped();
services.AddScoped();
services.AddScoped(serviceProvider =>
@@ -76,26 +77,11 @@ public static IServiceCollection AddClientCoreProjectServices(this IServiceColle
});
//#if (offlineDb == true)
- services.AddBesqlDbContextFactory(options =>
+ if (AppPlatform.IsBrowser)
{
- var isRunningInsideDocker = Directory.Exists("/container_volume"); // Blazor Server - Docker (It's supposed to be a mounted volume named /container_volume)
- var dirPath = isRunningInsideDocker ? "/container_volume"
- : AppPlatform.IsBlazorHybridOrBrowser ? Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData), "AC87AA5B-4B37-4E52-8468-2D5DF24AF256")
- : Directory.GetCurrentDirectory(); // Blazor server (Non docker Linux, macOS or Windows)
-
- dirPath = Path.Combine(dirPath, "App_Data");
-
- Directory.CreateDirectory(dirPath);
-
- var dbPath = Path.Combine(dirPath, "Offline.db");
-
- options
- // .UseModel(OfflineDbContextModel.Instance)
- .UseSqlite($"Data Source={dbPath}");
-
- options.EnableSensitiveDataLogging(AppEnvironment.IsDev())
- .EnableDetailedErrors(AppEnvironment.IsDev());
- });
+ AppContext.SetSwitch("Microsoft.EntityFrameworkCore.Issue31751", true);
+ }
+ services.AddBesqlDbContextFactory();
//#endif
//#if (appInsights == true)
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Extensions/ILoggingBuilderExtensions.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Extensions/ILoggingBuilderExtensions.cs
index 474e6d82fa..aa9b0d9a84 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Extensions/ILoggingBuilderExtensions.cs
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Extensions/ILoggingBuilderExtensions.cs
@@ -13,18 +13,14 @@ public static ILoggingBuilder AddDiagnosticLogger(this ILoggingBuilder builder)
public static ILoggingBuilder ConfigureLoggers(this ILoggingBuilder loggingBuilder)
{
- loggingBuilder.ClearProviders();
-
if (AppEnvironment.IsDev())
{
loggingBuilder.AddDebug();
}
- if (!AppPlatform.IsBrowser)
+ if (!AppPlatform.IsBrowser) // Browser has its own WebAssemblyConsoleLoggerProvider.
{
- loggingBuilder.AddConsole();
- // DiagnosticLogger is already logging in browser's console.
- // But Console logger is still useful in Visual Studio's Device Log (Android, iOS) or BrowserStack etc.
+ loggingBuilder.AddConsole(); // Device Log / logcat
}
loggingBuilder.AddDiagnosticLogger();
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Services/AbsoluteServerAddressProvider.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Services/AbsoluteServerAddressProvider.cs
new file mode 100644
index 0000000000..230e7daf9e
--- /dev/null
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Services/AbsoluteServerAddressProvider.cs
@@ -0,0 +1,28 @@
+namespace Boilerplate.Client.Core.Services;
+
+///
+/// The `ServerAddress` setting in `Client.Core/appsettings.json` can be either relative or absolute.
+/// If the server address is relative, we prepend it with `builder.HostEnvironment.BaseAddress` in Blazor WebAssembly
+/// or with the request URL from `IHttpContextAccessor.HttpContext.Request` in Blazor Server.
+/// The resulting server address is useful in various scenarios, such as binding an image's `src` attribute to a server API,
+/// like retrieving the current user's profile image.
+///
+public class AbsoluteServerAddressProvider
+{
+ public required Func GetAddress { get; init; }
+
+ public static implicit operator string(AbsoluteServerAddressProvider provider)
+ {
+ return provider.GetAddress().ToString();
+ }
+
+ public static implicit operator Uri(AbsoluteServerAddressProvider provider)
+ {
+ return provider.GetAddress();
+ }
+
+ public override string ToString()
+ {
+ return this;
+ }
+}
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Services/AppInsightsJsSdkService.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Services/AppInsightsJsSdkService.cs
index 516158ac21..5562b4111d 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Services/AppInsightsJsSdkService.cs
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Services/AppInsightsJsSdkService.cs
@@ -4,6 +4,9 @@
namespace Boilerplate.Client.Core.Services;
+///
+/// A Blazor Hybrid / Blazor Server compatible version of
+///
public partial class AppInsightsJsSdkService : IApplicationInsights
{
private TaskCompletionSource? telemetryInitializerIsAddedTcs;
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Services/AppTelemetryContext.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Services/AppTelemetryContext.cs
index b7b071834c..18e241c1fa 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Services/AppTelemetryContext.cs
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Services/AppTelemetryContext.cs
@@ -17,6 +17,8 @@ public class AppTelemetryContext : ITelemetryContext
public virtual string? WebView { get; set; }
+ public virtual string? PageUrl { get; set; }
+
public virtual string? UserAgent { get; set; }
public string? TimeZone { get; set; }
@@ -25,5 +27,5 @@ public class AppTelemetryContext : ITelemetryContext
public string? Environment { get; set; } = AppEnvironment.Current;
- public bool IsOnline { get; set; }
+ public bool? IsOnline { get; set; }
}
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Services/AuthenticationManager.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Services/AuthenticationManager.cs
index 897886353e..524c4088c2 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Services/AuthenticationManager.cs
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Services/AuthenticationManager.cs
@@ -17,7 +17,9 @@ public partial class AuthenticationManager : AuthenticationStateProvider
[AutoInject] private IAuthTokenProvider tokenProvider = default!;
[AutoInject] private IPrerenderStateService prerenderStateService;
[AutoInject] private IExceptionHandler exceptionHandler = default!;
+ [AutoInject] private IStringLocalizer localizer = default!;
[AutoInject] private IIdentityController identityController = default!;
+ [AutoInject] private ILogger authLogger = default!;
///
/// Sign in and return whether the user requires two-factor authentication.
@@ -29,95 +31,111 @@ public async Task SignIn(SignInRequestDto request, CancellationToken cance
if (response.RequiresTwoFactor) return true;
- await OnNewToken(response!, request.RememberMe);
+ await StoreTokens(response!, request.RememberMe);
return false;
}
- public async Task OnNewToken(TokenResponseDto response, bool? rememberMe = null)
+ public async Task StoreTokens(TokenResponseDto response, bool? rememberMe = null)
{
- await StoreTokens(response, rememberMe);
+ if (rememberMe is null)
+ {
+ rememberMe = await storageService.IsPersistent("refresh_token");
+ }
+
+ await storageService.SetItem("access_token", response!.AccessToken, rememberMe is true);
+ await storageService.SetItem("refresh_token", response!.RefreshToken, rememberMe is true);
- var state = await GetAuthenticationStateAsync();
+ if (AppPlatform.IsBlazorHybrid is false && jsRuntime.IsInitialized())
+ {
+ await cookie.Set(new()
+ {
+ Name = "access_token",
+ Value = response.AccessToken,
+ MaxAge = rememberMe is true ? response.ExpiresIn : null, // to create a session cookie
+ Path = "/",
+ SameSite = SameSite.Strict,
+ Secure = AppEnvironment.IsDev() is false
+ });
+ }
- NotifyAuthenticationStateChanged(Task.FromResult(state));
+ NotifyAuthenticationStateChanged(Task.FromResult(await GetAuthenticationStateAsync()));
}
public async Task SignOut(CancellationToken cancellationToken)
{
try
{
- if (await storageService.GetItem("refresh_token") is not null)
- {
- await userController.SignOut(cancellationToken);
- }
+ await userController.SignOut(cancellationToken);
}
- finally
+ catch (Exception exp) when (exp is ServerConnectionException or UnauthorizedException)
{
- await storageService.RemoveItem("access_token");
- await storageService.RemoveItem("refresh_token");
- if (AppPlatform.IsBlazorHybrid is false)
- {
- await cookie.Remove("access_token");
- }
- NotifyAuthenticationStateChanged(Task.FromResult(await GetAuthenticationStateAsync()));
+ // The user might sign out while the app is offline, making token refresh attempts fail.
+ // These exceptions are intentionally ignored in this case.
}
- }
-
- public async Task RefreshToken()
- {
- if (AppPlatform.IsBlazorHybrid is false)
+ finally
{
- await cookie.Remove("access_token");
+ await ClearTokens();
}
- await storageService.RemoveItem("access_token");
- NotifyAuthenticationStateChanged(Task.FromResult(await GetAuthenticationStateAsync()));
}
- public override async Task GetAuthenticationStateAsync()
+ public async Task RefreshToken(string requestedBy, CancellationToken cancellationToken)
{
try
{
- var access_token = await prerenderStateService.GetValue(() => tokenProvider.GetAccessToken());
-
- bool inPrerenderSession = AppPlatform.IsBlazorHybrid is false && jsRuntime.IsInitialized() is false;
+ var access_token_BeforeLockValue = await tokenProvider.GetAccessToken();
+ await semaphore.WaitAsync();
+ var access_token_AfterLockValue = await tokenProvider.GetAccessToken();
+ if (access_token_BeforeLockValue != access_token_AfterLockValue)
+ return access_token_AfterLockValue; // It was renewed by a concurrent refresh token request.
+ authLogger.LogInformation("Refreshing access token requested by {RequestedBy}", requestedBy);
+ try
+ {
+ string? refresh_token = await storageService.GetItem("refresh_token");
+ if (string.IsNullOrEmpty(refresh_token))
+ throw new UnauthorizedException(localizer[nameof(AppStrings.YouNeedToSignIn)]);
- if (string.IsNullOrEmpty(access_token) && inPrerenderSession is false)
+ var refreshTokenResponse = await identityController.Refresh(new() { RefreshToken = refresh_token }, cancellationToken);
+ await StoreTokens(refreshTokenResponse);
+ return refreshTokenResponse.AccessToken!;
+ }
+ catch (Exception exp)
{
- try
+ if (exp is UnauthorizedException)
{
- await semaphore.WaitAsync();
- access_token = await tokenProvider.GetAccessToken();
- if (string.IsNullOrEmpty(access_token)) // Check again after acquiring the lock.
- {
- string? refresh_token = await storageService.GetItem("refresh_token");
-
- if (string.IsNullOrEmpty(refresh_token) is false)
- {
- // We refresh the access_token to ensure a seamless user experience, preventing unnecessary 'NotAuthorized' page redirects and improving overall UX.
- // This method is triggered after 401 and 403 server responses in AuthDelegationHandler,
- // as well as when accessing pages without the required permissions in NotAuthorizedPage, ensuring that any recent claims granted to the user are promptly reflected.
-
- try
- {
- var refreshTokenResponse = await identityController.Refresh(new() { RefreshToken = refresh_token }, CancellationToken.None);
- await StoreTokens(refreshTokenResponse!);
- access_token = refreshTokenResponse!.AccessToken;
- }
- catch (UnauthorizedException) // refresh_token is either invalid or expired.
- {
- await storageService.RemoveItem("refresh_token");
- }
- }
- }
+ // refresh_token is either invalid or expired.
+ await ClearTokens();
}
- finally
+ exceptionHandler.Handle(exp, new()
{
- semaphore.Release();
- }
+ { "AdditionalData", "Refreshing access token failed." },
+ { "RefreshTokenRequestedBy", requestedBy }
+ });
+ return null;
}
+ }
+ finally
+ {
+ semaphore.Release();
+ }
+ }
- return new AuthenticationState(tokenProvider.ParseAccessToken(access_token, validateExpiry: false /* For better UX in order to minimize Routes.razor's Authorizing loading duration. */));
+ ///
+ /// Handles the process of determining the user's authentication state based on the availability of access and refresh tokens.
+ ///
+ /// - If no access / refresh token exists, an anonymous user object is returned to Blazor.
+ /// - If an access token exists, a ClaimsPrincipal is created from it regardless of its expiration status. This ensures:
+ /// - Users can access anonymous-allowed pages without unnecessary delays caused by token refresh attempts **during app startup**.
+ /// - For protected pages, it is typical for these pages to make HTTP requests to secured APIs. In such cases, the `AuthDelegatingHandler.cs`
+ /// validates the access token and refreshes it if necessary, keeping Blazor updated with the latest authentication state.
+ ///
+ public override async Task GetAuthenticationStateAsync()
+ {
+ try
+ {
+ var access_token = await prerenderStateService.GetValue(() => tokenProvider.GetAccessToken());
+
+ return new AuthenticationState(tokenProvider.ParseAccessToken(access_token, validateExpiry: false));
}
catch (Exception exp)
{
@@ -126,27 +144,14 @@ public override async Task GetAuthenticationStateAsync()
}
}
- private async Task StoreTokens(TokenResponseDto response, bool? rememberMe = null)
+ private async Task ClearTokens()
{
- if (rememberMe is null)
- {
- rememberMe = await storageService.IsPersistent("refresh_token");
- }
-
- await storageService.SetItem("access_token", response!.AccessToken, rememberMe is true);
- await storageService.SetItem("refresh_token", response!.RefreshToken, rememberMe is true);
-
- if (AppPlatform.IsBlazorHybrid is false && jsRuntime.IsInitialized())
+ await storageService.RemoveItem("access_token");
+ await storageService.RemoveItem("refresh_token");
+ if (AppPlatform.IsBlazorHybrid is false)
{
- await cookie.Set(new()
- {
- Name = "access_token",
- Value = response.AccessToken,
- MaxAge = rememberMe is true ? response.ExpiresIn : null, // to create a session cookie
- Path = "/",
- SameSite = SameSite.Strict,
- Secure = AppEnvironment.IsDev() is false
- });
+ await cookie.Remove("access_token");
}
+ NotifyAuthenticationStateChanged(Task.FromResult(await GetAuthenticationStateAsync()));
}
}
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Services/ExceptionHandlerBase.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Services/ClientExceptionHandlerBase.cs
similarity index 50%
rename from src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Services/ExceptionHandlerBase.cs
rename to src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Services/ClientExceptionHandlerBase.cs
index 6c137be287..87795acfa1 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Services/ExceptionHandlerBase.cs
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Services/ClientExceptionHandlerBase.cs
@@ -1,18 +1,15 @@
//+:cnd:noEmit
-using System.Reflection;
using System.Diagnostics;
-using Microsoft.Extensions.Logging;
using System.Runtime.CompilerServices;
namespace Boilerplate.Client.Core.Services;
-public abstract partial class ExceptionHandlerBase : IExceptionHandler
+public abstract partial class ClientExceptionHandlerBase : SharedExceptionHandler, IExceptionHandler
{
[AutoInject] protected Bit.Butil.Console Console = default!;
[AutoInject] protected ITelemetryContext TelemetryContext = default!;
- [AutoInject] protected ILogger Logger = default!;
+ [AutoInject] protected ILogger Logger = default!;
[AutoInject] protected readonly MessageBoxService MessageBoxService = default!;
- [AutoInject] protected readonly IStringLocalizer Localizer = default!;
public void Handle(Exception exception,
Dictionary? parameters = null,
@@ -35,14 +32,7 @@ protected virtual void Handle(Exception exception, Dictionary pa
using (var scope = Logger.BeginScope(parameters.ToDictionary(i => i.Key, i => i.Value ?? string.Empty)))
{
- var exceptionMessageToLog = exception.Message;
- var innerException = exception.InnerException;
-
- while (innerException is not null)
- {
- exceptionMessageToLog += $"{Environment.NewLine}{innerException.Message}";
- innerException = innerException.InnerException;
- }
+ var exceptionMessageToLog = GetExceptionMessageToLog(exception);
if (exception is KnownException)
{
@@ -54,8 +44,7 @@ protected virtual void Handle(Exception exception, Dictionary pa
}
}
- string exceptionMessageToShow = (exception as KnownException)?.Message ??
- (isDevEnv ? exception.ToString() : Localizer[nameof(AppStrings.UnknownException)]);
+ string exceptionMessageToShow = GetExceptionMessageToShow(exception);
MessageBoxService.Show(exceptionMessageToShow, Localizer[nameof(AppStrings.Error)]);
@@ -64,29 +53,4 @@ protected virtual void Handle(Exception exception, Dictionary pa
Debugger.Break();
}
}
-
- protected Exception UnWrapException(Exception exception)
- {
- if (exception is AggregateException aggregateException)
- {
- return aggregateException.Flatten().InnerException ?? aggregateException;
- }
- else if (exception is TargetInvocationException)
- {
- return exception.InnerException ?? exception;
- }
-
- return exception;
- }
-
- protected bool IgnoreException(Exception exception)
- {
- if (exception is KnownException)
- return false;
-
- return exception is TaskCanceledException ||
- exception is OperationCanceledException ||
- exception is TimeoutException ||
- (exception.InnerException is not null && IgnoreException(exception.InnerException));
- }
}
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Services/Contracts/ILocalHttpServer.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Services/Contracts/ILocalHttpServer.cs
index a5a0b7cf5c..dfcf4ba11f 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Services/Contracts/ILocalHttpServer.cs
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Services/Contracts/ILocalHttpServer.cs
@@ -1,5 +1,9 @@
namespace Boilerplate.Client.Core.Services.Contracts;
+///
+/// Social sign-in functions seamlessly on web browsers and on Android and iOS via universal app links.
+/// However, for Windows and macOS, a local HTTP server is needed to ensure a smooth social sign-in experience.
+///
public interface ILocalHttpServer
{
int Start(CancellationToken cancellationToken);
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Services/Contracts/ITelemetryContext.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Services/Contracts/ITelemetryContext.cs
index a1b5962c34..99c74936bd 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Services/Contracts/ITelemetryContext.cs
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Services/Contracts/ITelemetryContext.cs
@@ -37,6 +37,8 @@ public static ITelemetryContext? Current
public string? AppVersion { get; set; }
public string? WebView { get; set; }
+ public string? PageUrl { get; set; }
+
public string? UserAgent { get; set; }
public string? TimeZone { get; set; }
@@ -44,7 +46,7 @@ public static ITelemetryContext? Current
public string? Environment { get; set; }
- public bool IsOnline { get; set; }
+ public bool? IsOnline { get; set; }
public Dictionary ToDictionary(Dictionary? additionalParameters = null)
{
@@ -55,8 +57,10 @@ public static ITelemetryContext? Current
{ nameof(AppSessionId), AppSessionId },
{ nameof(OS), OS },
{ nameof(AppVersion), AppVersion },
+ { nameof(PageUrl), PageUrl },
{ nameof(UserAgent), UserAgent },
{ nameof(TimeZone), TimeZone },
+ { "ClientDateTime", DateTimeOffset.UtcNow.ToString("u") },
{ nameof(Culture), Culture },
{ nameof(Environment), Environment },
{ nameof(IsOnline), IsOnline }
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Services/CultureService.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Services/CultureService.cs
index 2722fdf4c7..9221921744 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Services/CultureService.cs
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Services/CultureService.cs
@@ -20,10 +20,12 @@ public async Task ChangeCulture(string? cultureName)
{
await cookie.Set(new()
{
- MaxAge = 30 * 24 * 3600,
Name = ".AspNetCore.Culture",
- Secure = AppEnvironment.IsDev() is false,
Value = Uri.EscapeDataString($"c={cultureName}|uic={cultureName}"),
+ MaxAge = 30 * 24 * 3600,
+ Path = "/",
+ SameSite = SameSite.Strict,
+ Secure = AppEnvironment.IsDev() is false
});
}
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Services/DiagnosticLog/DiagnosticLog.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Services/DiagnosticLog/DiagnosticLog.cs
index a3b76bbb0a..e11d4ae726 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Services/DiagnosticLog/DiagnosticLog.cs
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Services/DiagnosticLog/DiagnosticLog.cs
@@ -1,6 +1,4 @@
-using Microsoft.Extensions.Logging;
-
-namespace Boilerplate.Client.Core.Services.DiagnosticLog;
+namespace Boilerplate.Client.Core.Services.DiagnosticLog;
public class DiagnosticLog
{
@@ -10,6 +8,8 @@ public class DiagnosticLog
public string? Message { get; set; }
+ public string? Category { get; set; }
+
public Exception? Exception { get; set; }
public IDictionary? State { get; set; }
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Services/DiagnosticLog/DiagnosticLogger.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Services/DiagnosticLog/DiagnosticLogger.cs
index 9f25214154..e88cc29cd1 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Services/DiagnosticLog/DiagnosticLogger.cs
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Services/DiagnosticLog/DiagnosticLogger.cs
@@ -1,6 +1,4 @@
-using Microsoft.Extensions.Logging;
-
-namespace Boilerplate.Client.Core.Services.DiagnosticLog;
+namespace Boilerplate.Client.Core.Services.DiagnosticLog;
public partial class DiagnosticLogger : ILogger, IDisposable
{
@@ -8,7 +6,7 @@ public partial class DiagnosticLogger : ILogger, IDisposable
private IDictionary? currentState;
- public string? CategoryName { get; set; }
+ public string? Category { get; set; }
public IDisposable? BeginScope(TState state)
where TState : notnull
@@ -32,7 +30,15 @@ public void Log(LogLevel logLevel, EventId eventId, TState state, Except
var message = formatter(state, exception);
- Store.Add(new() { CreatedOn = DateTimeOffset.Now, Level = logLevel, Message = message, Exception = exception, State = currentState?.ToDictionary(i => i.Key, i => i.Value?.ToString()) });
+ Store.Add(new()
+ {
+ CreatedOn = DateTimeOffset.Now,
+ Level = logLevel,
+ Message = message,
+ Exception = exception,
+ Category = Category,
+ State = currentState?.ToDictionary(i => i.Key, i => i.Value?.ToString())
+ });
}
public void Dispose()
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Services/DiagnosticLog/DiagnosticLoggerProvider.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Services/DiagnosticLog/DiagnosticLoggerProvider.cs
index 74b2cccbd9..8848fc049e 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Services/DiagnosticLog/DiagnosticLoggerProvider.cs
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Services/DiagnosticLog/DiagnosticLoggerProvider.cs
@@ -1,13 +1,12 @@
//+:cnd:noEmit
-using Microsoft.Extensions.Logging;
namespace Boilerplate.Client.Core.Services.DiagnosticLog;
// https://learn.microsoft.com/en-us/aspnet/core/blazor/hybrid/developer-tools
///
-/// Provides a custom logger that outputs log messages to the browser's console and allows for selective display of logs
-/// within the application UI for enhanced diagnostics.
+/// Provides a custom logger that outputs log messages to the in memory store and allows for selective display of logs
+/// within the application UI for enhanced diagnostics using
///
[ProviderAlias("DiagnosticLogger")]
public partial class DiagnosticLoggerProvider : ILoggerProvider
@@ -16,7 +15,7 @@ public ILogger CreateLogger(string categoryName)
{
return new DiagnosticLogger()
{
- CategoryName = categoryName
+ Category = categoryName
};
}
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Services/HttpMessageHandlers/AuthDelegatingHandler.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Services/HttpMessageHandlers/AuthDelegatingHandler.cs
index c796951373..3c35813586 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Services/HttpMessageHandlers/AuthDelegatingHandler.cs
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Services/HttpMessageHandlers/AuthDelegatingHandler.cs
@@ -1,61 +1,81 @@
-using System.Net.Http.Headers;
+using System.Reflection;
+using System.Net.Http.Headers;
+using Boilerplate.Shared.Controllers;
using Boilerplate.Shared.Controllers.Identity;
namespace Boilerplate.Client.Core.Services.HttpMessageHandlers;
-public partial class AuthDelegatingHandler(IAuthTokenProvider tokenProvider,
- IJSRuntime jsRuntime,
- IServiceProvider serviceProvider,
- IStorageService storageService,
- HttpMessageHandler handler)
- : DelegatingHandler(handler)
+public partial class AuthDelegatingHandler(IJSRuntime jsRuntime,
+ IStorageService storageService,
+ IServiceProvider serviceProvider,
+ IAuthTokenProvider tokenProvider,
+ IStringLocalizer localizer,
+ AbsoluteServerAddressProvider absoluteServerAddress,
+ HttpMessageHandler handler) : DelegatingHandler(handler)
{
+
protected override async Task SendAsync(HttpRequestMessage request, CancellationToken cancellationToken)
{
- var isRefreshTokenRequest = request.RequestUri?.LocalPath?.Contains(IIdentityController.RefreshUri, StringComparison.InvariantCultureIgnoreCase) is true;
+ var isInternalRequest = request.RequestUri!.ToString().StartsWith(absoluteServerAddress, StringComparison.InvariantCultureIgnoreCase);
try
{
- if (request.Headers.Authorization is null && isRefreshTokenRequest is false)
+ if (isInternalRequest && /* We will restrict sending the access token to our own server only. */
+ request.Headers.Authorization is null)
{
var access_token = await tokenProvider.GetAccessToken();
- if (access_token is not null)
+ if (string.IsNullOrEmpty(access_token) is false && HasAuthorizedApiAttribute(request))
{
if (tokenProvider.ParseAccessToken(access_token, validateExpiry: true).IsAuthenticated() is false)
- throw new UnauthorizedException(nameof(AppStrings.YouNeedToSignIn));
-
- request.Headers.Authorization = new AuthenticationHeaderValue("Bearer", access_token);
+ throw new UnauthorizedException(localizer[nameof(AppStrings.YouNeedToSignIn)]);
}
+ request.Headers.Authorization = new AuthenticationHeaderValue("Bearer", access_token);
}
return await base.SendAsync(request, cancellationToken);
}
catch (KnownException _) when (_ is ForbiddenException or UnauthorizedException)
{
+ // Notes about ForbiddenException (403):
// Let's update the access token by refreshing it when a refresh token is available.
// Following this procedure, the newly acquired access token may now include the necessary roles or claims.
if (AppPlatform.IsBlazorHybrid is false && jsRuntime.IsInitialized() is false)
throw; // We don't have access to refresh_token during pre-rendering.
+ var isRefreshTokenRequest = request.RequestUri?.LocalPath?.Contains(IIdentityController.RefreshUri, StringComparison.InvariantCultureIgnoreCase) is true;
+
if (isRefreshTokenRequest)
throw; // To prevent refresh token loop
var refresh_token = await storageService.GetItem("refresh_token");
- if (refresh_token is null) throw;
+ if (string.IsNullOrEmpty(refresh_token)) throw;
var authManager = serviceProvider.GetRequiredService();
// In the AuthenticationStateProvider, the access_token is refreshed using the refresh_token (if available).
- await authManager.RefreshToken();
-
- var access_token = await tokenProvider.GetAccessToken();
+ var access_token = await authManager.RefreshToken(requestedBy: nameof(AuthDelegatingHandler), cancellationToken);
- if (string.IsNullOrEmpty(access_token)) throw;
+ if (string.IsNullOrEmpty(access_token))
+ throw;
request.Headers.Authorization = new AuthenticationHeaderValue("Bearer", access_token);
return await base.SendAsync(request, cancellationToken);
}
}
+
+ ///
+ ///
+ ///
+ private static bool HasAuthorizedApiAttribute(HttpRequestMessage request)
+ {
+ if (request.Options.TryGetValue(new(RequestOptionNames.IControllerType), out Type? controllerType) is false)
+ return false;
+
+ var parameterTypes = ((Dictionary)request.Options.GetValueOrDefault(RequestOptionNames.ActionParametersInfo)!).Select(p => p.Value).ToArray();
+ var method = controllerType!.GetMethod((string)request.Options.GetValueOrDefault(RequestOptionNames.ActionName)!, parameterTypes)!;
+ return controllerType.GetCustomAttribute(inherit: true) is not null ||
+ method.GetCustomAttribute() is not null;
+ }
}
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Services/HttpMessageHandlers/ExceptionDelegatingHandler.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Services/HttpMessageHandlers/ExceptionDelegatingHandler.cs
index 2ee7fec9cf..1a7bf35e3d 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Services/HttpMessageHandlers/ExceptionDelegatingHandler.cs
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Services/HttpMessageHandlers/ExceptionDelegatingHandler.cs
@@ -4,16 +4,17 @@
namespace Boilerplate.Client.Core.Services.HttpMessageHandlers;
public partial class ExceptionDelegatingHandler(IStringLocalizer localizer,
- //#if (signalR != true)
- PubSubService pubSubService,
- //#endif
- JsonSerializerOptions jsonSerializerOptions,
- HttpMessageHandler handler)
- : DelegatingHandler(handler)
+ //#if (signalR != true)
+ PubSubService pubSubService,
+ //#endif
+ JsonSerializerOptions jsonSerializerOptions,
+ AbsoluteServerAddressProvider absoluteServerAddress,
+ HttpMessageHandler handler) : DelegatingHandler(handler)
{
protected override async Task SendAsync(HttpRequestMessage request, CancellationToken cancellationToken)
{
bool serverCommunicationSuccess = false;
+ var isInternalRequest = request.RequestUri!.ToString().StartsWith(absoluteServerAddress, StringComparison.InvariantCultureIgnoreCase);
try
{
@@ -21,25 +22,24 @@ protected override async Task SendAsync(HttpRequestMessage
serverCommunicationSuccess = true;
- if (response.IsSuccessStatusCode is false && response.Content.Headers.ContentType?.MediaType?.Contains("application/json", StringComparison.InvariantCultureIgnoreCase) is true)
+ if (isInternalRequest && /* The following exception handling mechanism applies exclusively to responses from our own server. */
+ response.IsSuccessStatusCode is false &&
+ response.Content.Headers.ContentType?.MediaType?.Contains("application/json", StringComparison.InvariantCultureIgnoreCase) is true)
{
- if (response.Headers.TryGetValues("Request-Id", out IEnumerable? values) && values is not null && values.Any())
- {
- RestErrorInfo restError = (await response!.Content.ReadFromJsonAsync(jsonSerializerOptions.GetTypeInfo(), cancellationToken))!;
+ RestErrorInfo restError = (await response!.Content.ReadFromJsonAsync(jsonSerializerOptions.GetTypeInfo(), cancellationToken))!;
- Type exceptionType = typeof(RestErrorInfo).Assembly.GetType(restError.ExceptionType!) ?? typeof(UnknownException);
+ Type exceptionType = typeof(RestErrorInfo).Assembly.GetType(restError.ExceptionType!) ?? typeof(UnknownException);
- var args = new List { typeof(KnownException).IsAssignableFrom(exceptionType) ? new LocalizedString(restError.Key!, restError.Message!) : restError.Message! };
+ var args = new List { typeof(KnownException).IsAssignableFrom(exceptionType) ? new LocalizedString(restError.Key!, restError.Message!) : restError.Message! };
- if (exceptionType == typeof(ResourceValidationException))
- {
- args.Add(restError.Payload);
- }
+ if (exceptionType == typeof(ResourceValidationException))
+ {
+ args.Add(restError.Payload);
+ }
- Exception exp = (Exception)Activator.CreateInstance(exceptionType, args.ToArray())!;
+ Exception exp = (Exception)Activator.CreateInstance(exceptionType, args.ToArray())!;
- throw exp;
- }
+ throw exp;
}
if (response.StatusCode is HttpStatusCode.Unauthorized)
@@ -64,7 +64,10 @@ protected override async Task SendAsync(HttpRequestMessage
//#if (signalR != true)
finally
{
- pubSubService.Publish(ClientPubSubMessages.IS_ONLINE_CHANGED, serverCommunicationSuccess);
+ if (isInternalRequest)
+ {
+ pubSubService.Publish(ClientPubSubMessages.IS_ONLINE_CHANGED, serverCommunicationSuccess);
+ }
}
//#endif
}
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Services/HttpMessageHandlers/HttpMessageHandlersChainFactory.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Services/HttpMessageHandlers/HttpMessageHandlersChainFactory.cs
index 8ed58f0f44..f62e4d81f9 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Services/HttpMessageHandlers/HttpMessageHandlersChainFactory.cs
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Services/HttpMessageHandlers/HttpMessageHandlersChainFactory.cs
@@ -7,10 +7,11 @@
/// and returns a chain of handlers that will process HTTP messages sequentially.
/// The returned chain will include the following handlers, in order:
///
-/// 1.
-/// 2.
-/// 3.
-/// 4.
+/// 1.
+/// 2.
+/// 3.
+/// 4.
+/// 5.
///
/// The chain is constructed in reverse order, with the provided `transportHandler` as the final
/// link. Each subsequent handler in the chain receives the output of the previous one.
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Services/HttpMessageHandlers/LoggingDelegatingHandler.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Services/HttpMessageHandlers/LoggingDelegatingHandler.cs
new file mode 100644
index 0000000000..da6a471c21
--- /dev/null
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Services/HttpMessageHandlers/LoggingDelegatingHandler.cs
@@ -0,0 +1,38 @@
+using System.Diagnostics;
+
+namespace Boilerplate.Client.Core.Services.HttpMessageHandlers;
+
+internal class LoggingDelegatingHandler(ILogger logger, HttpMessageHandler handler)
+ : DelegatingHandler(handler)
+{
+ protected override async Task SendAsync(HttpRequestMessage request, CancellationToken cancellationToken)
+ {
+ logger.LogInformation("Sending HTTP request {Method} {Uri}", request.Method, request.RequestUri);
+
+ var stopwatch = Stopwatch.StartNew();
+ int? responseStatusCode = null;
+ try
+ {
+ var response = await base.SendAsync(request, cancellationToken);
+ responseStatusCode = (int?)response.StatusCode;
+ return response;
+ }
+ catch (RestException exp)
+ {
+ responseStatusCode = (int)exp.StatusCode;
+ throw;
+ }
+ catch (HttpRequestException exp)
+ {
+ responseStatusCode = (int?)exp.StatusCode;
+ throw;
+ }
+ finally
+ {
+ logger.Log(responseStatusCode is null or >= 400 ? LogLevel.Warning : LogLevel.Information, "Received HTTP response for {Uri} after {Duration}ms - {StatusCode}",
+ request.RequestUri,
+ stopwatch.ElapsedMilliseconds,
+ responseStatusCode);
+ }
+ }
+}
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Services/HttpMessageHandlers/RequestOptionNames.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Services/HttpMessageHandlers/RequestOptionNames.cs
index 3ead4cad05..1ff3539ab3 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Services/HttpMessageHandlers/RequestOptionNames.cs
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Services/HttpMessageHandlers/RequestOptionNames.cs
@@ -2,7 +2,7 @@
///
/// The generated HTTP client proxy by Bit.SourceGenerators will automatically include these request options in the constructed HttpRequestMessage.
-/// You can access these values within HTTP message handlers, such as .
+/// You can access these values within HTTP message handlers, such as .
///
public partial class RequestOptionNames
{
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Services/HttpMessageHandlers/RetryDelegatingHandler.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Services/HttpMessageHandlers/RetryDelegatingHandler.cs
index 08d38b9ae8..8e50cf5eb2 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Services/HttpMessageHandlers/RetryDelegatingHandler.cs
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Services/HttpMessageHandlers/RetryDelegatingHandler.cs
@@ -21,7 +21,7 @@ protected override async Task SendAsync(HttpRequestMessage
}
catch (Exception exp) when (exp is not KnownException || exp is ServerConnectionException) // If the exception is either unknown or a server connection issue, let's retry once more.
{
- if (HasNoRetryPolicy(request))
+ if (HasNoRetryPolicyAttribute(request))
throw;
lastExp = exp;
@@ -35,14 +35,16 @@ protected override async Task SendAsync(HttpRequestMessage
///
///
///
- private static bool HasNoRetryPolicy(HttpRequestMessage request)
+ private static bool HasNoRetryPolicyAttribute(HttpRequestMessage request)
{
if (request.Options.TryGetValue(new(RequestOptionNames.IControllerType), out Type? controllerType) is false)
return false;
var parameterTypes = ((Dictionary)request.Options.GetValueOrDefault(RequestOptionNames.ActionParametersInfo)!).Select(p => p.Value).ToArray();
var method = controllerType!.GetMethod((string)request.Options.GetValueOrDefault(RequestOptionNames.ActionName)!, parameterTypes)!;
- return method.GetCustomAttribute() is not null;
+
+ return controllerType.GetCustomAttribute(inherit: true) is not null ||
+ method.GetCustomAttribute() is not null;
}
private static IEnumerable GetDelaySequence(TimeSpan scaleFirstTry)
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Services/NoOpPrerenderStateService.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Services/NoOpPrerenderStateService.cs
index 5d94b5c1f7..0878bf9623 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Services/NoOpPrerenderStateService.cs
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Services/NoOpPrerenderStateService.cs
@@ -3,15 +3,7 @@
namespace Boilerplate.Client.Core.Services;
///
-/// The Client.Core codebase is shared across different Blazor hosting models, such as Hybrid and WebAssembly,
-/// which may or may not support pre-rendering. Additionally, the pre-rendering configuration can vary,
-/// being either enabled or disabled. To ensure compatibility across all scenarios, regardless of pre-rendering state,
-/// we introduce the IPrerenderStateService interface. This interface provides a GetValue method for data retrieval
-/// (e.g., in UserMenu’s OnInitAsync method).
-/// The WebPrerenderService implementation of IPrerenderStateService supports pre-rendering by leveraging
-/// PersistentComponentState to persist data across renders. However, for scenarios like Blazor Hybrid, where
-/// pre-rendering is not applicable, a 'Noop' (no operation) implementation is also provided. This Noop implementation
-/// simply executes the passed function and returns the result without persisting any data to PersistentComponentState.
+///
///
public class NoopPrerenderStateService : IPrerenderStateService
{
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Services/NoopLocalHttpServer.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Services/NoopLocalHttpServer.cs
index 327e9a28ce..ed0060400a 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Services/NoopLocalHttpServer.cs
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Services/NoopLocalHttpServer.cs
@@ -1,8 +1,8 @@
namespace Boilerplate.Client.Core.Services;
///
-/// Currently only Windows clients have local http server to have better support for social login.
-/// In other platforms, we don't have local http server and we use a noop implementation.
+///
+/// The is specifically registered for Android, iOS, and Web, where a local HTTP server is unnecessary.
///
public partial class NoopLocalHttpServer : ILocalHttpServer
{
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Services/PushNotificationServiceBase.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Services/PushNotificationServiceBase.cs
index 22fe69ae15..5265598f92 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Services/PushNotificationServiceBase.cs
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Services/PushNotificationServiceBase.cs
@@ -1,6 +1,5 @@
using Boilerplate.Shared.Dtos.PushNotification;
using Boilerplate.Shared.Controllers.PushNotification;
-using Microsoft.Extensions.Logging;
namespace Boilerplate.Client.Core.Services;
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Services/ThemeService.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Services/ThemeService.cs
index f03bbe9e29..ae3e266f15 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Services/ThemeService.cs
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Services/ThemeService.cs
@@ -24,14 +24,6 @@ public async Task ToggleTheme()
var theme = isDark ? AppThemeType.Dark : AppThemeType.Light;
pubSubService.Publish(ClientPubSubMessages.THEME_CHANGED, theme);
- await cookie.Set(new()
- {
- MaxAge = 30 * 24 * 3600,
- Name = "bit.Theme",
- Secure = AppEnvironment.IsDev() is false,
- Value = Uri.EscapeDataString(newThemeName),
- });
-
return theme;
}
}
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Styles/app.scss b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Styles/app.scss
index b850fa2043..8d709324f8 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Styles/app.scss
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Styles/app.scss
@@ -67,6 +67,10 @@ p {
}
}
+.max-width {
+ width: min(25rem, 100%);
+}
+
div[dir=rtl] {
.bitdatagrid-paginator {
.go-next, .go-last {
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/appsettings.json b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/appsettings.json
index c78c02f339..7691767137 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/appsettings.json
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/appsettings.json
@@ -1,4 +1,4 @@
-{
+{
//#if (api == "Integrated")
"ServerAddress": "http://localhost:5030/",
//#endif
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Maui/App.xaml.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Maui/App.xaml.cs
index 432d2440ad..0e8c2635b4 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Maui/App.xaml.cs
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Maui/App.xaml.cs
@@ -38,12 +38,28 @@ protected async override void OnStart()
//-:cnd:noEmit
#if Android
+
+ //+:cnd:noEmit
+ //#if (framework == 'net9.0')
+ const int minimumSupportedWebViewVersion = 94;
+ //#elif (framework == 'net8.0')
+ //#if (IsInsideProjectTemplate)
+ /*
+ //#endif
+ const int minimumSupportedWebViewVersion = 84;
+ //#if (IsInsideProjectTemplate)
+ */
+ //#endif
+ //#endif
+ //-:cnd:noEmit
+
if (Version.TryParse(Android.Webkit.WebView.CurrentWebViewPackage?.VersionName, out var webViewVersion) &&
- webViewVersion.Major < 83)
+ webViewVersion.Major < minimumSupportedWebViewVersion)
{
await App.Current!.Windows.First().Page!.DisplayAlert("Boilerplate", localizer[nameof(AppStrings.UpdateWebViewThroughGooglePlay)], localizer[nameof(AppStrings.Ok)]);
await Launcher.OpenAsync($"https://play.google.com/store/apps/details?id={Android.Webkit.WebView.CurrentWebViewPackage.PackageName}");
}
+//-:cnd:noEmit
#endif
}
catch (Exception exp)
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Maui/Boilerplate.Client.Maui.csproj b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Maui/Boilerplate.Client.Maui.csproj
index 4238d940e4..52b4b5434f 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Maui/Boilerplate.Client.Maui.csproj
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Maui/Boilerplate.Client.Maui.csproj
@@ -1,11 +1,11 @@
- net8.0-android;net8.0-ios;net8.0-maccatalyst
- $(TargetFrameworks);net8.0-windows10.0.19041.0
- net8.0-android
+ net9.0-android;net9.0-ios;net9.0-maccatalyst
+ $(TargetFrameworks);net9.0-windows10.0.19041.0
+ net9.0-android
-
+
Exe
true
true
@@ -94,8 +94,8 @@
-
-
+
+
@@ -148,6 +148,7 @@
+
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Maui/Services/MauiAppInsightsTelemetryInitializer.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Maui/Services/MauiAppInsightsTelemetryInitializer.cs
index 77e772e560..c0eb69ccfd 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Maui/Services/MauiAppInsightsTelemetryInitializer.cs
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Maui/Services/MauiAppInsightsTelemetryInitializer.cs
@@ -20,7 +20,7 @@ public void Initialize(ITelemetry telemetry)
telemetry.Context.GlobalProperties[nameof(ITelemetryContext.UserAgent)] = ITelemetryContext.Current.UserAgent;
telemetry.Context.GlobalProperties[nameof(ITelemetryContext.TimeZone)] = ITelemetryContext.Current.TimeZone;
telemetry.Context.GlobalProperties[nameof(ITelemetryContext.Culture)] = ITelemetryContext.Current.Culture;
- telemetry.Context.GlobalProperties[nameof(ITelemetryContext.IsOnline)] = ITelemetryContext.Current.IsOnline.ToString().ToLowerInvariant();
+ telemetry.Context.GlobalProperties[nameof(ITelemetryContext.IsOnline)] = ITelemetryContext.Current.IsOnline?.ToString().ToLowerInvariant();
}
telemetry.Context.Session.IsFirst = VersionTracking.IsFirstLaunchEver;
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Maui/Services/MauiExceptionHandler.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Maui/Services/MauiExceptionHandler.cs
index aba5b8504f..d5ffa6e90f 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Maui/Services/MauiExceptionHandler.cs
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Maui/Services/MauiExceptionHandler.cs
@@ -7,7 +7,7 @@ namespace Boilerplate.Client.Maui.Services;
/// Employing Microsoft.Extensions.Logging implementations (like Sentry.Extensions.Logging) will result in
/// automatic exception logging due to the logger.LogError method call within the ExceptionHandlerBase class.
///
-public partial class MauiExceptionHandler : ExceptionHandlerBase
+public partial class MauiExceptionHandler : ClientExceptionHandlerBase
{
protected override void Handle(Exception exception, Dictionary parameters)
{
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Maui/Services/MauiLocalHttpServer.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Maui/Services/MauiLocalHttpServer.cs
index 79885729bc..31babcf5dc 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Maui/Services/MauiLocalHttpServer.cs
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Maui/Services/MauiLocalHttpServer.cs
@@ -1,16 +1,18 @@
-using System.Net;
+using EmbedIO;
+using System.Net;
using System.Net.Sockets;
-using EmbedIO;
using EmbedIO.Actions;
using Boilerplate.Client.Core.Components;
-using Microsoft.Extensions.Logging;
namespace Boilerplate.Client.Maui.Services;
+///
+///
+///
public partial class MauiLocalHttpServer : ILocalHttpServer
{
- [AutoInject] private IConfiguration configuration;
[AutoInject] private IExceptionHandler exceptionHandler;
+ [AutoInject] private AbsoluteServerAddressProvider absoluteServerAddress;
private WebServer? localHttpServer;
@@ -25,7 +27,7 @@ public int Start(CancellationToken cancellationToken)
{
try
{
- var url = $"{configuration.GetServerAddress()}/api/Identity/SocialSignedIn?culture={CultureInfo.CurrentUICulture.Name}";
+ var url = new Uri(absoluteServerAddress, $"/api/Identity/SocialSignedIn?culture={CultureInfo.CurrentUICulture.Name}").ToString();
ctx.Redirect(url);
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Web/Boilerplate.Client.Web.csproj b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Web/Boilerplate.Client.Web.csproj
index 57509f1fc4..ffc21acad0 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Web/Boilerplate.Client.Web.csproj
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Web/Boilerplate.Client.Web.csproj
@@ -1,19 +1,18 @@
- net8.0
+ net9.0
true
false
true
true
-
- false
service-worker-assets.js
false
Default
+ false
true
true
@@ -24,6 +23,7 @@
+
@@ -44,7 +44,7 @@
-
+
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Web/Program.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Web/Program.cs
index fea7c32e43..97b2bc2bfe 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Web/Program.cs
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Web/Program.cs
@@ -1,4 +1,4 @@
-//-:cnd:noEmit
+//+:cnd:noEmit
using Microsoft.AspNetCore.Components;
using Microsoft.AspNetCore.Components.Web;
using Microsoft.AspNetCore.Components.WebAssembly.Hosting;
@@ -12,6 +12,19 @@ public static async Task Main(string[] args)
{
var builder = WebAssemblyHostBuilder.CreateDefault(args);
+ //#if (advancedTests == true)
+ //Pass configuration to BlazorWebAssembly
+ //More info: https://stackoverflow.com/questions/60831359/how-are-string-args-passed-to-program-main-in-a-blazor-webassembly-app
+ try
+ {
+ var js = (IJSInProcessRuntime)builder.Services.BuildServiceProvider().GetRequiredService();
+ var startupParams = js.Invoke("startupParams");
+ var configData = startupParams.Select(p => p.Split('=')).ToDictionary(p => p[0], p => p[1]);
+ builder.Configuration.AddInMemoryCollection(configData!);
+ }
+ catch { }
+ //#endif
+
AppEnvironment.Set(builder.HostEnvironment.Environment);
builder.Configuration.AddClientConfigurations(clientEntryAssemblyName: "Boilerplate.Client.Web");
@@ -21,11 +34,9 @@ public static async Task Main(string[] args)
// By default, App.razor adds Routes and HeadOutlet.
// The following is only required for blazor webassembly standalone.
builder.RootComponents.Add("head::after");
- //+:cnd:noEmit
//#if (appInsights == true)
builder.RootComponents.Add(selector: "head::after");
//#endif
- //-:cnd:noEmit
builder.RootComponents.Add("#app-container");
}
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Web/Services/WebExceptionHandler.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Web/Services/WebExceptionHandler.cs
index 2b6f05695e..8e7dd2c635 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Web/Services/WebExceptionHandler.cs
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Web/Services/WebExceptionHandler.cs
@@ -1,6 +1,6 @@
namespace Boilerplate.Client.Web.Services;
-public partial class WebExceptionHandler : ExceptionHandlerBase
+public partial class WebExceptionHandler : ClientExceptionHandlerBase
{
protected override void Handle(Exception exception, Dictionary parameters)
{
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Web/Services/WebPrerenderStateService.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Web/Services/WebPrerenderStateService.cs
index 0232dc1144..b93bcb17ad 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Web/Services/WebPrerenderStateService.cs
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Web/Services/WebPrerenderStateService.cs
@@ -7,7 +7,7 @@
namespace Boilerplate.Client.Web.Services;
///
-/// For more information docs.
+///
///
public partial class WebPrerenderStateService : IPrerenderStateService, IAsyncDisposable
{
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Web/appsettings.json b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Web/appsettings.json
index 5fe62e7f93..d2235cccdd 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Web/appsettings.json
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Web/appsettings.json
@@ -1,6 +1,7 @@
{
"WebAppRender": {
"PrerenderEnabled": false,
+ "PrerenderEnabled_Comment": "for apps with Prerender enabled, follow the instructions in the service-worker.published.js file",
"BlazorMode": "BlazorServer",
"BlazorMode_Comment": "BlazorServer, BlazorWebAssembly and BlazorAuto. Default value of Client.Core/appsettings.Production.json is BlazorAuto"
},
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Web/wwwroot/.well-known/apple-app-site-association b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Web/wwwroot/.well-known/apple-app-site-association
index 479c377c60..979b6f7d64 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Web/wwwroot/.well-known/apple-app-site-association
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Web/wwwroot/.well-known/apple-app-site-association
@@ -1,4 +1,4 @@
-{
+{
"activitycontinuation": {
"apps": [ "76WD644YU8.com.bitplatform.AdminPanel.Template", "76WD644YU8.com.bitplatform.Todo.Template" ]
},
@@ -18,6 +18,7 @@
"NOT /swagger/*",
"NOT /signin/*",
"NOT /.well-known/*",
+ "NOT /sitemap.xml",
"*"
]
},
@@ -34,6 +35,7 @@
"NOT /swagger/*",
"NOT /signin/*",
"NOT /.well-known/*",
+ "NOT /sitemap.xml",
"*"
]
}
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Web/wwwroot/service-worker.published.js b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Web/wwwroot/service-worker.published.js
index e275214ce2..da582b35c7 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Web/wwwroot/service-worker.published.js
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Web/wwwroot/service-worker.published.js
@@ -1,5 +1,5 @@
-//+:cnd:noEmit
-// bit version: 8.12.0
+//+:cnd:noEmit
+// bit version: 9.0.0
// https://github.com/bitfoundation/bitplatform/tree/develop/src/Bswup
//#if (notification == true)
@@ -31,7 +31,17 @@ self.externalAssets = [
"url": "/"
},
{
- url: "_framework/blazor.web.js?ver=8.0.404"
+ //#if (framework == "net9.0")
+ url: "_framework/blazor.web.js?ver=9.0.0"
+ //#else
+ //#if (IsInsideProjectTemplate == true)
+ /*
+ //#endif
+ url: "_framework/blazor.web.js?ver=8.0.11"
+ //#if (IsInsideProjectTemplate == true)
+ */
+ //#endif
+ //#endif
},
{
"url": "Boilerplate.Server.Web.styles.css"
@@ -52,9 +62,15 @@ self.serverHandledUrls = [
];
self.defaultUrl = "/";
-self.caseInsensitiveUrl = true;
-self.noPrerenderQuery = 'no-prerender=true';
-self.isPassive = self.disablePassiveFirstBoot = true;
+self.isPassive = true;
self.errorTolerance = 'lax';
+self.caseInsensitiveUrl = true;
+
+
+// on apps with Prerendering enabled, to have the best experience for the end user un-comment the following two lines.
+// more info: https://bitplatform.dev/bswup/service-worker
+// self.noPrerenderQuery = 'no-prerender=true';
+// self.disablePassiveFirstBoot = true;
+
self.importScripts('_content/Bit.Bswup/bit-bswup.sw.js');
\ No newline at end of file
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Windows/.config/dotnet-tools.json b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Windows/.config/dotnet-tools.json
index f8cf15add4..461b027bf4 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Windows/.config/dotnet-tools.json
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Windows/.config/dotnet-tools.json
@@ -1,9 +1,9 @@
-{
+{
"version": 1,
"isRoot": true,
"tools": {
"vpk": {
- "version": "0.0.869",
+ "version": "0.0.942",
"commands": [
"vpk"
]
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Windows/App.xaml.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Windows/App.xaml.cs
index f3a417e7b8..acc1f9a615 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Windows/App.xaml.cs
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Windows/App.xaml.cs
@@ -1,9 +1,11 @@
-using System.IO.IsolatedStorage;
+//+:cnd:noEmit
using System.IO;
using System.Windows;
-using System.Collections;
using Microsoft.Win32;
+using System.Collections;
using System.Windows.Media;
+using System.Windows.Threading;
+using System.IO.IsolatedStorage;
using Boilerplate.Client.Core.Styles;
namespace Boilerplate.Client.Windows;
@@ -17,14 +19,24 @@ public App()
var splash = new SplashScreen(typeof(App).Assembly, @"Resources\SplashScreen.png");
splash.Show(autoClose: true, topMost: true);
- Resources["PrimaryBgColor"] = new BrushConverter().ConvertFrom(IsDarkTheme() ? ThemeColors.PrimaryDarkBgColor : ThemeColors.PrimaryLightBgColor);
+ ConfigureAppTheme();
}
- private static bool IsDarkTheme()
+ private void ConfigureAppTheme()
{
+ //#if (framework == 'net9.0')
+ ThemeMode = ThemeMode.System;
+ Resources.MergedDictionaries.Add(new ResourceDictionary
+ {
+ Source = new Uri("pack://application:,,,/PresentationFramework.Fluent;component/Themes/Fluent.xaml", UriKind.Absolute)
+ });
+ //#endif
+
using var key = Registry.CurrentUser.OpenSubKey(@"Software\Microsoft\Windows\CurrentVersion\Themes\Personalize");
var value = key?.GetValue("AppsUseLightTheme");
- return value is int i && i == 0;
+ var isDark = value is int i && i == 0;
+
+ Resources["PrimaryBgColor"] = new BrushConverter().ConvertFrom(isDark ? ThemeColors.PrimaryDarkBgColor : ThemeColors.PrimaryLightBgColor);
}
const string WindowsStorageFilename = "windows.storage.json";
@@ -53,7 +65,7 @@ private void App_Exit(object sender, ExitEventArgs e)
writer.Write(JsonSerializer.Serialize(Properties));
}
- private void App_DispatcherUnhandledException(object sender, System.Windows.Threading.DispatcherUnhandledExceptionEventArgs e)
+ private void App_DispatcherUnhandledException(object sender, DispatcherUnhandledExceptionEventArgs e)
{
try
{
@@ -62,8 +74,8 @@ private void App_DispatcherUnhandledException(object sender, System.Windows.Thre
catch
{
var errorMessage = e.Exception.ToString();
- System.Windows.Clipboard.SetText(errorMessage);
- System.Windows.Forms.MessageBox.Show(errorMessage, "Error", MessageBoxButtons.OK, MessageBoxIcon.Error);
+ Clipboard.SetText(errorMessage);
+ System.Windows.MessageBox.Show(errorMessage, "Error", MessageBoxButton.OK, MessageBoxImage.Error);
}
e.Handled = true;
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Windows/Boilerplate.Client.Windows.csproj b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Windows/Boilerplate.Client.Windows.csproj
index f0d7956536..d137dc0ad5 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Windows/Boilerplate.Client.Windows.csproj
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Windows/Boilerplate.Client.Windows.csproj
@@ -2,11 +2,10 @@
WinExe
- net8.0-windows
+ net9.0-windows
enable
enable
true
- true
true
Boilerplate.Client.Windows
Boilerplate.Client.Windows.Program
@@ -15,6 +14,7 @@
BeforeBuildTasks;
$(ResolveStaticWebAssetsInputsDependsOn)
+ $(NoWarn);WPF0001
@@ -26,6 +26,8 @@
+
+
@@ -33,9 +35,6 @@
-
-
-
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Windows/MainWindow.xaml.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Windows/MainWindow.xaml.cs
index b171fb6cbf..4a05bf130d 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Windows/MainWindow.xaml.cs
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Windows/MainWindow.xaml.cs
@@ -1,6 +1,8 @@
//+:cnd:noEmit
using Microsoft.Web.WebView2.Core;
using Microsoft.AspNetCore.Components.WebView;
+using System.Drawing;
+using System.Diagnostics;
namespace Boilerplate.Client.Windows;
@@ -30,8 +32,9 @@ public MainWindow()
}
AppWebView.Services.GetRequiredService().Subscribe(ClientPubSubMessages.CULTURE_CHANGED, async culture =>
{
+ string executablePath = Environment.ProcessPath!;
+ Process.Start(executablePath);
App.Current.Shutdown();
- Application.Restart();
});
AppWebView.Loaded += async delegate
{
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Windows/Program.Services.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Windows/Program.Services.cs
index 0a9b133850..b55365d779 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Windows/Program.Services.cs
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Windows/Program.Services.cs
@@ -42,16 +42,7 @@ public static void AddClientWindowsProjectServices(this IServiceCollection servi
loggingBuilder.AddConfiguration(configuration.GetSection("Logging"));
loggingBuilder.AddEventSourceLogger();
- if (AppPlatform.IsWindows)
- {
- loggingBuilder.AddEventLog();
- }
- //#if (appCenter == true)
- if (Microsoft.AppCenter.AppCenter.Configured)
- {
- loggingBuilder.AddAppCenter(options => options.IncludeScopes = true);
- }
- //#endif
+ loggingBuilder.AddEventLog();
//#if (appInsights == true)
loggingBuilder.AddApplicationInsights(config =>
{
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Windows/Program.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Windows/Program.cs
index f29d6a50d7..9e30c106a8 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Windows/Program.cs
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Windows/Program.cs
@@ -8,16 +8,6 @@ public partial class Program
[STAThread]
public static void Main(string[] args)
{
- //+:cnd:noEmit
- //#if (appCenter == true)
- string? appCenterSecret = null;
- if (appCenterSecret is not null)
- {
- Microsoft.AppCenter.AppCenter.Start(appCenterSecret, typeof(Microsoft.AppCenter.Crashes.Crashes), typeof(Microsoft.AppCenter.Analytics.Analytics));
- }
- //#endif
- //-:cnd:noEmit
-
AppPlatform.IsBlazorHybrid = true;
ITelemetryContext.Current = new WindowsTelemetryContext();
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Windows/Services/WindowsAppInsightsTelemetryInitializer.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Windows/Services/WindowsAppInsightsTelemetryInitializer.cs
index 3589b903d5..b6d9ac626c 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Windows/Services/WindowsAppInsightsTelemetryInitializer.cs
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Windows/Services/WindowsAppInsightsTelemetryInitializer.cs
@@ -20,7 +20,7 @@ public void Initialize(ITelemetry telemetry)
telemetry.Context.GlobalProperties[nameof(ITelemetryContext.UserAgent)] = ITelemetryContext.Current.UserAgent;
telemetry.Context.GlobalProperties[nameof(ITelemetryContext.TimeZone)] = ITelemetryContext.Current.TimeZone;
telemetry.Context.GlobalProperties[nameof(ITelemetryContext.Culture)] = ITelemetryContext.Current.Culture;
- telemetry.Context.GlobalProperties[nameof(ITelemetryContext.IsOnline)] = ITelemetryContext.Current.IsOnline.ToString().ToLowerInvariant();
+ telemetry.Context.GlobalProperties[nameof(ITelemetryContext.IsOnline)] = ITelemetryContext.Current.IsOnline?.ToString().ToLowerInvariant();
}
}
}
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Windows/Services/WindowsDeviceCoordinator.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Windows/Services/WindowsDeviceCoordinator.cs
index 6dbbf26ea7..86f542899e 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Windows/Services/WindowsDeviceCoordinator.cs
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Windows/Services/WindowsDeviceCoordinator.cs
@@ -1,3 +1,12 @@
-namespace Boilerplate.Client.Windows.Services;
+//+:cnd:noEmit
+namespace Boilerplate.Client.Windows.Services;
-public partial class WindowsDeviceCoordinator : IBitDeviceCoordinator { }
+public partial class WindowsDeviceCoordinator : IBitDeviceCoordinator
+{
+ //#if (framework == 'net9.0')
+ public async Task ApplyTheme(bool isDark)
+ {
+ App.Current.ThemeMode = isDark ? System.Windows.ThemeMode.Dark : System.Windows.ThemeMode.Light;
+ }
+ //#endif
+}
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Windows/Services/WindowsExceptionHandler.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Windows/Services/WindowsExceptionHandler.cs
index 03c98a0444..ded179e349 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Windows/Services/WindowsExceptionHandler.cs
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Windows/Services/WindowsExceptionHandler.cs
@@ -2,11 +2,11 @@
///
/// Instead of Client.Core, install AppCenter, Firebase etc in Client.Windows, so the web version of the app won't download unnecessary packages.
-/// You can call their APIs such as Crashes.TrackError in WindowsExceptionHandler to monitor all exceptions across Android, iOS, Windows, and macOS.
+/// You can call their APIs such as Crashes.TrackError inside WindowsExceptionHandler to monitor all exceptions.
/// Employing Microsoft.Extensions.Logging implementations (like Sentry.Extensions.Logging) will result in
-/// automatic exception logging due to the logger.LogError method call within the ExceptionHandlerBase class.
+/// automatic exception logging due to the logger.LogError method call within the class.
///
-public partial class WindowsExceptionHandler : ExceptionHandlerBase
+public partial class WindowsExceptionHandler : ClientExceptionHandlerBase
{
protected override void Handle(Exception exception, Dictionary parameters)
{
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Windows/Services/WindowsLocalHttpServer.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Windows/Services/WindowsLocalHttpServer.cs
index 5b5c46bb18..c10bb849e8 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Windows/Services/WindowsLocalHttpServer.cs
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Windows/Services/WindowsLocalHttpServer.cs
@@ -1,18 +1,19 @@
-using System.Net;
+using EmbedIO;
+using System.Net;
using System.Net.Http;
using System.Net.Sockets;
-using EmbedIO;
using EmbedIO.Actions;
using Boilerplate.Client.Core.Components;
-using Microsoft.Extensions.Logging;
namespace Boilerplate.Client.Windows.Services;
+///
+///
+///
public partial class WindowsLocalHttpServer : ILocalHttpServer
{
- [AutoInject] private IConfiguration configuration;
[AutoInject] private IExceptionHandler exceptionHandler;
- [AutoInject] private ILogger logger = default!;
+ [AutoInject] private AbsoluteServerAddressProvider absoluteServerAddress;
private WebServer? localHttpServer;
@@ -27,7 +28,7 @@ public int Start(CancellationToken cancellationToken)
{
try
{
- var url = $"{configuration.GetServerAddress()}/api/Identity/SocialSignedIn?culture={CultureInfo.CurrentUICulture.Name}";
+ var url = new Uri(absoluteServerAddress, $"/api/Identity/SocialSignedIn?culture={CultureInfo.CurrentUICulture.Name}").ToString();
ctx.Redirect(url);
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Directory.Build.props b/src/Templates/Boilerplate/Bit.Boilerplate/src/Directory.Build.props
index fb789b23f0..31777cc84c 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Directory.Build.props
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Directory.Build.props
@@ -1,4 +1,4 @@
-
+
@@ -21,12 +21,6 @@
Development
Production
- 14.0
- 14.0
- 26.0
- 10.0.17763.0
- 10.0.17763.0
- 6.5
$(DefineConstants);Android
$(DefineConstants);iOS
$(DefineConstants);Windows
@@ -37,6 +31,28 @@
+
+
+ 14.0
+ 14.0
+ 26.0
+ 10.0.17763.0
+ 10.0.17763.0
+ 6.5
+
+
+
+
+
+ 16.4
+ 16.4
+ 26.0
+ 10.0.17763.0
+ 10.0.17763.0
+ 6.5
+
+
+
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Directory.Packages.props b/src/Templates/Boilerplate/Bit.Boilerplate/src/Directory.Packages.props
index 3e970cb07a..999ded2dca 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Directory.Packages.props
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Directory.Packages.props
@@ -1,32 +1,32 @@
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
@@ -42,19 +42,19 @@
-
-
+
+
-
-
-
-
-
+
+
+
+
+
@@ -66,25 +66,25 @@
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Directory.Packages8.props b/src/Templates/Boilerplate/Bit.Boilerplate/src/Directory.Packages8.props
new file mode 100644
index 0000000000..6c9ba3edaa
--- /dev/null
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Directory.Packages8.props
@@ -0,0 +1,96 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Api/.config/dotnet-tools.json b/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Api/.config/dotnet-tools.json
index 40d4373bd4..8f16bf4c3a 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Api/.config/dotnet-tools.json
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Api/.config/dotnet-tools.json
@@ -3,7 +3,11 @@
"isRoot": true,
"tools": {
"dotnet-ef": {
- "version": "8.0.10",
+ //#if (framework == 'net9.0')
+ "version": "9.0.0",
+ //#else
+ "version": "8.0.11",
+ //#endif
"commands": [
"dotnet-ef"
]
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Api/Boilerplate.Server.Api.csproj b/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Api/Boilerplate.Server.Api.csproj
index f729be6517..54e6d35083 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Api/Boilerplate.Server.Api.csproj
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Api/Boilerplate.Server.Api.csproj
@@ -1,7 +1,7 @@
- net8.0
+ net9.0
AC87AA5B-4B37-4E52-8468-2D5DF24AF256
PrepareResources;$(CompileDependsOn)
@@ -18,6 +18,7 @@
+
@@ -33,7 +34,7 @@
-
+
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Api/Controllers/Categories/CategoryController.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Api/Controllers/Categories/CategoryController.cs
index e2f39ea182..536fe678c6 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Api/Controllers/Categories/CategoryController.cs
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Api/Controllers/Categories/CategoryController.cs
@@ -6,7 +6,7 @@
using Boilerplate.Shared.Dtos.Categories;
using Boilerplate.Shared.Controllers.Categories;
-namespace Boilerplate.Server.Api.Controllers;
+namespace Boilerplate.Server.Api.Controllers.Categories;
[ApiController, Route("api/[controller]/[action]")]
public partial class CategoryController : AppControllerBase, ICategoryController
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Api/Controllers/Dashboard/DashboardController.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Api/Controllers/Dashboard/DashboardController.cs
index 7a2ac7701f..7895f782bc 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Api/Controllers/Dashboard/DashboardController.cs
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Api/Controllers/Dashboard/DashboardController.cs
@@ -1,7 +1,7 @@
using Boilerplate.Shared.Dtos.Dashboard;
using Boilerplate.Shared.Controllers.Dashboard;
-namespace Boilerplate.Server.Api.Controllers;
+namespace Boilerplate.Server.Api.Controllers.Dashboard;
[ApiController, Route("api/[controller]/[action]")]
public partial class DashboardController : AppControllerBase, IDashboardController
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Api/Controllers/Identity/IdentityController.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Api/Controllers/Identity/IdentityController.cs
index 88a97b1f5f..5abd60e54d 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Api/Controllers/Identity/IdentityController.cs
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Api/Controllers/Identity/IdentityController.cs
@@ -159,7 +159,7 @@ public async Task SignIn(SignInRequestDto request, CancellationToken cancellatio
}
///
- /// Creates a user session and adds its ID to the access and refresh tokens, but only if the sign-in is successful.
+ /// Creates a user session and adds its ID to the access and refresh tokens, but only if the sign-in is successful
///
private UserSession CreateUserSession(string? device)
{
@@ -218,14 +218,12 @@ public async Task> Refresh(RefreshRequestDto requ
}
finally
{
- try
+ if (user is not null)
{
- if (user is not null)
- {
- await userManager.UpdateAsync(user);
- }
+ var result = await userManager.UpdateAsync(user);
+ if (!result.Succeeded)
+ throw new ResourceValidationException(result.Errors.Select(err => new LocalizedString(err.Code, err.Description)).ToArray());
}
- catch (ConflictException) { /* When access_token gets expired and user navigates to the page that sends multiple requests in parallel, multiple concurrent refresh token api call happens and this will results into concurrency exception during updating session's renewed on. */ }
}
}
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Api/Controllers/Products/ProductController.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Api/Controllers/Products/ProductController.cs
index be48987b41..b455070c9b 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Api/Controllers/Products/ProductController.cs
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Api/Controllers/Products/ProductController.cs
@@ -4,9 +4,9 @@
using Microsoft.AspNetCore.SignalR;
//#endif
using Boilerplate.Shared.Dtos.Products;
-using Boilerplate.Shared.Controllers.Product;
+using Boilerplate.Shared.Controllers.Products;
-namespace Boilerplate.Server.Api.Controllers;
+namespace Boilerplate.Server.Api.Controllers.Products;
[ApiController, Route("api/[controller]/[action]")]
public partial class ProductController : AppControllerBase, IProductController
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Api/Controllers/Statistics/StatisticsController.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Api/Controllers/Statistics/StatisticsController.cs
new file mode 100644
index 0000000000..09b4d02182
--- /dev/null
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Api/Controllers/Statistics/StatisticsController.cs
@@ -0,0 +1,18 @@
+using Boilerplate.Server.Api.Services;
+using Boilerplate.Shared.Dtos.Statistics;
+using Boilerplate.Shared.Controllers.Statistics;
+
+namespace Boilerplate.Server.Api.Controllers.Statistics;
+
+[ApiController, Route("api/[controller]/[action]")]
+public partial class StatisticsController : AppControllerBase, IStatisticsController
+{
+ [AutoInject] private NugetStatisticsHttpClient nugetHttpClient = default!;
+
+ [AllowAnonymous]
+ [HttpGet("{packageId}")]
+ public async Task GetNugetStats(string packageId, CancellationToken cancellationToken)
+ {
+ return await nugetHttpClient.GetPackageStats(packageId, cancellationToken);
+ }
+}
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Api/Data/AppDbContext.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Api/Data/AppDbContext.cs
index 081ce477e8..39f2c1e9e3 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Api/Data/AppDbContext.cs
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Api/Data/AppDbContext.cs
@@ -207,7 +207,7 @@ private void ConcurrencyStamp(ModelBuilder modelBuilder)
foreach (var entityType in modelBuilder.Model.GetEntityTypes())
{
foreach (var property in entityType.GetProperties()
- .Where(p => p.Name is "ConcurrencyStamp"))
+ .Where(p => p.Name is "ConcurrencyStamp" && p.PropertyInfo?.PropertyType == typeof(byte[])))
{
var builder = new PropertyBuilder(property);
builder.IsConcurrencyToken()
@@ -218,12 +218,9 @@ private void ConcurrencyStamp(ModelBuilder modelBuilder)
{
//#endif
//#if (database == "PostgreSQL")
- if (property.ClrType == typeof(byte[]))
- {
- builder.HasConversion(new ValueConverter(
- v => BitConverter.ToUInt32(v, 0),
- v => BitConverter.GetBytes(v)));
- }
+ builder.HasConversion(new ValueConverter(
+ v => BitConverter.ToUInt32(v, 0),
+ v => BitConverter.GetBytes(v)));
//#endif
//#if (IsInsideProjectTemplate == true)
}
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Api/Data/Migrations/20241107182721_InitialMigration.Designer.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Api/Data/Migrations/20241107182721_InitialMigration.Designer.cs
index d7123ec841..6d697cb8a1 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Api/Data/Migrations/20241107182721_InitialMigration.Designer.cs
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Api/Data/Migrations/20241107182721_InitialMigration.Designer.cs
@@ -13,7 +13,7 @@ partial class InitialMigration
protected override void BuildTargetModel(ModelBuilder modelBuilder)
{
#pragma warning disable 612, 618
- modelBuilder.HasAnnotation("ProductVersion", "8.0.10");
+ modelBuilder.HasAnnotation("ProductVersion", "9.0.0");
modelBuilder.Entity("Boilerplate.Server.Api.Models.Categories.Category", b =>
{
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Api/Data/Migrations/AppDbContextModelSnapshot.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Api/Data/Migrations/AppDbContextModelSnapshot.cs
index 03c510345a..f864c7220d 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Api/Data/Migrations/AppDbContextModelSnapshot.cs
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Api/Data/Migrations/AppDbContextModelSnapshot.cs
@@ -11,7 +11,7 @@ partial class AppDbContextModelSnapshot : ModelSnapshot
protected override void BuildModel(ModelBuilder modelBuilder)
{
#pragma warning disable 612, 618
- modelBuilder.HasAnnotation("ProductVersion", "8.0.10");
+ modelBuilder.HasAnnotation("ProductVersion", "9.0.0");
modelBuilder.Entity("Boilerplate.Server.Api.Models.Categories.Category", b =>
{
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Api/Extensions/SignInManagerExtensions.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Api/Extensions/SignInManagerExtensions.cs
index 8a63f0b23f..20f6b832e9 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Api/Extensions/SignInManagerExtensions.cs
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Api/Extensions/SignInManagerExtensions.cs
@@ -12,14 +12,13 @@ public static partial class SignInManagerExtensions
///
/// 1. When the user opts to sign in using a 6-digit code received via SMS.
/// 2. When the user chooses to sign in using a 6-digit code sent via email, typically within a magic link.
- /// 3. After a successful email confirmation post sign-up, to automatically sign in the confirmed user for an improved user experience.
- /// 4. After a successful phone number confirmation post sign-up, to automatically sign in the confirmed user for a smoother user experience.
+ /// 3. After a successful email confirmation after sign-up, to automatically sign in the confirmed user for an improved user experience.
+ /// 4. After a successful phone number confirmation after sign-up, to automatically sign in the confirmed user for a smoother user experience.
/// 5. When the browser is redirected to a magic link created after a social sign-in, to automatically authenticate the user.
/// 6. When the user opts to sign in using a 6-digit code delivered via native push notification, web push or SignalR message (if configured).
///
/// It's important to clarify the authentication method (e.g., Social, SMS, Email, or Push Notification)
- /// to avoid sending a second step to the same communication channel.
- /// For successful two-step authentication, the user must use a different method for the second step.
+ /// to avoid sending a second step to the same communication channel: For successful two-step authentication, the user must use a different method for the second step.
///
public static async Task<(SignInResult signInResult, string? authenticationMethod)> OtpSignInAsync(this SignInManager signInManager, User user, string otp)
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Api/Mappers/Readme.md b/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Api/Mappers/Readme.md
index fad9970be8..6ebaa3422d 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Api/Mappers/Readme.md
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Api/Mappers/Readme.md
@@ -1,14 +1,14 @@
-When you have an IQueryable of an Entity or Model classes from EntityFrameworkCore,
+When you have an IQueryable of an Entity or Model classes from EntityFrameworkCore,
you ultimately need to convert it into an IQueryable of DTO classes and return it to the client.
The client can also implement pagination during the API call by sending values for $top, $skip and sort by $orderby in request query string.
-Ultimately, the query is executed by aspnetcore and the data gets streamed from the database to the client, which is the most optimal case.
-For this, you need to write a `Project` for each Entity you intend to return a query of DTO class from.
+Ultimately, the query is executed by aspnetcore and the data gets `streamed` from the database to the client, which is the most optimal case.
+For this, you need to write a `Project` method for each Entity you intend to return a query of DTO class from.
You also write a `Map` for when a DTO is sent to the server for create or update api,
so you can convert it to an Entity and save it in the database using ef core.
You also need a Map method to convert DTO to Entity and vice versa.
-You also need a `Patch` method for the update scenario, to perform update operation, first get the Entity from the database with its Id,
+You might also need a `Patch` method for the update scenario, to perform update operation, first get the Entity from the database with its Id,
then patch the latest changes from the DTO sent by the client, and finally save it.
These methods (`Project`, `Map` and `Patch`) are gets called in controllers.
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Api/Program.Services.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Api/Program.Services.cs
index 72b4b9ed1e..c2165f0c70 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Api/Program.Services.cs
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Api/Program.Services.cs
@@ -131,11 +131,11 @@ public static void AddServerApiProjectServices(this WebApplicationBuilder builde
services.AddAntiforgery();
- services.ConfigureHttpJsonOptions(options => options.SerializerOptions.TypeInfoResolverChain.AddRange([AppJsonContext.Default, IdentityJsonContext.Default]));
+ services.ConfigureHttpJsonOptions(options => options.SerializerOptions.TypeInfoResolverChain.AddRange([AppJsonContext.Default, IdentityJsonContext.Default, ServerJsonContext.Default]));
services
.AddControllers()
- .AddJsonOptions(options => options.JsonSerializerOptions.TypeInfoResolverChain.AddRange([AppJsonContext.Default, IdentityJsonContext.Default]))
+ .AddJsonOptions(options => options.JsonSerializerOptions.TypeInfoResolverChain.AddRange([AppJsonContext.Default, IdentityJsonContext.Default, ServerJsonContext.Default]))
//#if (api == "Integrated")
.AddApplicationPart(typeof(AppControllerBase).Assembly)
//#endif
@@ -189,10 +189,16 @@ void AddDbContext(DbContextOptionsBuilder options)
});
//#elif (database == "MySql")
+ //#if (IsInsideProjectTemplate == true)
+ /*
+ //#endif
options.UseMySql(configuration.GetConnectionString("MySqlSQLConnectionString"), ServerVersion.AutoDetect(configuration.GetConnectionString("MySqlSQLConnectionString")), dbOptions =>
{
});
+ //#if (IsInsideProjectTemplate == true)
+ */
+ //#endif
//#elif (database == "Other")
throw new NotImplementedException("Install and configure any database supported by ef core (https://learn.microsoft.com/en-us/ef/core/providers)");
//#endif
@@ -254,6 +260,11 @@ void AddDbContext(DbContextOptionsBuilder options)
c.BaseAddress = new Uri("https://www.google.com/recaptcha/");
});
//#endif
+
+ services.AddHttpClient(c =>
+ {
+ c.BaseAddress = new Uri("https://azuresearch-usnc.nuget.org");
+ });
}
private static void AddIdentity(WebApplicationBuilder builder)
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Api/Services/NugetStatisticsHttpClient.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Api/Services/NugetStatisticsHttpClient.cs
new file mode 100644
index 0000000000..22f870b34c
--- /dev/null
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Api/Services/NugetStatisticsHttpClient.cs
@@ -0,0 +1,18 @@
+using Boilerplate.Shared.Dtos.Statistics;
+
+namespace Boilerplate.Server.Api.Services;
+
+public partial class NugetStatisticsHttpClient
+{
+ [AutoInject] protected HttpClient httpClient = default!;
+
+ public virtual async ValueTask GetPackageStats(string packageId, CancellationToken cancellationToken)
+ {
+ var url = $"/query?q=packageid:{packageId}";
+
+ var response = await httpClient.GetFromJsonAsync(url, ServerJsonContext.Default.Options.GetTypeInfo(), cancellationToken)
+ ?? throw new ResourceNotFoundException(packageId);
+
+ return response;
+ }
+}
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Api/Services/PushNotificationService.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Api/Services/PushNotificationService.cs
index 0b49fd0eae..6df512bf92 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Api/Services/PushNotificationService.cs
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Api/Services/PushNotificationService.cs
@@ -96,7 +96,7 @@ public async Task RequestPush(string? title = null, string? message = null, stri
}
catch (Exception exp)
{
- logger.LogError(exp, "Failed to send push notification.");
+ logger.LogWarning(exp, "Failed to send push notification.");
}
}
}
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Api/Services/ServerExceptionHandler.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Api/Services/ServerExceptionHandler.cs
index 4cbea7ccfd..f0d31bcd1c 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Api/Services/ServerExceptionHandler.cs
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Api/Services/ServerExceptionHandler.cs
@@ -1,15 +1,13 @@
using System.Net;
-using System.Reflection;
using System.Diagnostics;
using Microsoft.Net.Http.Headers;
using Microsoft.AspNetCore.Diagnostics;
namespace Boilerplate.Server.Api.Services;
-public partial class ServerExceptionHandler : IExceptionHandler
+public partial class ServerExceptionHandler : SharedExceptionHandler, IExceptionHandler
{
[AutoInject] private IWebHostEnvironment webHostEnvironment = default!;
- [AutoInject] private IStringLocalizer localizer = default!;
[AutoInject] private JsonSerializerOptions jsonSerializerOptions = default!;
public async ValueTask TryHandleAsync(HttpContext httpContext, Exception e, CancellationToken cancellationToken)
@@ -22,13 +20,13 @@ public async ValueTask TryHandleAsync(HttpContext httpContext, Exception e
// The details of all of the exceptions are returned only in dev mode. in any other modes like production, only the details of the known exceptions are returned.
var key = knownException?.Key ?? nameof(UnknownException);
- var message = knownException?.Message ?? (webHostEnvironment.IsDevelopment() ? exception.Message : localizer[nameof(UnknownException)]);
+ var message = GetExceptionMessageToShow(exception);
var statusCode = (int)(exception is RestException restExp ? restExp.StatusCode : HttpStatusCode.InternalServerError);
if (exception is KnownException && message == key)
{
- message = localizer[message];
+ message = Localizer[message];
}
var restExceptionPayload = new RestErrorInfo
@@ -49,18 +47,4 @@ public async ValueTask TryHandleAsync(HttpContext httpContext, Exception e
return true;
}
-
- private Exception UnWrapException(Exception exception)
- {
- if (exception is AggregateException aggregateException)
- {
- return aggregateException.Flatten().InnerException ?? aggregateException;
- }
- else if (exception is TargetInvocationException)
- {
- return exception.InnerException ?? exception;
- }
-
- return exception;
- }
}
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Api/Services/ServerJsonContext.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Api/Services/ServerJsonContext.cs
index 801a336c29..6b02767d20 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Api/Services/ServerJsonContext.cs
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Api/Services/ServerJsonContext.cs
@@ -1,11 +1,13 @@
//+:cnd:noEmit
+using Boilerplate.Shared.Dtos.Statistics;
+
namespace Boilerplate.Server.Api.Services;
///
/// https://devblogs.microsoft.com/dotnet/try-the-new-system-text-json-source-generator/
///
[JsonSourceGenerationOptions(PropertyNamingPolicy = JsonKnownNamingPolicy.CamelCase)]
-[JsonSerializable(typeof(Dictionary))]
+[JsonSerializable(typeof(NugetStatsDto))]
//#if (captcha == "reCaptcha")
[JsonSerializable(typeof(GoogleRecaptchaVerificationResponse))]
//#endif
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Web/.config/dotnet-tools.json b/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Web/.config/dotnet-tools.json
index 40d4373bd4..8f16bf4c3a 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Web/.config/dotnet-tools.json
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Web/.config/dotnet-tools.json
@@ -3,7 +3,11 @@
"isRoot": true,
"tools": {
"dotnet-ef": {
- "version": "8.0.10",
+ //#if (framework == 'net9.0')
+ "version": "9.0.0",
+ //#else
+ "version": "8.0.11",
+ //#endif
"commands": [
"dotnet-ef"
]
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Web/Boilerplate.Server.Web.csproj b/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Web/Boilerplate.Server.Web.csproj
index 813308ddd4..4a7e29850d 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Web/Boilerplate.Server.Web.csproj
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Web/Boilerplate.Server.Web.csproj
@@ -1,12 +1,13 @@
- net8.0
+ net9.0
AC87AA5B-4B37-4E52-8468-2D5DF24AF256
false
+
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Web/Components/App.razor b/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Web/Components/App.razor
index 5204de1499..0e360e84d5 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Web/Components/App.razor
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Web/Components/App.razor
@@ -1,9 +1,18 @@
@using Boilerplate.Client.Web.Components
+@using Microsoft.AspNetCore.Components.Routing
+@attribute [StreamRendering(enabled: true)]
@*+:cnd:noEmit*@
@{
var noPrerender = HttpContext.Request.Query["no-prerender"].Count > 0;
var renderMode = noPrerender ? noPrerenderBlazorWebAssembly : serverWebSettings.WebAppRender.RenderMode;
+ @*#if (framework == "net9.0")*@
+ if (HttpContext.AcceptsInteractiveRouting() is false)
+ {
+ // https://learn.microsoft.com/en-us/aspnet/core/release-notes/aspnetcore-9.0?view=aspnetcore-9.0#add-static-server-side-rendering-ssr-pages-to-a-globally-interactive-blazor-web-app
+ renderMode = null;
+ }
+ @*#endif*@
}
@@ -54,14 +63,24 @@
@if (renderMode != null && (serverWebSettings.WebAppRender.PrerenderEnabled is false || noPrerender))
{
-
+
}
@if (HttpContext.Request.IsCrawlerClient() is false)
{
-
+ @*#if (framework == "net9.0")*@
+
+ @*#else*@
+ @*#if (IsInsideProjectTemplate == true)*@
+ /*
+ @*#endif)*@
+
+ @*#if (IsInsideProjectTemplate == true)*@
+ */
+ @*#endif)*@
+ @*#endif)*@
@if (serverWebSettings.WebAppRender.PwaEnabled)
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Web/Components/App.razor.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Web/Components/App.razor.cs
index 1d08359c5d..e745ec44e9 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Web/Components/App.razor.cs
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Web/Components/App.razor.cs
@@ -4,7 +4,6 @@
namespace Boilerplate.Server.Web.Components;
-[StreamRendering(enabled: true)]
public partial class App
{
private static readonly IComponentRenderMode noPrerenderBlazorWebAssembly = new InteractiveWebAssemblyRenderMode(prerender: false);
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Web/Program.Middlewares.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Web/Program.Middlewares.cs
index 8f2c0376ff..46409dcf14 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Web/Program.Middlewares.cs
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Web/Program.Middlewares.cs
@@ -132,6 +132,9 @@ public static void ConfigureMiddlewares(this WebApplication app)
app.UseSiteMap();
// Handle the rest of requests with blazor
+ //#if (framework == 'net9.0')
+ app.MapStaticAssets();
+ //#endif
var blazorApp = app.MapRazorComponents()
.AddInteractiveServerRenderMode()
.AddInteractiveWebAssemblyRenderMode()
@@ -212,7 +215,7 @@ private static void Configure_401_403_404_Pages(WebApplication app)
var qs = HttpUtility.ParseQueryString(httpContext.Request.QueryString.Value ?? string.Empty);
qs.Remove("try_refreshing_token");
- var returnUrl = UriHelper.BuildRelative(httpContext.Request.PathBase, httpContext.Request.Path, new QueryString(qs.ToString()));
+ var returnUrl = UriHelper.BuildRelative(httpContext.Request.PathBase, httpContext.Request.Path, new QueryString($"?{qs}"));
httpContext.Response.Redirect($"{Urls.NotAuthorizedPage}?return-url={returnUrl}&isForbidden={(is403 ? "true" : "false")}");
}
else if (httpContext.Response.StatusCode is 404 &&
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Shared/Boilerplate.Shared.csproj b/src/Templates/Boilerplate/Bit.Boilerplate/src/Shared/Boilerplate.Shared.csproj
index d91b299f5b..a38fb10801 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Shared/Boilerplate.Shared.csproj
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Shared/Boilerplate.Shared.csproj
@@ -1,7 +1,7 @@
- net8.0
+ net9.0
PrepareResources;$(CompileDependsOn)
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Shared/Controllers/Attributes.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Shared/Controllers/Attributes.cs
index 55a18795a7..b8a2b5b43e 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Shared/Controllers/Attributes.cs
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Shared/Controllers/Attributes.cs
@@ -38,10 +38,23 @@ internal partial class HttpPatchAttribute(string? template = null) : Attribute
///
/// Avoid retrying the request upon failure.
-///
///
-[AttributeUsage(AttributeTargets.Method)]
+[AttributeUsage(AttributeTargets.Method | AttributeTargets.Interface)]
public partial class NoRetryPolicyAttribute : Attribute
{
}
+
+///
+/// This `optional` attribute enables `client-side` validation of access token expiry before making any requests to the server.
+/// By checking the token's validity locally, unnecessary server requests that would result in a 401 response are avoided,
+/// and the refresh token can be invoked immediately if the access token is expired.
+/// Since access tokens are intentionally set to expire frequently for security and other benefits, this scenario is expected to occur often.
+/// Performing this validation on the client improves overall application performance by reducing redundant network calls.
+/// Note: This attribute requires the client’s date and time settings to be accurate, as incorrect settings may cause validation issues.
+///
+[AttributeUsage(AttributeTargets.Method | AttributeTargets.Interface)]
+public partial class AuthorizedApiAttribute : Attribute
+{
+
+}
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Shared/Controllers/Categories/ICategoryController.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Shared/Controllers/Categories/ICategoryController.cs
index e05c46bb5a..2f3e35b1f3 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Shared/Controllers/Categories/ICategoryController.cs
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Shared/Controllers/Categories/ICategoryController.cs
@@ -2,7 +2,7 @@
namespace Boilerplate.Shared.Controllers.Categories;
-[Route("api/[controller]/[action]/")]
+[Route("api/[controller]/[action]/"), AuthorizedApi]
public interface ICategoryController : IAppController
{
[HttpGet("{id}")]
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Shared/Controllers/Dashboard/IDashboardController.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Shared/Controllers/Dashboard/IDashboardController.cs
index a238327a30..836079c966 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Shared/Controllers/Dashboard/IDashboardController.cs
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Shared/Controllers/Dashboard/IDashboardController.cs
@@ -2,7 +2,7 @@
namespace Boilerplate.Shared.Controllers.Dashboard;
-[Route("api/[controller]/[action]/")]
+[Route("api/[controller]/[action]/"), AuthorizedApi]
public interface IDashboardController : IAppController
{
[HttpGet]
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Shared/Controllers/Identity/IUserController.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Shared/Controllers/Identity/IUserController.cs
index 0d915c8e2b..2e72e977a8 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Shared/Controllers/Identity/IUserController.cs
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Shared/Controllers/Identity/IUserController.cs
@@ -2,7 +2,7 @@
namespace Boilerplate.Shared.Controllers.Identity;
-[Route("api/[controller]/[action]/")]
+[Route("api/[controller]/[action]/"), AuthorizedApi]
public interface IUserController : IAppController
{
[HttpGet]
@@ -11,7 +11,7 @@ public interface IUserController : IAppController
[HttpGet]
Task> GetUserSessions(CancellationToken cancellationToken);
- [HttpPost]
+ [HttpPost, NoRetryPolicy]
Task SignOut(CancellationToken cancellationToken);
[HttpPost("{id}")]
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Shared/Controllers/Products/IProductController.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Shared/Controllers/Products/IProductController.cs
index 669f71e376..1656a8a3e7 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Shared/Controllers/Products/IProductController.cs
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Shared/Controllers/Products/IProductController.cs
@@ -1,8 +1,8 @@
using Boilerplate.Shared.Dtos.Products;
-namespace Boilerplate.Shared.Controllers.Product;
+namespace Boilerplate.Shared.Controllers.Products;
-[Route("api/[controller]/[action]/")]
+[Route("api/[controller]/[action]/"), AuthorizedApi]
public interface IProductController : IAppController
{
[HttpGet("{id}")]
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Shared/Controllers/Readme.md b/src/Templates/Boilerplate/Bit.Boilerplate/src/Shared/Controllers/Readme.md
index cb5eda9f51..eed5b93cf9 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Shared/Controllers/Readme.md
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Shared/Controllers/Readme.md
@@ -1,8 +1,8 @@
-**Bit.SourceGenerator interface based HttpClient proxy generator**
+**Bit.SourceGenerator interface based HttpClient proxy generator**
**Introduction:**
When defining server-side APIs, there are no restrictions. You can leverage features such as Api versioning, OData, ASP.NET Core Minimal API,
-Middleware, and more. On the client side, use HttpClient and optionally employ Bit.SourceGenerator.
+Middleware, and more. On the client side, use HttpClient and optionally employ Bit.SourceGenerators.
Getting started:
@@ -15,7 +15,8 @@ public interface ICategoryController : IAppController
2- Simply inject these interfaces into your classes, and you're all set!
-3- (Optional) implement that interface in server project.
+3- `Optionaly` implement that interface in server project.
+
```csharp
public class CategoryController : AppControllerBase, ICategoryController
```
@@ -27,7 +28,7 @@ that methods seen by the client in `ICategoryController` are present in `Categor
**Note:** Server-side methods may have conditions that make direct definition in the client-side interface challenging.
For example, an `Upload` method in `AttachmentController` has `IFormFile`,
and `Refresh` method of `IdentityController` returns `ActionResult` and these types are not present in client side.
-In this case you can still use `Bit.SourceGenerator`, but in order to prevent C# compiler's build error, write the followings:
+In this case you can still use `Bit.SourceGenerators`, but in order to prevent C# compiler's build error, write the followings:
```csharp
[HttpPost]
Task Refresh(RefreshRequestDto body) => default!;
@@ -52,5 +53,7 @@ Explore `IMinimalApiController` for example of ASP.NET Core Minimal API that has
3- Example of Query String.
+4- Direct GitHub API call at client-side in IStatisticsController's GetGitHubStats.
+
**Note:** We supprt [RFC6570](https://datatracker.ietf.org/doc/html/rfc6570) for request url templates thanks to [DoLess.UriTemplates](https://github.com/letsar/DoLess.UriTemplates?tab=readme-ov-file#examples)!
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Shared/Controllers/Statistics/IStatisticsController.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Shared/Controllers/Statistics/IStatisticsController.cs
new file mode 100644
index 0000000000..c4196ebc04
--- /dev/null
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Shared/Controllers/Statistics/IStatisticsController.cs
@@ -0,0 +1,13 @@
+using Boilerplate.Shared.Dtos.Statistics;
+
+namespace Boilerplate.Shared.Controllers.Statistics;
+
+[Route("api/[controller]/[action]/")]
+public interface IStatisticsController : IAppController
+{
+ [HttpGet("{packageId}")]
+ Task GetNugetStats(string packageId, CancellationToken cancellationToken);
+
+ [HttpGet, Route("https://api.github.com/repos/bitfoundation/bitplatform")]
+ Task GetGitHubStats(CancellationToken cancellationToken) => default!;
+}
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Shared/Controllers/Todo/ITodoItemController.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Shared/Controllers/Todo/ITodoItemController.cs
index a93719b9c0..00eac962fa 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Shared/Controllers/Todo/ITodoItemController.cs
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Shared/Controllers/Todo/ITodoItemController.cs
@@ -2,7 +2,7 @@
namespace Boilerplate.Shared.Controllers.Todo;
-[Route("api/[controller]/[action]/")]
+[Route("api/[controller]/[action]/"), AuthorizedApi]
public interface ITodoItemController : IAppController
{
[HttpGet("{id}")]
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Shared/Dtos/AppJsonContext.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Shared/Dtos/AppJsonContext.cs
index 6ab5f7d91c..39d4b3a7ad 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Shared/Dtos/AppJsonContext.cs
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Shared/Dtos/AppJsonContext.cs
@@ -9,6 +9,7 @@
//#if (notification == true)
using Boilerplate.Shared.Dtos.PushNotification;
//#endif
+using Boilerplate.Shared.Dtos.Statistics;
namespace Boilerplate.Shared.Dtos;
@@ -19,6 +20,8 @@ namespace Boilerplate.Shared.Dtos;
[JsonSerializable(typeof(Dictionary))]
[JsonSerializable(typeof(string[]))]
[JsonSerializable(typeof(RestErrorInfo))]
+[JsonSerializable(typeof(GitHubStats))]
+[JsonSerializable(typeof(NugetStatsDto))]
//#if (notification == true)
[JsonSerializable(typeof(DeviceInstallationDto))]
//#endif
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Shared/Dtos/Statistics/GitHubStats.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Shared/Dtos/Statistics/GitHubStats.cs
new file mode 100644
index 0000000000..27903db9f0
--- /dev/null
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Shared/Dtos/Statistics/GitHubStats.cs
@@ -0,0 +1,18 @@
+namespace Boilerplate.Shared.Dtos.Statistics;
+
+public record GitHubStats(
+ [property: JsonPropertyName("id")] int Id,
+ [property: JsonPropertyName("name")] string Name,
+ [property: JsonPropertyName("full_name")] string FullName,
+ [property: JsonPropertyName("description")] string Description,
+ [property: JsonPropertyName("homepage")] string Homepage,
+ [property: JsonPropertyName("size")] int Size,
+ [property: JsonPropertyName("stargazers_count")] int StargazersCount,
+ [property: JsonPropertyName("watchers_count")] int WatchersCount,
+ [property: JsonPropertyName("language")] string Language,
+ [property: JsonPropertyName("forks_count")] int ForksCount,
+ [property: JsonPropertyName("open_issues_count")] int OpenIssuesCount,
+ [property: JsonPropertyName("default_branch")] string DefaultBranch,
+ [property: JsonPropertyName("network_count")] int NetworkCount,
+ [property: JsonPropertyName("subscribers_count")] int SubscribersCount
+);
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Shared/Dtos/Statistics/NugetStatsDto.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Shared/Dtos/Statistics/NugetStatsDto.cs
new file mode 100644
index 0000000000..04d74ac268
--- /dev/null
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Shared/Dtos/Statistics/NugetStatsDto.cs
@@ -0,0 +1,15 @@
+namespace Boilerplate.Shared.Dtos.Statistics;
+
+public record NugetStatsDto(
+ [property: JsonPropertyName("data")] IReadOnlyList Data
+);
+
+public record Datum(
+ [property: JsonPropertyName("id")] string Id,
+ [property: JsonPropertyName("version")] string Version,
+ [property: JsonPropertyName("description")] string Description,
+ [property: JsonPropertyName("title")] string Title,
+ [property: JsonPropertyName("projectUrl")] string ProjectUrl,
+ [property: JsonPropertyName("totalDownloads")] int TotalDownloads
+);
+
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Shared/Extensions/TupleExtensions.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Shared/Extensions/TupleExtensions.cs
index a81cd2fc1c..e84fb45b37 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Shared/Extensions/TupleExtensions.cs
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Shared/Extensions/TupleExtensions.cs
@@ -33,6 +33,8 @@ namespace System.Threading.Tasks;
/// // The total time is 150ms 👍
/// }
/// }
+///
+/// See HomePage.razor.cs's OnInitAsync example.
///
public static partial class TupleExtensions
{
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Shared/Mapper.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Shared/Mapper.cs
index c798f4904b..6f803dcfb9 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Shared/Mapper.cs
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Shared/Mapper.cs
@@ -9,7 +9,7 @@ namespace Boilerplate.Shared;
///
/// Patching methods help you patch the DTO you have received from the server (for example, after calling an Update api)
-/// onto the DTO you have bound to the UI. This way, the UI gets updated with the latest saved changes,
+/// onto the DTO you have bound to the UI. This way, the UI gets updated with the latest stored changes,
/// and there's no need to re-fetch that specific data from the server.
/// For complete end to end sample you can check ProfilePage.razor.cs
/// You can add as many as Patch methods you want for other DTO classes here.
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Shared/Resources/AppStrings.fa.resx b/src/Templates/Boilerplate/Bit.Boilerplate/src/Shared/Resources/AppStrings.fa.resx
index 84e99323b0..1f2165350a 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Shared/Resources/AppStrings.fa.resx
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Shared/Resources/AppStrings.fa.resx
@@ -277,6 +277,9 @@
ویرایش پروفایل آفلاین
+
+
+ فرم ویرایش آفلاین مبتنیبر EF Core / Sqlite قابل استفاده در برنامه های وب / موبایل / دسکتاپ شما!
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Shared/Resources/AppStrings.nl.resx b/src/Templates/Boilerplate/Bit.Boilerplate/src/Shared/Resources/AppStrings.nl.resx
index 3873a39d58..89588e6038 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Shared/Resources/AppStrings.nl.resx
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Shared/Resources/AppStrings.nl.resx
@@ -274,6 +274,9 @@
Offline Profiel bewerken
+
+
+ EF Core/Sqlite-aangedreven offline bewerkingsformulieren direct in uw web-/mobiele/desktop-apps!
@@ -1067,7 +1070,7 @@
Voer de productnaam in
-
+
Aantal categorieën met product
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Shared/Resources/AppStrings.resx b/src/Templates/Boilerplate/Bit.Boilerplate/src/Shared/Resources/AppStrings.resx
index 3c21d04baa..f3b7ac1621 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Shared/Resources/AppStrings.resx
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Shared/Resources/AppStrings.resx
@@ -277,10 +277,13 @@
Offline Edit profile
+
+
+ EF Core / Sqlite powered offline edit form right into your web/mobile/desktop apps!
- FullName
+ Full name
Terms
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Shared/Services/AppEnvironment.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Shared/Services/AppEnvironment.cs
index 638ef21103..c0b217ada9 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Shared/Services/AppEnvironment.cs
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Shared/Services/AppEnvironment.cs
@@ -5,8 +5,7 @@ namespace Boilerplate.Shared.Services;
/// Unlike ASP.NET Core, which allows environment configuration via environment variables,
/// Android, iOS, Windows, and macOS do not support the exact same concept.
/// To maintain consistency, we introduced .
-/// The environment name is synchronized with ASP.NET Core environment's name in the API,
-/// Blazor Server, and Blazor WebAssembly (WASM).
+/// The environment name is synchronized with ASP.NET Core environment's name in the API, Blazor Server, and Blazor WebAssembly (WASM).
/// Additionally, in Blazor Hybrid, it stays in sync with the build configuration (Debug, Release).
///
public static partial class AppEnvironment
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Shared/Services/Contracts/IPrerenderStateService.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Shared/Services/Contracts/IPrerenderStateService.cs
index 3333d1ea2d..84c4acb4ec 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Shared/Services/Contracts/IPrerenderStateService.cs
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Shared/Services/Contracts/IPrerenderStateService.cs
@@ -3,17 +3,24 @@
namespace Boilerplate.Shared.Services.Contracts;
///
-/// This service simplifies the process of persisting application state in Pre-Rendering mode
-/// (explained in this documentation: https://docs.microsoft.com/en-us/aspnet/core/blazor/components/prerendering-and-integration#persist-prerendered-state).
-/// If your project does not require prerendering to be enabled, you can completely remove this service and its usages from your project.
+/// The Client.Core codebase is designed to support various Blazor hosting models, including Hybrid and WebAssembly,
+/// which may or may not enable pre-rendering. To ensure consistent behavior across all scenarios,
+/// the `IPrerenderStateService` interface is introduced. This service provides the `GetValue` method for data retrieval,
+/// such as during the `OnInitAsync` method in components like UserMenu.
+///
+/// The `WebPrerenderStateService` implementation of `IPrerenderStateService` facilitates pre-rendering by using
+/// PersistentComponentState to persist data across renders, simplifies the process of managing application state in pre-rendering scenarios outlined in
+/// the documentation: https://docs.microsoft.com/en-us/aspnet/core/blazor/components/prerendering-and-integration#persist-prerendered-state.
+///
+/// For cases where pre-rendering is unnecessary, such as in Blazor Hybrid, a `NoopPrerenderStateService` is provided. This implementation simply executes the provided
+/// function and returns its result without persisting any state.
+///
+/// If pre-rendering is not required for your project, this service and its related dependencies can be safely removed.
///
public interface IPrerenderStateService : IAsyncDisposable
{
///
- /// Instead of using ApplicationState.TryTakeFromJson, ApplicationState.RegisterOnPersisting,
- /// and ApplicationState.PersistAsJson (explained here: https://docs.microsoft.com/en-us/aspnet/core/blazor/components/prerendering-and-integration#persist-prerendered-state),
- /// one can easily use the following method () in the OnInit lifecycle method of the Blazor components or pages
- /// to retrieve everything that requires an async-await (like current user's info).
+ ///
///
Task GetValue(Func> factory,
[CallerLineNumber] int lineNumber = 0,
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Shared/Services/CultureInfoManager.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Shared/Services/CultureInfoManager.cs
index e249529b1d..982ae71684 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Shared/Services/CultureInfoManager.cs
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Shared/Services/CultureInfoManager.cs
@@ -39,7 +39,7 @@ public static CultureInfo CreateCultureInfo(string name)
public void SetCurrentCulture(string cultureName)
{
- var cultureInfo = SupportedCultures.FirstOrDefault(sc => sc.Culture.Name == cultureName).Culture ?? DefaultCulture;
+ var cultureInfo = SupportedCultures.FirstOrDefault(sc => string.Equals(sc.Culture.Name, cultureName, StringComparison.InvariantCultureIgnoreCase)).Culture ?? DefaultCulture;
CultureInfo.CurrentCulture = CultureInfo.DefaultThreadCurrentCulture = Thread.CurrentThread.CurrentCulture = cultureInfo;
CultureInfo.CurrentUICulture = CultureInfo.DefaultThreadCurrentUICulture = Thread.CurrentThread.CurrentUICulture = cultureInfo;
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Shared/Services/SharedExceptionHandler.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Shared/Services/SharedExceptionHandler.cs
new file mode 100644
index 0000000000..6a54ab1abb
--- /dev/null
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Shared/Services/SharedExceptionHandler.cs
@@ -0,0 +1,58 @@
+using System.Reflection;
+
+namespace Boilerplate.Shared.Services;
+
+public partial class SharedExceptionHandler
+{
+ [AutoInject] protected IStringLocalizer Localizer { get; set; } = default!;
+
+ protected string GetExceptionMessageToShow(Exception exception)
+ {
+ if (exception is KnownException)
+ return exception.Message;
+
+ if (AppEnvironment.IsDev())
+ return exception.ToString();
+
+ return Localizer[nameof(AppStrings.UnknownException)];
+ }
+
+ protected string GetExceptionMessageToLog(Exception exception)
+ {
+ var exceptionMessageToLog = exception.Message;
+ var innerException = exception.InnerException;
+
+ while (innerException is not null)
+ {
+ exceptionMessageToLog += $"{Environment.NewLine}{innerException.Message}";
+ innerException = innerException.InnerException;
+ }
+
+ return exceptionMessageToLog;
+ }
+
+ protected Exception UnWrapException(Exception exception)
+ {
+ if (exception is AggregateException aggregateException)
+ {
+ return aggregateException.Flatten().InnerException ?? aggregateException;
+ }
+ else if (exception is TargetInvocationException)
+ {
+ return exception.InnerException ?? exception;
+ }
+
+ return exception;
+ }
+
+ protected bool IgnoreException(Exception exception)
+ {
+ if (exception is KnownException)
+ return false;
+
+ return exception is TaskCanceledException ||
+ exception is OperationCanceledException ||
+ exception is TimeoutException ||
+ (exception.InnerException is not null && IgnoreException(exception.InnerException));
+ }
+}
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Shared/SharedSettings.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Shared/SharedSettings.cs
index f2f9c80e7c..2cc3ddc864 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Shared/SharedSettings.cs
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Shared/SharedSettings.cs
@@ -4,7 +4,7 @@ namespace Boilerplate.Shared;
public partial class SharedSettings : IValidatableObject
{
///
- /// If you are hosting the API and web client on different URLs (e.g., api.company.com and app.company.com), you must set `WebClientUrl` to your web client's address.
+ /// If you are hosting the API and web client on different URLs (e.g., adminpanel-api.bitplatform.dev and adminpanel.bitplatform.dev), you must set `WebClientUrl` to your web client's address.
/// This ensures that the API server redirects to the correct URL after social sign-ins and other similar actions.
///
public string? WebClientUrl { get; set; }
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Shared/appsettings.Development.json b/src/Templates/Boilerplate/Bit.Boilerplate/src/Shared/appsettings.Development.json
index d2a86e4696..d2b0879764 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Shared/appsettings.Development.json
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Shared/appsettings.Development.json
@@ -1,65 +1,81 @@
-{
+{
"Logging": {
- "Console": {
+ "LogLevel": {
+ "Default": "Information",
+ "Microsoft.AspNetCore*": "Warning",
+ "System.Net.Http.HttpClient": "Warning",
+ "System.Net.Http.HttpClient.*.LogicalHandler": "Warning"
+ },
+ //#if (appInsights == true)
+ "ApplicationInsights": {
"LogLevel": {
"Default": "Information",
- "Microsoft.AspNetCore": "Warning"
+ "Microsoft.AspNetCore*": "Warning",
+ "System.Net.Http.HttpClient.*.LogicalHandler": "Warning"
},
"IncludeScopes": true
},
- "EventLog": {
+ "ApplicationInsightsLoggerProvider": {
"LogLevel": {
"Default": "Information",
- "Microsoft.AspNetCore": "Warning"
+ "Microsoft.AspNetCore*": "Warning",
+ "System.Net.Http.HttpClient": "Warning",
+ "System.Net.Http.HttpClient.*.LogicalHandler": "Warning"
},
"IncludeScopes": true
},
- "EventSource": {
+ //#endif
+ //#if (appCenter == true)
+ "AppCenterLoggerProvider": {
"LogLevel": {
"Default": "Information",
- "Microsoft.AspNetCore": "Warning"
+ "Microsoft.AspNetCore*": "Warning",
+ "System.Net.Http.HttpClient.*.LogicalHandler": "Warning"
},
"IncludeScopes": true
},
- "DiagnosticLogger": {
+ //#endif
+ "Console": {
"LogLevel": {
"Default": "Information",
- "Microsoft.AspNetCore": "Warning"
+ "Microsoft.AspNetCore*": "Warning",
+ "System.Net.Http.HttpClient.*.LogicalHandler": "Warning"
},
"IncludeScopes": true
},
- "Debug": {
+ "WebAssemblyConsoleLoggerProvider": {
"LogLevel": {
"Default": "Information",
- "Microsoft.AspNetCore": "Warning"
+ "Microsoft.AspNetCore*": "Warning",
+ "System.Net.Http.HttpClient": "Warning",
+ "System.Net.Http.HttpClient.*.LogicalHandler": "Warning"
},
"IncludeScopes": true
},
- //#if (appInsights == true)
- "ApplicationInsights": {
+ "EventLog": {
"LogLevel": {
"Default": "Information",
- "Microsoft.AspNetCore": "Warning"
+ "Microsoft.AspNetCore*": "Warning",
+ "System.Net.Http.HttpClient.*.LogicalHandler": "Warning"
},
- "IncludeScopes": false
+ "IncludeScopes": true
},
- "ApplicationInsightsLoggerProvider": {
+ "EventSource": {
"LogLevel": {
"Default": "Information",
- "Microsoft.AspNetCore": "Warning"
+ "Microsoft.AspNetCore*": "Warning",
+ "System.Net.Http.HttpClient.*.LogicalHandler": "Warning"
},
- "IncludeScopes": false
+ "IncludeScopes": true
},
- //#endif
- //#if (appCenter == true)
- "AppCenterLoggerProvider": {
+ "Debug": {
"LogLevel": {
"Default": "Information",
- "Microsoft.AspNetCore": "Warning"
+ "Microsoft.AspNetCore*": "Warning",
+ "System.Net.Http.HttpClient.*.LogicalHandler": "Warning"
},
- "IncludeScopes": false
+ "IncludeScopes": true
}
- //#endif
},
"$schema": "https://json.schemastore.org/appsettings.json"
}
\ No newline at end of file
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Shared/appsettings.json b/src/Templates/Boilerplate/Bit.Boilerplate/src/Shared/appsettings.json
index f7313af1be..bc4b2d2dfe 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Shared/appsettings.json
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Shared/appsettings.json
@@ -1,4 +1,4 @@
-{
+{
"WebClientUrl": null,
"WebClientUrl_Comment": "If you are hosting the API and web client on different URLs (e.g., api.company.com and app.company.com), you must set `WebClientUrl` to your web client's address. This ensures that the API server redirects to the correct URL after social sign-ins and other similar actions.",
//#if (appInsights == true)
@@ -7,20 +7,22 @@
},
//#endif
"Logging": {
+ "LogLevel": {
+ "Default": "Warning",
+ "Microsoft.EntityFrameworkCore.Database.Command": "Information"
+ },
//#if (appInsights == true)
"ApplicationInsights": {
"LogLevel": {
"Default": "Warning",
- "Microsoft.EntityFrameworkCore.Database.Command": "Information",
- "Boilerplate.Client.Core.Services.AuthenticationManager": "Information"
+ "Microsoft.EntityFrameworkCore.Database.Command": "Information"
},
"IncludeScopes": true
},
"ApplicationInsightsLoggerProvider": {
"LogLevel": {
"Default": "Warning",
- "Microsoft.EntityFrameworkCore.Database.Command": "Information",
- "Boilerplate.Client.Core.Services.AuthenticationManager": "Information"
+ "Microsoft.EntityFrameworkCore.Database.Command": "Information"
},
"IncludeScopes": true
},
@@ -42,6 +44,13 @@
},
"IncludeScopes": true
},
+ "WebAssemblyConsoleLoggerProvider": {
+ "LogLevel": {
+ "Default": "Warning",
+ "Microsoft.EntityFrameworkCore.Database.Command": "Information"
+ },
+ "IncludeScopes": true
+ },
"EventLog": {
"LogLevel": {
"Default": "Warning",
@@ -59,7 +68,8 @@
"DiagnosticLogger": {
"LogLevel": {
"Default": "Information",
- "Microsoft.AspNetCore": "Warning"
+ "Microsoft.AspNetCore*": "Warning",
+ "System.Net.Http.HttpClient.*.LogicalHandler": "Warning"
},
"IncludeScopes": true
},
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Tests/Boilerplate.Tests.csproj b/src/Templates/Boilerplate/Bit.Boilerplate/src/Tests/Boilerplate.Tests.csproj
index 2c299476b7..25ea8e7f1a 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Tests/Boilerplate.Tests.csproj
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Tests/Boilerplate.Tests.csproj
@@ -1,7 +1,7 @@
- net8.0
+ net9.0
enable
true
$(MSBuildProjectDirectory)\.runsettings
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Tests/Extensions/BrowserContextExtensions.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Tests/Extensions/BrowserContextExtensions.cs
new file mode 100644
index 0000000000..f1ad37ad74
--- /dev/null
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Tests/Extensions/BrowserContextExtensions.cs
@@ -0,0 +1,18 @@
+namespace Boilerplate.Tests.Extensions;
+
+public static class PlaywrightInitialScriptExtensions
+{
+ public static async Task SetBlazorWebAssemblyServerAddress(this IBrowserContext context, string serverAddress)
+ {
+ await context.SetBlazorWebAssemblyConfiguration(new() { ["ServerAddress"] = serverAddress });
+ }
+
+ public static async Task SetBlazorWebAssemblyConfiguration(this IBrowserContext context, Dictionary configs)
+ {
+ //Pass configuration to BlazorWebAssembly
+ //More info: https://stackoverflow.com/questions/60831359/how-are-string-args-passed-to-program-main-in-a-blazor-webassembly-app
+
+ var arrayString = string.Join(',', configs.Select(p => $"'{p.Key}={p.Value}'"));
+ await context.AddInitScriptAsync($"window.startupParams = function() {{ return [ {arrayString} ]; }};");
+ }
+}
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Tests/Extensions/PlaywrightCacheExtensions.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Tests/Extensions/PlaywrightAssetCachingExtensions.cs
similarity index 63%
rename from src/Templates/Boilerplate/Bit.Boilerplate/src/Tests/Extensions/PlaywrightCacheExtensions.cs
rename to src/Templates/Boilerplate/Bit.Boilerplate/src/Tests/Extensions/PlaywrightAssetCachingExtensions.cs
index 2d42b91d73..86ee67b098 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Tests/Extensions/PlaywrightCacheExtensions.cs
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Tests/Extensions/PlaywrightAssetCachingExtensions.cs
@@ -3,9 +3,9 @@
namespace Boilerplate.Tests.Extensions;
-public static partial class PlaywrightCacheExtensions
+public static partial class PlaywrightAssetCachingExtensions
{
- private static readonly ConcurrentDictionary Headers)> cachedResponses = [];
+ public static ConcurrentDictionary Headers)> CachedResponses { get; } = [];
public static Task EnableBlazorWasmCaching(this IPage page) => page.EnableAssetCaching(BlazorWasmRegex());
@@ -27,12 +27,12 @@ private static async Task CacheHandler(IRoute route)
{
var url = new Uri(route.Request.Url).PathAndQuery;
- if (cachedResponses.TryGetValue(url, out var cachedResponse) is false)
+ if (CachedResponses.TryGetValue(url, out var cachedResponse) is false)
{
var response = await route.FetchAsync();
var body = await response.BodyAsync();
cachedResponse = (body, response.Headers);
- cachedResponses[url] = cachedResponse;
+ CachedResponses[url] = cachedResponse;
}
await route.FulfillAsync(new RouteFulfillOptions
@@ -43,10 +43,19 @@ await route.FulfillAsync(new RouteFulfillOptions
});
}
- public static void ClearCache() => cachedResponses.Clear();
+ public static bool ContainsAsset(Regex regex) => CachedResponses.Keys.Any(regex.IsMatch);
- public static bool ContainsAsset(Regex regex) => cachedResponses.Keys.Any(regex.IsMatch);
+ public static bool ContainsAsset(string url) => CachedResponses.Keys.Any(url.Contains);
+ public static void ClearBlazorWasmCache() => ClearCache(BlazorWasmRegex());
+
+ public static void ClearCache() => CachedResponses.Clear();
+
+ public static void ClearCache(Regex regex) => CachedResponses.Where(x => regex.IsMatch(x.Key)).ToList().ForEach(key => CachedResponses.TryRemove(key));
+
+ public static void ClearCache(string url) => CachedResponses.Where(x => url.Contains(x.Key)).ToList().ForEach(key => CachedResponses.TryRemove(key));
+
+ //Glob pattern: /_framework/*.{wasm|pdb|dat}?v=sha256-*
[GeneratedRegex(@"\/_framework\/[\w\.]+\.((wasm)|(pdb)|(dat))\?v=sha256-.+")]
- private static partial Regex BlazorWasmRegex();
+ public static partial Regex BlazorWasmRegex();
}
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Tests/Extensions/PlaywrightCacheStorageExtensions.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Tests/Extensions/PlaywrightCacheStorageExtensions.cs
new file mode 100644
index 0000000000..2c3aecbeed
--- /dev/null
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Tests/Extensions/PlaywrightCacheStorageExtensions.cs
@@ -0,0 +1,81 @@
+using System.Text.RegularExpressions;
+
+namespace Boilerplate.Tests.Extensions;
+
+public static class PlaywrightCacheStorageExtensions
+{
+ public static async Task DeleteCacheStorage(this IPage page, CacheId? cacheId = null)
+ {
+ // Chrome DevTools Protocol
+ // https://chromedevtools.github.io/devtools-protocol/tot/CacheStorage/
+
+ cacheId ??= new();
+ await using var client = await page.Context.NewCDPSessionAsync(page);
+ await client.SendAsync("CacheStorage.deleteCache", new() { ["cacheId"] = cacheId.Value });
+ }
+
+ public static async Task GetCacheStorageEntries(this IPage page, CacheId? cacheId = null)
+ {
+ cacheId ??= new();
+ await using var client = await page.Context.NewCDPSessionAsync(page);
+ var json = await client.SendAsync("CacheStorage.requestEntries", new() { ["cacheId"] = cacheId.Value });
+ return json.Value.Deserialize()!;
+ }
+}
+
+public record CacheId(string Origin = "http://localhost:5000/", string CacheName = "dotnet-resources-/")
+{
+ public string Value { get; init; } = $"{Origin}|{CacheName}";
+
+ public override string ToString() => Value;
+}
+
+public class CacheEntries
+{
+ [JsonPropertyName("cacheDataEntries")]
+ public List CacheDataEntries { get; set; } = [];
+
+ public List GetCacheEntries(Regex regex) => CacheDataEntries.Where(x => regex.IsMatch(x.RequestURL)).ToList();
+
+ public List GetCacheEntries(string url) => CacheDataEntries.Where(x => url.Contains(x.RequestURL)).ToList();
+
+ public bool ContainsCacheEntry(Regex regex) => CacheDataEntries.Exists(x => regex.IsMatch(x.RequestURL));
+
+ public bool ContainsCacheEntry(string url) => CacheDataEntries.Exists(x => url.Contains(x.RequestURL));
+}
+
+public class CacheEntry
+{
+ [JsonPropertyName("requestURL")]
+ public string RequestURL { get; set; }
+
+ [JsonPropertyName("requestMethod")]
+ public string RequestMethod { get; set; }
+
+ [JsonPropertyName("responseTime")]
+ public double ResponseTime { get; set; }
+
+ [JsonPropertyName("responseStatus")]
+ public int ResponseStatus { get; set; }
+
+ [JsonPropertyName("responseStatusText")]
+ public string ResponseStatusText { get; set; }
+
+ [JsonPropertyName("responseType")]
+ public string ResponseType { get; set; }
+
+ [JsonPropertyName("requestHeaders")]
+ public List RequestHeaders { get; set; }
+
+ [JsonPropertyName("responseHeaders")]
+ public List ResponseHeaders { get; set; }
+}
+
+public class RequestResponseHeader
+{
+ [JsonPropertyName("name")]
+ public string Name { get; set; }
+
+ [JsonPropertyName("value")]
+ public string Value { get; set; }
+}
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Tests/Extensions/PlaywrightHydrationExtensions.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Tests/Extensions/PlaywrightHydrationExtensions.cs
new file mode 100644
index 0000000000..6f02accab3
--- /dev/null
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Tests/Extensions/PlaywrightHydrationExtensions.cs
@@ -0,0 +1,43 @@
+using System.Text.RegularExpressions;
+
+namespace Boilerplate.Tests.Extensions;
+public static partial class PlaywrightHydrationExtensions
+{
+ public static async Task WaitForHydrationToComplete(this IPage page)
+ {
+ await page.WaitForFunctionAsync("document.title != 'Before-Hydration'");
+ //await Assertions.Expect(page.Locator("title")).Not.ToHaveTextAsync("Before-Hydration");
+ }
+
+ public static Task EnableHydrationCheck(this IBrowserContext context) => context.RouteAsync("**/*", ChangeTitleHandler);
+
+ public static Task EnableHydrationCheck(this IPage page) => page.RouteAsync("**/*", ChangeTitleHandler);
+
+ private static async Task ChangeTitleHandler(IRoute route)
+ {
+ var request = route.Request;
+ if (request.ResourceType == "document" && request.Method == HttpMethods.Get)
+ {
+ var response = await route.FetchAsync();
+
+ // Change page title to Before-Hydration to check if hydration is completed
+ // It will be set to original title once after hydration is completed
+ var body = await response.TextAsync();
+ body = TitleRegex().Replace(body, "Before-Hydration");
+
+ await route.FulfillAsync(new()
+ {
+ Response = response,
+ Body = body,
+ });
+ }
+ else
+ {
+ await route.ContinueAsync();
+ }
+ }
+
+ [GeneratedRegex(@"(.*?)<\/title>")]
+ private static partial Regex TitleRegex();
+}
+
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Tests/Extensions/PlaywrightNetworkExtensions.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Tests/Extensions/PlaywrightNetworkExtensions.cs
new file mode 100644
index 0000000000..a9f9285cdd
--- /dev/null
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Tests/Extensions/PlaywrightNetworkExtensions.cs
@@ -0,0 +1,320 @@
+using System.Text.RegularExpressions;
+
+namespace Boilerplate.Tests.Extensions;
+
+public static class PlaywrightNetworkExtensions
+{
+ public static async Task<PlaywrightNetworkSession> OpenNetworkSession(this IPage page)
+ {
+ // Enable CDP session to access network details
+ var client = await page.Context.NewCDPSessionAsync(page);
+ var networkSession = new PlaywrightNetworkSession(client);
+ await networkSession.Enable();
+ return networkSession;
+ }
+}
+
+public class PlaywrightNetworkSession : IAsyncDisposable
+{
+ private readonly ICDPSession client;
+ private readonly ICDPSessionEvent responseReceived;
+ private readonly ICDPSessionEvent loadingFinished;
+
+ public List<DownloadedResponse> DownloadedResponses { get; } = [];
+ public int TotalDownloaded => DownloadedResponses.Sum(x => x.EncodedDataLength);
+
+ public PlaywrightNetworkSession(ICDPSession client)
+ {
+ this.client = client;
+
+ // Chrome DevTools Protocol
+ // https://chromedevtools.github.io/devtools-protocol/1-3/Network/
+
+ // Listen to the 'Network.responseReceived' events
+ responseReceived = client.Event("Network.responseReceived");
+ responseReceived.OnEvent += OnResponseReceived;
+
+ // Listen to the 'Network.loadingFinished' events
+ loadingFinished = client.Event("Network.loadingFinished");
+ loadingFinished.OnEvent += OnLoadingFinished;
+ }
+
+ /// <summary>
+ /// Enables network tracking, network events will now be delivered to the client.
+ /// </summary>
+ public async Task Enable() => client.SendAsync("Network.enable");
+
+ /// <summary>
+ /// Disables network tracking, prevents network events from being sent to the client.
+ /// </summary>
+ public async Task Disable() => client.SendAsync("Network.disable");
+
+ private async void OnResponseReceived(object? sender, JsonElement? arg)
+ {
+ try
+ {
+ var data = arg!.Value.Deserialize<ResponseReceivedData>()!;
+ data.Response.RequestId = data.RequestId;
+ DownloadedResponses.Add(data.Response);
+ }
+ catch (Exception ex)
+ {
+ Console.WriteLine($"Failed to retrieve response data: {ex.Message}");
+ }
+ }
+
+ private async void OnLoadingFinished(object? sender, JsonElement? arg)
+ {
+ try
+ {
+ var data = arg!.Value.Deserialize<LoadingFinishedData>()!;
+ var response = DownloadedResponses.Find(x => x.RequestId == data.RequestId)!;
+ response.EncodedDataLength = data.EncodedDataLength;
+ }
+ catch (Exception ex)
+ {
+ Console.WriteLine($"Failed to retrieve encoded size: {ex.Message}");
+ }
+ }
+
+ #region Other Commands
+
+ public Task ClearBrowserCache() => client.SendAsync("Network.clearBrowserCache");
+
+ public Task ClearBrowserCookies() => client.SendAsync("Network.clearBrowserCookies");
+
+ /// <summary>
+ /// Toggles ignoring cache for each request. If true, cache will not be used.
+ /// </summary>
+ public Task SetCacheDisabled(bool disabled) => client.SendAsync("Network.setCacheDisabled", new() { ["cacheDisabled"] = disabled });
+
+ /// <summary>
+ /// Activates emulation of network conditions.
+ /// </summary>
+ public Task EmulateNetworkConditions(NetworkCondition networkCondition) =>
+ client.SendAsync("Network.emulateNetworkConditions", new()
+ {
+ ["offline"] = networkCondition.Offline,
+ ["latency"] = networkCondition.Latency,
+ ["downloadThroughput"] = networkCondition.DownloadThroughput,
+ ["uploadThroughput"] = networkCondition.UploadThroughput,
+ ["connectionType"] = networkCondition.ConnectionType
+ });
+
+ /// <summary>
+ /// Blocks URLs from loading.
+ /// </summary>
+ /// <param name="urls">URL patterns to block. Wildcards ('*') are allowed.</param>
+ public Task SetBlockedUrls(string[] urls) => client.SendAsync("Network.setBlockedURLs", new() { ["urls"] = urls });
+
+ #endregion
+
+ public List<DownloadedResponse> GetResponses(Regex regex) => DownloadedResponses.Where(x => regex.IsMatch(x.Url)).ToList();
+
+ public List<DownloadedResponse> GetResponses(string url) => DownloadedResponses.Where(x => url.Contains(x.Url)).ToList();
+
+ public bool ContainsResponse(Regex regex) => DownloadedResponses.Exists(x => regex.IsMatch(x.Url));
+
+ public bool ContainsResponse(string url) => DownloadedResponses.Exists(x => url.Contains(x.Url));
+
+ public async ValueTask DisposeAsync()
+ {
+ responseReceived.OnEvent -= OnResponseReceived;
+ loadingFinished.OnEvent -= OnLoadingFinished;
+ await client.DisposeAsync();
+ }
+
+ private class LoadingFinishedData
+ {
+ [JsonPropertyName("requestId")]
+ public string RequestId { get; set; }
+
+ [JsonPropertyName("timestamp")]
+ public double Timestamp { get; set; }
+
+ [JsonPropertyName("encodedDataLength")]
+ public int EncodedDataLength { get; set; }
+ }
+
+ private class ResponseReceivedData
+ {
+ [JsonPropertyName("requestId")]
+ public string RequestId { get; set; }
+
+ [JsonPropertyName("loaderId")]
+ public string LoaderId { get; set; }
+
+ [JsonPropertyName("timestamp")]
+ public double Timestamp { get; set; }
+
+ [JsonPropertyName("type")]
+ public string Type { get; set; }
+
+ [JsonPropertyName("response")]
+ public DownloadedResponse Response { get; set; }
+ }
+}
+
+public class DownloadedResponse : IEquatable<DownloadedResponse>
+{
+ public string RequestId { get; set; }
+
+ [JsonPropertyName("url")]
+ public string Url { get; set; }
+
+ [JsonPropertyName("status")]
+ public int Status { get; set; }
+
+ [JsonPropertyName("statusText")]
+ public string StatusText { get; set; }
+
+ [JsonPropertyName("headers")]
+ public Dictionary<string, string> Headers { get; set; }
+
+ [JsonPropertyName("mimeType")]
+ public string MimeType { get; set; }
+
+ [JsonPropertyName("charset")]
+ public string Charset { get; set; }
+
+ [JsonPropertyName("remoteIPAddress")]
+ public string RemoteIPAddress { get; set; }
+
+ [JsonPropertyName("remotePort")]
+ public int RemotePort { get; set; }
+
+ [JsonPropertyName("fromDiskCache")]
+ public bool FromDiskCache { get; set; }
+
+ [JsonPropertyName("fromServiceWorker")]
+ public bool FromServiceWorker { get; set; }
+
+ [JsonPropertyName("fromPrefetchCache")]
+ public bool FromPrefetchCache { get; set; }
+
+ [JsonPropertyName("encodedDataLength")]
+ public int EncodedDataLength { get; set; }
+
+ [JsonPropertyName("responseTime")]
+ public double ResponseTime { get; set; }
+
+ [JsonPropertyName("protocol")]
+ public string Protocol { get; set; }
+
+ public override int GetHashCode() => RequestId.GetHashCode();
+ public override bool Equals(object? obj) => obj is DownloadedResponse other && Equals(other);
+ public bool Equals(DownloadedResponse? other) => other is not null && RequestId == other.RequestId;
+}
+
+public class NetworkCondition
+{
+ /// <summary>
+ /// True to emulate Internet disconnection.
+ /// </summary>
+ public bool Offline { get; set; }
+
+ /// <summary>
+ /// Minimum latency from request sent to response headers received(ms).
+ /// </summary>
+ public int Latency { get; set; }
+
+ /// <summary>
+ /// Maximal aggregated download throughput(bytes/sec). -1 disables download throttling.
+ /// </summary>
+ public int DownloadThroughput { get; set; }
+
+ /// <summary>
+ /// Maximal aggregated upload throughput(bytes/sec). -1 disables upload throttling.
+ /// </summary>
+ public int UploadThroughput { get; set; }
+
+ /// <summary>
+ /// The underlying connection technology that the browser is supposedly using.
+ /// </summary>
+ public ConnectionType ConnectionType { get; set; }
+
+ public static readonly NetworkCondition IsOffline = new()
+ {
+ Offline = true,
+ DownloadThroughput = 0,
+ UploadThroughput = 0,
+ Latency = 0,
+ ConnectionType = ConnectionType.None
+ };
+
+ public static readonly NetworkCondition NoThrottle = new()
+ {
+ Offline = false,
+ DownloadThroughput = -1,
+ UploadThroughput = -1,
+ Latency = 0,
+ ConnectionType = ConnectionType.None
+ };
+
+ public static readonly NetworkCondition Regular2G = new()
+ {
+ Offline = false,
+ DownloadThroughput = (250 * 1024) / 8,
+ UploadThroughput = (50 * 1024) / 8,
+ Latency = 300,
+ ConnectionType = ConnectionType.Cellular2G
+ };
+
+ public static readonly NetworkCondition Fast2G = new()
+ {
+ Offline = false,
+ DownloadThroughput = (450 * 1024) / 8,
+ UploadThroughput = (150 * 1024) / 8,
+ Latency = 150,
+ ConnectionType = ConnectionType.Cellular2G
+ };
+
+ public static readonly NetworkCondition Regular3G = new()
+ {
+ Offline = false,
+ DownloadThroughput = (750 * 1024) / 8,
+ UploadThroughput = (250 * 1024) / 8,
+ Latency = 100,
+ ConnectionType = ConnectionType.Cellular3G
+ };
+
+ public static readonly NetworkCondition Good3G = new()
+ {
+ Offline = false,
+ DownloadThroughput = (1500 * 1024) / 8,
+ UploadThroughput = (750 * 1024) / 8,
+ Latency = 40,
+ ConnectionType = ConnectionType.Cellular3G
+ };
+
+ public static readonly NetworkCondition Regular4G = new()
+ {
+ Offline = false,
+ DownloadThroughput = (4 * 1024 * 1024) / 8,
+ UploadThroughput = (3 * 1024 * 1024) / 8,
+ Latency = 20,
+ ConnectionType = ConnectionType.Cellular4G
+ };
+
+ public static readonly NetworkCondition WiFi = new()
+ {
+ Offline = false,
+ DownloadThroughput = (30 * 1024 * 1024) / 8,
+ UploadThroughput = (15 * 1024 * 1024) / 8,
+ Latency = 2,
+ ConnectionType = ConnectionType.Wifi
+ };
+}
+
+public enum ConnectionType
+{
+ None,
+ Cellular2G,
+ Cellular3G,
+ Cellular4G,
+ Bluetooth,
+ Ethernet,
+ Wifi,
+ Wimax,
+ Other
+}
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Tests/Extensions/PlaywrightVideoRecordingExtensions.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Tests/Extensions/PlaywrightVideoRecordingExtensions.cs
index 3f9c4c25da..f65e686e77 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Tests/Extensions/PlaywrightVideoRecordingExtensions.cs
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Tests/Extensions/PlaywrightVideoRecordingExtensions.cs
@@ -5,47 +5,34 @@ namespace Boilerplate.Tests.Extensions;
public static class PlaywrightVideoRecordingExtensions
{
- public static async Task FinalizeVideoRecording(this PageTest page)
- {
- await FinalizeVideoRecording(page.Context, page.TestContext);
- }
-
- public static async Task FinalizeVideoRecording(this IBrowserContext browserContext, TestContext testContext)
+ //Pass full name of the test method to 'testMethodFullName' param or it will be inferred from the test context
+ public static async Task FinalizeVideoRecording(this IBrowserContext browserContext, TestContext testContext, string? testMethodFullName = null)
{
await browserContext.CloseAsync();
if (testContext.CurrentTestOutcome is not UnitTestOutcome.Failed)
{
- var directory = GetVideoDirectory(testContext);
+ var directory = GetVideoDirectory(testContext, testMethodFullName);
if (Directory.Exists(directory))
Directory.Delete(directory, true);
}
}
- public static BrowserNewContextOptions EnableVideoRecording(this BrowserNewContextOptions options, TestContext testContext)
- {
- options.RecordVideoDir = GetVideoDirectory(testContext);
- return options;
- }
-
- public static BrowserNewContextOptions EnableVideoRecording(this BrowserNewContextOptions options, TestContext testContext, string testMethodFullName)
+ //Pass full name of the test method to 'testMethodFullName' param or it will be inferred from the test context
+ public static BrowserNewContextOptions EnableVideoRecording(this BrowserNewContextOptions options, TestContext testContext, string? testMethodFullName = null)
{
options.RecordVideoDir = GetVideoDirectory(testContext, testMethodFullName);
return options;
}
- private static string GetVideoDirectory(TestContext testContext)
+ private static string GetVideoDirectory(TestContext testContext, string? testMethodFullName = null)
{
- var testMethodFullName = $"{testContext.FullyQualifiedTestClassName}.{GetTestMethodName(testContext)}";
- return GetVideoDirectory(testContext, testMethodFullName);
- }
+ testMethodFullName ??= $"{testContext.FullyQualifiedTestClassName}.{GetTestMethodName(testContext)}";
- private static string GetVideoDirectory(TestContext testContext, string testMethodFullName)
- {
// Remove invalid characters from the test method name
char[] notAllowedChars = [')', '"', '<', '>', '|', '*', '?', '\r', '\n', .. Path.GetInvalidFileNameChars()];
testMethodFullName = new string(testMethodFullName.Where(ch => !notAllowedChars.Contains(ch)).ToArray()).Replace('(', '_').Replace(',', '_');
- var dir = Path.Combine(testContext.TestResultsDirectory!, "..", "..", "Videos", testMethodFullName);
+ var dir = Path.Combine(AppContext.BaseDirectory, "..", "..", "..", "TestResults", "Videos", testMethodFullName);
return Path.GetFullPath(dir);
}
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Tests/IdentityPagesTests.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Tests/IdentityPagesTests.cs
index c1aa75e2b8..5d3344678c 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Tests/IdentityPagesTests.cs
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Tests/IdentityPagesTests.cs
@@ -49,5 +49,5 @@ public async Task SignIn_Should_WorkAsExpected()
public override BrowserNewContextOptions ContextOptions() => base.ContextOptions().EnableVideoRecording(TestContext);
[TestCleanup]
- public async ValueTask Cleanup() => await this.FinalizeVideoRecording();
+ public async ValueTask Cleanup() => await Context.FinalizeVideoRecording(TestContext);
}
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Tests/PageTests/BlazorServerPreRenderingTests.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Tests/PageTests/BlazorServerPreRenderingTests.cs
new file mode 100644
index 0000000000..dcaed1f5ca
--- /dev/null
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Tests/PageTests/BlazorServerPreRenderingTests.cs
@@ -0,0 +1,13 @@
+namespace Boilerplate.Tests.PageTests.BlazorServer.PreRendering;
+
+[TestClass]
+public partial class IdentityPagesTests : BlazorServer.IdentityPagesTests
+{
+ public override bool PreRenderEnabled => true;
+}
+
+[TestClass]
+public partial class LocalizationTests : BlazorServer.LocalizationTests
+{
+ public override bool PreRenderEnabled => true;
+}
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Tests/PageTests/BlazorWebAssemblyPreRenderingTests.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Tests/PageTests/BlazorWebAssemblyPreRenderingTests.cs
new file mode 100644
index 0000000000..0b1bb2c1c0
--- /dev/null
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Tests/PageTests/BlazorWebAssemblyPreRenderingTests.cs
@@ -0,0 +1,13 @@
+namespace Boilerplate.Tests.PageTests.BlazorWebAssembly.PreRendering;
+
+[TestClass]
+public partial class IdentityPagesTests : BlazorWebAssembly.IdentityPagesTests
+{
+ public override bool PreRenderEnabled => true;
+}
+
+[TestClass]
+public partial class LocalizationTests : BlazorWebAssembly.LocalizationTests
+{
+ public override bool PreRenderEnabled => true;
+}
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Tests/PageTests/BlazorWebAssemblyTests.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Tests/PageTests/BlazorWebAssemblyTests.cs
index b39c56c77e..8184ab661c 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Tests/PageTests/BlazorWebAssemblyTests.cs
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Tests/PageTests/BlazorWebAssemblyTests.cs
@@ -1,4 +1,8 @@
-using Boilerplate.Client.Web;
+//+:cnd:noEmit
+using Boilerplate.Client.Web;
+using Boilerplate.Tests.Extensions;
+using Boilerplate.Tests.PageTests.PageModels;
+using Boilerplate.Tests.PageTests.PageModels.Layout;
namespace Boilerplate.Tests.PageTests.BlazorWebAssembly;
@@ -13,17 +17,85 @@ public partial class LocalizationTests : BlazorServer.LocalizationTests
{
public override BlazorWebAppMode BlazorRenderMode => BlazorWebAppMode.BlazorWebAssembly;
-#if MultilingualEnabled == false
[TestMethod]
[TestCategory("MultilingualDisabled")]
public async Task MultilingualDisabled()
{
- var homePage = new PageModels.MainHomePage(Page, WebAppServerAddress);
+ if (CultureInfoManager.MultilingualEnabled is false)
+ {
+ Assert.Inconclusive("Multilingual is disabled. " +
+ "You can enable it via <MultilingualEnabled>true</MultilingualEnabled> setting in Directiory.Build.props.");
+ return;
+ }
+
+ var homePage = new MainHomePage(Page, WebAppServerAddress);
await homePage.Open();
await homePage.AssertOpen();
- var contains = Extensions.PlaywrightCacheExtensions.ContainsAsset(new(@"\/_framework\/icudt_hybrid\.dat\?v=sha256-.+"));
+ var contains = PlaywrightAssetCachingExtensions.ContainsAsset("icudt_hybrid.dat");
Assert.IsFalse(contains, "The 'icudt_hybrid.dat' file must not be loaded when Multilingual is disabled.");
}
-#endif
+}
+
+[TestClass]
+public partial class DownloadSizeTests : PageTestBase
+{
+ public override BlazorWebAppMode BlazorRenderMode => BlazorWebAppMode.BlazorWebAssembly;
+ public override Uri WebAppServerAddress => new("http://localhost:5000/");
+ public override bool EnableBlazorWasmCaching => false;
+
+ //#if (sample == "Todo")
+ [TestMethod]
+ [AutoAuthenticate]
+ [AutoStartTestServer(false)]
+ public async Task TodoDownloadSize()
+ {
+ await AssertDownloadSize(new IdentityHomePage(Page, WebAppServerAddress), expectedTotalSizeKB: 3_200, expectedWasmSizeKB: 2_700);
+ }
+ //#elif (sample == "Admin")
+ [TestMethod]
+ [AutoAuthenticate]
+ [AutoStartTestServer(false)]
+ public async Task AdminDownloadSize()
+ {
+ await AssertDownloadSize(new IdentityHomePage(Page, WebAppServerAddress), expectedTotalSizeKB: 3_200, expectedWasmSizeKB: 2_700);
+ }
+ //#else
+ [TestMethod]
+ [AutoStartTestServer(false)]
+ public async Task SimpleDownloadSize()
+ {
+ await AssertDownloadSize(new MainHomePage(Page, WebAppServerAddress), expectedTotalSizeKB: 3_200, expectedWasmSizeKB: 2_700);
+ }
+ //#endif
+
+ private async Task AssertDownloadSize<TPage>(TPage page, int expectedTotalSizeKB, int expectedWasmSizeKB, int toleranceKB = 50)
+ where TPage : RootLayout
+ {
+ var downloadSizeTests = Environment.GetEnvironmentVariable(nameof(DownloadSizeTests));
+ if (Convert.ToBoolean(downloadSizeTests) is false)
+ {
+ Assert.Inconclusive("Download size tests are disabled. " +
+ "You can enable it via an environment variable `DownloadSizeTests=true`");
+ return;
+ }
+
+ await using var networkSession = await Page.OpenNetworkSession();
+
+ await page.Open();
+ await page.AssertOpen();
+
+ await Page.WaitForHydrationToComplete();
+ await Page.WaitForLoadStateAsync(LoadState.NetworkIdle);
+
+ var totalSizeKB = networkSession.TotalDownloaded / 1000;
+ var wasmSizeKB = networkSession.DownloadedResponses
+ .Where(x => PlaywrightAssetCachingExtensions.BlazorWasmRegex().IsMatch(new Uri(x.Url).PathAndQuery))
+ .Sum(x => x.EncodedDataLength) / 1000;
+
+ Assert.AreEqual(expectedTotalSizeKB, totalSizeKB, toleranceKB, "Total size is not within tolerance.");
+ Assert.AreEqual(expectedWasmSizeKB, wasmSizeKB, toleranceKB, "Wasm size is not within tolerance.");
+
+ Console.WriteLine($"Total size: {totalSizeKB} KB");
+ }
}
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Tests/PageTests/IdentityPagesTests.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Tests/PageTests/IdentityPagesTests.cs
index 4e39e94f5b..d41d0b335e 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Tests/PageTests/IdentityPagesTests.cs
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Tests/PageTests/IdentityPagesTests.cs
@@ -3,6 +3,8 @@
using Boilerplate.Server.Api.Data;
using Boilerplate.Tests.PageTests.PageModels;
using Boilerplate.Tests.PageTests.PageModels.Identity;
+using Boilerplate.Tests.Extensions;
+using Microsoft.EntityFrameworkCore;
namespace Boilerplate.Tests.PageTests.BlazorServer;
@@ -13,9 +15,12 @@ public partial class IdentityPagesTests : PageTestBase
public async Task UnauthorizedUser_Should_RedirectToSignInPage()
{
var response = await Page.GotoAsync(new Uri(WebAppServerAddress, Urls.SettingsPage).ToString());
+ await Page.WaitForHydrationToComplete();
Assert.IsNotNull(response);
- Assert.AreEqual(StatusCodes.Status200OK, response.Status);
+ //NOTE: Status code differs between pre-render Disabled (200) and Enabled(401)
+ //Once it resolved we can uncomment this line
+ //Assert.AreEqual(StatusCodes.Status200OK, response.Status);
await Expect(Page).ToHaveURLAsync(new Uri(WebAppServerAddress, "/sign-in?return-url=settings").ToString());
}
@@ -310,6 +315,39 @@ public async Task ChangePhone(string mode)
}
}
+ [TestMethod]
+ public async Task DeleteUser()
+ {
+ await using var scope = TestServer.WebApp.Services.CreateAsyncScope();
+
+ var dbContext = scope.ServiceProvider.GetRequiredService<AppDbContext>();
+ var userService = new UserService(dbContext);
+ var email = $"{Guid.NewGuid()}@gmail.com";
+ await userService.AddUser(email);
+
+ var signInPage = new SignInPage(Page, WebAppServerAddress);
+
+ await signInPage.Open();
+ await signInPage.AssertOpen();
+
+ var identityHomePage = await signInPage.SignInWithEmail(email);
+ await identityHomePage.AssertSignInSuccess(email, userFullName: null);
+
+ var settingsPage = new SettingsPage(Page, WebAppServerAddress);
+
+ await settingsPage.Open();
+ await settingsPage.AssertOpen();
+
+ await settingsPage.ExpandAccount();
+ await settingsPage.ClickOnDeleteTab();
+
+ signInPage = await settingsPage.DeleteUser();
+ await signInPage.AssertSignOut();
+
+ var exists = await dbContext.Users.AnyAsync(u => u.Email == email);
+ Assert.IsFalse(exists, "User must be deleted.");
+ }
+
private async Task<string> CreateNewUser()
{
await using var scope = TestServer.WebApp.Services.CreateAsyncScope();
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Tests/PageTests/LocalizationTests.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Tests/PageTests/LocalizationTests.cs
index 59fe5c20bf..dd5954a1c1 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Tests/PageTests/LocalizationTests.cs
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Tests/PageTests/LocalizationTests.cs
@@ -1,6 +1,7 @@
using System.Reflection;
using Boilerplate.Tests.Services;
using Boilerplate.Tests.PageTests.PageModels;
+using Boilerplate.Tests.Extensions;
namespace Boilerplate.Tests.PageTests.BlazorServer;
@@ -37,6 +38,7 @@ public async Task QueryString(string cultureName, string cultureDisplayName)
var localizer = StringLocalizerFactory.Create<AppStrings>(cultureName);
var homePage = new MainHomePage(Page, WebAppServerAddress);
await Page.GotoAsync($"{WebAppServerAddress}?culture={cultureName}");
+ await Page.WaitForHydrationToComplete();
await homePage.AssertLocalized(localizer, cultureName, cultureDisplayName);
}
@@ -47,6 +49,7 @@ public async Task UrlSegment(string cultureName, string cultureDisplayName)
var localizer = StringLocalizerFactory.Create<AppStrings>(cultureName);
var homePage = new MainHomePage(Page, WebAppServerAddress);
await Page.GotoAsync(new Uri(WebAppServerAddress, cultureName).ToString());
+ await Page.WaitForHydrationToComplete();
await homePage.AssertLocalized(localizer, cultureName, cultureDisplayName);
}
}
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Tests/PageTests/PageModels/Email/TokenMagicLinkEmail.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Tests/PageTests/PageModels/Email/TokenMagicLinkEmail.cs
index 57c2b2d857..33b71f15a0 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Tests/PageTests/PageModels/Email/TokenMagicLinkEmail.cs
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Tests/PageTests/PageModels/Email/TokenMagicLinkEmail.cs
@@ -1,4 +1,5 @@
using System.Text.RegularExpressions;
+using Boilerplate.Tests.Extensions;
using Boilerplate.Tests.PageTests.PageModels.Layout;
using Boilerplate.Tests.Services;
@@ -61,6 +62,8 @@ public virtual async Task<TFinalPage> OpenMagicLink<TFinalPage>()
await Page.WaitForURLAsync(url => url != href);
}
+ await Page.WaitForHydrationToComplete();
+
return (TFinalPage)Activator.CreateInstance(typeof(TFinalPage), Page, WebAppServerAddress)!;
}
}
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Tests/PageTests/PageModels/HomePage.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Tests/PageTests/PageModels/HomePage.cs
index e1edf64c08..b39c9a2495 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Tests/PageTests/PageModels/HomePage.cs
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Tests/PageTests/PageModels/HomePage.cs
@@ -18,7 +18,7 @@ public async Task AssertLocalized(IStringLocalizer localizer, string cultureName
{
await Assertions.Expect(Page).ToHaveTitleAsync(localizer[nameof(AppStrings.HomePageTitle)]);
- await Assertions.Expect(Page.GetByText(localizer[nameof(AppStrings.HomePanelTitle)] + " " + localizer[nameof(AppStrings.HomePanelSubtitle)])).ToBeVisibleAsync();
+ await Assertions.Expect(Page.GetByRole(AriaRole.Heading, new() { Level = 4, Name = localizer[nameof(AppStrings.HomePanelTitle)] + " " + localizer[nameof(AppStrings.HomePanelSubtitle)] })).ToBeVisibleAsync();
await Assertions.Expect(Page.GetByText(localizer[nameof(AppStrings.HomeMessage)])).ToBeVisibleAsync();
@@ -42,10 +42,10 @@ public partial class IdentityHomePage(IPage page, Uri serverAddress)
public override string PagePath => Urls.HomePage;
public override string PageTitle => AppStrings.HomePageTitle;
- public async Task<MainHomePage> SignOut()
+ public new async Task<MainHomePage> SignOut()
{
- await Page.GetByRole(AriaRole.Button, new() { Name = AppStrings.SignOut }).ClickAsync();
- await Page.GetByRole(AriaRole.Dialog).GetByRole(AriaRole.Button, new() { Name = AppStrings.SignOut }).ClickAsync();
+ await Page.Locator(".bit-crd.panel").GetByRole(AriaRole.Button, new() { Name = AppStrings.SignOut }).ClickAsync();
+ await Page.GetByRole(AriaRole.Dialog).GetByRole(AriaRole.Button, new() { Name = AppStrings.SignOut, Exact = true }).ClickAsync();
return new MainHomePage(Page, WebAppServerAddress);
}
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Tests/PageTests/PageModels/Identity/SettingsPage.Account.Delete.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Tests/PageTests/PageModels/Identity/SettingsPage.Account.Delete.cs
new file mode 100644
index 0000000000..52aee1fb4c
--- /dev/null
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Tests/PageTests/PageModels/Identity/SettingsPage.Account.Delete.cs
@@ -0,0 +1,25 @@
+namespace Boilerplate.Tests.PageTests.PageModels.Identity;
+
+public partial class SettingsPage
+{
+ public async Task ClickOnDeleteTab()
+ {
+ await Page.GetByRole(AriaRole.Tab, new() { Name = AppStrings.Delete }).ClickAsync();
+ }
+
+ public async Task AssertDeleteTab()
+ {
+ await Assertions.Expect(Page.GetByLabel(AppStrings.Delete).GetByRole(AriaRole.Heading)).ToContainTextAsync(AppStrings.DeleteAccount);
+ await Assertions.Expect(Page.GetByLabel(AppStrings.Delete).GetByRole(AriaRole.Paragraph)).ToContainTextAsync(AppStrings.DeleteAccountPrompt);
+ await Assertions.Expect(Page.GetByLabel(AppStrings.Delete).GetByRole(AriaRole.Button, new() { Name = AppStrings.DeleteAccount })).ToBeVisibleAsync();
+ }
+
+ public async Task<SignInPage> DeleteUser()
+ {
+ await Page.GetByLabel(AppStrings.Delete).GetByRole(AriaRole.Button, new() { Name = AppStrings.DeleteAccount }).ClickAsync();
+ var currentUrl = Page.Url;
+ await Page.GetByRole(AriaRole.Dialog).GetByRole(AriaRole.Button, new() { Name = AppStrings.Yes }).ClickAsync();
+ await Page.WaitForURLAsync(url => url != currentUrl);
+ return new(Page, WebAppServerAddress) { ReturnUrl = new Uri(currentUrl).PathAndQuery.TrimStart('/') };
+ }
+}
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Tests/PageTests/PageModels/Identity/SettingsPage.Account.Email.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Tests/PageTests/PageModels/Identity/SettingsPage.Account.Email.cs
index c00cf39407..f9d5e0540a 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Tests/PageTests/PageModels/Identity/SettingsPage.Account.Email.cs
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Tests/PageTests/PageModels/Identity/SettingsPage.Account.Email.cs
@@ -1,4 +1,5 @@
using System.Text.RegularExpressions;
+using Boilerplate.Tests.Extensions;
using Boilerplate.Tests.PageTests.PageModels.Email;
namespace Boilerplate.Tests.PageTests.PageModels.Identity;
@@ -64,6 +65,7 @@ public async Task ConfirmEmailByToken(string token)
{
await Page.GetByPlaceholder(AppStrings.EmailTokenPlaceholder).FillAsync(token);
await Page.GetByRole(AriaRole.Button, new() { Name = AppStrings.EmailTokenConfirmButtonText }).ClickAsync();
+ await Page.WaitForHydrationToComplete();
}
public async Task AssertConfirmEmailSuccess()
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Tests/PageTests/PageModels/Layout/IdentityLayout.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Tests/PageTests/PageModels/Layout/IdentityLayout.cs
index 90df31e737..4456346a23 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Tests/PageTests/PageModels/Layout/IdentityLayout.cs
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Tests/PageTests/PageModels/Layout/IdentityLayout.cs
@@ -19,8 +19,8 @@ public async Task AssertSignInSuccess(string userEmail = TestData.DefaultTestEma
public async Task<SignInPage> SignOut()
{
- await Page.GetByRole(AriaRole.Button, new() { Name = AppStrings.SignOut }).ClickAsync();
- await Page.GetByRole(AriaRole.Dialog).GetByRole(AriaRole.Button, new() { Name = AppStrings.SignOut }).ClickAsync();
+ await Page.Locator(".bit-crd.panel").GetByRole(AriaRole.Button, new() { Name = AppStrings.SignOut }).ClickAsync();
+ await Page.GetByRole(AriaRole.Dialog).GetByRole(AriaRole.Button, new() { Name = AppStrings.SignOut, Exact = true }).ClickAsync();
return new SignInPage(Page, WebAppServerAddress) { ReturnUrl = new Uri(Page.Url).PathAndQuery.TrimStart('/') };
}
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Tests/PageTests/PageModels/Layout/RootLayout.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Tests/PageTests/PageModels/Layout/RootLayout.cs
index 69ae2b9d13..bc72939cbd 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Tests/PageTests/PageModels/Layout/RootLayout.cs
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Tests/PageTests/PageModels/Layout/RootLayout.cs
@@ -1,4 +1,6 @@
-namespace Boilerplate.Tests.PageTests.PageModels.Layout;
+using Boilerplate.Tests.Extensions;
+
+namespace Boilerplate.Tests.PageTests.PageModels.Layout;
public abstract partial class RootLayout(IPage page, Uri serverAddress)
{
@@ -10,6 +12,7 @@ public abstract partial class RootLayout(IPage page, Uri serverAddress)
public virtual async Task Open()
{
await Page.GotoAsync(new Uri(WebAppServerAddress, PagePath).ToString());
+ await Page.WaitForHydrationToComplete();
}
public virtual async Task AssertOpen()
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Tests/PageTests/PageTestBase.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Tests/PageTests/PageTestBase.cs
index a00681d4bd..c7a75baa3c 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Tests/PageTests/PageTestBase.cs
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Tests/PageTests/PageTestBase.cs
@@ -10,13 +10,21 @@ public abstract partial class PageTestBase : PageTest
{
public AppTestServer TestServer { get; set; } = new();
public WebApplication WebApp => TestServer.WebApp;
- public Uri WebAppServerAddress => TestServer.WebAppServerAddress;
+ public virtual Uri WebAppServerAddress => TestServer.WebAppServerAddress;
public virtual BlazorWebAppMode BlazorRenderMode => BlazorWebAppMode.BlazorServer;
+ public virtual bool PreRenderEnabled => false;
+ public virtual bool EnableBlazorWasmCaching => true;
[TestInitialize]
public async Task InitializeTestServer()
{
- await Context.EnableBlazorWasmCaching();
+ if (PreRenderEnabled)
+ await Context.EnableHydrationCheck();
+
+ if (EnableBlazorWasmCaching)
+ await Context.EnableBlazorWasmCaching();
+
+ await Context.SetBlazorWebAssemblyServerAddress(WebAppServerAddress.OriginalString);
var currentTestMethod = GetType().GetMethod(TestContext.TestName!);
@@ -32,10 +40,11 @@ public async Task InitializeTestServer()
}
var autoStartTestServer = currentTestMethod!.GetCustomAttribute<AutoStartTestServerAttribute>();
- if (autoStartTestServer is null || autoStartTestServer.AutoStart)
+ if (autoStartTestServer?.AutoStart != false)
{
await TestServer.Build(configureTestConfigurations: configuration =>
{
+ configuration["WebAppRender:PrerenderEnabled"] = PreRenderEnabled.ToString();
configuration["WebAppRender:BlazorMode"] = BlazorRenderMode.ToString();
}).Start();
}
@@ -44,7 +53,7 @@ await TestServer.Build(configureTestConfigurations: configuration =>
[TestCleanup]
public async ValueTask CleanupTestServer()
{
- await this.FinalizeVideoRecording();
+ await Context.FinalizeVideoRecording(TestContext);
if (TestServer is not null)
{
@@ -62,7 +71,7 @@ public override BrowserNewContextOptions ContextOptions()
var isAuthenticated = currentTestMethod!.GetCustomAttribute<AutoAuthenticateAttribute>() is not null;
if (isAuthenticated)
{
- options.StorageState = TestsInitializer.AuthenticationState.Replace("[ServerAddress]", WebAppServerAddress.OriginalString);
+ options.StorageState = TestsInitializer.AuthenticationState.Replace("[ServerAddress]", WebAppServerAddress.ToString());
}
var configureBrowserContext = currentTestMethod!.GetCustomAttribute<ConfigureBrowserContextAttribute>();
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Tests/TestsInitializer.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Tests/TestsInitializer.cs
index db15392677..6cfa7f8119 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Tests/TestsInitializer.cs
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Tests/TestsInitializer.cs
@@ -70,10 +70,13 @@ private static async Task InitializeAuthenticationState(AppTestServer testServer
var playwrightPage = new PageTest() { TestContext = testContext };
await playwrightPage.Setup();
await playwrightPage.BrowserSetup();
+
var currentMethodFullName = $"{typeof(TestsInitializer).FullName}.{(nameof(InitializeAuthenticationState))}";
var options = new BrowserNewContextOptions().EnableVideoRecording(testContext, currentMethodFullName);
var context = await playwrightPage.NewContextAsync(options);
+
await context.EnableBlazorWasmCaching();
+ await context.SetBlazorWebAssemblyServerAddress(testServer.WebAppServerAddress.ToString());
var page = await context.NewPageAsync();
var signinPage = new SignInPage(page, testServer.WebAppServerAddress);
@@ -94,6 +97,7 @@ private static async Task InitializeAuthenticationState(AppTestServer testServer
AuthenticationState = state.Replace(testServer.WebAppServerAddress.OriginalString.TrimEnd('/'), "[ServerAddress]");
+ await context.FinalizeVideoRecording(testContext, currentMethodFullName);
await context.Browser!.CloseAsync();
await context.Browser!.DisposeAsync();
}
diff --git a/src/Websites/Careers/src/Bit.Websites.Careers.Client/Bit.Websites.Careers.Client.csproj b/src/Websites/Careers/src/Bit.Websites.Careers.Client/Bit.Websites.Careers.Client.csproj
index 6ae9ab3a5a..71a5eca69c 100644
--- a/src/Websites/Careers/src/Bit.Websites.Careers.Client/Bit.Websites.Careers.Client.csproj
+++ b/src/Websites/Careers/src/Bit.Websites.Careers.Client/Bit.Websites.Careers.Client.csproj
@@ -1,12 +1,10 @@
<Project Sdk="Microsoft.NET.Sdk.BlazorWebAssembly">
<PropertyGroup>
- <TargetFramework>net8.0</TargetFramework>
+ <TargetFramework>net9.0</TargetFramework>
<NoDefaultLaunchSettingsFile>true</NoDefaultLaunchSettingsFile>
<StaticWebAssetProjectMode>Default</StaticWebAssetProjectMode>
<InvariantGlobalization>true</InvariantGlobalization>
- <!-- Disabled WasmSIMD because of dotnet 8 rc issue on safari (iOS 16 and older devices) -->
- <WasmEnableSIMD>false</WasmEnableSIMD>
<ResolveStaticWebAssetsInputsDependsOn>
BeforeBuildTasks;
$(ResolveStaticWebAssetsInputsDependsOn)
@@ -14,7 +12,7 @@
</PropertyGroup>
<ItemGroup>
- <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.10" />
+ <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="9.0.0" />
</ItemGroup>
<ItemGroup>
@@ -24,19 +22,19 @@
<Content Remove="appsettings.json" />
<EmbeddedResource Include="appsettings.json" />
- <PackageReference Include="Bit.BlazorUI" Version="8.12.0" />
- <PackageReference Include="Bit.BlazorUI.Icons" Version="8.12.0" />
+ <PackageReference Include="Bit.BlazorUI" Version="9.0.0" />
+ <PackageReference Include="Bit.BlazorUI.Icons" Version="9.0.0" />
<BlazorWebAssemblyLazyLoad Include="Bit.BlazorUI.Icons.wasm" />
- <PackageReference Include="Bit.BlazorUI.Assets" Version="8.12.0" />
- <PackageReference Include="Bit.CodeAnalyzers" Version="8.12.0">
+ <PackageReference Include="Bit.BlazorUI.Assets" Version="9.0.0" />
+ <PackageReference Include="Bit.CodeAnalyzers" Version="9.0.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
- <PackageReference Include="Bit.SourceGenerators" Version="8.12.0">
+ <PackageReference Include="Bit.SourceGenerators" Version="9.0.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
- <PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="8.0.10" />
+ <PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="9.0.0" />
<Using Include="System.Net.Http.Json" />
<Using Include="System.Collections.Concurrent" />
diff --git a/src/Websites/Careers/src/Bit.Websites.Careers.Server/Bit.Websites.Careers.Server.csproj b/src/Websites/Careers/src/Bit.Websites.Careers.Server/Bit.Websites.Careers.Server.csproj
index f5ed83a289..51d7ea4526 100644
--- a/src/Websites/Careers/src/Bit.Websites.Careers.Server/Bit.Websites.Careers.Server.csproj
+++ b/src/Websites/Careers/src/Bit.Websites.Careers.Server/Bit.Websites.Careers.Server.csproj
@@ -1,23 +1,24 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
+<Project Sdk="Microsoft.NET.Sdk.Web">
<PropertyGroup>
- <TargetFramework>net8.0</TargetFramework>
+ <TargetFramework>net9.0</TargetFramework>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\Bit.Websites.Careers.Shared\Bit.Websites.Careers.Shared.csproj" />
<ProjectReference Include="..\Bit.Websites.Careers.Client\Bit.Websites.Careers.Client.csproj" />
- <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="8.0.10" />
- <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.10" />
- <PackageReference Include="Bit.CodeAnalyzers" Version="8.12.0">
+ <PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="9.0.0" />
+ <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="9.0.0" />
+ <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="9.0.0" />
+ <PackageReference Include="Bit.CodeAnalyzers" Version="9.0.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
- <PackageReference Include="Bit.SourceGenerators" Version="8.12.0">
+ <PackageReference Include="Bit.SourceGenerators" Version="9.0.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
- <PackageReference Include="Swashbuckle.AspNetCore" Version="6.9.0" />
+ <PackageReference Include="Swashbuckle.AspNetCore" Version="7.0.0" />
<PackageReference Include="AspNetCore.HealthChecks.System" Version="8.0.1" />
<PackageReference Include="AspNetCore.HealthChecks.UI" Version="8.0.2" />
<PackageReference Include="AspNetCore.HealthChecks.UI.Client" Version="8.0.1" />
diff --git a/src/Websites/Careers/src/Bit.Websites.Careers.Server/Startup/Middlewares.cs b/src/Websites/Careers/src/Bit.Websites.Careers.Server/Startup/Middlewares.cs
index d3e05f5f0b..b8d762807b 100644
--- a/src/Websites/Careers/src/Bit.Websites.Careers.Server/Startup/Middlewares.cs
+++ b/src/Websites/Careers/src/Bit.Websites.Careers.Server/Startup/Middlewares.cs
@@ -74,6 +74,7 @@ public static void Use(WebApplication app, IWebHostEnvironment env, IConfigurati
UseSiteMap(app);
+ app.MapStaticAssets();
app.MapRazorComponents<App>()
.AddInteractiveServerRenderMode()
.AddInteractiveWebAssemblyRenderMode()
diff --git a/src/Websites/Careers/src/Bit.Websites.Careers.Shared/Bit.Websites.Careers.Shared.csproj b/src/Websites/Careers/src/Bit.Websites.Careers.Shared/Bit.Websites.Careers.Shared.csproj
index 35e5fb020d..72da2da997 100644
--- a/src/Websites/Careers/src/Bit.Websites.Careers.Shared/Bit.Websites.Careers.Shared.csproj
+++ b/src/Websites/Careers/src/Bit.Websites.Careers.Shared/Bit.Websites.Careers.Shared.csproj
@@ -1,22 +1,22 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <TargetFramework>net8.0</TargetFramework>
+ <TargetFramework>net9.0</TargetFramework>
<NeutralLanguage>en-US</NeutralLanguage>
</PropertyGroup>
<ItemGroup>
- <PackageReference Include="Bit.CodeAnalyzers" Version="8.12.0">
+ <PackageReference Include="Bit.CodeAnalyzers" Version="9.0.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
- <PackageReference Include="Bit.SourceGenerators" Version="8.12.0">
+ <PackageReference Include="Bit.SourceGenerators" Version="9.0.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
- <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.2" />
- <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="8.0.2" />
- <PackageReference Include="System.Text.Json" Version="8.0.5" />
+ <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.0" />
+ <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="9.0.0" />
+ <PackageReference Include="System.Text.Json" Version="9.0.0" />
<PackageReference Include="Riok.Mapperly" Version="4.1.0" PrivateAssets="all" ExcludeAssets="runtime">
<IncludeAssets>compile; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
diff --git a/src/Websites/Careers/src/Directory.Build.props b/src/Websites/Careers/src/Directory.Build.props
index 8f121b27da..8fd44b1f06 100644
--- a/src/Websites/Careers/src/Directory.Build.props
+++ b/src/Websites/Careers/src/Directory.Build.props
@@ -1,4 +1,4 @@
-<!-- Generated by bit-dual template v-8.12.0 -->
+<!-- Generated by bit-dual template v-9.0.0 -->
<Project>
<PropertyGroup>
<LangVersion>12.0</LangVersion>
diff --git a/src/Websites/Platform/src/Bit.Websites.Platform.Client/Bit.Websites.Platform.Client.csproj b/src/Websites/Platform/src/Bit.Websites.Platform.Client/Bit.Websites.Platform.Client.csproj
index 0e70844fd8..5f7ccd28c1 100644
--- a/src/Websites/Platform/src/Bit.Websites.Platform.Client/Bit.Websites.Platform.Client.csproj
+++ b/src/Websites/Platform/src/Bit.Websites.Platform.Client/Bit.Websites.Platform.Client.csproj
@@ -1,12 +1,10 @@
<Project Sdk="Microsoft.NET.Sdk.BlazorWebAssembly">
<PropertyGroup>
- <TargetFramework>net8.0</TargetFramework>
+ <TargetFramework>net9.0</TargetFramework>
<NoDefaultLaunchSettingsFile>true</NoDefaultLaunchSettingsFile>
<StaticWebAssetProjectMode>Default</StaticWebAssetProjectMode>
<InvariantGlobalization>true</InvariantGlobalization>
- <!-- Disabled WasmSIMD because of dotnet 8 rc issue on safari (iOS 16 and older devices) -->
- <WasmEnableSIMD>false</WasmEnableSIMD>
<ResolveStaticWebAssetsInputsDependsOn>
BeforeBuildTasks;
$(ResolveStaticWebAssetsInputsDependsOn)
@@ -14,7 +12,7 @@
</PropertyGroup>
<ItemGroup>
- <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.10" />
+ <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="9.0.0" />
</ItemGroup>
<ItemGroup>
@@ -24,20 +22,20 @@
<Content Remove="appsettings.json" />
<EmbeddedResource Include="appsettings.json" />
- <PackageReference Include="Bit.Butil" Version="8.12.0" />
- <PackageReference Include="Bit.BlazorUI" Version="8.12.0" />
- <PackageReference Include="Bit.BlazorUI.Icons" Version="8.12.0" />
+ <PackageReference Include="Bit.Butil" Version="9.0.0" />
+ <PackageReference Include="Bit.BlazorUI" Version="9.0.0" />
+ <PackageReference Include="Bit.BlazorUI.Icons" Version="9.0.0" />
<BlazorWebAssemblyLazyLoad Include="Bit.BlazorUI.Icons.wasm" />
- <PackageReference Include="Bit.BlazorUI.Assets" Version="8.12.0" />
- <PackageReference Include="Bit.CodeAnalyzers" Version="8.12.0">
+ <PackageReference Include="Bit.BlazorUI.Assets" Version="9.0.0" />
+ <PackageReference Include="Bit.CodeAnalyzers" Version="9.0.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
- <PackageReference Include="Bit.SourceGenerators" Version="8.12.0">
+ <PackageReference Include="Bit.SourceGenerators" Version="9.0.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
- <PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="8.0.10" />
+ <PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="9.0.0" />
<Using Include="System.Net.Http.Json" />
<Using Include="System.Collections.Concurrent" />
diff --git a/src/Websites/Platform/src/Bit.Websites.Platform.Client/Pages/Besql/Besql01OverviewPage.razor b/src/Websites/Platform/src/Bit.Websites.Platform.Client/Pages/Besql/Besql01OverviewPage.razor
index 6487a42771..d06c99990a 100644
--- a/src/Websites/Platform/src/Bit.Websites.Platform.Client/Pages/Besql/Besql01OverviewPage.razor
+++ b/src/Websites/Platform/src/Bit.Websites.Platform.Client/Pages/Besql/Besql01OverviewPage.razor
@@ -1,4 +1,5 @@
-@page "/besql/overview"
+@page "/besql"
+@page "/besql/overview"
@inherits AppComponentBase
<PageOutlet Url="besql/overview"
diff --git a/src/Websites/Platform/src/Bit.Websites.Platform.Client/Pages/Bswup/Bswup01OverviewPage.razor b/src/Websites/Platform/src/Bit.Websites.Platform.Client/Pages/Bswup/Bswup01OverviewPage.razor
index 9df47bb56b..faea7b7106 100644
--- a/src/Websites/Platform/src/Bit.Websites.Platform.Client/Pages/Bswup/Bswup01OverviewPage.razor
+++ b/src/Websites/Platform/src/Bit.Websites.Platform.Client/Pages/Bswup/Bswup01OverviewPage.razor
@@ -1,4 +1,5 @@
-@page "/bswup/overview"
+@page "/bswup"
+@page "/bswup/overview"
@inherits AppComponentBase
<PageOutlet Url="bswup/overview"
diff --git a/src/Websites/Platform/src/Bit.Websites.Platform.Client/Pages/Butil/Butil01OverviewPage.razor b/src/Websites/Platform/src/Bit.Websites.Platform.Client/Pages/Butil/Butil01OverviewPage.razor
index 16660d8e1f..fc4cdb9fbd 100644
--- a/src/Websites/Platform/src/Bit.Websites.Platform.Client/Pages/Butil/Butil01OverviewPage.razor
+++ b/src/Websites/Platform/src/Bit.Websites.Platform.Client/Pages/Butil/Butil01OverviewPage.razor
@@ -1,4 +1,5 @@
-@page "/butil/overview"
+@page "/butil"
+@page "/butil/overview"
@inherits AppComponentBase
<PageOutlet Url="butil/overview"
diff --git a/src/Websites/Platform/src/Bit.Websites.Platform.Client/Pages/ContactUsPage.razor b/src/Websites/Platform/src/Bit.Websites.Platform.Client/Pages/ContactUsPage.razor
index 9c8bbb9b0b..7189b47e49 100644
--- a/src/Websites/Platform/src/Bit.Websites.Platform.Client/Pages/ContactUsPage.razor
+++ b/src/Websites/Platform/src/Bit.Websites.Platform.Client/Pages/ContactUsPage.razor
@@ -38,9 +38,10 @@
<ValidationMessage For="() => contactUsModel.Email" />
<BitTextField @bind-Value="@contactUsModel.Message"
+ Required
+ Multiline
+ Resizable
Label="Message"
- IsRequired=true
- IsMultiline=true
Class="contact-text-field"
Placeholder="Enter your message" />
<ValidationMessage For="() => contactUsModel.Message" />
diff --git a/src/Websites/Platform/src/Bit.Websites.Platform.Client/Pages/Lcnc/LcncPage.razor b/src/Websites/Platform/src/Bit.Websites.Platform.Client/Pages/Lcnc/LcncPage.razor
index 6022abcec3..04a83d651d 100644
--- a/src/Websites/Platform/src/Bit.Websites.Platform.Client/Pages/Lcnc/LcncPage.razor
+++ b/src/Websites/Platform/src/Bit.Websites.Platform.Client/Pages/Lcnc/LcncPage.razor
@@ -154,7 +154,7 @@
<br />
<BitText Typography="BitTypography.H5" Class="text-subtitle">
<div class="stats-container">
- <div>+4.8M NuGet downloads</div>
+ <div>+5.5M NuGet downloads</div>
<div>+1K GitHub stars</div>
<div>+125 contributors</div>
</div>
diff --git a/src/Websites/Platform/src/Bit.Websites.Platform.Client/Pages/Templates/Templates01OverviewPage.razor b/src/Websites/Platform/src/Bit.Websites.Platform.Client/Pages/Templates/Templates01OverviewPage.razor
index 17df98a396..9b74c4ba39 100644
--- a/src/Websites/Platform/src/Bit.Websites.Platform.Client/Pages/Templates/Templates01OverviewPage.razor
+++ b/src/Websites/Platform/src/Bit.Websites.Platform.Client/Pages/Templates/Templates01OverviewPage.razor
@@ -36,16 +36,23 @@
<BitText Typography="BitTypography.Body1" Gutter>
Blazor is supported in the browsers shown in the following list on both mobile and desktop platforms.
</BitText>
+ <br />
+ <b>.NET 8</b>
<ul dir="auto">
- <li>Apple Safari (Current† version)</li>
- <li>Google Chrome (Current† version)</li>
- <li>Microsoft Edge (Current† version)</li>
- <li>Mozilla Firefox (Current† version)</li>
+ <li>Safari 15+</li>
+ <li>Firefox 100+</li>
+ <li>Chrome/Edge 95+</li>
+ </ul>
+ <br />
+ <b>.NET 9</b>
+ <ul dir="auto">
+ <li>Safari 16.4+</li>
+ <li>Firefox 100+</li>
+ <li>Chrome/Edge 95+</li>
</ul>
</li>
</ul>
</div>
- <br />
<BitText Typography="BitTypography.H6" Gutter>Supported platforms</BitText>
<div class="section-card-txt">
<ul>
@@ -53,11 +60,21 @@
<BitText Typography="BitTypography.Body1" Gutter>
Blazor Hybrid apps have the following additional platform requirements:
</BitText>
+ <br />
+ <b>.NET 8</b>
+ <ul dir="auto">
+ <li>iOS 15+</li>
+ <li>Windows 7 SP1+</li>
+ <li>macOS (Monterey) 12+</li>
+ <li>Android 8+ & <a href="https://play.google.com/store/apps/details?id=com.google.android.webview" target="_blank">WebView</a> 84+</li>
+ </ul>
+ <br />
+ <b>.NET 9</b>
<ul dir="auto">
- <li>Android 8 (API Level 26) or higher</li>
- <li>iOS 15 or higher</li>
- <li>macOS 12 (Monterey) or higher</li>
- <li>Windows 7 SP1 or higher</li>
+ <li>iOS 16.4+</li>
+ <li>Windows 7 SP1+</li>
+ <li>macOS (Ventura) 13.3+</li>
+ <li>Android 8+ & <a href="https://play.google.com/store/apps/details?id=com.google.android.webview" target="_blank">WebView</a> 94+</li>
</ul>
</li>
</ul>
diff --git a/src/Websites/Platform/src/Bit.Websites.Platform.Client/Pages/Templates/Templates03GettingStartedPage.razor b/src/Websites/Platform/src/Bit.Websites.Platform.Client/Pages/Templates/Templates03GettingStartedPage.razor
index 09fcf275c6..b70e2346bd 100644
--- a/src/Websites/Platform/src/Bit.Websites.Platform.Client/Pages/Templates/Templates03GettingStartedPage.razor
+++ b/src/Websites/Platform/src/Bit.Websites.Platform.Client/Pages/Templates/Templates03GettingStartedPage.razor
@@ -15,6 +15,13 @@
<section class="section-card">
<div class="section-card-txt">
<BitText Typography="BitTypography.H5" Gutter>Setup your development environment</BitText>
+ <BitDropdown @bind-Value="dotnetVersion"
+ FitWidth
+ Label=".NET version"
+ TItem="BitDropdownOption<string>" TValue="string">
+ <BitDropdownOption Text=".NET 8" Value="@("net8.0")" />
+ <BitDropdownOption Text=".NET 9" Value="@("net9.0")" />
+ </BitDropdown>
<br />
<BitPivot>
<BitPivotItem HeaderText="Easy setup">
@@ -83,36 +90,47 @@
</BitPivotItem>
<BitPivotItem HeaderText="Step-by-step setup">
<br />
+ <BitText Typography="BitTypography.H6" Gutter>
+ Step-by-step instructions for:
+ </BitText>
<BitStack Horizontal HorizontalAlign="BitAlignment.Start">
- <BitText Typography="BitTypography.H6" Gutter>
- Step-by-step instructions for
- </BitText>
- <BitPivot HeadersOnly="true" OnItemClick="@(item => devOS = item?.Key)">
+ <BitPivot HeaderOnly OnItemClick="@(item => devOS = item?.Key)">
<BitPivotItem HeaderText="Windows" Key="Windows"></BitPivotItem>
<BitPivotItem HeaderText="macOS" Key="macOS"></BitPivotItem>
<BitPivotItem HeaderText="Linux" Key="Linux"></BitPivotItem>
</BitPivot>
</BitStack>
- <br /><br />
- <BitToggle IsInlineLabel Label="Show cross-platform development steps" @bind-Value="showCrossPlatform" />
<br />
+ <BitToggle Inline Label="Show cross-platform development steps" @bind-Value="showCrossPlatform" />
<ol>
<li style="margin-bottom:8px">
- Install latest <a href="https://dotnet.microsoft.com/en-us/download/dotnet/8.0" target="_blank">.NET 8 SDK</a>
+ Install latest <a href="https://dotnet.microsoft.com/en-us/download/dotnet/@(dotnetVersion is "net9.0" ? "9.0" : "8.0")" target="_blank">.NET SDK</a>
@if (devOS is "Linux")
{
- <BitAccordion Title=".NET 8 Sdk on Linux instructions">
- <div>To install .NET 8 SDK on Linux(Ubuntu) run the following commands:</div>
- <CodeBox>wget https://download.visualstudio.microsoft.com/download/pr/ca6cd525-677e-4d3a-b66c-11348a6f920a/ec395f498f89d0ca4d67d903892af82d/dotnet-sdk-8.0.403-linux-x64.tar.gz -O $HOME/dotnet.tar.gz
+ <br />
+ <BitAccordion Title=".NET Sdk on Linux instructions">
+ <div>To install .NET SDK on Linux(Ubuntu) run the following commands:</div>
+ @if (dotnetVersion is "net9.0")
+ {
+ <CodeBox>wget https://download.visualstudio.microsoft.com/download/pr/308f16a9-2ecf-4a42-b8bb-c1233de985fd/be6e87045ab21935bd8bb98ce69026c4/dotnet-sdk-9.0.100-linux-x64.tar.gz -O $HOME/dotnet.tar.gz
+mkdir -p $HOME/.dotnet
+tar zxf $HOME/dotnet.tar.gz -C "$HOME/.dotnet"
+echo 'PATH=$HOME/.dotnet:$HOME/.dotnet/tools:$PATH' >> ~/.bashrc
+export PATH=$HOME/.dotnet:$HOME/.dotnet/tools:$PATH
+rm $HOME/dotnet.tar.gz</CodeBox>
+ }
+ else
+ {
+ <CodeBox>wget https://download.visualstudio.microsoft.com/download/pr/4e3b04aa-c015-4e06-a42e-05f9f3c54ed2/74d1bb68e330eea13ecfc47f7cf9aeb7/dotnet-sdk-8.0.404-linux-x64.tar.gz -O $HOME/dotnet.tar.gz
mkdir -p $HOME/.dotnet
tar zxf $HOME/dotnet.tar.gz -C "$HOME/.dotnet"
echo 'PATH=$HOME/.dotnet:$HOME/.dotnet/tools:$PATH' >> ~/.bashrc
export PATH=$HOME/.dotnet:$HOME/.dotnet/tools:$PATH
rm $HOME/dotnet.tar.gz</CodeBox>
+ }
</BitAccordion>
}
</li>
- <br />
<li>Install <a href="@( devOS is "Windows" ? "https://nodejs.org/en/download/prebuilt-installer" : "https://nodejs.org/en/download/package-manager")" title="Node.js" rel="nofollow">Node.js</a></li>
<br />
<li>
@@ -149,8 +167,8 @@ rm $HOME/dotnet.tar.gz</CodeBox>
}
</li>
<li>
- <div style="margin-bottom:8px">Install <a href="https://www.nuget.org/packages/Bit.Boilerplate/8.12.0" target="_blank">Bit Boilerplate</a> project template</div>
- <CodeBox>dotnet new install Bit.Boilerplate::8.12.0</CodeBox>
+ <div style="margin-bottom:8px">Install <a href="https://www.nuget.org/packages/Bit.Boilerplate/9.0.0" target="_blank">Bit Boilerplate</a> project template</div>
+ <CodeBox>dotnet new install Bit.Boilerplate::9.0.0</CodeBox>
</li>
@if (showCrossPlatform && devOS is "Windows")
{
@@ -199,7 +217,7 @@ rm $HOME/dotnet.tar.gz</CodeBox>
<div class="section-card-txt">
<ul>
<li>
- <a href="https://visualstudio.microsoft.com/downloads/" target="_blank">Microsoft Visual Studio</a> 2022 - Version 17.11 or higher
+ <a href="https://visualstudio.microsoft.com/downloads/" target="_blank">Microsoft Visual Studio</a> 2022 - Version 17.12 or higher
<ul dir="auto">
<li>
Workloads:
diff --git a/src/Websites/Platform/src/Bit.Websites.Platform.Client/Pages/Templates/Templates03GettingStartedPage.razor.cs b/src/Websites/Platform/src/Bit.Websites.Platform.Client/Pages/Templates/Templates03GettingStartedPage.razor.cs
index 332c7cd297..20b77f73cf 100644
--- a/src/Websites/Platform/src/Bit.Websites.Platform.Client/Pages/Templates/Templates03GettingStartedPage.razor.cs
+++ b/src/Websites/Platform/src/Bit.Websites.Platform.Client/Pages/Templates/Templates03GettingStartedPage.razor.cs
@@ -8,52 +8,16 @@ public partial class Templates03GettingStartedPage
private bool installVs;
private bool installVsCode;
+ private bool showCrossPlatform;
private bool enableCrossPlatform;
- private bool enableVirtualization;
private string devOS = "Windows";
+ private bool enableVirtualization;
+ private string dotnetVersion = "net9.0";
private string copyButtonText = "Copy commands";
- private bool showCrossPlatform;
-
- private List<(string text, string command)> GetSelectedComands()
- {
- List<(string text, string command)> selectedCommandGroups = [.. commandGroups[CommandGroup.Core]];
- if (enableVirtualization)
- selectedCommandGroups.AddRange(commandGroups[CommandGroup.Virtualization]);
- if (enableCrossPlatform)
- selectedCommandGroups.AddRange(commandGroups[CommandGroup.Additional]);
- if (installVsCode)
- selectedCommandGroups.AddRange(commandGroups[CommandGroup.VSCode]);
- if (installVs)
- {
- if (enableCrossPlatform)
- selectedCommandGroups.AddRange(commandGroups[CommandGroup.AdditionalVS]);
- else
- selectedCommandGroups.AddRange(commandGroups[CommandGroup.VS]);
- }
- return selectedCommandGroups;
- }
-
- private string GetReadyToRunSelectedCommands()
+ private List<(string text, string command)> GetSelectedCommands()
{
- return string.Join(" ", GetSelectedComands().Select(c => $"{c.text} {c.command}"));
- }
-
- private string GetDisplayableSelectedCommands()
- {
- return string.Join($"{Environment.NewLine}", GetSelectedComands().Select(c => $"{c.text}{Environment.NewLine}{c.command}{Environment.NewLine}"));
- }
-
- private async Task CopyCommandsToClipboard()
- {
- var commands = GetReadyToRunSelectedCommands();
- await clipboard.WriteText(commands);
- copyButtonText = "Now paste commands in Windows PowerShell";
- }
-
- private Dictionary<CommandGroup, List<(string text, string command)>> commandGroups = new()
- {
- [CommandGroup.Core] =
+ List<(string text, string command)> result =
[
(text:"echo 'Set execution policy';",
command:"Set-ExecutionPolicy -ExecutionPolicy RemoteSigned -Scope CurrentUser -Force;"),
@@ -62,7 +26,7 @@ private async Task CopyCommandsToClipboard()
command:"$ProgressPreference = 'SilentlyContinue'; Install-PackageProvider -Name \"NuGet\" -Force; Set-PSRepository -Name \"PSGallery\" -InstallationPolicy Trusted; Install-Script winget-install -Force; winget-install -Force;"),
(text:@"echo 'Install .NET SDK https://dotnet.microsoft.com/en-us/download';",
- command:"winget install Microsoft.DotNet.SDK.8 --accept-source-agreements --accept-package-agreements;"),
+ command: $"winget install Microsoft.DotNet.SDK.{(dotnetVersion is "net9.0" ? "9" : "8")} --accept-source-agreements --accept-package-agreements;"),
(text:@"echo 'Discover installed .NET SDK';",
command:"$env:Path = [System.Environment]::GetEnvironmentVariable(\"Path\",\"Machine\") + \";\" + [System.Environment]::GetEnvironmentVariable(\"Path\",\"User\");"),
@@ -74,85 +38,95 @@ private async Task CopyCommandsToClipboard()
command:"dotnet nuget add source \"https://api.nuget.org/v3/index.json\" --name \"nuget.org\"; dotnet workload install wasm-tools;"),
(text:@"echo 'Install the Bit.Boilerplate project template https://www.nuget.org/packages/Boilerplate.Templates';",
- command:"dotnet new install Bit.Boilerplate::8.12.0;"),
- ],
+ command:"dotnet new install Bit.Boilerplate::9.0.0;")
+ ];
- [CommandGroup.Additional] =
- [
- (text:@"echo 'Install MAUI workloads https://learn.microsoft.com/en-us/dotnet/maui/get-started/installation?tabs=visual-studio-code#install-net-and-net-maui-workloads';",
- command:"dotnet workload install maui;"),
+ if (enableVirtualization)
+ {
+ result.AddRange([
+ (text:@"echo 'Install WSL';",
+ command:"wsl --install;"),
- (text:@"echo 'Enable long paths files in Windows https://learn.microsoft.com/en-us/windows/win32/fileio/maximum-file-path-limitation';",
- command:@"New-ItemProperty -Path ""HKLM:\SYSTEM\CurrentControlSet\Control\FileSystem"" -Name ""LongPathsEnabled"" -Value 1 -PropertyType DWORD -Force;"),
+ (text:@"echo 'Install HyperV';",
+ command:"Enable-WindowsOptionalFeature -FeatureName Microsoft-Hyper-V-All -Online -NoRestart;"),
- (text:@"echo 'Enable Windows developer mode https://learn.microsoft.com/en-us/windows/apps/get-started/developer-mode-features-and-debugging#use-regedit-to-enable-your-device';",
- command:@"New-ItemProperty -Path ""HKLM:\SOFTWARE\Microsoft\Windows\CurrentVersion\AppModelUnlock"" -Name ""AllowDevelopmentWithoutDevLicense"" -Value 1 -PropertyType DWORD -Force;"),
- ],
+ (text:@"echo 'Install HyperVisior Platform';",
+ command:"Enable-WindowsOptionalFeature -FeatureName HypervisorPlatform -Online -NoRestart;"),
- [CommandGroup.VS] =
- [
- (text:@"echo 'Install Visual Studio 2022 Community Edition https://visualstudio.microsoft.com/downloads/';",
- command:"winget install --id Microsoft.VisualStudio.2022.Community --exact --silent --custom \"--add Microsoft.VisualStudio.Workload.NetWeb\" --accept-source-agreements --accept-package-agreements --disable-interactivity;")
- ],
+ (text:@"echo 'Install Virtual Machine Platform';",
+ command:"Enable-WindowsOptionalFeature -FeatureName VirtualMachinePlatform -Online -NoRestart;"),
- [CommandGroup.AdditionalVS] =
- [
- (text:@"echo 'Install Visual Studio 2022 Community Edition https://visualstudio.microsoft.com/downloads/';",
- command:"winget install --id Microsoft.VisualStudio.2022.Community --exact --silent --custom \"--add Microsoft.VisualStudio.Workload.NetCrossPlat --add Microsoft.VisualStudio.Workload.NetWeb --add Component.Android.SDK.MAUI\" --accept-source-agreements --accept-package-agreements --disable-interactivity;")
- ],
+ (text:@"echo 'Install Docker Desktop';",
+ command:"winget install Docker.DockerDesktop --accept-source-agreements --accept-package-agreements;")]
+ );
+ }
- [CommandGroup.VSCode] =
- [
- (text:@"echo 'Install Visual Studio Code https://code.visualstudio.com/download';",
- command:"winget install -e --id Microsoft.VisualStudioCode --scope machine --accept-source-agreements --accept-package-agreements;"),
+ if (enableCrossPlatform)
+ {
+ result.AddRange([
+ (text:@"echo 'Install MAUI workloads https://learn.microsoft.com/en-us/dotnet/maui/get-started/installation?tabs=visual-studio-code#install-net-and-net-maui-workloads';",
+ command:"dotnet workload install maui;"),
- (text:@"echo 'Discover installed Visual Studio Code';",
- command:"$env:Path = [System.Environment]::GetEnvironmentVariable(\"Path\",\"Machine\") + \";\" + [System.Environment]::GetEnvironmentVariable(\"Path\",\"User\");"),
+ (text:@"echo 'Enable long paths files in Windows https://learn.microsoft.com/en-us/windows/win32/fileio/maximum-file-path-limitation';",
+ command:@"New-ItemProperty -Path ""HKLM:\SYSTEM\CurrentControlSet\Control\FileSystem"" -Name ""LongPathsEnabled"" -Value 1 -PropertyType DWORD -Force;"),
- (text:@"echo 'Install the C# Dev Kit extension for Visual Studio Code https://marketplace.visualstudio.com/items?itemName=ms-dotnettools.csdevkit';",
- command:"code --install-extension ms-dotnettools.csdevkit;"),
+ (text:@"echo 'Enable Windows developer mode https://learn.microsoft.com/en-us/windows/apps/get-started/developer-mode-features-and-debugging#use-regedit-to-enable-your-device';",
+ command:@"New-ItemProperty -Path ""HKLM:\SOFTWARE\Microsoft\Windows\CurrentVersion\AppModelUnlock"" -Name ""AllowDevelopmentWithoutDevLicense"" -Value 1 -PropertyType DWORD -Force;")]
+ );
+ }
- (text:@"echo 'Install Dev Containers extension for Visual Studio Code https://marketplace.visualstudio.com/items?itemName=ms-vscode-remote.remote-containers';",
- command:"code --install-extension ms-vscode-remote.remote-containers;"),
+ if (installVsCode)
+ {
+ result.AddRange([
+ (text: @"echo 'Install Visual Studio Code https://code.visualstudio.com/download';",
+ command: "winget install -e --id Microsoft.VisualStudioCode --scope machine --accept-source-agreements --accept-package-agreements;"),
- (text:@"echo 'Install the Blazor WASM Companion extension for Visual Studio Code https://marketplace.visualstudio.com/items?itemName=ms-dotnettools.blazorwasm-companion';",
- command:"code --install-extension ms-dotnettools.blazorwasm-companion;"),
+ (text: @"echo 'Discover installed Visual Studio Code';",
+ command: "$env:Path = [System.Environment]::GetEnvironmentVariable(\"Path\",\"Machine\") + \";\" + [System.Environment]::GetEnvironmentVariable(\"Path\",\"User\");"),
- (text:@"echo 'Install the Live Sass Compiler extension for Visual Studio Code https://marketplace.visualstudio.com/items?itemName=glenn2223.live-sass';",
- command:"code --install-extension glenn2223.live-sass;"),
+ (text: @"echo 'Install the C# Dev Kit extension for Visual Studio Code https://marketplace.visualstudio.com/items?itemName=ms-dotnettools.csdevkit';",
+ command: "code --install-extension ms-dotnettools.csdevkit;"),
- (text:@"echo 'Install the ASP.NET Core Razor IntelliSense for Visual Studio Code https://marketplace.visualstudio.com/items?itemName=kevin-chatham.aspnetcorerazor-html-css-class-completion';",
- command:"code --install-extension kevin-chatham.aspnetcorerazor-html-css-class-completion;"),
+ (text: @"echo 'Install Dev Containers extension for Visual Studio Code https://marketplace.visualstudio.com/items?itemName=ms-vscode-remote.remote-containers';",
+ command: "code --install-extension ms-vscode-remote.remote-containers;"),
- (text:@"echo 'Install the .NET MAUI extension for Visual Studio Code https://marketplace.visualstudio.com/items?itemName=ms-dotnettools.dotnet-maui';",
- command:"code --install-extension ms-dotnettools.dotnet-maui;"),
- ],
- [CommandGroup.Virtualization] =
- [
- (text:@"echo 'Install WSL';",
- command:"wsl --install;"),
+ (text: @"echo 'Install the Blazor WASM Companion extension for Visual Studio Code https://marketplace.visualstudio.com/items?itemName=ms-dotnettools.blazorwasm-companion';",
+ command: "code --install-extension ms-dotnettools.blazorwasm-companion;"),
+
+ (text: @"echo 'Install the Live Sass Compiler extension for Visual Studio Code https://marketplace.visualstudio.com/items?itemName=glenn2223.live-sass';",
+ command: "code --install-extension glenn2223.live-sass;"),
+
+ (text: @"echo 'Install the ASP.NET Core Razor IntelliSense for Visual Studio Code https://marketplace.visualstudio.com/items?itemName=kevin-chatham.aspnetcorerazor-html-css-class-completion';",
+ command: "code --install-extension kevin-chatham.aspnetcorerazor-html-css-class-completion;"),
+
+ (text: @"echo 'Install the .NET MAUI extension for Visual Studio Code https://marketplace.visualstudio.com/items?itemName=ms-dotnettools.dotnet-maui';",
+ command: "code --install-extension ms-dotnettools.dotnet-maui;")]
+ );
+ }
- (text:@"echo 'Install HyperV';",
- command:"Enable-WindowsOptionalFeature -FeatureName Microsoft-Hyper-V-All -Online -NoRestart;"),
+ if (installVs)
+ {
+ result.Add((text: @"echo 'Install Visual Studio 2022 Community Edition https://visualstudio.microsoft.com/downloads/';",
+ command: $"winget install --id Microsoft.VisualStudio.2022.Community --exact --silent --custom \"--add Microsoft.VisualStudio.Workload.NetWeb{(enableCrossPlatform ? " --add Microsoft.VisualStudio.Workload.NetCrossPlat --add Component.Android.SDK.MAUI" : "")}\" --accept-source-agreements --accept-package-agreements --disable-interactivity;"));
+ }
- (text:@"echo 'Install HyperVisior Platform';",
- command:"Enable-WindowsOptionalFeature -FeatureName HypervisorPlatform -Online -NoRestart;"),
+ return result;
+ }
- (text:@"echo 'Install Virtual Machine Platform';",
- command:"Enable-WindowsOptionalFeature -FeatureName VirtualMachinePlatform -Online -NoRestart;"),
+ private string GetReadyToRunSelectedCommands()
+ {
+ return string.Join(" ", GetSelectedCommands().Select(c => $"{c.text} {c.command}"));
+ }
- (text:@"echo 'Install Docker Desktop';",
- command:"winget install Docker.DockerDesktop --accept-source-agreements --accept-package-agreements;"),
- ]
- };
+ private string GetDisplayableSelectedCommands()
+ {
+ return string.Join($"{Environment.NewLine}", GetSelectedCommands().Select(c => $"{c.text}{Environment.NewLine}{c.command}{Environment.NewLine}"));
+ }
- private enum CommandGroup
+ private async Task CopyCommandsToClipboard()
{
- Core,
- Additional,
- AdditionalVS,
- VS,
- VSCode,
- Virtualization
+ var commands = GetReadyToRunSelectedCommands();
+ await clipboard.WriteText(commands);
+ copyButtonText = "Now paste commands in Windows PowerShell";
}
}
diff --git a/src/Websites/Platform/src/Bit.Websites.Platform.Client/Pages/Templates/Templates05CreateProjectPage.razor b/src/Websites/Platform/src/Bit.Websites.Platform.Client/Pages/Templates/Templates05CreateProjectPage.razor
index 7e283c80ea..05f67e2f11 100644
--- a/src/Websites/Platform/src/Bit.Websites.Platform.Client/Pages/Templates/Templates05CreateProjectPage.razor
+++ b/src/Websites/Platform/src/Bit.Websites.Platform.Client/Pages/Templates/Templates05CreateProjectPage.razor
@@ -14,7 +14,7 @@
Let's make our next cross platform project a success with Bit.Boilerplate.
</BitText>
<br />
- <BitSticky Top="90px">
+ <BitSticky Top="110px">
<CodeBox>
@GetFinalCommand()
</CodeBox>
@@ -38,6 +38,19 @@
</BitGridItem>
<BitGridItem Class="grid-item">
+ <div class="row">
+ <BitText Typography="BitTypography.H6" Gutter>.NET</BitText>
+ <BitDropdown Placeholder="Choose .NET version" Items="@dotnetVersion.Items" @bind-Value="@dotnetVersion.Value" />
+ </div>
+ <br />
+ <CodeBox>
+ @GetDotNetVersionCommand()
+ </CodeBox>
+ <br />
+ Refer to the <a href="https://dotnet.microsoft.com/en-us/platform/support/policy" target="_blank">.NET Support Policy</a>
+ </BitGridItem>
+
+ <BitGridItem Class="grid-item md">
<div class="row">
<BitText Typography="BitTypography.H6" Gutter>Captcha</BitText>
<BitDropdown Placeholder="Choose captcha" Items="@captcha.Items" @bind-Value="@captcha.Value" />
@@ -64,7 +77,7 @@
</div>
</BitGridItem>
- <BitGridItem Class="grid-item">
+ <BitGridItem Class="grid-item md">
<div class="row">
<BitText Typography="BitTypography.H6" Gutter>Pipeline</BitText>
<BitDropdown Placeholder="Choose pipeline" Items="@pipeline.Items" @bind-Value="@pipeline.Value" />
@@ -95,7 +108,7 @@
}
</BitGridItem>
- <BitGridItem Class="grid-item">
+ <BitGridItem Class="grid-item md">
<div class="row">
<BitText Typography="BitTypography.H6" Gutter>Sample</BitText>
<BitDropdown Placeholder="Choose sample" Items="@sample.Items" @bind-Value="@sample.Value" />
@@ -108,7 +121,7 @@
The two available options are <a href="https://adminpanel.bitplatform.dev/" target="_blank">Admin Panel</a> and <a href="https://todo.bitplatform.dev/" target="_blank">Todo</a>."
</BitGridItem>
- <BitGridItem Class="grid-item">
+ <BitGridItem Class="grid-item md">
<div class="row">
<BitText Typography="BitTypography.H6" Gutter>Windows</BitText>
<BitToggle @bind-Value="windows.Value" OnText="true" OffText="false" />
@@ -121,7 +134,7 @@
but no separate Windows application will be included.
</BitGridItem>
- <BitGridItem Class="grid-item">
+ <BitGridItem Class="grid-item md">
<div class="row">
<BitText Typography="BitTypography.H6" Gutter>App Center</BitText>
<BitToggle @bind-Value="appCenter.Value" OnText="true" OffText="false" />
@@ -134,7 +147,7 @@
seamlessly across all supported platforms.
</BitGridItem>
- <BitGridItem Class="grid-item">
+ <BitGridItem Class="grid-item md">
<div class="row">
<BitText Typography="BitTypography.H6" Gutter>AppInsights</BitText>
<BitToggle @bind-Value="appInsight.Value" OnText="true" OffText="false" />
@@ -148,7 +161,7 @@
errors and informational messages.
</BitGridItem>
- <BitGridItem Class="grid-item">
+ <BitGridItem Class="grid-item md">
<div class="row">
<BitText Typography="BitTypography.H6" Gutter>SignalR</BitText>
<BitToggle @bind-Value="signalR.Value" OnText="true" OffText="false" />
@@ -161,11 +174,11 @@
<br />
<br />
<b>Note:</b>
- <br />
+ <br />
This setting does not affect the enabling or disabling of Blazor Server.
</BitGridItem>
- <BitGridItem Class="grid-item">
+ <BitGridItem Class="grid-item md">
<div class="row">
<BitText Typography="BitTypography.H6" Gutter>File Storage</BitText>
<BitDropdown Placeholder="Choose file storage" Items="@fileStorage.Items" @bind-Value="@fileStorage.Value" />
@@ -202,7 +215,7 @@
}
</BitGridItem>
- <BitGridItem Class="grid-item">
+ <BitGridItem Class="grid-item lg">
<div class="row">
<BitText Typography="BitTypography.H6" Gutter>Offline Database</BitText>
<BitToggle @bind-Value="offlineDb.Value" OnText="true" OffText="false" />
@@ -218,7 +231,7 @@
Warning: It is advisable to use this option only when necessary, as integrating Entity Framework Core can increase application size and potentially reduce startup performance.
</BitGridItem>
- <BitGridItem Class="grid-item">
+ <BitGridItem Class="grid-item lg">
<div class="row">
<BitText Typography="BitTypography.H6" Gutter>Server Database</BitText>
<BitDropdown Placeholder="Choose database" Items="@database.Items" @bind-Value="@database.Value" />
@@ -235,8 +248,6 @@
<br />
<br />
Supported options include SqlServer, PostgreSQL, MySQL, Cosmos, and Other.
- If you require a database not listed among the options, select Other. After project creation, you can add the desired <a href="https://learn.microsoft.com/en-us/ef/core/providers/" target="_blank">database</a>
- package and configure it in the AddDbContextPool method which is located in the Program.Services.cs file within the Server.Api project.
<br />
<br />
For the default Sqlite option, we'd recommend installing sqlite package for <a href="https://marketplace.visualstudio.com/items?itemName=ErikEJ.SQLServerCompactSQLiteToolbox" target="_blank">Visual Studio</a> and <a href="https://marketplace.visualstudio.com/items?itemName=yy0931.vscode-sqlite3-editor" target="_blank">Visual Studio Code</a>.
@@ -279,7 +290,7 @@
}
</BitGridItem>
- <BitGridItem Class="grid-item">
+ <BitGridItem Class="grid-item md">
<div class="row">
<BitText Typography="BitTypography.H6" Gutter>Push Notification (Native and Web Push)</BitText>
<BitToggle @bind-Value="notification.Value" OnText="true" OffText="false" />
diff --git a/src/Websites/Platform/src/Bit.Websites.Platform.Client/Pages/Templates/Templates05CreateProjectPage.razor.cs b/src/Websites/Platform/src/Bit.Websites.Platform.Client/Pages/Templates/Templates05CreateProjectPage.razor.cs
index f5867c7114..e1bdd7412f 100644
--- a/src/Websites/Platform/src/Bit.Websites.Platform.Client/Pages/Templates/Templates05CreateProjectPage.razor.cs
+++ b/src/Websites/Platform/src/Bit.Websites.Platform.Client/Pages/Templates/Templates05CreateProjectPage.razor.cs
@@ -6,57 +6,41 @@ public partial class Templates05CreateProjectPage
{
private string name = "MyFirstProject";
- private Parameter<bool> windows = new()
- {
- Value = true,
- Default = true,
- };
-
- private Parameter<bool> appCenter = new()
- {
- Value = false,
- Default = false,
- };
-
- private Parameter<bool> offlineDb = new()
- {
- Value = false,
- Default = false,
- };
-
- private Parameter<bool> notification = new()
- {
- Value = false,
- Default = false,
- };
-
- private Parameter<bool> appInsight = new()
- {
- Value = false,
- Default = false,
- };
-
- private Parameter<bool> signalR = new()
- {
- Value = false,
- Default = false,
- };
+ private Parameter<bool> windows = new() { Value = true, Default = true };
+ private Parameter<bool> appCenter = new() { Value = false, Default = false };
+ private Parameter<bool> offlineDb = new() { Value = false, Default = false };
+ private Parameter<bool> notification = new() { Value = false, Default = false };
+ private Parameter<bool> appInsight = new() { Value = false, Default = false };
+ private Parameter<bool> signalR = new() { Value = false, Default = false };
private Parameter<string> captcha = new()
{
Value = "None",
Default = "None",
- Items = [
+ Items =
+ [
new() { Text = "None", Value = "None" },
new() { Text = "reCaptcha", Value = "reCaptcha" },
]
};
+ private Parameter<string> dotnetVersion = new()
+ {
+ Value = "net9.0",
+ Default = "net9.0",
+ Items =
+ [
+ new() { Text = ".NET 8", Value = "net8.0" },
+ new() { Text = ".NET 9", Value = "net9.0" },
+ ]
+ };
+
private Parameter<string> pipeline = new()
{
Value = "GitHub",
Default = "GitHub",
- Items = [
+ Items =
+ [
new() { Text = "None", Value = "None" },
new() { Text = "GitHub", Value = "GitHub" },
new() { Text = "Azure", Value = "Azure" },
@@ -67,7 +51,8 @@ public partial class Templates05CreateProjectPage
{
Value = "None",
Default = "None",
- Items = [
+ Items =
+ [
new() { Text = "None", Value = "None" },
new() { Text = "Admin", Value = "Admin" },
new() { Text = "Todo", Value = "Todo" },
@@ -78,7 +63,8 @@ public partial class Templates05CreateProjectPage
{
Value = "Sqlite",
Default = "Sqlite",
- Items = [
+ Items =
+ [
new() { Text = "Sqlite", Value = "Sqlite" },
new() { Text = "SqlServer", Value = "SqlServer" },
new() { Text = "PostgreSQL", Value = "PostgreSQL" },
@@ -92,7 +78,8 @@ public partial class Templates05CreateProjectPage
{
Value = "Local",
Default = "Local",
- Items = [
+ Items =
+ [
new() { Text = "Local", Value = "Local" },
new() { Text = "AzureBlobStorage", Value = "AzureBlobStorage" },
new() { Text = "Other", Value = "Other" },
@@ -103,7 +90,8 @@ public partial class Templates05CreateProjectPage
{
Value = "Integrated",
Default = "Integrated",
- Items = [
+ Items =
+ [
new() { Text = "Integrated", Value = "Integrated" },
new() { Text = "Standalone", Value = "Standalone" },
]
@@ -118,6 +106,11 @@ private string GetFinalCommand()
finalCommand.Append(GetCaptchaCommand());
}
+ if (dotnetVersion.IsModified)
+ {
+ finalCommand.Append(GetDotNetVersionCommand());
+ }
+
if (pipeline.IsModified)
{
finalCommand.Append(GetPipelineCommand());
@@ -186,6 +179,11 @@ private string GetCaptchaCommand()
return $"--captcha {captcha.Value} ";
}
+ private string GetDotNetVersionCommand()
+ {
+ return $"--framework {dotnetVersion.Value} ";
+ }
+
private string GetPipelineCommand()
{
return $"--pipeline {pipeline.Value} ";
diff --git a/src/Websites/Platform/src/Bit.Websites.Platform.Client/Pages/Templates/Templates05CreateProjectPage.razor.scss b/src/Websites/Platform/src/Bit.Websites.Platform.Client/Pages/Templates/Templates05CreateProjectPage.razor.scss
index efc3843eff..f001d8dca3 100644
--- a/src/Websites/Platform/src/Bit.Websites.Platform.Client/Pages/Templates/Templates05CreateProjectPage.razor.scss
+++ b/src/Websites/Platform/src/Bit.Websites.Platform.Client/Pages/Templates/Templates05CreateProjectPage.razor.scss
@@ -62,9 +62,9 @@
}
.grid-item {
- width: rem2(550px);
- min-height: rem2(400px);
overflow: auto;
+ width: rem2(550px);
+ min-height: 21rem;
position: relative;
padding: rem2(28px);
word-wrap: break-word;
@@ -72,5 +72,33 @@
background-clip: padding-box;
box-shadow: $bit-box-shadow-callout;
background-color: $bit-color-background-primary;
+
+ &.md {
+ min-height: 24rem;
+ }
+
+ &.lg {
+ min-height: 28rem;
+ }
+
+ @include lt-xl {
+ &.md {
+ min-height: 27rem;
+ }
+
+ &.lg {
+ min-height: 33rem;
+ }
+ }
+
+ @include lt-lg {
+ &.md {
+ min-height: 30rem;
+ }
+
+ &.lg {
+ min-height: 37rem;
+ }
+ }
}
}
diff --git a/src/Websites/Platform/src/Bit.Websites.Platform.Client/Shared/Urls.cs b/src/Websites/Platform/src/Bit.Websites.Platform.Client/Shared/Urls.cs
index 3983112892..bd989417a1 100644
--- a/src/Websites/Platform/src/Bit.Websites.Platform.Client/Shared/Urls.cs
+++ b/src/Websites/Platform/src/Bit.Websites.Platform.Client/Shared/Urls.cs
@@ -21,11 +21,11 @@ public static class Urls
public const string Facebook = "#";
public const string LowCodeNoCode = "/lowcode-nocode";
- public const string Templates = "/templates/overview";
+ public const string Templates = "/templates";
- public const string Bswup = "/bswup/overview";
- public const string Besql = "/besql/overview";
- public const string Butil = "/butil/overview";
+ public const string Bswup = "/bswup";
+ public const string Besql = "/besql";
+ public const string Butil = "/butil";
public const string BoilerplateNuget = "https://www.nuget.org/packages/Bit.Boilerplate/";
diff --git a/src/Websites/Platform/src/Bit.Websites.Platform.Server/Bit.Websites.Platform.Server.csproj b/src/Websites/Platform/src/Bit.Websites.Platform.Server/Bit.Websites.Platform.Server.csproj
index b2c6f02956..76695c36db 100644
--- a/src/Websites/Platform/src/Bit.Websites.Platform.Server/Bit.Websites.Platform.Server.csproj
+++ b/src/Websites/Platform/src/Bit.Websites.Platform.Server/Bit.Websites.Platform.Server.csproj
@@ -1,23 +1,24 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
+<Project Sdk="Microsoft.NET.Sdk.Web">
<PropertyGroup>
- <TargetFramework>net8.0</TargetFramework>
+ <TargetFramework>net9.0</TargetFramework>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\Bit.Websites.Platform.Shared\Bit.Websites.Platform.Shared.csproj" />
<ProjectReference Include="..\Bit.Websites.Platform.Client\Bit.Websites.Platform.Client.csproj" />
- <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="8.0.10" />
- <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.10" />
- <PackageReference Include="Bit.CodeAnalyzers" Version="8.12.0">
+ <PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="9.0.0" />
+ <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="9.0.0" />
+ <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="9.0.0" />
+ <PackageReference Include="Bit.CodeAnalyzers" Version="9.0.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
- <PackageReference Include="Bit.SourceGenerators" Version="8.12.0">
+ <PackageReference Include="Bit.SourceGenerators" Version="9.0.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
- <PackageReference Include="Swashbuckle.AspNetCore" Version="6.9.0" />
+ <PackageReference Include="Swashbuckle.AspNetCore" Version="7.0.0" />
<PackageReference Include="AspNetCore.HealthChecks.System" Version="8.0.1" />
<PackageReference Include="AspNetCore.HealthChecks.UI" Version="8.0.2" />
<PackageReference Include="AspNetCore.HealthChecks.UI.Client" Version="8.0.1" />
diff --git a/src/Websites/Platform/src/Bit.Websites.Platform.Server/Startup/Middlewares.cs b/src/Websites/Platform/src/Bit.Websites.Platform.Server/Startup/Middlewares.cs
index 0cd9a9f38c..3fb3814349 100644
--- a/src/Websites/Platform/src/Bit.Websites.Platform.Server/Startup/Middlewares.cs
+++ b/src/Websites/Platform/src/Bit.Websites.Platform.Server/Startup/Middlewares.cs
@@ -74,6 +74,7 @@ public static void Use(WebApplication app, IWebHostEnvironment env, IConfigurati
UseSiteMap(app);
+ app.MapStaticAssets();
app.MapRazorComponents<App>()
.AddInteractiveServerRenderMode()
.AddInteractiveWebAssemblyRenderMode()
diff --git a/src/Websites/Platform/src/Bit.Websites.Platform.Shared/Bit.Websites.Platform.Shared.csproj b/src/Websites/Platform/src/Bit.Websites.Platform.Shared/Bit.Websites.Platform.Shared.csproj
index 35e5fb020d..72da2da997 100644
--- a/src/Websites/Platform/src/Bit.Websites.Platform.Shared/Bit.Websites.Platform.Shared.csproj
+++ b/src/Websites/Platform/src/Bit.Websites.Platform.Shared/Bit.Websites.Platform.Shared.csproj
@@ -1,22 +1,22 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <TargetFramework>net8.0</TargetFramework>
+ <TargetFramework>net9.0</TargetFramework>
<NeutralLanguage>en-US</NeutralLanguage>
</PropertyGroup>
<ItemGroup>
- <PackageReference Include="Bit.CodeAnalyzers" Version="8.12.0">
+ <PackageReference Include="Bit.CodeAnalyzers" Version="9.0.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
- <PackageReference Include="Bit.SourceGenerators" Version="8.12.0">
+ <PackageReference Include="Bit.SourceGenerators" Version="9.0.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
- <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.2" />
- <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="8.0.2" />
- <PackageReference Include="System.Text.Json" Version="8.0.5" />
+ <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.0" />
+ <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="9.0.0" />
+ <PackageReference Include="System.Text.Json" Version="9.0.0" />
<PackageReference Include="Riok.Mapperly" Version="4.1.0" PrivateAssets="all" ExcludeAssets="runtime">
<IncludeAssets>compile; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
diff --git a/src/Websites/Platform/src/Directory.Build.props b/src/Websites/Platform/src/Directory.Build.props
index f54fe94aa7..d008fee570 100644
--- a/src/Websites/Platform/src/Directory.Build.props
+++ b/src/Websites/Platform/src/Directory.Build.props
@@ -1,4 +1,4 @@
-<!-- Generated by bit-dual template v-8.12.0 -->
+<!-- Generated by bit-dual template v-9.0.0 -->
<Project>
<PropertyGroup>
<LangVersion>preview</LangVersion>
diff --git a/src/Websites/Sales/src/Bit.Websites.Sales.Client/Bit.Websites.Sales.Client.csproj b/src/Websites/Sales/src/Bit.Websites.Sales.Client/Bit.Websites.Sales.Client.csproj
index 96cfd29993..6ec719d9e1 100644
--- a/src/Websites/Sales/src/Bit.Websites.Sales.Client/Bit.Websites.Sales.Client.csproj
+++ b/src/Websites/Sales/src/Bit.Websites.Sales.Client/Bit.Websites.Sales.Client.csproj
@@ -1,12 +1,10 @@
<Project Sdk="Microsoft.NET.Sdk.BlazorWebAssembly">
<PropertyGroup>
- <TargetFramework>net8.0</TargetFramework>
+ <TargetFramework>net9.0</TargetFramework>
<NoDefaultLaunchSettingsFile>true</NoDefaultLaunchSettingsFile>
<StaticWebAssetProjectMode>Default</StaticWebAssetProjectMode>
<InvariantGlobalization>true</InvariantGlobalization>
- <!-- Disabled WasmSIMD because of dotnet 8 rc issue on safari (iOS 16 and older devices) -->
- <WasmEnableSIMD>false</WasmEnableSIMD>
<ResolveStaticWebAssetsInputsDependsOn>
BeforeBuildTasks;
$(ResolveStaticWebAssetsInputsDependsOn)
@@ -14,7 +12,7 @@
</PropertyGroup>
<ItemGroup>
- <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.10" />
+ <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="9.0.0" />
</ItemGroup>
<ItemGroup>
@@ -24,19 +22,19 @@
<Content Remove="appsettings.json" />
<EmbeddedResource Include="appsettings.json" />
- <PackageReference Include="Bit.BlazorUI" Version="8.12.0" />
- <PackageReference Include="Bit.BlazorUI.Icons" Version="8.12.0" />
+ <PackageReference Include="Bit.BlazorUI" Version="9.0.0" />
+ <PackageReference Include="Bit.BlazorUI.Icons" Version="9.0.0" />
<BlazorWebAssemblyLazyLoad Include="Bit.BlazorUI.Icons.wasm" />
- <PackageReference Include="Bit.BlazorUI.Assets" Version="8.12.0" />
- <PackageReference Include="Bit.CodeAnalyzers" Version="8.12.0">
+ <PackageReference Include="Bit.BlazorUI.Assets" Version="9.0.0" />
+ <PackageReference Include="Bit.CodeAnalyzers" Version="9.0.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
- <PackageReference Include="Bit.SourceGenerators" Version="8.12.0">
+ <PackageReference Include="Bit.SourceGenerators" Version="9.0.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
- <PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="8.0.10" />
+ <PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="9.0.0" />
<Using Include="System.Net.Http.Json" />
<Using Include="System.Collections.Concurrent" />
diff --git a/src/Websites/Sales/src/Bit.Websites.Sales.Server/Bit.Websites.Sales.Server.csproj b/src/Websites/Sales/src/Bit.Websites.Sales.Server/Bit.Websites.Sales.Server.csproj
index 54245f1339..126f6d4a14 100644
--- a/src/Websites/Sales/src/Bit.Websites.Sales.Server/Bit.Websites.Sales.Server.csproj
+++ b/src/Websites/Sales/src/Bit.Websites.Sales.Server/Bit.Websites.Sales.Server.csproj
@@ -1,23 +1,24 @@
<Project Sdk="Microsoft.NET.Sdk.Web">
<PropertyGroup>
- <TargetFramework>net8.0</TargetFramework>
+ <TargetFramework>net9.0</TargetFramework>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\Bit.Websites.Sales.Shared\Bit.Websites.Sales.Shared.csproj" />
<ProjectReference Include="..\Bit.Websites.Sales.Client\Bit.Websites.Sales.Client.csproj" />
- <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="8.0.10" />
- <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.10" />
- <PackageReference Include="Bit.CodeAnalyzers" Version="8.12.0">
+ <PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="9.0.0" />
+ <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="9.0.0" />
+ <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="9.0.0" />
+ <PackageReference Include="Bit.CodeAnalyzers" Version="9.0.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
- <PackageReference Include="Bit.SourceGenerators" Version="8.12.0">
+ <PackageReference Include="Bit.SourceGenerators" Version="9.0.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
- <PackageReference Include="Swashbuckle.AspNetCore" Version="6.9.0" />
+ <PackageReference Include="Swashbuckle.AspNetCore" Version="7.0.0" />
<PackageReference Include="AspNetCore.HealthChecks.System" Version="8.0.1" />
<PackageReference Include="AspNetCore.HealthChecks.UI" Version="8.0.2" />
<PackageReference Include="AspNetCore.HealthChecks.UI.Client" Version="8.0.1" />
diff --git a/src/Websites/Sales/src/Bit.Websites.Sales.Server/Startup/Middlewares.cs b/src/Websites/Sales/src/Bit.Websites.Sales.Server/Startup/Middlewares.cs
index bc4433fb00..923ecdb312 100644
--- a/src/Websites/Sales/src/Bit.Websites.Sales.Server/Startup/Middlewares.cs
+++ b/src/Websites/Sales/src/Bit.Websites.Sales.Server/Startup/Middlewares.cs
@@ -74,6 +74,7 @@ public static void Use(WebApplication app, IWebHostEnvironment env, IConfigurati
UseSiteMap(app);
+ app.MapStaticAssets();
app.MapRazorComponents<App>()
.AddInteractiveServerRenderMode()
.AddInteractiveWebAssemblyRenderMode()
diff --git a/src/Websites/Sales/src/Bit.Websites.Sales.Shared/Bit.Websites.Sales.Shared.csproj b/src/Websites/Sales/src/Bit.Websites.Sales.Shared/Bit.Websites.Sales.Shared.csproj
index 35e5fb020d..72da2da997 100644
--- a/src/Websites/Sales/src/Bit.Websites.Sales.Shared/Bit.Websites.Sales.Shared.csproj
+++ b/src/Websites/Sales/src/Bit.Websites.Sales.Shared/Bit.Websites.Sales.Shared.csproj
@@ -1,22 +1,22 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <TargetFramework>net8.0</TargetFramework>
+ <TargetFramework>net9.0</TargetFramework>
<NeutralLanguage>en-US</NeutralLanguage>
</PropertyGroup>
<ItemGroup>
- <PackageReference Include="Bit.CodeAnalyzers" Version="8.12.0">
+ <PackageReference Include="Bit.CodeAnalyzers" Version="9.0.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
- <PackageReference Include="Bit.SourceGenerators" Version="8.12.0">
+ <PackageReference Include="Bit.SourceGenerators" Version="9.0.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
- <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.2" />
- <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="8.0.2" />
- <PackageReference Include="System.Text.Json" Version="8.0.5" />
+ <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.0" />
+ <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="9.0.0" />
+ <PackageReference Include="System.Text.Json" Version="9.0.0" />
<PackageReference Include="Riok.Mapperly" Version="4.1.0" PrivateAssets="all" ExcludeAssets="runtime">
<IncludeAssets>compile; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
diff --git a/src/Websites/Sales/src/Directory.Build.props b/src/Websites/Sales/src/Directory.Build.props
index c1389de24f..a797397358 100644
--- a/src/Websites/Sales/src/Directory.Build.props
+++ b/src/Websites/Sales/src/Directory.Build.props
@@ -1,4 +1,4 @@
-<!-- Generated by bit-dual template v-8.12.0 -->
+<!-- Generated by bit-dual template v-9.0.0 -->
<Project>
<PropertyGroup>
<LangVersion>12.0</LangVersion>
diff --git a/src/global.json b/src/global.json
index a10ccd6b1d..5771bf7ab8 100644
--- a/src/global.json
+++ b/src/global.json
@@ -1,6 +1,6 @@
{
"sdk": {
- "version": "8.0.403",
+ "version": "9.0.100",
"rollForward": "disable"
}
}
\ No newline at end of file