Upstream/bitwarden-server
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2024-11-26 12:55:17 +01:00
Code Issues Projects Releases Wiki Activity

deleted instead of disabled

Browse Source
This commit is contained in:
Kyle Spearrin 2017-05-16 11:21:53 -04:00
parent 933a3feade
commit f0328cb3ab
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Api/Controllers/OrganizationsController.cs
View File

@ -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));
}
}
}

4
src/Core/Models/Api/Request/Organizations/ImportOrganizationUsersRequestModel.cs
View File

@ -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<ValidationResult> 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) });
}