merge results

src/BlazorUI/Demo/Bit.BlazorUI.Demo.Server/Bit.BlazorUI.Demo.Server.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
+<Project Sdk="Microsoft.NET.Sdk.Web">
 
     <PropertyGroup>
         <TargetFramework>net9.0</TargetFramework>

src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Windows/Bit.BlazorUI.Demo.Client.Windows.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk.Razor">
+<Project Sdk="Microsoft.NET.Sdk.Razor">
 
     <PropertyGroup>
         <OutputType>WinExe</OutputType>

src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/AppInitializer.cs

@@ -89,10 +89,10 @@ private async Task ConnectSignalR()
         hubConnection = new HubConnectionBuilder()
             .WithUrl($"{Configuration.GetServerAddress()}/app-hub?access_token={access_token}", options =>
             {
-                options.HttpMessageHandlerFactory = httpClientHandler =>
+                options.HttpMessageHandlerFactory = signalrHttpMessageHandler =>
                 {
                     return serviceProvider.GetRequiredService<Func<HttpMessageHandler, HttpMessageHandler>>()
-                        .Invoke(httpClientHandler);
+                        .Invoke(signalrHttpMessageHandler);
                 };
             })
             .Build();

src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Extensions/IServiceCollectionExtensions.cs

@@ -40,19 +40,22 @@ public static IServiceCollection AddClientCoreProjectServices(this IServiceColle
         });
         services.TryAddSessioned<HttpClientHandler>();
 
