diff --git a/src/Api/Controllers/OrganizationsController.cs b/src/Api/Controllers/OrganizationsController.cs index d47982360d..8d8c518842 100644 --- a/src/Api/Controllers/OrganizationsController.cs +++ b/src/Api/Controllers/OrganizationsController.cs @@ -243,8 +243,8 @@ namespace Bit.Api.Controllers orgIdGuid, userId.Value, model.Groups.Select(g => g.ToImportedGroup(orgIdGuid)), - model.Users.Where(u => !u.Disabled).Select(u => u.ToImportedOrganizationUser()), - model.Users.Where(u => u.Disabled).Select(u => u.ExternalId)); + model.Users.Where(u => !u.Deleted).Select(u => u.ToImportedOrganizationUser()), + model.Users.Where(u => u.Deleted).Select(u => u.ExternalId)); } } } diff --git a/src/Core/Models/Api/Request/Organizations/ImportOrganizationUsersRequestModel.cs b/src/Core/Models/Api/Request/Organizations/ImportOrganizationUsersRequestModel.cs index 7f31900bc2..97b6c783f0 100644 --- a/src/Core/Models/Api/Request/Organizations/ImportOrganizationUsersRequestModel.cs +++ b/src/Core/Models/Api/Request/Organizations/ImportOrganizationUsersRequestModel.cs @@ -40,7 +40,7 @@ namespace Bit.Core.Models.Api { [EmailAddress] public string Email { get; set; } - public bool Disabled { get; set; } + public bool Deleted { get; set; } [Required] public string ExternalId { get; set; } @@ -57,7 +57,7 @@ namespace Bit.Core.Models.Api public IEnumerable Validate(ValidationContext validationContext) { - if(string.IsNullOrWhiteSpace(Email) && !Disabled) + if(string.IsNullOrWhiteSpace(Email) && !Deleted) { yield return new ValidationResult("Email is required for enabled users.", new string[] { nameof(Email) }); }