Merge pull request #43 from StockDrops/main

Fixed a bug where TenantRoles would give an exception if the _tenantRoles was null
JonPSmith · Jun 2, 2022 · a93b460 · a93b460
2 parents 56a3230 + 430c549
commit a93b460
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/AuthPermissions.AspNetCore/CreateNuGetRelease.nuspec b/AuthPermissions.AspNetCore/CreateNuGetRelease.nuspec
@@ -2,7 +2,7 @@
 <package xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
   <metadata>
     <id>AuthPermissions.AspNetCore</id>
-    <version>3.2.0</version>
+    <version>3.2.1-dev1</version>
     <authors>Jon P Smith</authors>
     <product>AuthPermissions.AspNetCore</product>
     <copyright>Copyright (c) 2021 Jon P Smith</copyright>

diff --git a/AuthPermissions.AspNetCore/MultiProjPack.xml b/AuthPermissions.AspNetCore/MultiProjPack.xml
@@ -4,7 +4,7 @@
   <!-- See documentation for all the possible values -->
   <metadata>
     <id>AuthPermissions.AspNetCore</id>
-    <version>3.2.0</version>
+    <version>3.2.1-dev1</version>
     <authors>Jon P Smith</authors>
     <product>AuthPermissions.AspNetCore</product>
     <copyright>Copyright (c) 2021 Jon P Smith</copyright>

diff --git a/AuthPermissions.BaseCode/DataLayer/Classes/Tenant.cs b/AuthPermissions.BaseCode/DataLayer/Classes/Tenant.cs
@@ -124,11 +124,11 @@ public static IStatusGeneric<Tenant> CreateHierarchicalTenant(string fullTenantN
         /// </summary>
         public IReadOnlyCollection<Tenant> Children => _children?.ToList();
 
+
         /// <summary>
         /// This holds any Roles that have been specifically 
         /// </summary>
-        public IReadOnlyCollection<RoleToPermissions> TenantRoles => _tenantRoles.ToList();
-
+        public IReadOnlyCollection<RoleToPermissions> TenantRoles => _tenantRoles?.ToList() ?? new List<RoleToPermissions>();
         /// <summary>
         /// Easy way to see the tenant and its key
         /// </summary>