nhyatt/bitwarden
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2025-07-04 01:22:50 -05:00
Code Activity

overwrite existing users on import

Browse Source
This commit is contained in:
Kyle Spearrin
2019-05-06 21:31:20 -04:00
parent afdf29da78
commit 0c760cf9e1
4 changed files with 24 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -376,7 +376,8 @@ namespace Bit.Api.Controllers
userId.Value,
model.Groups.Select(g => g.ToImportedGroup(orgIdGuid)),
model.Users.Where(u => !u.Deleted).Select(u => u.ToImportedOrganizationUser()),
model.Users.Where(u => u.Deleted).Select(u => u.ExternalId));
model.Users.Where(u => u.Deleted).Select(u => u.ExternalId),
model.OverwriteExisting);
}
[HttpPost("{id}/api-key")]