Merge pull request #8001 from abpframework/liangshiwei/abpremotecalle…

…xception Handle AbpRemoteCallException in DefaultExceptionToErrorInfoConverter
abpframework · Mar 16, 2021 · 2a94795 · 2a94795
2 parents a995e66 + 363c64f
commit 2a94795
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 7 deletions.
diff --git a/...bly/Volo/Abp/AspNetCore/Components/WebAssembly/ExceptionHandling/UserExceptionInformer.cs b/...bly/Volo/Abp/AspNetCore/Components/WebAssembly/ExceptionHandling/UserExceptionInformer.cs
@@ -1,6 +1,7 @@
 using System;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Logging.Abstractions;
+using Microsoft.Extensions.Options;
 using Volo.Abp.AspNetCore.Components.Messages;
 using Volo.Abp.AspNetCore.ExceptionHandling;
 using Volo.Abp.DependencyInjection;
@@ -15,12 +16,16 @@ public class UserExceptionInformer : IUserExceptionInformer, ITransientDependenc
         protected IUiMessageService MessageService { get; }
         protected IExceptionToErrorInfoConverter ExceptionToErrorInfoConverter { get; }
 
+        protected AbpExceptionHandlingOptions Options { get; }
+
         public UserExceptionInformer(
             IUiMessageService messageService,
-            IExceptionToErrorInfoConverter exceptionToErrorInfoConverter)
+            IExceptionToErrorInfoConverter exceptionToErrorInfoConverter,
+            IOptions<AbpExceptionHandlingOptions> options)
         {
             MessageService = messageService;
             ExceptionToErrorInfoConverter = exceptionToErrorInfoConverter;
+            Options = options.Value;
             Logger = NullLogger<UserExceptionInformer>.Instance;
         }
 
@@ -41,12 +46,7 @@ public void Inform(UserExceptionInformerContext context)
 
         protected virtual RemoteServiceErrorInfo GetErrorInfo(UserExceptionInformerContext context)
         {
-            if (context.Exception is AbpRemoteCallException remoteCallException)
-            {
-                return remoteCallException.Error;
-            }
-
-            return ExceptionToErrorInfoConverter.Convert(context.Exception, false);
+            return ExceptionToErrorInfoConverter.Convert(context.Exception, Options.SendExceptionsDetailsToClients);
         }
     }
 }
diff --git a/...onHandling/AbpExceptionHandlingOptions.cs → ...onHandling/AbpExceptionHandlingOptions.cs b/...onHandling/AbpExceptionHandlingOptions.cs → ...onHandling/AbpExceptionHandlingOptions.cs
diff --git a/...ionHandling/Volo/Abp/AspNetCore/ExceptionHandling/DefaultExceptionToErrorInfoConverter.cs b/...ionHandling/Volo/Abp/AspNetCore/ExceptionHandling/DefaultExceptionToErrorInfoConverter.cs
@@ -11,6 +11,7 @@
 using Volo.Abp.ExceptionHandling;
 using Volo.Abp.ExceptionHandling.Localization;
 using Volo.Abp.Http;
+using Volo.Abp.Http.Client;
 using Volo.Abp.Localization;
 using Volo.Abp.Localization.ExceptionHandling;
 using Volo.Abp.Validation;
@@ -62,6 +63,11 @@ protected virtual RemoteServiceErrorInfo CreateErrorInfoWithoutCode(Exception ex
                 return CreateEntityNotFoundError(exception as EntityNotFoundException);
             }
 
+            if (exception is AbpRemoteCallException remoteCallException)
+            {
+                return remoteCallException.Error;
+            }
+
             var errorInfo = new RemoteServiceErrorInfo();
 
             if (exception is IUserFriendlyException)

diff --git a/...Abp/Http/Client/AbpRemoteCallException.cs → ...Abp/Http/Client/AbpRemoteCallException.cs b/...Abp/Http/Client/AbpRemoteCallException.cs → ...Abp/Http/Client/AbpRemoteCallException.cs