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

sometimes delete org on user delete

Browse Source
This commit is contained in:
Kyle Spearrin 2018-12-03 10:56:55 -05:00
parent 9b80043098
commit 002b642e50
1 changed files with 26 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -31,6 +31,7 @@ namespace Bit.Core.Services
private readonly IUserRepository _userRepository; private readonly IUserRepository _userRepository;
private readonly ICipherRepository _cipherRepository; private readonly ICipherRepository _cipherRepository;
private readonly IOrganizationUserRepository _organizationUserRepository; private readonly IOrganizationUserRepository _organizationUserRepository;
private readonly IOrganizationRepository _organizationRepository;
private readonly IU2fRepository _u2fRepository; private readonly IU2fRepository _u2fRepository;
private readonly IMailService _mailService; private readonly IMailService _mailService;
private readonly IPushNotificationService _pushService; private readonly IPushNotificationService _pushService;
@ -49,6 +50,7 @@ namespace Bit.Core.Services
IUserRepository userRepository, IUserRepository userRepository,
ICipherRepository cipherRepository, ICipherRepository cipherRepository,
IOrganizationUserRepository organizationUserRepository, IOrganizationUserRepository organizationUserRepository,
IOrganizationRepository organizationRepository,
IU2fRepository u2fRepository, IU2fRepository u2fRepository,
IMailService mailService, IMailService mailService,
IPushNotificationService pushService, IPushNotificationService pushService,
@ -81,6 +83,7 @@ namespace Bit.Core.Services
_userRepository = userRepository; _userRepository = userRepository;
_cipherRepository = cipherRepository; _cipherRepository = cipherRepository;
_organizationUserRepository = organizationUserRepository; _organizationUserRepository = organizationUserRepository;
_organizationRepository = organizationRepository;
_u2fRepository = u2fRepository; _u2fRepository = u2fRepository;
_mailService = mailService; _mailService = mailService;
_pushService = pushService; _pushService = pushService;
@ -174,10 +177,30 @@ namespace Bit.Core.Services
var onlyOwnerCount = await _organizationUserRepository.GetCountByOnlyOwnerAsync(user.Id); var onlyOwnerCount = await _organizationUserRepository.GetCountByOnlyOwnerAsync(user.Id);
if(onlyOwnerCount > 0) if(onlyOwnerCount > 0)
{ {
return IdentityResult.Failed(new IdentityError var deletedOrg = false;
var orgs = await _organizationUserRepository.GetManyDetailsByUserAsync(user.Id,
OrganizationUserStatusType.Confirmed);
if(orgs.Count == 1)
{ {
Description = "You must leave or delete any organizations that you are the only owner of first." var org = await _organizationRepository.GetByIdAsync(orgs.First().OrganizationId);
}); if(org != null && (!org.Enabled || string.IsNullOrWhiteSpace(org.GatewaySubscriptionId)))
{
var orgCount = await _organizationUserRepository.GetCountByOrganizationIdAsync(org.Id);
if(orgCount == 1)
{
await _organizationRepository.DeleteAsync(org);
deletedOrg = true;
}
}
}
if(!deletedOrg)
{
return IdentityResult.Failed(new IdentityError
{
Description = "You must leave or delete any organizations that you are the only owner of first."
});
}
} }
if(!string.IsNullOrWhiteSpace(user.GatewaySubscriptionId)) if(!string.IsNullOrWhiteSpace(user.GatewaySubscriptionId))