Merge branch 'dev'

Author: JonPSmith

AuthPermissions.AspNetCore/CreateNuGetRelease.nuspec

@@ -2,17 +2,13 @@
 <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>2.3.0</version>
+    <version>2.3.1</version>
     <authors>Jon P Smith</authors>
     <product>AuthPermissions.AspNetCore</product>
     <copyright>Copyright (c) 2021 Jon P Smith</copyright>
     <description>Provides extra authorization and multi-tenant features to a ASP.NET Core application.</description>
     <releaseNotes>
-- New Feature: You can add extra claims to the user via the RegisterAddClaimToUser method
-- New Feature: Tap into AuthPermissionsDbContext events by registering a service implmenting the IRegisterStateChangeEvent interface
-- Bug Fix: UpdateRoleToPermissionsAsync now return errors if a Role change is invalid for a user or tenants that is that Role - see issue #13
-- Bug Fix: DeleteRoleAsync now handles tenant Roles - see issue #13
-- Bug Fix: Add or update of an AuthUser now checks the tenant has the correct Roles - see issue #15
+Bug Fix: Problem in ClaimCalculator when used with multi-tenant applications - see issue #23
 	</releaseNotes>
     <license type="expression">MIT</license>
     <projectUrl>https://github.com/JonPSmith/AuthPermissions.AspNetCore</projectUrl>

AuthPermissions.AspNetCore/MultiProjPack.xml

@@ -4,17 +4,13 @@
   <!-- See documentation for all the possible values -->
   <metadata>
     <id>AuthPermissions.AspNetCore</id>
-    <version>2.3.0</version>
+    <version>2.3.1</version>
     <authors>Jon P Smith</authors>
     <product>AuthPermissions.AspNetCore</product>
     <copyright>Copyright (c) 2021 Jon P Smith</copyright>
     <description>Provides extra authorization and multi-tenant features to a ASP.NET Core application.</description>
     <releaseNotes>
-- New Feature: You can add extra claims to the user via the RegisterAddClaimToUser method
-- New Feature: Tap into AuthPermissionsDbContext events by registering a service implmenting the IRegisterStateChangeEvent interface
-- Bug Fix: UpdateRoleToPermissionsAsync now return errors if a Role change is invalid for a user or tenants that is that Role - see issue #13
-- Bug Fix: DeleteRoleAsync now handles tenant Roles - see issue #13
-- Bug Fix: Add or update of an AuthUser now checks the tenant has the correct Roles - see issue #15
+Bug Fix: Problem in ClaimCalculator when used with multi-tenant applications - see issue #23
 	</releaseNotes>
     <license type="expression">MIT</license>
     <projectUrl>https://github.com/JonPSmith/AuthPermissions.AspNetCore</projectUrl>

AuthPermissions/ClaimsCalculator.cs

@@ -77,21 +77,24 @@ public async Task<List<Claim>> GetClaimsForAuthUserAsync(string userId)
         private async Task<string> CalcPermissionsForUserAsync(string userId)
         {
             //This gets all the permissions, with a distinct to remove duplicates
-            var permissionsForAllRoles = (await _context.UserToRoles.Where(x => x.UserId == userId)
+            var permissionsForAllRoles = await _context.UserToRoles
+                .Where(x => x.UserId == userId)
                 .Select(x => x.Role.PackedPermissionsInRole)
-                .ToListAsync());
+                .ToListAsync();
 
             if (_options.TenantType != TenantTypes.NotUsingTenants)
             {
                 //We need to add any RoleTypes.TenantAdminAdd for a tenant user
 
-                var autoAddRoles = await _context.AuthUsers
+                var autoAddPermissions = await _context.AuthUsers
                     .Where(x => x.UserId == userId && x.TenantId != null)
-                    .Select(x => x.UserTenant.TenantRoles.Where(y => y.RoleType == RoleTypes.TenantAutoAdd))
-                    .SingleOrDefaultAsync();
+                    .SelectMany(x => x.UserTenant.TenantRoles
+                        .Where(y => y.RoleType == RoleTypes.TenantAutoAdd)
+                        .Select(z => z.PackedPermissionsInRole))
+                    .ToListAsync();
 
-                if (autoAddRoles != null)
-                    permissionsForAllRoles.AddRange(autoAddRoles.Select(x => x.PackedPermissionsInRole));
+                if (autoAddPermissions.Any())
+                    permissionsForAllRoles.AddRange(autoAddPermissions);
             }
 
             if (!permissionsForAllRoles.Any())

ReleaseNotes.md

@@ -1,5 +1,9 @@
 # Release Notes
 
+## 2.3.1
+
+- Bug Fix: Problem in ClaimCalculator when used with multi-tenant applications - see issue #23 
+
 ## 2.3.0
 
 - New Feature: You can add extra claims to the user via the RegisterAddClaimToUser method