feat(infra): refactor server address usages (#6038) (#6039)

bitfoundation · Nov 14, 2023 · 2342898 · 2342898
1 parent 1260e0e
commit 2342898
Show file tree

Hide file tree

Showing 26 changed files with 132 additions and 38 deletions.
diff --git a/.github/workflows/adminpanel.cd.yml b/.github/workflows/adminpanel.cd.yml
@@ -37,6 +37,13 @@ jobs:
        dotnet pack -c Release -o . -p:ReleaseVersion=0.0.0 -p:PackageVersion=0.0.0
        dotnet new install Bit.Boilerplate.0.0.0.nupkg
        cd ../../../ && dotnet new bit-bp --name AdminPanel --database SqlServer --sample AdminPanel
+       
+    - name: Update appsettings.json api server address
+      uses: microsoft/variable-substitution@v1 
+      with:
+        files: 'AdminPanel/src/Client/Core/appsettings.json'
+      env:
+        ApiServerAddress: ${{ env.API_SERVER_ADDRESS }}
 
     - uses: actions/setup-node@v3
       with:

diff --git a/.github/workflows/blazorui.demo.cd.yml b/.github/workflows/blazorui.demo.cd.yml
@@ -34,6 +34,13 @@ jobs:
     - uses: actions/setup-node@v3
       with:
         node-version: 18
+
+    - name: Update appsettings.json api server address
+      uses: microsoft/variable-substitution@v1 
+      with:
+        files: 'src/BlazorUI/Demo/Client/Core/appsettings.json'
+      env:
+        ApiServerAddress: ${{ env.API_SERVER_ADDRESS }}
 
     - name: Switch to blazor web assembly
       run:  sed -i 's/Microsoft.NET.Sdk.Web/Microsoft.NET.Sdk.BlazorWebAssembly/g' src/BlazorUI/Demo/Client/Web/Bit.BlazorUI.Demo.Client.Web.csproj

diff --git a/.github/workflows/todotemplate.cd.yml b/.github/workflows/todotemplate.cd.yml
@@ -41,6 +41,13 @@ jobs:
         dotnet new install Bit.Boilerplate.0.0.0.nupkg
         cd ../../../ && dotnet new bit-bp --name TodoTemplate --database SqlServer --sample Todo
 
+    - name: Update appsettings.json api server address
+      uses: microsoft/variable-substitution@v1 
+      with:
+        files: 'TodoTemplate/src/Client/Core/appsettings.json'
+      env:
+        ApiServerAddress: ${{ env.API_SERVER_ADDRESS }}
+
     - name: Switch to blazor web assembly
       run: sed -i 's/Microsoft.NET.Sdk.Web/Microsoft.NET.Sdk.BlazorWebAssembly/g' TodoTemplate/src/Client/Web/TodoTemplate.Client.Web.csproj
 

diff --git a/src/BlazorUI/Demo/Client/App/MauiProgram.cs b/src/BlazorUI/Demo/Client/App/MauiProgram.cs
@@ -24,11 +24,10 @@ public static MauiAppBuilder CreateMauiAppBuilder()
 #endif
 
             var builder = MauiApp.CreateBuilder();
-            var assembly = typeof(MainLayout).GetTypeInfo().Assembly;
 
             builder
                 .UseMauiApp<App>()
-                .Configuration.AddJsonFile(new EmbeddedFileProvider(assembly), "appsettings.json", optional: false, false);
+                .Configuration.AddClientConfigurations();
 
             var services = builder.Services;
 
@@ -37,11 +36,12 @@ public static MauiAppBuilder CreateMauiAppBuilder()
             services.AddBlazorWebViewDeveloperTools();
 #endif
 
+            Uri.TryCreate(builder.Configuration.GetApiServerAddress(), UriKind.Absolute, out var apiServerAddress);
             services.AddScoped(sp =>
             {
                 HttpClient httpClient = new(sp.GetRequiredService<AppHttpClientHandler>())
                 {
-                    BaseAddress = new Uri(sp.GetRequiredService<IConfiguration>().GetApiServerAddress())
+                    BaseAddress = apiServerAddress
                 };
 
                 return httpClient;

diff --git a/src/BlazorUI/Demo/Client/Core/Bit.BlazorUI.Demo.Client.Core.csproj b/src/BlazorUI/Demo/Client/Core/Bit.BlazorUI.Demo.Client.Core.csproj
@@ -32,6 +32,7 @@
         </PackageReference>
         <PackageReference Condition=" '$(BlazorMode)' == 'BlazorWebAssembly' " Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.0-rc.2.23480.2" />
         <PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="8.0.0-rc.2.23480.2" />
+        <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.0-rc.2.23479.6" />
 
         <Using Include="System.Net.Http.Json" />
         <Using Include="System.Collections.Concurrent" />

diff --git a/src/BlazorUI/Demo/Client/Core/Extensions/IConfigurationBuilderExtensions.cs b/src/BlazorUI/Demo/Client/Core/Extensions/IConfigurationBuilderExtensions.cs
@@ -0,0 +1,12 @@
+using System.Reflection;
+
+namespace Microsoft.Extensions.Configuration;
+
+public static class IConfigurationBuilderExtensions
+{
+    public static void AddClientConfigurations(this IConfigurationBuilder builder)
+    {
+        var assembly = Assembly.Load("Bit.BlazorUI.Demo.Client.Core");
+        builder.AddJsonStream(assembly.GetManifestResourceStream("Bit.BlazorUI.Demo.Client.Core.appsettings.json")!);
+    }
+}
diff --git a/src/BlazorUI/Demo/Client/Core/Extensions/IConfigurationExtensions.cs b/src/BlazorUI/Demo/Client/Core/Extensions/IConfigurationExtensions.cs
@@ -1,12 +1,11 @@
-namespace Microsoft.Extensions.Configuration;
+//-:cnd:noEmit
+namespace Microsoft.Extensions.Configuration;
 public static class IConfigurationExtensions
 {
     public static string GetApiServerAddress(this IConfiguration configuration)
     {
-#if BlazorWebAssembly
-        return "api/";
-#else
-        return configuration.GetValue<string?>("ApiServerAddress") ?? throw new InvalidOperationException("Could not find ApiServerAddress config");
-#endif
+        var apiServerAddress = configuration.GetValue("ApiServerAddress", defaultValue: "api/")!;
+
+        return Uri.TryCreate(apiServerAddress, UriKind.RelativeOrAbsolute, out _) ? apiServerAddress : throw new InvalidOperationException($"Api server address {apiServerAddress} is invalid");
     }
 }
diff --git a/src/BlazorUI/Demo/Client/Web/Extensions/HttpRequestExtensions.cs b/src/BlazorUI/Demo/Client/Web/Extensions/HttpRequestExtensions.cs
@@ -4,6 +4,20 @@ namespace Microsoft.AspNetCore.Http;
 
 public static class HttpRequestExtensions
 {
+    /// <summary>
+    /// https://blog.elmah.io/how-to-get-base-url-in-asp-net-core/
+    /// </summary>
+    public static string GetBaseUrl(this HttpRequest req)
+    {
+        var uriBuilder = new UriBuilder(req.Scheme, req.Host.Host, req.Host.Port ?? -1);
+        if (uriBuilder.Uri.IsDefaultPort)
+        {
+            uriBuilder.Port = -1;
+        }
+
+        return uriBuilder.Uri.AbsoluteUri;
+    }
+
     public static bool ShouldRenderStaticMode(this HttpRequest request)
     {
         var agent = GetLoweredUserAgent(request);

diff --git a/src/BlazorUI/Demo/Client/Web/Program.BlazorElectron.cs b/src/BlazorUI/Demo/Client/Web/Program.BlazorElectron.cs
@@ -10,7 +10,7 @@ public partial class Program
     public static WebApplication CreateHostBuilder(string[] args)
     {
         var builder = WebApplication.CreateBuilder(args);
-        builder.Configuration.AddJsonStream(typeof(Core.Shared.MainLayout).Assembly.GetManifestResourceStream("Bit.BlazorUI.Demo.Client.Core.appsettings.json")!);
+        builder.Configuration.AddClientConfigurations();
 
         builder.WebHost.UseElectron(args);
         builder.Services.AddElectron();

diff --git a/src/BlazorUI/Demo/Client/Web/Program.BlazorServer.cs b/src/BlazorUI/Demo/Client/Web/Program.BlazorServer.cs
@@ -6,7 +6,7 @@ public partial class Program
     public static WebApplication CreateHostBuilder(string[] args)
     {
         var builder = WebApplication.CreateBuilder(args);
-        builder.Configuration.AddJsonStream(typeof(Core.Shared.MainLayout).Assembly.GetManifestResourceStream("Bit.BlazorUI.Demo.Client.Core.appsettings.json")!);
+        builder.Configuration.AddClientConfigurations();
 
 #if DEBUG
     if (OperatingSystem.IsWindows())

diff --git a/src/BlazorUI/Demo/Client/Web/Program.BlazorWebAssembly.cs b/src/BlazorUI/Demo/Client/Web/Program.BlazorWebAssembly.cs
@@ -10,11 +10,16 @@ public partial class Program
     public static WebAssemblyHost CreateHostBuilder(string[] args)
     {
         var builder = WebAssemblyHostBuilder.CreateDefault();
-        builder.Configuration.AddJsonStream(typeof(Core.Shared.MainLayout).Assembly.GetManifestResourceStream("Bit.BlazorUI.Demo.Client.Core.appsettings.json")!);
+        builder.Configuration.AddClientConfigurations();
 
         var apiServerAddressConfig = builder.Configuration.GetApiServerAddress();
 
-        var apiServerAddress = new Uri($"{builder.HostEnvironment.BaseAddress}{apiServerAddressConfig}");
+        Uri.TryCreate(builder.Configuration.GetApiServerAddress(), UriKind.RelativeOrAbsolute, out var apiServerAddress);
+
+        if (apiServerAddress.IsAbsoluteUri is false)
+        {
+            apiServerAddress = new Uri($"{builder.HostEnvironment.BaseAddress}{apiServerAddress}");
+        }
 
         builder.Services.AddSingleton(sp => new HttpClient(sp.GetRequiredService<AppHttpClientHandler>()) { BaseAddress = apiServerAddress });
         builder.Services.AddScoped<Microsoft.AspNetCore.Components.WebAssembly.Services.LazyAssemblyLoader>();

diff --git a/src/BlazorUI/Demo/Client/Web/Startup/Services.cs b/src/BlazorUI/Demo/Client/Web/Startup/Services.cs
@@ -8,11 +8,12 @@ public static class Services
 {
     public static void Add(IServiceCollection services, IConfiguration configuration)
     {
+        Uri.TryCreate(configuration.GetApiServerAddress(), UriKind.Absolute, out var apiServerAddress);
         services.AddScoped(sp =>
         {
             HttpClient httpClient = new(sp.GetRequiredService<AppHttpClientHandler>())
             {
-                BaseAddress = new Uri(sp.GetRequiredService<IConfiguration>().GetApiServerAddress())
+                BaseAddress = apiServerAddress
             };
 
             return httpClient;

diff --git a/src/BlazorUI/Demo/Server/Api/Program.cs b/src/BlazorUI/Demo/Server/Api/Program.cs
@@ -1,5 +1,9 @@
 var builder = WebApplication.CreateBuilder(args);
 
+#if BlazorWebAssembly
+builder.Configuration.AddClientConfigurations();
+#endif
+
 #if DEBUG
 if (OperatingSystem.IsWindows())
 {

diff --git a/src/BlazorUI/Demo/Server/Api/Startup/Services.cs b/src/BlazorUI/Demo/Server/Api/Startup/Services.cs
@@ -30,8 +30,12 @@ public static void Add(IServiceCollection services, IWebHostEnvironment env, ICo
             .ConfigurePrimaryHttpMessageHandler<AppHttpClientHandler>()
             .ConfigureHttpClient((sp, httpClient) =>
             {
-                NavigationManager navManager = sp.GetRequiredService<IHttpContextAccessor>().HttpContext!.RequestServices.GetRequiredService<NavigationManager>();
-                httpClient.BaseAddress = new Uri($"{navManager.BaseUri}api/");
+                Uri.TryCreate(configuration.GetApiServerAddress(), UriKind.RelativeOrAbsolute, out var apiServerAddress);
+                if (apiServerAddress!.IsAbsoluteUri is false)
+                {
+                    apiServerAddress = new Uri($"{sp.GetRequiredService<IHttpContextAccessor>().HttpContext!.Request.GetBaseUrl()}{apiServerAddress}");
+                }
+                httpClient.BaseAddress = apiServerAddress;
             });
         services.AddScoped<Microsoft.AspNetCore.Components.WebAssembly.Services.LazyAssemblyLoader>();
 
@@ -43,7 +47,6 @@ public static void Add(IServiceCollection services, IWebHostEnvironment env, ICo
             // for other usages of http client, for example calling 3rd party apis, either use services.AddHttpClient("NamedHttpClient") or services.AddHttpClient<TypedHttpClient>();
         });
         services.AddRazorPages();
-        services.AddMvcCore();
 #endif
 
         services.AddCors();

diff --git a/src/Templates/BlazorWeb/Bit.BlazorWeb/.github/workflows/cd.yml b/src/Templates/BlazorWeb/Bit.BlazorWeb/.github/workflows/cd.yml
@@ -35,13 +35,6 @@ jobs:
 
     - name: Install wasm
       run:  cd src && dotnet workload install wasm-tools wasm-experimental
-
-    - name: Update appsettings.json api server address
-      uses: microsoft/variable-substitution@v1 
-      with:
-        files: 'src/BlazorWeb.Client/appsettings.json'
-      env:
-        ApiServerAddress: ${{ env.API_SERVER_ADDRESS }}
 
     - name: Generate CSS/JS files
       run: dotnet build src/BlazorWeb.Client/BlazorWeb.Client.csproj -t:BeforeBuildTasks --no-restore

diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/.github/workflows/cd.yml b/src/Templates/Boilerplate/Bit.Boilerplate/.github/workflows/cd.yml
@@ -35,6 +35,13 @@ jobs:
     - uses: actions/setup-node@v3
       with:
         node-version: 18
+
+    - name: Update appsettings.json api server address
+      uses: microsoft/variable-substitution@v1 
+      with:
+        files: 'src/Client/Core/appsettings.json'
+      env:
+        ApiServerAddress: ${{ env.API_SERVER_ADDRESS }}
 
     - name: Switch to blazor web assembly
       run:  sed -i 's/Microsoft.NET.Sdk.Web/Microsoft.NET.Sdk.BlazorWebAssembly/g' src/Client/Web/Boilerplate.Client.Web.csproj

diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/App/MauiProgram.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/App/MauiProgram.cs
@@ -19,7 +19,7 @@ public static MauiApp CreateMauiApp()
 
         builder
             .UseMauiApp<App>()
-            .Configuration.AddJsonFile(new EmbeddedFileProvider(assembly), "appsettings.json", optional: false, false);
+            .Configuration.AddClientConfigurations();
 
         var services = builder.Services;
 

diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Web/Program.BlazorWebAssembly.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Web/Program.BlazorWebAssembly.cs
@@ -14,7 +14,7 @@ public static WebAssemblyHost CreateHostBuilder(string[] args)
     {
         var builder = WebAssemblyHostBuilder.CreateDefault();
 
-                builder.Configuration.AddClientConfigurations();
+        builder.Configuration.AddClientConfigurations();
 
         Uri.TryCreate(builder.Configuration.GetApiServerAddress(), UriKind.RelativeOrAbsolute, out var apiServerAddress);
 

diff --git a/src/Websites/Sales/src/Bit.Websites.Sales.Api/Program.cs b/src/Websites/Sales/src/Bit.Websites.Sales.Api/Program.cs
@@ -1,5 +1,9 @@
 var builder = WebApplication.CreateBuilder(args);
 
+#if BlazorWebAssembly
+builder.Configuration.AddClientConfigurations();
+#endif
+
 Bit.Websites.Sales.Api.Startup.Services.Add(builder.Services, builder.Environment, builder.Configuration);
 
 var app = builder.Build();

diff --git a/src/Websites/Sales/src/Bit.Websites.Sales.Api/Startup/Services.cs b/src/Websites/Sales/src/Bit.Websites.Sales.Api/Startup/Services.cs
@@ -28,8 +28,12 @@ public static void Add(IServiceCollection services, IWebHostEnvironment env, ICo
             .ConfigurePrimaryHttpMessageHandler<AppHttpClientHandler>()
             .ConfigureHttpClient((sp, httpClient) =>
             {
-                NavigationManager navManager = sp.GetRequiredService<IHttpContextAccessor>().HttpContext!.RequestServices.GetRequiredService<NavigationManager>();
-                httpClient.BaseAddress = new Uri($"{navManager.BaseUri}api/");
+                Uri.TryCreate(configuration.GetApiServerAddress(), UriKind.RelativeOrAbsolute, out var apiServerAddress);
+                if (apiServerAddress!.IsAbsoluteUri is false)
+                {
+                    apiServerAddress = new Uri($"{sp.GetRequiredService<IHttpContextAccessor>().HttpContext!.Request.GetBaseUrl()}{apiServerAddress}");
+                }
+                httpClient.BaseAddress = apiServerAddress;
             });
         services.AddScoped<Microsoft.AspNetCore.Components.WebAssembly.Services.LazyAssemblyLoader>();
 
@@ -41,7 +45,6 @@ public static void Add(IServiceCollection services, IWebHostEnvironment env, ICo
             // for other usages of httpclient, for example calling 3rd party apis, either use services.AddHttpClient("NamedHttpClient") or services.AddHttpClient<TypedHttpClient>();
         });
         services.AddRazorPages();
-        services.AddMvcCore();
 #endif
         services.AddHttpClient<TelegramBotApiClient>();
         services.AddScoped<TelegramBotService>();

diff --git a/src/Websites/Sales/src/Bit.Websites.Sales.Web/Extensions/HttpRequestExtensions.cs b/src/Websites/Sales/src/Bit.Websites.Sales.Web/Extensions/HttpRequestExtensions.cs
@@ -4,6 +4,20 @@ namespace Microsoft.AspNetCore.Http;
 
 public static class HttpRequestExtensions
 {
+    /// <summary>
+    /// https://blog.elmah.io/how-to-get-base-url-in-asp-net-core/
+    /// </summary>
+    public static string GetBaseUrl(this HttpRequest req)
+    {
+        var uriBuilder = new UriBuilder(req.Scheme, req.Host.Host, req.Host.Port ?? -1);
+        if (uriBuilder.Uri.IsDefaultPort)
+        {
+            uriBuilder.Port = -1;
+        }
+
+        return uriBuilder.Uri.AbsoluteUri;
+    }
+
     public static bool ShouldRenderStaticMode(this HttpRequest request)
     {
         var agent = GetLoweredUserAgent(request);

diff --git a/src/Websites/Sales/src/Bit.Websites.Sales.Web/Extensions/IConfigurationBuilderExtensions.cs b/src/Websites/Sales/src/Bit.Websites.Sales.Web/Extensions/IConfigurationBuilderExtensions.cs
@@ -0,0 +1,12 @@
+using System.Reflection;
+
+namespace Microsoft.Extensions.Configuration;
+
+public static class IConfigurationBuilderExtensions
+{
+    public static void AddClientConfigurations(this IConfigurationBuilder builder)
+    {
+        var assembly = Assembly.Load("Bit.Websites.Sales.Web");
+        builder.AddJsonStream(assembly.GetManifestResourceStream("Bit.Websites.Sales.Web.appsettings.json")!);
+    }
+}
diff --git a/src/Websites/Sales/src/Bit.Websites.Sales.Web/Extensions/IConfigurationExtensions.cs b/src/Websites/Sales/src/Bit.Websites.Sales.Web/Extensions/IConfigurationExtensions.cs
@@ -1,8 +1,11 @@
-namespace Microsoft.Extensions.Configuration;
+//-:cnd:noEmit
+namespace Microsoft.Extensions.Configuration;
 public static class IConfigurationExtensions
 {
     public static string GetApiServerAddress(this IConfiguration configuration)
     {
-        return configuration.GetValue<string?>("ApiServerAddress") ?? throw new InvalidOperationException("Could not find ApiServerAddress config");
+        var apiServerAddress = configuration.GetValue("ApiServerAddress", defaultValue: "api/")!;
+
+        return Uri.TryCreate(apiServerAddress, UriKind.RelativeOrAbsolute, out _) ? apiServerAddress : throw new InvalidOperationException($"Api server address {apiServerAddress} is invalid");
     }
 }
diff --git a/src/Websites/Sales/src/Bit.Websites.Sales.Web/Program.BlazorServer.cs b/src/Websites/Sales/src/Bit.Websites.Sales.Web/Program.BlazorServer.cs
@@ -10,7 +10,7 @@ public static WebApplication CreateHostBuilder(string[] args)
     {
         var builder = WebApplication.CreateBuilder(args);
 
-        builder.Configuration.AddJsonStream(typeof(MainLayout).Assembly.GetManifestResourceStream("Bit.Websites.Sales.Web.appsettings.json")!);
+        builder.Configuration.AddClientConfigurations();
 
         Startup.Services.Add(builder.Services, builder.Configuration);
 

diff --git a/src/Websites/Sales/src/Bit.Websites.Sales.Web/Program.BlazorWebAssembly.cs b/src/Websites/Sales/src/Bit.Websites.Sales.Web/Program.BlazorWebAssembly.cs
@@ -10,12 +10,9 @@ public partial class Program
     public static WebAssemblyHost CreateHostBuilder(string[] args)
     {
         var builder = WebAssemblyHostBuilder.CreateDefault();
-        builder.Configuration.AddJsonStream(typeof(MainLayout).Assembly.GetManifestResourceStream("Bit.Websites.Sales.Web.appsettings.json"));
+        builder.Configuration.AddClientConfigurations();
 
-        if (Uri.TryCreate(builder.Configuration.GetApiServerAddress(), UriKind.RelativeOrAbsolute, out var apiServerAddress) is false)
-        {
-            throw new InvalidOperationException("Api server address is invalid");
-        }
+        Uri.TryCreate(builder.Configuration.GetApiServerAddress(), UriKind.RelativeOrAbsolute, out var apiServerAddress);
 
         if (apiServerAddress.IsAbsoluteUri is false)
         {

diff --git a/src/Websites/Sales/src/Bit.Websites.Sales.Web/Startup/Services.cs b/src/Websites/Sales/src/Bit.Websites.Sales.Web/Startup/Services.cs
@@ -8,11 +8,12 @@ public static class Services
 {
     public static void Add(IServiceCollection services, IConfiguration configuration)
     {
+        Uri.TryCreate(configuration.GetApiServerAddress(), UriKind.Absolute, out var apiServerAddress);
         services.AddScoped(sp =>
         {
             HttpClient httpClient = new(sp.GetRequiredService<AppHttpClientHandler>())
             {
-                BaseAddress = new Uri(sp.GetRequiredService<IConfiguration>().GetApiServerAddress())
+                BaseAddress = apiServerAddress
             };
 
             return httpClient;