Merge pull request #722 from ONLYOFFICE/bugfix/Bug53348

Bug 53348 - Client.Account termination. Account deletion confirmation…
This commit is contained in:
Pavel Bannov 2022-07-13 13:43:03 +03:00 committed by GitHub
commit 48a743e01e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -26,6 +26,8 @@
using static ASC.Security.Cryptography.EmailValidationKeyProvider;
using Constants = ASC.Core.Users.Constants;
namespace ASC.Api.Core.Security;
[Transient]
@ -58,7 +60,7 @@ public class EmailValidationKeyModelHelper
{
var request = QueryHelpers.ParseQuery(_httpContextAccessor.HttpContext.Request.Headers["confirm"]);
request.TryGetValue("type", out var type);
var type = request["type"].FirstOrDefault();
ConfirmType? cType = null;
if (ConfirmTypeExtensions.TryParse(type, out var confirmType))
@ -141,7 +143,7 @@ public class EmailValidationKeyModelHelper
case ConfirmType.ProfileRemove:
// validate UiD
var user = _userManager.GetUsers(uiD.GetValueOrDefault());
if (user == null || user.Status == EmployeeStatus.Terminated || _authContext.IsAuthenticated && _authContext.CurrentAccount.ID != uiD)
if (user == null || user == Constants.LostUser || user.Status == EmployeeStatus.Terminated || _authContext.IsAuthenticated && _authContext.CurrentAccount.ID != uiD)
{
return ValidationResult.Invalid;
}