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

sync with user externalids

Browse Source
This commit is contained in:
Kyle Spearrin
2017-05-16 00:11:21 -04:00
parent b3e4fcca74
commit 933a3feade
9 changed files with 108 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Api/Controllers/OrganizationUsersController.cs
View File

@ -93,7 +93,7 @@ namespace Bit.Api.Controllers
var userId = _userService.GetProperUserId(User);
var result = await _organizationService.InviteUserAsync(orgGuidId, userId.Value, model.Email, model.Type.Value,
model.AccessAll, model.Collections?.Select(c => c.ToSelectionReadOnly()));
model.AccessAll, null, model.Collections?.Select(c => c.ToSelectionReadOnly()));
}
[HttpPut("{id}/reinvite")]

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

@ -242,9 +242,9 @@ namespace Bit.Api.Controllers
await _organizationService.ImportAsync(
orgIdGuid,
userId.Value,
model.Groups.Select(g => g.ToGroupTuple(orgIdGuid)),
model.Users.Where(u => !u.Disabled).Select(u => u.Email),
model.Users.Where(u => u.Disabled).Select(u => u.Email));
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));
}
}
}