aljaz/BTCPayServerPlugins
1
0
Fork 0
mirror of https://github.com/aljazceru/BTCPayServerPlugins.git synced 2025-12-18 08:04:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix w

Browse Source
This commit is contained in:
Kukks
2023-11-01 12:08:51 +01:00
parent ebe89c1156
commit 9cf533a0be
2 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Plugins/BTCPayServer.Plugins.Wabisabi/BTCPayServer.Plugins.Wabisabi.csproj
View File

@@ -13,7 +13,7 @@
<PropertyGroup> <PropertyGroup>
<Product>Wabisabi Coinjoin</Product> <Product>Wabisabi Coinjoin</Product>
<Description>Allows you to integrate your btcpayserver store with coinjoins.</Description> <Description>Allows you to integrate your btcpayserver store with coinjoins.</Description>
<Version>1.0.61</Version> <Version>1.0.62</Version>
</PropertyGroup> </PropertyGroup>
<!-- Plugin development properties --> <!-- Plugin development properties -->

12
Plugins/BTCPayServer.Plugins.Wabisabi/Coordinator/Filters/ExceptionTranslateAttribute.cs
View File

@@ -3,12 +3,14 @@ using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.Mvc.Filters; using Microsoft.AspNetCore.Mvc.Filters;
using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging;
using Newtonsoft.Json;
using NLog; using NLog;
using WabiSabi.Crypto; using WabiSabi.Crypto;
using WalletWasabi.Affiliation; using WalletWasabi.Affiliation;
using WalletWasabi.WabiSabi; using WalletWasabi.WabiSabi;
using WalletWasabi.WabiSabi.Backend.Models; using WalletWasabi.WabiSabi.Backend.Models;
using WalletWasabi.WabiSabi.Models; using WalletWasabi.WabiSabi.Models;
using WalletWasabi.WabiSabi.Models.Serialization;
namespace WalletWasabi.Backend.Filters; namespace WalletWasabi.Backend.Filters;
@@ -16,6 +18,10 @@ public class ExceptionTranslateAttribute : ExceptionFilterAttribute
{ {
public override void OnException(ExceptionContext context) public override void OnException(ExceptionContext context)
{ {
var serializerSettings = new JsonSerializerSettings()
{
Converters = JsonSerializationOptions.Default.Settings.Converters
};
var logger = context.HttpContext.RequestServices.GetRequiredService<ILogger<WabiSabiCoordinator>>(); var logger = context.HttpContext.RequestServices.GetRequiredService<ILogger<WabiSabiCoordinator>>();
var exception = context.Exception.InnerException ?? context.Exception; var exception = context.Exception.InnerException ?? context.Exception;
logger.LogError(exception, "Exception occured in WabiSabiCoordinator API, "); logger.LogError(exception, "Exception occured in WabiSabiCoordinator API, ");
@@ -25,7 +31,7 @@ public class ExceptionTranslateAttribute : ExceptionFilterAttribute
Type: ProtocolConstants.ProtocolViolationType, Type: ProtocolConstants.ProtocolViolationType,
ErrorCode: e.ErrorCode.ToString(), ErrorCode: e.ErrorCode.ToString(),
Description: e.Message, Description: e.Message,
ExceptionData: e.ExceptionData ?? EmptyExceptionData.Instance)) ExceptionData: e.ExceptionData ?? EmptyExceptionData.Instance), serializerSettings )
{ {
StatusCode = (int) HttpStatusCode.InternalServerError StatusCode = (int) HttpStatusCode.InternalServerError
}, },
@@ -33,7 +39,7 @@ public class ExceptionTranslateAttribute : ExceptionFilterAttribute
Type: ProtocolConstants.ProtocolViolationType, Type: ProtocolConstants.ProtocolViolationType,
ErrorCode: WabiSabiProtocolErrorCode.CryptoException.ToString(), ErrorCode: WabiSabiProtocolErrorCode.CryptoException.ToString(),
Description: e.Message, Description: e.Message,
ExceptionData: EmptyExceptionData.Instance)) ExceptionData: EmptyExceptionData.Instance), serializerSettings)
{ {
StatusCode = (int) HttpStatusCode.InternalServerError StatusCode = (int) HttpStatusCode.InternalServerError
}, },
@@ -41,7 +47,7 @@ public class ExceptionTranslateAttribute : ExceptionFilterAttribute
Type: AffiliationConstants.RequestSecrecyViolationType, Type: AffiliationConstants.RequestSecrecyViolationType,
ErrorCode: "undefined", ErrorCode: "undefined",
Description: e.Message, Description: e.Message,
ExceptionData: EmptyExceptionData.Instance)) ExceptionData: EmptyExceptionData.Instance), serializerSettings)
{ {
StatusCode = (int) HttpStatusCode.InternalServerError StatusCode = (int) HttpStatusCode.InternalServerError
}, },