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

check for org user email to be null

Browse Source
This commit is contained in:
Kyle Spearrin 2018-01-01 22:05:43 -05:00
parent 46c36dc885
commit 3251c4b574
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -930,7 +930,7 @@ namespace Bit.Core.Services
public async Task<OrganizationUser> AcceptUserAsync(Guid organizationUserId, User user, string token) public async Task<OrganizationUser> AcceptUserAsync(Guid organizationUserId, User user, string token)
{ {
var orgUser = await _organizationUserRepository.GetByIdAsync(organizationUserId); var orgUser = await _organizationUserRepository.GetByIdAsync(organizationUserId);
if(orgUser == null || !orgUser.Email.Equals(user.Email, StringComparison.InvariantCultureIgnoreCase)) if(orgUser == null)
{ {
throw new BadRequestException("User invalid."); throw new BadRequestException("User invalid.");
} }
@ -940,6 +940,12 @@ namespace Bit.Core.Services
throw new BadRequestException("Already accepted."); throw new BadRequestException("Already accepted.");
} }
if(string.IsNullOrWhiteSpace(orgUser.Email) ||
!orgUser.Email.Equals(user.Email, StringComparison.InvariantCultureIgnoreCase))
{
throw new BadRequestException("User email does not match invite.");
}
if(orgUser.Type == OrganizationUserType.Owner || orgUser.Type == OrganizationUserType.Admin) if(orgUser.Type == OrganizationUserType.Owner || orgUser.Type == OrganizationUserType.Admin)
{ {
var org = await GetOrgById(orgUser.OrganizationId); var org = await GetOrgById(orgUser.OrganizationId);