nhyatt/bitwarden
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2025-05-30 15:50:33 -05:00
Code

dont remove owners when syncing directory

Browse Source
This commit is contained in:
Kyle Spearrin 2019-05-14 13:09:56 -04:00
parent 889d770cec
commit 92505a2d4f
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1186,24 +1186,24 @@ namespace Bit.Core.Services
.Select(ru => existingUsersDict[ru]); .Select(ru => existingUsersDict[ru]);
foreach(var user in usersToRemove) foreach(var user in usersToRemove)
{
if(user.Type != OrganizationUserType.Owner)
{ {
await _organizationUserRepository.DeleteAsync(new OrganizationUser { Id = user.Id }); await _organizationUserRepository.DeleteAsync(new OrganizationUser { Id = user.Id });
existingExternalUsersIdDict.Remove(user.ExternalId); existingExternalUsersIdDict.Remove(user.ExternalId);
} }
} }
}
if(overwriteExisting) if(overwriteExisting)
{ {
// Remove existing external users that are not in new user set // Remove existing external users that are not in new user set
foreach(var user in existingExternalUsers) foreach(var user in existingExternalUsers)
{ {
if(!newUsersSet.Contains(user.ExternalId) && if(user.Type != OrganizationUserType.Owner && !newUsersSet.Contains(user.ExternalId) &&
existingExternalUsersIdDict.ContainsKey(user.ExternalId)) existingExternalUsersIdDict.ContainsKey(user.ExternalId))
{ {
await _organizationUserRepository.DeleteAsync(new OrganizationUser await _organizationUserRepository.DeleteAsync(new OrganizationUser { Id = user.Id });
{
Id = user.Id
});
existingExternalUsersIdDict.Remove(user.ExternalId); existingExternalUsersIdDict.Remove(user.ExternalId);
} }
} }