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

catch gateway exception when canceling on delete

Browse Source
This commit is contained in:
Kyle Spearrin 2018-09-07 14:00:56 -04:00
parent fceef7133e
commit fb45f75bc8
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Core/Services/Implementations/OrganizationService.cs
View File

@ -769,9 +769,13 @@ namespace Bit.Core.Services
public async Task DeleteAsync(Organization organization) public async Task DeleteAsync(Organization organization)
{ {
if(!string.IsNullOrWhiteSpace(organization.GatewaySubscriptionId)) if(!string.IsNullOrWhiteSpace(organization.GatewaySubscriptionId))
{
try
{ {
await _stripePaymentService.CancelSubscriptionAsync(organization, true); await _stripePaymentService.CancelSubscriptionAsync(organization, true);
} }
catch(GatewayException) { }
}
await _organizationRepository.DeleteAsync(organization); await _organizationRepository.DeleteAsync(organization);
await _applicationCacheService.DeleteOrganizationAbilityAsync(organization.Id); await _applicationCacheService.DeleteOrganizationAbilityAsync(organization.Id);

4
src/Core/Services/Implementations/UserService.cs
View File

@ -182,8 +182,12 @@ namespace Bit.Core.Services
if(!string.IsNullOrWhiteSpace(user.GatewaySubscriptionId)) if(!string.IsNullOrWhiteSpace(user.GatewaySubscriptionId))
{ {
var paymentService = user.GetPaymentService(_globalSettings); var paymentService = user.GetPaymentService(_globalSettings);
try
{
await paymentService.CancelSubscriptionAsync(user, true); await paymentService.CancelSubscriptionAsync(user, true);
} }
catch(GatewayException) { }
}
await _userRepository.DeleteAsync(user); await _userRepository.DeleteAsync(user);
await _pushService.PushLogOutAsync(user.Id); await _pushService.PushLogOutAsync(user.Id);