From a74cd045c0a67e0caef98bc79d2064f53b3cd792 Mon Sep 17 00:00:00 2001
From: vnugent <public@vaughnnugent.com>
Date: Sat, 27 Apr 2024 17:39:50 -0400
Subject: Squashed commit of the following:

commit 377c8a5f8bb272eff5089094f5b764eb043b728f
Author: vnugent <public@vaughnnugent.com>
Date:   Sat Apr 27 17:28:25 2024 -0400

    fix: Missing cookie set on cred regen

commit a12873dceecc72c9af3966002bfca9faefc5aac7
Merge: 2963bf6 8d57b05
Author: vnugent <public@vaughnnugent.com>
Date:   Sat Apr 20 12:07:42 2024 -0400

    Merge branch 'master' into develop

commit 2963bf62919b3bfac4aa5055d57fe91f93ca8a0b
Author: vnugent <public@vaughnnugent.com>
Date:   Sat Apr 20 11:59:45 2024 -0400

    chore: Package updates

commit 9539717a751baae762498a2cadfe94ef8fda5830
Merge: 44803e0 a7cf7c8
Author: vnugent <public@vaughnnugent.com>
Date:   Mon Apr 8 22:04:26 2024 -0400

    Merge branch 'master' into develop

commit 44803e06d1aa45496c04127930aa8897272d42f6
Author: vnugent <public@vaughnnugent.com>
Date:   Mon Apr 8 21:41:38 2024 -0400

    fix: dangling/expired session security check and cookie cleanup

commit 1082bd146549a1aff47877bcd28e6be1ce0ef5e9
Author: vnugent <public@vaughnnugent.com>
Date:   Sat Mar 30 22:20:29 2024 -0400

    feat(app): Add AppData client plugin and browser library updated

commit ec9b42f4cacbeae8a0b4d96e48bd9e522b3a9145
Merge: 2a11454 27b487b
Author: vnugent <public@vaughnnugent.com>
Date:   Sun Mar 24 21:16:05 2024 -0400

    Merge branch 'master' into develop

commit 2a114541a3bfddae887adaa98c1ed326b125d511
Author: vnugent <public@vaughnnugent.com>
Date:   Sun Mar 24 20:53:38 2024 -0400

    refactor: pull apart session authorization for future dev

commit f8aea6453ddb2d56c1ce2ecb6a9e67d1af523c2e
Author: vnugent <public@vaughnnugent.com>
Date:   Thu Mar 21 14:33:21 2024 -0400

    feat: Add optional svg base64 icons for social OAuth2 connections

commit cc29bed99dc9e151315cce75e50d55dca306b532
Author: vnugent <public@vaughnnugent.com>
Date:   Sun Mar 10 21:58:27 2024 -0400

    source tree project location updated
---
 .../src/VNLib.Plugins.Essentials.Accounts.Registration.csproj        | 5 +----
 .../src/SecurityProvider/AccountSecProvider.cs                       | 5 ++++-
 .../src/VNLib.Plugins.Essentials.Accounts.csproj                     | 1 -
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/plugins/VNLib.Plugins.Essentials.Accounts.Registration/src/VNLib.Plugins.Essentials.Accounts.Registration.csproj b/plugins/VNLib.Plugins.Essentials.Accounts.Registration/src/VNLib.Plugins.Essentials.Accounts.Registration.csproj
index 6f1ea65..51033cc 100644
--- a/plugins/VNLib.Plugins.Essentials.Accounts.Registration/src/VNLib.Plugins.Essentials.Accounts.Registration.csproj
+++ b/plugins/VNLib.Plugins.Essentials.Accounts.Registration/src/VNLib.Plugins.Essentials.Accounts.Registration.csproj
@@ -42,10 +42,7 @@
       <PackagePath>\</PackagePath>
     </None>
   </ItemGroup>
-  
-  <ItemGroup>
-    <PackageReference Include="FluentValidation" Version="11.9.0" />
-  </ItemGroup>
+ 
   <ItemGroup>
     <ProjectReference Include="..\..\..\..\core\lib\Plugins.Essentials\src\VNLib.Plugins.Essentials.csproj" />
     <ProjectReference Include="..\..\..\..\Emails.Transactional\lib\Emails.Transactional.Client\src\Emails.Transactional.Client.csproj" />
diff --git a/plugins/VNLib.Plugins.Essentials.Accounts/src/SecurityProvider/AccountSecProvider.cs b/plugins/VNLib.Plugins.Essentials.Accounts/src/SecurityProvider/AccountSecProvider.cs
index 4f8bcd3..46c52cb 100644
--- a/plugins/VNLib.Plugins.Essentials.Accounts/src/SecurityProvider/AccountSecProvider.cs
+++ b/plugins/VNLib.Plugins.Essentials.Accounts/src/SecurityProvider/AccountSecProvider.cs
@@ -120,7 +120,7 @@ namespace VNLib.Plugins.Essentials.Accounts.SecurityProvider
                 else if (ClientWebAuthManager.IsSessionElevated(in session))
                 {
                     //If the session stored a user-agent, make sure it matches the connection
-                    if (session.UserAgent != null && !session.UserAgent.Equals(entity.Server.UserAgent, StringComparison.Ordinal))
+                    if (string.Equals(session.UserAgent, entity.Server.UserAgent, StringComparison.Ordinal))
                     {
                         _logger.Debug("Denied authorized connection from {ip} because user-agent changed", entity.TrustedRemoteIp);
                         return ValueTask.FromResult(FileProcessArgs.Deny);
@@ -209,6 +209,9 @@ namespace VNLib.Plugins.Essentials.Accounts.SecurityProvider
                 throw new InvalidOperationException("The user does not have the required public key token stored");
             }
 
+            //re-set the client status cookie on successful re-auth
+            _statusCookie.SetCookie(entity, entity.Session.HasLocalAccount() ? "1" : "2");
+
             return new EncryptedTokenAuthorization(clientData);
         }
 
diff --git a/plugins/VNLib.Plugins.Essentials.Accounts/src/VNLib.Plugins.Essentials.Accounts.csproj b/plugins/VNLib.Plugins.Essentials.Accounts/src/VNLib.Plugins.Essentials.Accounts.csproj
index a9c207a..b5f7374 100644
--- a/plugins/VNLib.Plugins.Essentials.Accounts/src/VNLib.Plugins.Essentials.Accounts.csproj
+++ b/plugins/VNLib.Plugins.Essentials.Accounts/src/VNLib.Plugins.Essentials.Accounts.csproj
@@ -49,7 +49,6 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="FluentValidation" Version="11.9.0" />
   </ItemGroup>
 
   <ItemGroup>
-- 
cgit