nhyatt/bitwarden
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2025-07-04 09:32:48 -05:00
Code Activity

fix to user already exists checks

Browse Source
This commit is contained in:
Kyle Spearrin
2017-11-13 10:06:54 -05:00
parent 39baf2a9be
commit d03421fe4b
5 changed files with 60 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -857,8 +857,9 @@ namespace Bit.Core.Services
foreach(var email in emails)
{
// Make sure user is not already invited
var existingOrgUser = await _organizationUserRepository.GetByOrganizationAsync(organizationId, email);
if(existingOrgUser != null)
var existingOrgUserCount = await _organizationUserRepository.GetCountByOrganizationAsync(
organizationId, email, false);
if(existingOrgUserCount > 0)
{
throw new BadRequestException("User already invited.");
}
@ -940,8 +941,9 @@ namespace Bit.Core.Services
}
}
var existingOrgUser = await _organizationUserRepository.GetByOrganizationAsync(orgUser.OrganizationId, user.Email);
if(existingOrgUser != null)
var existingOrgUserCount = await _organizationUserRepository.GetCountByOrganizationAsync(
orgUser.OrganizationId, user.Email, true);
if(existingOrgUserCount > 0)
{
throw new BadRequestException("You are already part of this organization.");
}