nhyatt/bitwarden
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2025-07-09 03:43:51 -05:00
Code Activity

public API for organization import (#707)

Browse Source
This commit is contained in:
Kyle Spearrin
2020-04-23 11:29:19 -04:00
committed by GitHub
parent c177714799
commit fae4a335dc
4 changed files with 165 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Core/Services/IOrganizationService.cs
View File

@ -45,7 +45,7 @@ namespace Bit.Core.Services
Task UpdateUserGroupsAsync(OrganizationUser organizationUser, IEnumerable<Guid> groupIds);
Task<OrganizationLicense> GenerateLicenseAsync(Guid organizationId, Guid installationId);
Task<OrganizationLicense> GenerateLicenseAsync(Organization organization, Guid installationId);
Task ImportAsync(Guid organizationId, Guid importingUserId, IEnumerable<ImportedGroup> groups,
Task ImportAsync(Guid organizationId, Guid? importingUserId, IEnumerable<ImportedGroup> groups,
IEnumerable<ImportedOrganizationUser> newUsers, IEnumerable<string> removeUserExternalIds,
bool overwriteExisting);
Task RotateApiKeyAsync(Organization organization);

2
src/Core/Services/Implementations/OrganizationService.cs
View File

@ -1214,7 +1214,7 @@ namespace Bit.Core.Services
}
public async Task ImportAsync(Guid organizationId,
Guid importingUserId,
Guid? importingUserId,
IEnumerable<ImportedGroup> groups,
IEnumerable<ImportedOrganizationUser> newUsers,
IEnumerable<string> removeUserExternalIds,