nhyatt/bitwarden
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2025-05-31 08:10:32 -05:00
Code

remove duplicate filter checks

Browse Source
This commit is contained in:
Kyle Spearrin 2017-04-18 10:21:32 -04:00
parent 4da172a94b
commit c7496d2be2
1 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -657,9 +657,6 @@ namespace Bit.Core.Services
throw new BadRequestException("User already invited."); throw new BadRequestException("User already invited.");
} }
var orgSubvaults = await _subvaultRepository.GetManyByOrganizationIdAsync(organizationId);
var filteredSubvaults = subvaults.Where(s => orgSubvaults.Any(os => os.Id == s.SubvaultId));
var orgUser = new OrganizationUser var orgUser = new OrganizationUser
{ {
OrganizationId = organizationId, OrganizationId = organizationId,
@ -673,7 +670,7 @@ namespace Bit.Core.Services
}; };
await _organizationUserRepository.CreateAsync(orgUser); await _organizationUserRepository.CreateAsync(orgUser);
await SaveUserSubvaultsAsync(orgUser, filteredSubvaults, true); await SaveUserSubvaultsAsync(orgUser, subvaults, true);
await SendInviteAsync(orgUser); await SendInviteAsync(orgUser);
return orgUser; return orgUser;
@ -789,11 +786,8 @@ namespace Bit.Core.Services
throw new BadRequestException("Organization must have at least one confirmed owner."); throw new BadRequestException("Organization must have at least one confirmed owner.");
} }
var orgSubvaults = await _subvaultRepository.GetManyByOrganizationIdAsync(user.OrganizationId);
var filteredSubvaults = subvaults.Where(s => orgSubvaults.Any(os => os.Id == s.SubvaultId));
await _organizationUserRepository.ReplaceAsync(user); await _organizationUserRepository.ReplaceAsync(user);
await SaveUserSubvaultsAsync(user, filteredSubvaults, false); await SaveUserSubvaultsAsync(user, subvaults, false);
} }
public async Task DeleteUserAsync(Guid organizationId, Guid organizationUserId, Guid deletingUserId) public async Task DeleteUserAsync(Guid organizationId, Guid organizationUserId, Guid deletingUserId)