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

updated format of import data

Browse Source
This commit is contained in:
Kyle Spearrin
2017-05-15 14:41:20 -04:00
parent befca0561b
commit 670b548b22
9 changed files with 156 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -239,8 +239,8 @@ namespace Bit.Api.Controllers
}
var userId = _userService.GetProperUserId(User);
await _organizationService.ImportAsync(orgIdGuid, userId.Value, model.Groups.Select(g => g.ToGroup(orgIdGuid)),
model.Users.Select(u => u.ToKvp()));
await _organizationService.ImportAsync(orgIdGuid, userId.Value, model.Groups.Select(g => g.ToGroupTuple(orgIdGuid)),
model.NewUsers.Select(u => u.Email), model.RemoveUsers.Select(u => u.Email));
}
}
}

2
src/Api/Startup.cs
View File

@ -95,7 +95,7 @@ namespace Bit.Api
// Services
services.AddBaseServices();
services.AddDefaultServices();
services.AddNoopServices();
// Cors
services.AddCors(config =>