fix(auth-validator): [PM-22975] Client Version Validator - Updated with removal of cqrs approach in favor of static user checks. Also fixed tests

src/Core/Entities/User.cs

@@ -212,14 +212,31 @@ public class User : ITableObject<Guid>, IStorableSubscriber, IRevisable, ITwoFac
         return SecurityVersion ?? 1;
     }
 
-    public bool IsSetupForV2Encryption()
+    /// <summary>
+    /// Evaluates user state to determine if they are currently in a v2 encryption state.
+    /// </summary>
+    /// <returns>If the shape of their private key is v2 as well as has the proper security version then true, otherwise false</returns>
+    public bool HasV2Encryption()
     {
         return HasV2KeyShape() && IsSecurityVersionTwo();
     }
 
     private bool HasV2KeyShape()
     {
-        return EncryptionParsing.GetEncryptionType(PrivateKey) == EncryptionType.XChaCha20Poly1305_B64;
+        if (string.IsNullOrEmpty(PrivateKey))
+        {
+            return false;
+        }
+
+        try
+        {
+            return EncryptionParsing.GetEncryptionType(PrivateKey) == EncryptionType.XChaCha20Poly1305_B64;
+        }
+        catch (ArgumentException)
+        {
+            // Invalid encryption string format - treat as not v2
+            return false;
+        }
     }
 
     /// <summary>

src/Core/KeyManagement/KeyManagementServiceCollectionExtensions.cs

@@ -26,6 +26,5 @@ public static class KeyManagementServiceCollectionExtensions
     private static void AddKeyManagementQueries(this IServiceCollection services)
     {
         services.AddScoped<IUserAccountKeysQuery, UserAccountKeysQuery>();
-        services.AddScoped<IGetMinimumClientVersionForUserQuery, GetMinimumClientVersionForUserQuery>();
     }
 }

src/Core/KeyManagement/Queries/GetMinimumClientVersionForUserQuery.cs

@@ -1,23 +0,0 @@
-using Bit.Core.Entities;
-using Bit.Core.KeyManagement.Queries.Interfaces;
-
-namespace Bit.Core.KeyManagement.Queries;
-
-public class GetMinimumClientVersionForUserQuery()
-    : IGetMinimumClientVersionForUserQuery
-{
-    public Task<Version?> Run(User? user)
-    {
-        if (user == null)
-        {
-            return Task.FromResult<Version?>(null);
-        }
-
-        if (user.IsSetupForV2Encryption())
-        {
-            return Task.FromResult(Constants.MinimumClientVersionForV2Encryption)!;
-        }
-
-        return Task.FromResult<Version?>(null);
-    }
-}

src/Core/KeyManagement/Queries/Interfaces/IGetMinimumClientVersionForUserQuery.cs

@@ -1,8 +0,0 @@
-using Bit.Core.Entities;
-
-namespace Bit.Core.KeyManagement.Queries.Interfaces;
-
-public interface IGetMinimumClientVersionForUserQuery
-{
-    Task<Version?> Run(User? user);
-}