Merge pull request #5791 from abpframework/issue/5784

Fixed: Blazor Exception handling doesn't show the error message

framework/src/Volo.Abp.AspNetCore.Components.WebAssembly/Volo/Abp/AspNetCore/Components/WebAssembly/ExceptionHandling/AbpExceptionHandlingLogger.cs

@@ -4,10 +4,9 @@ using Microsoft.Extensions.Logging;
 
 namespace Volo.Abp.AspNetCore.Components.WebAssembly.ExceptionHandling
 {
-    public class AbpExceptionHandlingLogger : ILogger, IDisposable
+    public class AbpExceptionHandlingLogger : ILogger
     {
         private readonly IServiceCollection _serviceCollection;
-        private IServiceScope _serviceScope;
         private IUserExceptionInformer _userExceptionInformer;
 
         public AbpExceptionHandlingLogger(IServiceCollection serviceCollection)
@@ -39,7 +38,7 @@ namespace Volo.Abp.AspNetCore.Components.WebAssembly.ExceptionHandling
                 return;
             }
 
-            _userExceptionInformer.InformAsync(new UserExceptionInformerContext(exception));
+            _userExceptionInformer.Inform(new UserExceptionInformerContext(exception));
         }
 
         protected virtual void TryInitialize()
@@ -50,8 +49,7 @@ namespace Volo.Abp.AspNetCore.Components.WebAssembly.ExceptionHandling
                 return;
             }
 
-            _serviceScope = serviceProvider.CreateScope();
-            _userExceptionInformer = _serviceScope.ServiceProvider.GetRequiredService<IUserExceptionInformer>();
+            _userExceptionInformer = serviceProvider.GetRequiredService<IUserExceptionInformer>();
         }
 
         public virtual bool IsEnabled(LogLevel logLevel)
@@ -63,10 +61,5 @@ namespace Volo.Abp.AspNetCore.Components.WebAssembly.ExceptionHandling
         {
             return NullDisposable.Instance;
         }
-
-        public virtual void Dispose()
-        {
-            _serviceScope?.Dispose();
-        }
     }
 }

framework/src/Volo.Abp.AspNetCore.Components.WebAssembly/Volo/Abp/AspNetCore/Components/WebAssembly/ExceptionHandling/AbpExceptionHandlingLoggerProvider.cs

@@ -32,7 +32,7 @@ namespace Volo.Abp.AspNetCore.Components.WebAssembly.ExceptionHandling
 
         public void Dispose()
         {
-            _logger.Dispose();
+
         }
     }
 }

framework/src/Volo.Abp.AspNetCore.Components.WebAssembly/Volo/Abp/AspNetCore/Components/WebAssembly/ExceptionHandling/IUserExceptionInformer.cs

@@ -1,10 +1,7 @@
-using System;
-using System.Threading.Tasks;
-
-namespace Volo.Abp.AspNetCore.Components.WebAssembly.ExceptionHandling
+namespace Volo.Abp.AspNetCore.Components.WebAssembly.ExceptionHandling
 {
     public interface IUserExceptionInformer
     {
-        Task InformAsync(UserExceptionInformerContext context);
+        void Inform(UserExceptionInformerContext context);
     }
 }

framework/src/Volo.Abp.AspNetCore.Components.WebAssembly/Volo/Abp/AspNetCore/Components/WebAssembly/ExceptionHandling/UserExceptionInformer.cs

@@ -1,5 +1,7 @@
 using System;
 using System.Threading.Tasks;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Logging.Abstractions;
 using Volo.Abp.AspNetCore.ExceptionHandling;
 using Volo.Abp.DependencyInjection;
 using Volo.Abp.Http;
@@ -9,19 +11,32 @@ namespace Volo.Abp.AspNetCore.Components.WebAssembly.ExceptionHandling
 {
     public class UserExceptionInformer : IUserExceptionInformer, ITransientDependency
     {
+        public ILogger<UserExceptionInformer> Logger { get; set; }
         protected IUiMessageService MessageService { get; }
         protected IExceptionToErrorInfoConverter ExceptionToErrorInfoConverter { get; }
 
-        public UserExceptionInformer(IUiMessageService messageService, IExceptionToErrorInfoConverter exceptionToErrorInfoConverter)
+        public UserExceptionInformer(
+            IUiMessageService messageService,
+            IExceptionToErrorInfoConverter exceptionToErrorInfoConverter)
         {
             MessageService = messageService;
             ExceptionToErrorInfoConverter = exceptionToErrorInfoConverter;
+            Logger = NullLogger<UserExceptionInformer>.Instance;
         }
 
-        public virtual async Task InformAsync(UserExceptionInformerContext context)
+        public void Inform(UserExceptionInformerContext context)
         {
             var errorInfo = GetErrorInfo(context);
-            await ShowErrorInfoAsync(errorInfo);
+
+            if (errorInfo.Details.IsNullOrEmpty())
+            {
+                //TODO: Should we introduce MessageService.Error (sync) method instead of such a usage (without await)..?
+                MessageService.ErrorAsync(errorInfo.Message);
+            }
+            else
+            {
+                MessageService.ErrorAsync(errorInfo.Details, errorInfo.Message);
+            }
         }
 
         protected virtual RemoteServiceErrorInfo GetErrorInfo(UserExceptionInformerContext context)
@@ -33,17 +48,5 @@ namespace Volo.Abp.AspNetCore.Components.WebAssembly.ExceptionHandling
 
             return ExceptionToErrorInfoConverter.Convert(context.Exception, false);
         }
-
-        protected virtual async Task ShowErrorInfoAsync(RemoteServiceErrorInfo errorInfo)
-        {
-            if (errorInfo.Details.IsNullOrEmpty())
-            {
-                await MessageService.ErrorAsync(errorInfo.Message);
-            }
-            else
-            {
-                await MessageService.ErrorAsync(errorInfo.Details, errorInfo.Message);
-            }
-        }
     }
 }

framework/src/Volo.Abp.AspNetCore.Components.WebAssembly/Volo/Abp/AspNetCore/Components/WebAssembly/UiMessageService.cs → framework/src/Volo.Abp.AspNetCore.Components.WebAssembly/Volo/Abp/AspNetCore/Components/WebAssembly/SimpleUiMessageService.cs

@@ -5,12 +5,11 @@ using Volo.Abp.DependencyInjection;
 
 namespace Volo.Abp.AspNetCore.Components.WebAssembly
 {
-    //TODO: Implement with sweetalert in a new package
-    public class UiMessageService : IUiMessageService, ITransientDependency
+    public class SimpleUiMessageService : IUiMessageService, ITransientDependency
     {
         protected IJSRuntime JsRuntime { get; }
 
-        public UiMessageService(IJSRuntime jsRuntime)
+        public SimpleUiMessageService(IJSRuntime jsRuntime)
         {
             JsRuntime = jsRuntime;
         }