nhyatt/bitwarden
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2025-04-05 05:00:19 -05:00
Code

Added some defensive logging around making braintree payments (#5317)

Browse Source
This commit is contained in:
Conner Turnbull 2025-01-23 10:00:51 -05:00 committed by GitHub
parent e8cd86e5f6
commit 31e95d529f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 35 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
src/Billing/Services/Implementations/StripeEventUtilityService.cs
View File

@ -318,26 +318,34 @@ public class StripeEventUtilityService : IStripeEventUtilityService
Result<Braintree.Transaction> transactionResult; Result<Braintree.Transaction> transactionResult;
try try
{ {
transactionResult = await _btGateway.Transaction.SaleAsync( var transactionRequest = new Braintree.TransactionRequest
new Braintree.TransactionRequest {
Amount = btInvoiceAmount,
CustomerId = customer.Metadata["btCustomerId"],
Options = new Braintree.TransactionOptionsRequest
{ {
Amount = btInvoiceAmount, SubmitForSettlement = true,
CustomerId = customer.Metadata["btCustomerId"], PayPal = new Braintree.TransactionOptionsPayPalRequest
Options = new Braintree.TransactionOptionsRequest
{ {
SubmitForSettlement = true, CustomField =
PayPal = new Braintree.TransactionOptionsPayPalRequest $"{btObjIdField}:{btObjId},region:{_globalSettings.BaseServiceUri.CloudRegion}"
{
CustomField =
$"{btObjIdField}:{btObjId},region:{_globalSettings.BaseServiceUri.CloudRegion}"
}
},
CustomFields = new Dictionary<string, string>
{
[btObjIdField] = btObjId.ToString(),
["region"] = _globalSettings.BaseServiceUri.CloudRegion
} }
}); },
CustomFields = new Dictionary<string, string>
{
[btObjIdField] = btObjId.ToString(),
["region"] = _globalSettings.BaseServiceUri.CloudRegion
}
};
_logger.LogInformation("Creating Braintree transaction with Amount: {Amount}, CustomerId: {CustomerId}, " +
"CustomField: {CustomField}, CustomFields: {@CustomFields}",
transactionRequest.Amount,
transactionRequest.CustomerId,
transactionRequest.Options.PayPal.CustomField,
transactionRequest.CustomFields);
transactionResult = await _btGateway.Transaction.SaleAsync(transactionRequest);
} }
catch (NotFoundException e) catch (NotFoundException e)
{ {
@ -345,9 +353,19 @@ public class StripeEventUtilityService : IStripeEventUtilityService
"Attempted to make a payment with Braintree, but customer did not exist for the given btCustomerId present on the Stripe metadata"); "Attempted to make a payment with Braintree, but customer did not exist for the given btCustomerId present on the Stripe metadata");
throw; throw;
} }
catch (Exception e)
{
_logger.LogError(e, "Exception occurred while trying to pay invoice with Braintree");
throw;
}
if (!transactionResult.IsSuccess()) if (!transactionResult.IsSuccess())
{ {
_logger.LogWarning("Braintree transaction failed. Error: {ErrorMessage}, Transaction Status: {Status}, Validation Errors: {ValidationErrors}",
transactionResult.Message,
transactionResult.Target?.Status,
string.Join(", ", transactionResult.Errors.DeepAll().Select(e => $"Code: {e.Code}, Message: {e.Message}, Attribute: {e.Attribute}")));
if (invoice.AttemptCount < 4) if (invoice.AttemptCount < 4)
{ {
await _mailService.SendPaymentFailedAsync(customer.Email, btInvoiceAmount, true); await _mailService.SendPaymentFailedAsync(customer.Email, btInvoiceAmount, true);