Merge pull request #18226 from abpframework/BlazorServerLookupApiRequestService

Do not use `try catch` to determine the BlazorServer running mode.

framework/src/Volo.Abp.AspNetCore.Components.Server/Volo/Abp/AspNetCore/Components/Server/AbpAspNetCoreComponentsServerModule.cs

@@ -1,5 +1,7 @@
 using System;
 using System.Collections.Generic;
+using System.Net;
+using System.Net.Http;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting.StaticWebAssets;
 using Microsoft.AspNetCore.Http.Connections;
@@ -8,6 +10,7 @@ using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.FileProviders;
 using Microsoft.Extensions.Hosting;
 using Volo.Abp.AspNetCore.Auditing;
+using Volo.Abp.AspNetCore.Components.Server.Extensibility;
 using Volo.Abp.AspNetCore.Components.Web;
 using Volo.Abp.AspNetCore.Mvc;
 using Volo.Abp.AspNetCore.SignalR;
@@ -30,7 +33,11 @@ public class AbpAspNetCoreComponentsServerModule : AbpModule
     public override void ConfigureServices(ServiceConfigurationContext context)
     {
         StaticWebAssetsLoader.UseStaticWebAssets(context.Services.GetHostingEnvironment(), context.Services.GetConfiguration());
-        context.Services.AddHttpClient();
+        context.Services.AddHttpClient(nameof(BlazorServerLookupApiRequestService))
+            .ConfigurePrimaryHttpMessageHandler(() => new HttpClientHandler
+            {
+                AutomaticDecompression = DecompressionMethods.All
+            });
         var serverSideBlazorBuilder = context.Services.AddServerSideBlazor(options =>
         {
             if (context.Services.GetHostingEnvironment().IsDevelopment())

framework/src/Volo.Abp.AspNetCore.Components.Server/Volo/Abp/AspNetCore/Components/Server/Extensibility/BlazorServerLookupApiRequestService.cs

@@ -41,27 +41,25 @@ public class BlazorServerLookupApiRequestService : ILookupApiRequestService, ITr
 
     public async Task<string> SendAsync(string url)
     {
-        var client = HttpClientFactory.CreateClient();
+        var client = HttpClientFactory.CreateClient(nameof(BlazorServerLookupApiRequestService));
         var requestMessage = new HttpRequestMessage(HttpMethod.Get, url);
 
         var uri = new Uri(url, UriKind.RelativeOrAbsolute);
         if (!uri.IsAbsoluteUri)
         {
-            var baseUrl = string.Empty;
+            var remoteServiceConfig = await RemoteServiceConfigurationProvider.GetConfigurationOrDefaultOrNullAsync("Default");
-            try
+            if (remoteServiceConfig != null)
             {
-                //Blazor tiered -- mode
+                // Blazor tiered mode
-                var remoteServiceConfig = await RemoteServiceConfigurationProvider.GetConfigurationOrDefaultAsync("Default");
+                var baseUrl = remoteServiceConfig.BaseUrl;
-                baseUrl = remoteServiceConfig.BaseUrl;
                 client.BaseAddress = new Uri(baseUrl);
                 AddHeaders(requestMessage);
-                await HttpClientAuthenticator.Authenticate(new RemoteServiceHttpClientAuthenticateContext(client,
+                await HttpClientAuthenticator.Authenticate(new RemoteServiceHttpClientAuthenticateContext(client, requestMessage, new RemoteServiceConfiguration(baseUrl), string.Empty));
-                    requestMessage, new RemoteServiceConfiguration(baseUrl), string.Empty));
             }
-            catch (AbpException) // Blazor-Server mode.
+            else
             {
-                baseUrl = NavigationManager.BaseUri;
+                // Blazor server  mode
-                client.BaseAddress = new Uri(baseUrl);
+                client.BaseAddress = new Uri(NavigationManager.BaseUri);
                 foreach (var header in HttpContextAccessor.HttpContext!.Request.Headers)
                 {
                     requestMessage.Headers.TryAddWithoutValidation(header.Key, header.Value.ToArray());

framework/src/Volo.Abp.AspNetCore.Components.WebAssembly/Volo/Abp/AspNetCore/Components/WebAssembly/Extensibility/WebAssemblyLookupApiRequestService.cs

@@ -32,14 +32,18 @@ public class WebAssemblyLookupApiRequestService : ILookupApiRequestService, ITra
 
     public async Task<string> SendAsync(string url)
     {
-        var client = HttpClientFactory.CreateClient();
+        var client = HttpClientFactory.CreateClient(nameof(WebAssemblyLookupApiRequestService));
         var requestMessage = new HttpRequestMessage(HttpMethod.Get, url);
         AddHeaders(requestMessage);
 
         var uri = new Uri(url, UriKind.RelativeOrAbsolute);
         if (!uri.IsAbsoluteUri)
         {
-            var remoteServiceConfig = await RemoteServiceConfigurationProvider.GetConfigurationOrDefaultAsync("Default");
+            var remoteServiceConfig = await RemoteServiceConfigurationProvider.GetConfigurationOrDefaultOrNullAsync("Default");
+            if (remoteServiceConfig == null)
+            {
+                throw new AbpException("Remote service configuration 'Default' was not found!");
+            }
             client.BaseAddress = new Uri(remoteServiceConfig.BaseUrl);
             await HttpClientAuthenticator.Authenticate(new RemoteServiceHttpClientAuthenticateContext(client, requestMessage, new RemoteServiceConfiguration(remoteServiceConfig.BaseUrl), string.Empty));
         }