Merge pull request #1393 from ITfoxtec/test

Revsgaard · web-flow · commit df56320be56a · 2025-11-25T14:56:53.000+01:00
Add save active session if up-party change form marker session.
diff --git a/src/FoxIDs.Control/FoxIDs.Control.csproj b/src/FoxIDs.Control/FoxIDs.Control.csproj
@@ -2,7 +2,7 @@
 
 	<PropertyGroup>
 		<TargetFramework>net9.0</TargetFramework>
-		<Version>2.9.8</Version>
+		<Version>2.9.9</Version>
 		<RootNamespace>FoxIDs</RootNamespace>
 		<Authors>Anders Revsgaard</Authors>
 		<Company>FoxIDs</Company>
diff --git a/src/FoxIDs.ControlClient/FoxIDs.ControlClient.csproj b/src/FoxIDs.ControlClient/FoxIDs.ControlClient.csproj
@@ -2,7 +2,7 @@
 
 	<PropertyGroup>
 		<TargetFramework>net9.0</TargetFramework>
-		<Version>2.9.8</Version>
+		<Version>2.9.9</Version>
 		<RootNamespace>FoxIDs.Client</RootNamespace>
 		<Authors>Anders Revsgaard</Authors>
 		<Company>FoxIDs</Company>
diff --git a/src/FoxIDs.ControlShared/FoxIDs.ControlShared.csproj b/src/FoxIDs.ControlShared/FoxIDs.ControlShared.csproj
@@ -2,7 +2,7 @@
 
 	<PropertyGroup>
 		<TargetFramework>net9.0</TargetFramework>
-		<Version>2.9.8</Version>
+		<Version>2.9.9</Version>
 		<RootNamespace>FoxIDs</RootNamespace>
 		<Authors>Anders Revsgaard</Authors>
 		<Company>FoxIDs</Company>
diff --git a/src/FoxIDs.Shared/FoxIDs.Shared.csproj b/src/FoxIDs.Shared/FoxIDs.Shared.csproj
@@ -2,7 +2,7 @@
 
 	<PropertyGroup>
 		<TargetFramework>net9.0</TargetFramework>
-		<Version>2.9.8</Version>
+		<Version>2.9.9</Version>
 		<RootNamespace>FoxIDs</RootNamespace>
 		<Authors>Anders Revsgaard</Authors>
 		<Company>FoxIDs</Company>
diff --git a/src/FoxIDs.SharedBase/FoxIDs.SharedBase.csproj b/src/FoxIDs.SharedBase/FoxIDs.SharedBase.csproj
@@ -2,7 +2,7 @@
 
 	<PropertyGroup>
 		<TargetFramework>net9.0</TargetFramework>
-		<Version>2.9.8</Version>
+		<Version>2.9.9</Version>
 		<RootNamespace>FoxIDs</RootNamespace>
 		<Authors>Anders Revsgaard</Authors>
 		<Company>FoxIDs</Company>
diff --git a/src/FoxIDs/FoxIDs.csproj b/src/FoxIDs/FoxIDs.csproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk.Web">
 	<PropertyGroup>
 		<TargetFramework>net9.0</TargetFramework>
-		<Version>2.9.8</Version>
+		<Version>2.9.9</Version>
 		<RootNamespace>FoxIDs</RootNamespace>
 		<Authors>Anders Revsgaard</Authors>
 		<Company>FoxIDs</Company>
