Browse Source

Fix error message if already accepted EA invite (#1159)

* Fix error message if already accepted EA invite

* Fix error message wording depending on EA status
pull/1163/head
Thomas Rittson 5 years ago committed by GitHub
parent
commit
499c30a805
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 14
      src/Core/Services/Implementations/EmergencyAccessService.cs

14
src/Core/Services/Implementations/EmergencyAccessService.cs

@ -116,15 +116,19 @@ namespace Bit.Core.Services @@ -116,15 +116,19 @@ namespace Bit.Core.Services
throw new BadRequestException("Invalid token.");
}
if (string.IsNullOrWhiteSpace(emergencyAccess.Email) ||
!emergencyAccess.Email.Equals(user.Email, StringComparison.InvariantCultureIgnoreCase))
if (emergencyAccess.Status == EmergencyAccessStatusType.Accepted)
{
throw new BadRequestException("User email does not match invite.");
throw new BadRequestException("Invitation already accepted. You will receive an email when the grantor confirms you as an emergency access contact.");
}
else if (emergencyAccess.Status != EmergencyAccessStatusType.Invited)
{
throw new BadRequestException("Invitation already accepted.");
}
if (emergencyAccess.Status != EmergencyAccessStatusType.Invited)
if (string.IsNullOrWhiteSpace(emergencyAccess.Email) ||
!emergencyAccess.Email.Equals(user.Email, StringComparison.InvariantCultureIgnoreCase))
{
throw new BadRequestException("Already accepted.");
throw new BadRequestException("User email does not match invite.");
}
var granteeEmail = emergencyAccess.Email;

Loading…
Cancel
Save