Upstream/bitwarden-server
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2025-01-27 22:41:22 +01:00
Code Issues Projects Releases Wiki Activity

[SM-502] Fix Users with no name (#2698)

Browse Source 
* Return email if username is empty
This commit is contained in:
Thomas Avery 2023-02-16 10:05:19 -06:00 committed by GitHub
parent f288787a45
commit bcc2a2a1ce
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/Api/SecretsManager/Models/Response/AccessPolicyResponseModel.cs
View File

@ -1,4 +1,5 @@
#nullable enable #nullable enable
using Bit.Core.Entities;
using Bit.Core.Models.Api; using Bit.Core.Models.Api;
using Bit.Core.SecretsManager.Entities; using Bit.Core.SecretsManager.Entities;
@ -20,6 +21,11 @@ public abstract class BaseAccessPolicyResponseModel : ResponseModel
public bool Write { get; set; } public bool Write { get; set; }
public DateTime CreationDate { get; set; } public DateTime CreationDate { get; set; }
public DateTime RevisionDate { get; set; } public DateTime RevisionDate { get; set; }
public string? GetUserDisplayName(User? user)
{
return string.IsNullOrWhiteSpace(user?.Name) ? user?.Email : user?.Name;
}
} }
public class UserProjectAccessPolicyResponseModel : BaseAccessPolicyResponseModel public class UserProjectAccessPolicyResponseModel : BaseAccessPolicyResponseModel
@ -30,7 +36,7 @@ public class UserProjectAccessPolicyResponseModel : BaseAccessPolicyResponseMode
{ {
OrganizationUserId = accessPolicy.OrganizationUserId; OrganizationUserId = accessPolicy.OrganizationUserId;
GrantedProjectId = accessPolicy.GrantedProjectId; GrantedProjectId = accessPolicy.GrantedProjectId;
OrganizationUserName = accessPolicy.User?.Name; OrganizationUserName = GetUserDisplayName(accessPolicy.User);
} }
public UserProjectAccessPolicyResponseModel() : base(new UserProjectAccessPolicy(), _objectName) public UserProjectAccessPolicyResponseModel() : base(new UserProjectAccessPolicy(), _objectName)
@ -51,7 +57,7 @@ public class UserServiceAccountAccessPolicyResponseModel : BaseAccessPolicyRespo
{ {
OrganizationUserId = accessPolicy.OrganizationUserId; OrganizationUserId = accessPolicy.OrganizationUserId;
GrantedServiceAccountId = accessPolicy.GrantedServiceAccountId; GrantedServiceAccountId = accessPolicy.GrantedServiceAccountId;
OrganizationUserName = accessPolicy.User?.Name; OrganizationUserName = GetUserDisplayName(accessPolicy.User);
} }
public UserServiceAccountAccessPolicyResponseModel() : base(new UserServiceAccountAccessPolicy(), _objectName) public UserServiceAccountAccessPolicyResponseModel() : base(new UserServiceAccountAccessPolicy(), _objectName)