diff --git a/src/FoxIDs/Logic/ExternalLogin/ExternalLoginPageLogic.cs b/src/FoxIDs/Logic/ExternalLogin/ExternalLoginPageLogic.cs
@@ -96,7 +96,7 @@ public async Task<IActionResult> LoginResponseUpdateSessionAsync(ExternalLoginUp
         {
             if (session != null && await sessionLogic.UpdateSessionAsync(extLoginUpParty, session))
             {
-                await sessionLogic.AddOrUpdateSessionTrackAsync(extLoginUpParty, sequenceData.DownPartyLink, updateDbActiveSession: true);
+                await sessionLogic.AddOrUpdateSessionTrackAsync(extLoginUpParty, sequenceData.DownPartyLink, saveDbActiveSession: true);
                 (var transformedClaims, var actionResult) = await TransformClaimsAsync(extLoginUpParty, sequenceData, session.Claims.ToClaimList());
                 if (actionResult != null)
                 {
diff --git a/src/FoxIDs/Logic/Login/LoginPageLogic.cs b/src/FoxIDs/Logic/Login/LoginPageLogic.cs
@@ -368,7 +368,7 @@ public async Task<IActionResult> LoginResponseUpdateSessionAsync(LoginUpParty lo
         {
             if (session != null && await sessionLogic.UpdateSessionAsync(loginUpParty, session))
             {
-                await sessionLogic.AddOrUpdateSessionTrackAsync(loginUpParty, sequenceData.DownPartyLink, updateDbActiveSession: true);
+                await sessionLogic.AddOrUpdateSessionTrackAsync(loginUpParty, sequenceData.DownPartyLink, saveDbActiveSession: true);
                 (var transformedClaims, var actionResult) = await TransformClaimsAsync(loginUpParty, sequenceData, session.Claims.ToClaimList());
                 if (actionResult != null)
                 {
diff --git a/src/FoxIDs/Logic/Tracks/SessionBaseLogic.cs b/src/FoxIDs/Logic/Tracks/SessionBaseLogic.cs
@@ -76,7 +76,7 @@ protected bool SessionEnabled<T>(T upParty) where T : IUpParty
             return upParty.SessionLifetime > 0 || upParty.PersistentSessionAbsoluteLifetime > 0 || upParty.PersistentSessionLifetimeUnlimited;
         }
 
-        public async Task AddOrUpdateSessionTrackAsync<T>(T upParty, DownPartySessionLink downPartyLink, bool updateDbActiveSession = false) where T : IUpParty
+        public async Task AddOrUpdateSessionTrackAsync<T>(T upParty, DownPartySessionLink downPartyLink, bool saveDbActiveSession = false) where T : IUpParty
         {
             (var session, var sessionGroups) = await LoadSessionTrackAsync(upParty, downPartyLink);
             foreach (var sessionGroup in sessionGroups)
@@ -89,13 +89,13 @@ public async Task AddOrUpdateSessionTrackAsync<T>(T upParty, DownPartySessionLin
             }
             await sessionTrackCookieRepository.SaveAsync(session);
 
-            if (updateDbActiveSession)
+            if (saveDbActiveSession)
             {
                 await activeSessionLogic.SaveSessionAsync(sessionGroups, session.CreateTime, session.LastUpdated);
             }
         }
 
-        protected async Task AddOrUpdateSessionTrackWithClaimsAsync<T>(T upParty, IEnumerable<ClaimAndValues> claims, bool updateDbActiveSession = false) where T : IUpParty
+        protected async Task AddOrUpdateSessionTrackWithClaimsAsync<T>(T upParty, IEnumerable<ClaimAndValues> claims, bool saveDbActiveSession = false) where T : IUpParty
         {
             (var session, var sessionGroups) = await LoadSessionTrackAsync(upParty, null);
             foreach (var sessionGroup in sessionGroups)
@@ -109,7 +109,7 @@ protected async Task AddOrUpdateSessionTrackWithClaimsAsync<T>(T upParty, IEnume
             }
             await sessionTrackCookieRepository.SaveAsync(session);
 
-            if (updateDbActiveSession && claims?.Any() == true)
+            if (saveDbActiveSession && claims?.Any() == true)
             {
                 await activeSessionLogic.SaveSessionAsync(sessionGroups, session.CreateTime, session.LastUpdated);
             }
diff --git a/src/FoxIDs/Logic/Tracks/SessionLoginUpPartyLogic.cs b/src/FoxIDs/Logic/Tracks/SessionLoginUpPartyLogic.cs
@@ -51,7 +51,7 @@ public async Task CreateSessionAsync(IUpParty upParty, long authTime, LoginUserI
                 session.CreateTime = authTime;
                 session.LastUpdated = authTime;
                 SetLoginUserIdentifier(session, loginUserIdentifier);
-                await AddOrUpdateSessionTrackWithClaimsAsync(upParty, session.Claims, updateDbActiveSession: true);
+                await AddOrUpdateSessionTrackWithClaimsAsync(upParty, session.Claims, saveDbActiveSession: true);
                 await sessionCookieRepository.SaveAsync(upParty, session, GetPersistentCookieExpires(upParty, session.CreateTime));
                 logger.ScopeTrace(() => $"Session created, User id '{session.UserIdClaim}', Session id '{session.SessionIdClaim}'.", GetSessionScopeProperties(session));
             }
@@ -79,7 +79,7 @@ public async Task<bool> UpdateSessionAsync(IUpParty upParty, SessionLoginUpParty
                 {
                     SetLoginUserIdentifier(session, loginUserIdentifier);
                 }
-                await AddOrUpdateSessionTrackWithClaimsAsync(upParty, session.Claims, updateDbActiveSession: false);
+                await AddOrUpdateSessionTrackWithClaimsAsync(upParty, session.Claims);
                 await sessionCookieRepository.SaveAsync(upParty, session, GetPersistentCookieExpires(upParty, session.CreateTime));
                 logger.ScopeTrace(() => $"Session updated, Session id '{session.SessionIdClaim}'.", GetSessionScopeProperties(session));
                 return true;
diff --git a/src/FoxIDs/Logic/Tracks/SessionUpPartyLogic.cs b/src/FoxIDs/Logic/Tracks/SessionUpPartyLogic.cs
@@ -91,10 +91,12 @@ public async Task<string> CreateOrUpdateSessionAsync<T>(T upParty, List<Claim> c
                 logger.ScopeTrace(() => $"User id '{session.UserIdClaim}' session for authentication method exists, Enabled '{sessionEnabled}', Valid '{sessionValid}', Session id '{session.SessionIdClaim}', Route '{RouteBinding.Route}'.");
                 if (sessionEnabled && sessionValid && activeSessionExists)
                 {
+                    var saveDbActiveSession = false;
                     if (session.IsMarkerSession)
                     {
                         updateAction(session);
                         session.IsMarkerSession = false;
+                        saveDbActiveSession = true;
                     }
 
                     var userId = sessionClaims.FindFirstOrDefaultValue(c => c.Type == JwtClaimTypes.Subject);
@@ -110,7 +112,7 @@ public async Task<string> CreateOrUpdateSessionAsync<T>(T upParty, List<Claim> c
                         updateAction(session);
                     }
 
-                    await AddOrUpdateSessionTrackWithClaimsAsync(upParty, session.Claims, updateDbActiveSession: false);
+                    await AddOrUpdateSessionTrackWithClaimsAsync(upParty, session.Claims, saveDbActiveSession: saveDbActiveSession);
                     session.LastUpdated = DateTimeOffset.UtcNow.ToUnixTimeSeconds();
                     await sessionCookieRepository.SaveAsync(upParty, session, null);
                     logger.ScopeTrace(() => $"Session updated authentication method, Session id '{session.SessionIdClaim}'.", GetSessionScopeProperties(session));
@@ -133,7 +135,7 @@ public async Task<string> CreateOrUpdateSessionAsync<T>(T upParty, List<Claim> c
                 updateAction(session);
                 session.LastUpdated = session.CreateTime;
 
-                await AddOrUpdateSessionTrackWithClaimsAsync(upParty, session.Claims, updateDbActiveSession: true);
+                await AddOrUpdateSessionTrackWithClaimsAsync(upParty, session.Claims, saveDbActiveSession: true);
                 await sessionCookieRepository.SaveAsync(upParty, session, null);
                 logger.ScopeTrace(() => $"Session for authentication method created, User id '{session.UserIdClaim}', Session id '{session.SessionIdClaim}', External Session id '{externalSessionId}'.", GetSessionScopeProperties(session));
 

Original file line number	Diff line number	Diff line change
`@@ -96,7 +96,7 @@ public async Task<IActionResult> LoginResponseUpdateSessionAsync(ExternalLoginUp`
`96`	`96`	`{`
`97`	`97`	`if (session != null && await sessionLogic.UpdateSessionAsync(extLoginUpParty, session))`
`98`	`98`	`{`
`99`		`- await sessionLogic.AddOrUpdateSessionTrackAsync(extLoginUpParty, sequenceData.DownPartyLink, updateDbActiveSession: true);`
	`99`	`+ await sessionLogic.AddOrUpdateSessionTrackAsync(extLoginUpParty, sequenceData.DownPartyLink, saveDbActiveSession: true);`
`100`	`100`	`(var transformedClaims, var actionResult) = await TransformClaimsAsync(extLoginUpParty, sequenceData, session.Claims.ToClaimList());`
`101`	`101`	`if (actionResult != null)`
`102`	`102`	`{`
Original file line number	Diff line number	Diff line change
`@@ -368,7 +368,7 @@ public async Task<IActionResult> LoginResponseUpdateSessionAsync(LoginUpParty lo`
`368`	`368`	`{`
`369`	`369`	`if (session != null && await sessionLogic.UpdateSessionAsync(loginUpParty, session))`
`370`	`370`	`{`
`371`		`- await sessionLogic.AddOrUpdateSessionTrackAsync(loginUpParty, sequenceData.DownPartyLink, updateDbActiveSession: true);`
	`371`	`+ await sessionLogic.AddOrUpdateSessionTrackAsync(loginUpParty, sequenceData.DownPartyLink, saveDbActiveSession: true);`
`372`	`372`	`(var transformedClaims, var actionResult) = await TransformClaimsAsync(loginUpParty, sequenceData, session.Claims.ToClaimList());`
`373`	`373`	`if (actionResult != null)`
`374`	`374`	`{`
Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,7 @@ protected bool SessionEnabled<T>(T upParty) where T : IUpParty`
`76`	`76`	`return upParty.SessionLifetime > 0 \|\| upParty.PersistentSessionAbsoluteLifetime > 0 \|\| upParty.PersistentSessionLifetimeUnlimited;`
`77`	`77`	`}`
`78`	`78`
`79`		`- public async Task AddOrUpdateSessionTrackAsync<T>(T upParty, DownPartySessionLink downPartyLink, bool updateDbActiveSession = false) where T : IUpParty`
	`79`	`+ public async Task AddOrUpdateSessionTrackAsync<T>(T upParty, DownPartySessionLink downPartyLink, bool saveDbActiveSession = false) where T : IUpParty`
`80`	`80`	`{`
`81`	`81`	`(var session, var sessionGroups) = await LoadSessionTrackAsync(upParty, downPartyLink);`
`82`	`82`	`foreach (var sessionGroup in sessionGroups)`
`@@ -89,13 +89,13 @@ public async Task AddOrUpdateSessionTrackAsync<T>(T upParty, DownPartySessionLin`
`89`	`89`	`}`
`90`	`90`	`await sessionTrackCookieRepository.SaveAsync(session);`
`91`	`91`
`92`		`- if (updateDbActiveSession)`
	`92`	`+ if (saveDbActiveSession)`
`93`	`93`	`{`
`94`	`94`	`await activeSessionLogic.SaveSessionAsync(sessionGroups, session.CreateTime, session.LastUpdated);`
`95`	`95`	`}`
`96`	`96`	`}`
`97`	`97`
`98`		`- protected async Task AddOrUpdateSessionTrackWithClaimsAsync<T>(T upParty, IEnumerable<ClaimAndValues> claims, bool updateDbActiveSession = false) where T : IUpParty`
	`98`	`+ protected async Task AddOrUpdateSessionTrackWithClaimsAsync<T>(T upParty, IEnumerable<ClaimAndValues> claims, bool saveDbActiveSession = false) where T : IUpParty`
`99`	`99`	`{`
`100`	`100`	`(var session, var sessionGroups) = await LoadSessionTrackAsync(upParty, null);`
`101`	`101`	`foreach (var sessionGroup in sessionGroups)`
`@@ -109,7 +109,7 @@ protected async Task AddOrUpdateSessionTrackWithClaimsAsync<T>(T upParty, IEnume`
`109`	`109`	`}`
`110`	`110`	`await sessionTrackCookieRepository.SaveAsync(session);`
`111`	`111`
`112`		`- if (updateDbActiveSession && claims?.Any() == true)`
	`112`	`+ if (saveDbActiveSession && claims?.Any() == true)`
`113`	`113`	`{`
`114`	`114`	`await activeSessionLogic.SaveSessionAsync(sessionGroups, session.CreateTime, session.LastUpdated);`
`115`	`115`	`}`
Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ public async Task CreateSessionAsync(IUpParty upParty, long authTime, LoginUserI`
`51`	`51`	`session.CreateTime = authTime;`
`52`	`52`	`session.LastUpdated = authTime;`
`53`	`53`	`SetLoginUserIdentifier(session, loginUserIdentifier);`
`54`		`- await AddOrUpdateSessionTrackWithClaimsAsync(upParty, session.Claims, updateDbActiveSession: true);`
	`54`	`+ await AddOrUpdateSessionTrackWithClaimsAsync(upParty, session.Claims, saveDbActiveSession: true);`
`55`	`55`	`await sessionCookieRepository.SaveAsync(upParty, session, GetPersistentCookieExpires(upParty, session.CreateTime));`
`56`	`56`	`logger.ScopeTrace(() => $"Session created, User id '{session.UserIdClaim}', Session id '{session.SessionIdClaim}'.", GetSessionScopeProperties(session));`
`57`	`57`	`}`
`@@ -79,7 +79,7 @@ public async Task<bool> UpdateSessionAsync(IUpParty upParty, SessionLoginUpParty`
`79`	`79`	`{`
`80`	`80`	`SetLoginUserIdentifier(session, loginUserIdentifier);`
`81`	`81`	`}`
`82`		`- await AddOrUpdateSessionTrackWithClaimsAsync(upParty, session.Claims, updateDbActiveSession: false);`
	`82`	`+ await AddOrUpdateSessionTrackWithClaimsAsync(upParty, session.Claims);`
`83`	`83`	`await sessionCookieRepository.SaveAsync(upParty, session, GetPersistentCookieExpires(upParty, session.CreateTime));`
`84`	`84`	`logger.ScopeTrace(() => $"Session updated, Session id '{session.SessionIdClaim}'.", GetSessionScopeProperties(session));`
`85`	`85`	`return true;`