-        // The following code build chain of http message handlers, it uses HttpClientHandler to send requests to the server by default,
-        // but you can also use other http message handlers such as aspnetcore's test host's http message handler for integration tests.
+        // This code constructs a chain of HTTP message handlers. By default, it uses `HttpClientHandler` 
+        // to send requests to the server. However, you can replace `HttpClientHandler` with other HTTP message 
+        // handlers, such as ASP.NET Core's `HttpMessageHandler` from the Test Host, which is useful for integration tests.
         services.TryAddTransient<Func<HttpMessageHandler, HttpMessageHandler>>(serviceProvider => underlyingHttpMessageHandler =>
         {
-            return ActivatorUtilities.CreateInstance<RequestHeadersDelegationHandler>(serviceProvider,
+            var constructedHttpMessageHandler = ActivatorUtilities.CreateInstance<RequestHeadersDelegationHandler>(serviceProvider,
                         [ActivatorUtilities.CreateInstance<AuthDelegatingHandler>(serviceProvider,
                         [ActivatorUtilities.CreateInstance<RetryDelegatingHandler>(serviceProvider,
                         [ActivatorUtilities.CreateInstance<ExceptionDelegatingHandler>(serviceProvider, [underlyingHttpMessageHandler])])])]);
+            return constructedHttpMessageHandler;
         });
         services.TryAddTransient(serviceProvider =>
         {
             var underlyingHttpMessageHandler = serviceProvider.GetRequiredService<HttpClientHandler>();
-            return serviceProvider.GetRequiredService<Func<HttpMessageHandler, HttpMessageHandler>>().Invoke(underlyingHttpMessageHandler);
+            var constructedHttpMessageHandler = serviceProvider.GetRequiredService<Func<HttpMessageHandler, HttpMessageHandler>>().Invoke(underlyingHttpMessageHandler);
+            return constructedHttpMessageHandler;
         });
 
         services.AddSessioned<AuthenticationStateProvider, AuthenticationManager>(); // Use 'Add' instead of 'TryAdd' to override the aspnetcore's default AuthenticationStateProvider.

src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Maui/Boilerplate.Client.Maui.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk.Razor">
+<Project Sdk="Microsoft.NET.Sdk.Razor">
 
     <PropertyGroup>
         <TargetFrameworks>net9.0-android;net9.0-ios;net9.0-maccatalyst</TargetFrameworks>

src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Windows/Boilerplate.Client.Windows.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk.Razor">
+<Project Sdk="Microsoft.NET.Sdk.Razor">
 
     <PropertyGroup>
         <OutputType>WinExe</OutputType>

src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Windows/MainWindow.xaml.cs

@@ -8,7 +8,7 @@ public MainWindow()
     {
         AppPlatform.IsBlazorHybrid = true;
         var services = new ServiceCollection();
-        services.ConfigureServices();
+        services.AddClientWindowsProjectServices();
         InitializeComponent();
         AppWebView.Services = services.BuildServiceProvider();
         if (CultureInfoManager.MultilingualEnabled)

src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Windows/Program.Services.cs

@@ -8,7 +8,7 @@ namespace Boilerplate.Client.Windows;
 
 public static partial class Program
 {
-    public static void ConfigureServices(this IServiceCollection services)
+    public static void AddClientWindowsProjectServices(this IServiceCollection services)
     {
         // Services being registered here can get injected in windows project only.
 

src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Api/Boilerplate.Server.Api.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
+<Project Sdk="Microsoft.NET.Sdk.Web">
 
     <PropertyGroup>
         <TargetFramework>net9.0</TargetFramework>

src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Api/Program.Middlewares.cs

@@ -9,7 +9,7 @@ public static partial class Program
     /// <summary>
     /// https://learn.microsoft.com/en-us/aspnet/core/fundamentals/middleware/?view=aspnetcore-8.0#middleware-order
     /// </summary>
-    public static void ConfiureMiddlewares(this WebApplication app)
+    private static void ConfiureMiddlewares(this WebApplication app)
     {
         var configuration = app.Configuration;
         var env = app.Environment;

src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Api/Program.Services.cs

@@ -1,4 +1,4 @@
-//+:cnd:noEmit
+//+:cnd:noEmit
 using System.IO.Compression;
 using Microsoft.AspNetCore.ResponseCompression;
 using Boilerplate.Server.Api.Services;
@@ -21,7 +21,7 @@ namespace Boilerplate.Server.Api;
 
 public static partial class Program
 {
-    public static void ConfigureApiServices(this WebApplicationBuilder builder)
+    public static void AddServerApiProjectServices(this WebApplicationBuilder builder)
     {
         // Services being registered here can get injected in server project only.
 

src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Api/Program.cs

@@ -17,7 +17,7 @@ public static async Task Main(string[] args)
             builder.WebHost.UseUrls("http://localhost:5031", "http://*:5031");
         }
 
-        builder.ConfigureApiServices();
+        builder.AddServerApiProjectServices();
         builder.Services.AddSharedProjectServices();
 
         var app = builder.Build();

src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Web/Program.Middlewares.cs

@@ -18,7 +18,7 @@ public static partial class Program
     /// <summary>
     /// https://learn.microsoft.com/en-us/aspnet/core/fundamentals/middleware/?view=aspnetcore-8.0#middleware-order
     /// </summary>
-    private static void ConfiureMiddlewares(this WebApplication app)
+    public static void ConfiureMiddlewares(this WebApplication app)
     {
         var configuration = app.Configuration;
         var env = app.Environment;
@@ -81,6 +81,7 @@ private static void ConfiureMiddlewares(this WebApplication app)
                 await next.Invoke();
             });
         }
+        app.UseBlazorFrameworkFiles();
         app.UseStaticFiles();
 
         if (string.IsNullOrEmpty(env.WebRootPath) is false && Path.Exists(Path.Combine(env.WebRootPath, @".well-known")))

src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Web/Program.Services.cs

@@ -14,7 +14,7 @@ namespace Boilerplate.Server.Web;
 
 public static partial class Program
 {
-    private static void ConfigureServices(this WebApplicationBuilder builder)
+    public static void AddServerWebProjectServices(this WebApplicationBuilder builder)
     {
         // Services being registered here can get injected in server project only.
 
@@ -24,7 +24,7 @@ private static void ConfigureServices(this WebApplicationBuilder builder)
         AddBlazor(builder);
 
         //#if (api == "Integrated")
-        builder.ConfigureApiServices();
+        builder.AddServerApiProjectServices();
         //#else
         services.AddOptions<ForwardedHeadersOptions>()
             .Bind(configuration.GetRequiredSection("ForwardedHeaders"))

src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Web/Program.cs

@@ -27,7 +27,7 @@ public static async Task Main(string[] args)
             builder.WebHost.UseUrls("http://localhost:5030", "http://*:5030");
         }
 
-        builder.ConfigureServices();
+        builder.AddServerWebProjectServices();
 
         var app = builder.Build();
 

src/Templates/Boilerplate/Bit.Boilerplate/src/Tests/AppTestServer.cs

@@ -1,14 +1,13 @@
-using Microsoft.AspNetCore.Builder;
-using Microsoft.Extensions.Hosting;
-using Microsoft.AspNetCore.TestHost;
-using Boilerplate.Server.Api;
+using Boilerplate.Server.Api;
+using Boilerplate.Server.Web;
 using Boilerplate.Server.Api.Data;
+using Microsoft.AspNetCore.Hosting.Server;
+using Microsoft.AspNetCore.Hosting.Server.Features;
 
 namespace Boilerplate.Tests;
 
 public partial class AppTestServer : IAsyncDisposable
 {
-    private TestServer? testServer;
     private WebApplication? webApp;
 
     public AppTestServer Build(Action<IServiceCollection>? configureTestServices = null)
@@ -18,18 +17,19 @@ public AppTestServer Build(Action<IServiceCollection>? configureTestServices = n
 
         var builder = WebApplication.CreateBuilder(options: new()
         {
-            EnvironmentName = Environments.Development
+            EnvironmentName = Environments.Development,
+            Args = Environment.GetCommandLineArgs()
         });
 
         AppEnvironment.Set(builder.Environment.EnvironmentName);
 
-        builder.Configuration.AddSharedConfigurations();
+        builder.Configuration.AddClientConfigurations();
 
-        builder.WebHost.UseTestServer();
+        builder.WebHost.UseUrls("http://127.0.0.1:0" /* 0 means random port */);
 
         configureTestServices?.Invoke(builder.Services);
-        builder.ConfigureApiServices();
-        builder.Services.AddSharedProjectServices();
+
+        builder.AddTestProjectServices();
 
         var app = webApp = builder.Build();
 
@@ -38,6 +38,8 @@ public AppTestServer Build(Action<IServiceCollection>? configureTestServices = n
         return this;
     }
 
+    public IServiceProvider Services => (webApp ?? throw new InvalidOperationException("Web app is null.")).Services;
+
     public async Task Start()
     {
         if (webApp == null)
@@ -52,27 +54,7 @@ public async Task Start()
 
         await webApp.StartAsync();
 
-        testServer = webApp.GetTestServer();
-    }
-
-    public HttpClient CreateClient()
-    {
-        return (testServer ?? throw new InvalidOperationException()).CreateClient();
-    }
-
-    public HttpMessageHandler CreateHandler()
-    {
-        return (testServer ?? throw new InvalidOperationException()).CreateHandler();
-    }
-
-    public RequestBuilder CreateRequest(string path)
-    {
-        return (testServer ?? throw new InvalidOperationException()).CreateRequest(path);
-    }
-
-    public WebSocketClient CreateWebSocketClient()
-    {
-        return (testServer ?? throw new InvalidOperationException()).CreateWebSocketClient();
+        webApp.Configuration["ServerAddress"] = GetServerAddress().ToString();
     }
 
     public async ValueTask DisposeAsync()
@@ -81,6 +63,14 @@ public async ValueTask DisposeAsync()
         {
             await webApp.DisposeAsync();
         }
-        testServer?.Dispose();
+    }
+
+    internal Uri GetServerAddress()
+    {
+        if (webApp == null)
+            throw new InvalidOperationException($"web app is null");
+
+        return new Uri(webApp.Services.GetRequiredService<IServer>()
+            .Features.Get<IServerAddressesFeature>()!.Addresses.First());
     }
 }

src/Templates/Boilerplate/Bit.Boilerplate/src/Tests/Boilerplate.Tests.csproj

@@ -1,11 +1,11 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk.Web">
 
     <PropertyGroup>
         <TargetFramework>net9.0</TargetFramework>
-        <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
         <IsPackable>false</IsPackable>
         <IsTestProject>true</IsTestProject>
+        <NoDefaultLaunchSettingsFile>true</NoDefaultLaunchSettingsFile>
     </PropertyGroup>
 
     <ItemGroup>
@@ -14,19 +14,22 @@
           <PrivateAssets>all</PrivateAssets>
         </PackageReference>
         <PackageReference Include="FakeItEasy" Version="8.3.0" />
-        <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="9.0.0-rc.1.24452.1" />
         <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
+        <PackageReference Include="Microsoft.Playwright.MSTest" Version="1.47.0" />
         <PackageReference Include="MSTest.TestAdapter" Version="3.6.0" />
         <PackageReference Include="MSTest.TestFramework" Version="3.6.0" />
+        <PackageReference Include="Bit.CodeAnalyzers" Version="8.11.1-pre-02" PrivateAssets="all" />
+        <PackageReference Include="Bit.SourceGenerators" Version="8.11.1-pre-02" PrivateAssets="all" />
     </ItemGroup>
 
     <ItemGroup>
-        <ProjectReference Include="..\Server\Boilerplate.Server.Api\Boilerplate.Server.Api.csproj" />
+        <ProjectReference Include="..\Server\Boilerplate.Server.Web\Boilerplate.Server.Web.csproj" />
     </ItemGroup>
 
     <ItemGroup>
         <Using Include="System.Net.Http.Headers" />
         <Using Include="System.Net.Http.Json" />
+        <Using Include="Boilerplate.Shared" />
         <Using Include="Boilerplate.Shared.Enums" />
         <Using Include="Microsoft.AspNetCore.Components" />
         <Using Include="Microsoft.VisualStudio.TestTools.UnitTesting" />

src/Templates/Boilerplate/Bit.Boilerplate/src/Tests/Extensions/WebApplicationBuilderExtensions.cs

@@ -0,0 +1,26 @@
+using Boilerplate.Server.Web;
+using Boilerplate.Tests.Services;
+using Boilerplate.Client.Core.Services.Contracts;
+
+namespace Microsoft.AspNetCore.Builder;
+
+public static partial class WebApplicationBuilderExtensions
+{
+    public static void AddTestProjectServices(this WebApplicationBuilder builder)
+    {
+        var services = builder.Services;
+
+        services.TryAddScoped<IStorageService, TestStorageService>();
+        services.TryAddTransient<IAuthTokenProvider, TestTokenProvider>();
+
+        services.TryAddTransient(sp =>
+        {
+            return new HttpClient(sp.GetRequiredService<HttpMessageHandler>())
+            {
+                BaseAddress = new Uri(sp.GetRequiredService<IConfiguration>().GetServerAddress(), UriKind.Absolute)
+            };
+        });
+
+        builder.AddServerWebProjectServices();
+    }
+}

src/Templates/Boilerplate/Bit.Boilerplate/src/Tests/IdentityApiTests.cs

@@ -0,0 +1,49 @@
+using Boilerplate.Client.Core.Services;
+using Boilerplate.Shared.Controllers.Identity;
+
+namespace Boilerplate.Tests;
+
+[TestClass]
+public partial class IdentityApiTests
+{
+    [TestMethod]
+    public async Task SignInTest()
+    {
+        await using var server = new AppTestServer();
+
+        await server.Build(services =>
+        {
+            // Services registered in this test project will be used instead of the application's services, allowing you to fake certain behaviors during testing.
+        }).Start();
+
+        await using var scope = server.Services.CreateAsyncScope();
+
+        var authenticationManager = scope.ServiceProvider.GetRequiredService<AuthenticationManager>();
+
+        var signInResponse = await authenticationManager.SignIn(new()
+        {
+            Email = "[email protected]",
+            Password = "123456"
+        }, default);
+
+        var userController = scope.ServiceProvider.GetRequiredService<IUserController>();
+
+        var user = await userController.GetCurrentUser(default);
+
+        Assert.AreEqual(Guid.Parse("8ff71671-a1d6-4f97-abb9-d87d7b47d6e7"), user.Id);
+    }
+
+    [TestMethod, ExpectedException(typeof(UnauthorizedException))]
+    public async Task UnauthorizedAccessTest()
+    {
+        await using var server = new AppTestServer();
+
+        await server.Build().Start();
+
+        await using var scope = server.Services.CreateAsyncScope();
+
+        var userController = scope.ServiceProvider.GetRequiredService<IUserController>();
+
+        var user = await userController.GetCurrentUser(default);
+    }
+}