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

Permissions bugs (#1083)

Browse Source 
* Null checked org invite collections

* Null checked permissions on org invite

* Gave a static seat count to org invite fixture

* Null checked the right way
This commit is contained in:
Addison Beck
2021-01-13 15:14:28 -05:00
committed by GitHub
parent 96cc88aafc
commit 9f938f5efd
4 changed files with 29 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Core/Models/Business/OrganizationUserInvite.cs
View File

@ -20,7 +20,7 @@ namespace Bit.Core.Models.Business
Emails = requestModel.Emails;
Type = requestModel.Type.Value;
AccessAll = requestModel.AccessAll;
Collections = requestModel.Collections.Select(c => c.ToSelectionReadOnly());
Collections = requestModel.Collections?.Select(c => c.ToSelectionReadOnly());
Permissions = requestModel.Permissions;
}
}

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

@ -1022,11 +1022,15 @@ namespace Bit.Core.Services
ExternalId = externalId,
CreationDate = DateTime.UtcNow,
RevisionDate = DateTime.UtcNow,
Permissions = System.Text.Json.JsonSerializer.Serialize(invite.Permissions, new JsonSerializerOptions
};
if (invite.Permissions != null)
{
orgUser.Permissions = System.Text.Json.JsonSerializer.Serialize(invite.Permissions, new JsonSerializerOptions
{
PropertyNamingPolicy = JsonNamingPolicy.CamelCase,
}),
};
});
}
if (!orgUser.AccessAll && invite.Collections.Any())
{