Merge pull request #1266 from Blazam-App/v1-Nightly

jacobsen9026 · web-flow · commit b6c8111e6b3d · 2025-10-27T16:13:42.000-04:00
v1.4.11 hotfix
diff --git a/BLAZAM/BLAZAM.csproj b/BLAZAM/BLAZAM.csproj
@@ -5,8 +5,8 @@
 		<Nullable>enable</Nullable>
 		<ImplicitUsings>enable</ImplicitUsings>
 		<ServerGarbageCollection>false</ServerGarbageCollection>
-		<AssemblyVersion>1.4.10</AssemblyVersion>
-		<Version>2025.10.24.1800</Version>
+		<AssemblyVersion>1.4.11</AssemblyVersion>
+		<Version>2025.10.27.1707</Version>
 		<IncludeSourceRevisionInInformationalVersion>false</IncludeSourceRevisionInInformationalVersion>
 		<RootNamespace>BLAZAM</RootNamespace>
 		<GenerateDocumentationFile>True</GenerateDocumentationFile>
diff --git a/BLAZAMActiveDirectory/Adapters/ADGroup.cs b/BLAZAMActiveDirectory/Adapters/ADGroup.cs
@@ -263,6 +263,7 @@ public async Task<IEnumerable<IGroupableDirectoryAdapter>> GetNestedMembersAsync
 
             ADSearch search = new(Directory);
             search.Fields.NestedMemberOf = this;
+            search.EnabledOnly = false;
             var result = await search.SearchAsync<GroupableDirectoryAdapter, IGroupableDirectoryAdapter>();
             return result;
 
@@ -284,6 +285,7 @@ public List<IGroupableDirectoryAdapter> Members
                 {
                     search.Results.Clear();
                     search.Fields.DN = t;
+                    search.EnabledOnly = false;
                     var member = search.Search<GroupableDirectoryAdapter, IGroupableDirectoryAdapter>()?.FirstOrDefault();
                     if (member != null)
                     {
diff --git a/BLAZAMSession/ApplicationUserStateService.cs b/BLAZAMSession/ApplicationUserStateService.cs
@@ -186,7 +186,10 @@ public void SetMFAUserState(MfaType mfaType, string mfaToken, IApplicationUserSt
             if (clonedPrincipal != null)
             {
                 // Create a fresh ApplicationUserState with the cloned principal so the queued MFARequest keeps a stable principal
+                var oldState = state;
                 state = CreateUserState(clonedPrincipal);
+                state.PermissionDelegates.AddRange(oldState.PermissionDelegates);
+                state.PermissionMappings.AddRange(oldState.PermissionMappings);
             }
             Loggers.SystemLogger.Information("ApplicationUserStateService.SetMFAUserState: Adding MFA request to queue for UserGUID {UserGUID}, MFAToken (hash): {MFATokenHash}.", state?.User?.FindFirstValue(ClaimTypes.Sid) ?? "Unknown", mfaToken?.GetAppHashCode().ToString() ?? "N/A");
             MFARequest mfaRequest = new(mfaType, mfaToken, returnURL, state);

Original file line number	Diff line number	Diff line change
`@@ -263,6 +263,7 @@ public async Task<IEnumerable<IGroupableDirectoryAdapter>> GetNestedMembersAsync`
`263`	`263`
`264`	`264`	`ADSearch search = new(Directory);`
`265`	`265`	`search.Fields.NestedMemberOf = this;`
	`266`	`+ search.EnabledOnly = false;`
`266`	`267`	`var result = await search.SearchAsync<GroupableDirectoryAdapter, IGroupableDirectoryAdapter>();`
`267`	`268`	`return result;`
`268`	`269`
`@@ -284,6 +285,7 @@ public List<IGroupableDirectoryAdapter> Members`
`284`	`285`	`{`
`285`	`286`	`search.Results.Clear();`
`286`	`287`	`search.Fields.DN = t;`
	`288`	`+ search.EnabledOnly = false;`
`287`	`289`	`var member = search.Search<GroupableDirectoryAdapter, IGroupableDirectoryAdapter>()?.FirstOrDefault();`
`288`	`290`	`if (member != null)`
`289`	`291`	`{`
Original file line number	Diff line number	Diff line change
`@@ -186,7 +186,10 @@ public void SetMFAUserState(MfaType mfaType, string mfaToken, IApplicationUserSt`
`186`	`186`	`if (clonedPrincipal != null)`
`187`	`187`	`{`
`188`	`188`	`// Create a fresh ApplicationUserState with the cloned principal so the queued MFARequest keeps a stable principal`
	`189`	`+ var oldState = state;`
`189`	`190`	`state = CreateUserState(clonedPrincipal);`
	`191`	`+ state.PermissionDelegates.AddRange(oldState.PermissionDelegates);`
	`192`	`+ state.PermissionMappings.AddRange(oldState.PermissionMappings);`
`190`	`193`	`}`
`191`	`194`	`Loggers.SystemLogger.Information("ApplicationUserStateService.SetMFAUserState: Adding MFA request to queue for UserGUID {UserGUID}, MFAToken (hash): {MFATokenHash}.", state?.User?.FindFirstValue(ClaimTypes.Sid) ?? "Unknown", mfaToken?.GetAppHashCode().ToString() ?? "N/A");`
`192`	`195`	`MFARequest mfaRequest = new(mfaType, mfaToken, returnURL, state);`