Skip to content

[PM-38272] fix: handle null or empty permissions in OrganizationUserResponseModel #8207

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
JaredScar wants to merge 2 commits into
base: main
Choose a base branch
from
+3 −3
Open

[PM-38272] fix: handle null or empty permissions in OrganizationUserResponseModel #8207

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4e49d0d
fix: handle null or empty permissions in OrganizationUserResponseModel
JaredScar Aug 13, 2026
939c1a2
refactor: simplify permissions handling in OrganizationUserResponseModel
JaredScar Aug 13, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/Api/AdminConsole/Models/Response/Organizations/OrganizationUserResponseModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
using Bit.Core.Models.Api;
using Bit.Core.Models.Data;
using Bit.Core.Models.Data.Organizations.OrganizationUsers;
using Bit.Core.Utilities;

namespace Bit.Api.AdminConsole.Models.Response.Organizations;

Expand All @@ -29,7 +28,7 @@ public OrganizationUserResponseModel(OrganizationUser organizationUser, string o
ExternalId = organizationUser.ExternalId;
AccessSecretsManager = organizationUser.AccessSecretsManager;
AccessPam = organizationUser.AccessPam;
Permissions = CoreHelpers.LoadClassFromJsonData<Permissions>(organizationUser.Permissions);
Permissions = organizationUser.GetPermissions();
ResetPasswordEnrolled = OrganizationUser.IsValidResetPasswordKey(organizationUser.ResetPasswordKey);
}

Expand All @@ -49,7 +48,7 @@ public OrganizationUserResponseModel(OrganizationUserUserDetails organizationUse
ExternalId = organizationUser.ExternalId;
AccessSecretsManager = organizationUser.AccessSecretsManager;
AccessPam = organizationUser.AccessPam;
Permissions = CoreHelpers.LoadClassFromJsonData<Permissions>(organizationUser.Permissions);
Permissions = organizationUser.GetPermissions();
ResetPasswordEnrolled = OrganizationUser.IsValidResetPasswordKey(organizationUser.ResetPasswordKey);
UsesKeyConnector = organizationUser.UsesKeyConnector;
HasMasterPassword = organizationUser.HasMasterPassword;
Expand All @@ -62,6 +61,7 @@ public OrganizationUserResponseModel(OrganizationUserUserDetails organizationUse
public string ExternalId { get; set; }
public bool AccessSecretsManager { get; set; }
public bool AccessPam { get; set; }
[JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
Comment thread
JaredScar marked this conversation as resolved.
public Permissions Permissions { get; set; }
public bool ResetPasswordEnrolled { get; set; }
public bool UsesKeyConnector { get; set; }
Expand Down
Loading