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

[AC-2334] Fix unable to load members when permissions is "null" (#3922)

Browse Source 
* Also add xmldoc comment to CoreHelpers.LoadClassFromJsonData to warn about this
This commit is contained in:
Thomas Rittson
2024-03-26 00:26:12 +10:00
committed by GitHub
parent fd71ed8584
commit c5d5de0aed
4 changed files with 128 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/Api/AdminConsole/Models/Response/ProfileOrganizationResponseModel.cs
View File

@ -74,7 +74,7 @@ public class ProfileOrganizationResponseModel : ResponseModel
if (FlexibleCollections)
{
// Downgrade Custom users with no other permissions than 'Edit/Delete Assigned Collections' to User
if (Type == OrganizationUserType.Custom)
if (Type == OrganizationUserType.Custom && Permissions is not null)
{
if ((Permissions.EditAssignedCollections || Permissions.DeleteAssignedCollections) &&
Permissions is
@ -98,8 +98,11 @@ public class ProfileOrganizationResponseModel : ResponseModel
}
// Set 'Edit/Delete Assigned Collections' custom permissions to false
Permissions.EditAssignedCollections = false;
Permissions.DeleteAssignedCollections = false;
if (Permissions is not null)
{
Permissions.EditAssignedCollections = false;
Permissions.DeleteAssignedCollections = false;
}
}
}