From c4823f1c376047ad688f16734ea76d7eaafda5da Mon Sep 17 00:00:00 2001 From: Addison Beck Date: Tue, 19 Jan 2021 17:45:12 -0500 Subject: [PATCH] null checked all the permissions (#1227) --- src/Core/Models/Data/OrganizationData.cs | 4 ++-- src/Core/Models/Domain/Organization.cs | 4 ++-- src/Core/Models/Response/ProfileOrganizationResponse.cs | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/Core/Models/Data/OrganizationData.cs b/src/Core/Models/Data/OrganizationData.cs index e08e6fd16..926bb71ff 100644 --- a/src/Core/Models/Data/OrganizationData.cs +++ b/src/Core/Models/Data/OrganizationData.cs @@ -26,7 +26,7 @@ namespace Bit.Core.Models.Data Seats = response.Seats; MaxCollections = response.MaxCollections; MaxStorageGb = response.MaxStorageGb; - Permissions = response.Permissions; + Permissions = response.Permissions ?? new Permissions(); } public string Id { get; set; } @@ -46,6 +46,6 @@ namespace Bit.Core.Models.Data public int Seats { get; set; } public int MaxCollections { get; set; } public short? MaxStorageGb { get; set; } - public Permissions Permissions { get; set; } + public Permissions Permissions { get; set; } = new Permissions(); } } diff --git a/src/Core/Models/Domain/Organization.cs b/src/Core/Models/Domain/Organization.cs index 11c398552..77676b1d5 100644 --- a/src/Core/Models/Domain/Organization.cs +++ b/src/Core/Models/Domain/Organization.cs @@ -26,7 +26,7 @@ namespace Bit.Core.Models.Domain Seats = obj.Seats; MaxCollections = obj.MaxCollections; MaxStorageGb = obj.MaxStorageGb; - Permissions = obj.Permissions; + Permissions = obj.Permissions ?? new Permissions(); } public string Id { get; set; } @@ -46,7 +46,7 @@ namespace Bit.Core.Models.Domain public int Seats { get; set; } public int MaxCollections { get; set; } public short? MaxStorageGb { get; set; } - public Permissions Permissions { get; set; } + public Permissions Permissions { get; set; } = new Permissions(); public bool CanAccess { diff --git a/src/Core/Models/Response/ProfileOrganizationResponse.cs b/src/Core/Models/Response/ProfileOrganizationResponse.cs index 567562432..0036c337a 100644 --- a/src/Core/Models/Response/ProfileOrganizationResponse.cs +++ b/src/Core/Models/Response/ProfileOrganizationResponse.cs @@ -23,6 +23,6 @@ namespace Bit.Core.Models.Response public OrganizationUserStatusType Status { get; set; } public OrganizationUserType Type { get; set; } public bool Enabled { get; set; } - public Permissions Permissions { get; set; } + public Permissions Permissions { get; set; } = new Permissions(); } }