Merge branch 'master' of github.com:Squidex/squidex

# Conflicts: # backend/Squidex.sln # backend/src/Squidex.Data.MongoDb/Squidex.Data.MongoDb.csproj # backend/src/Squidex.Domain.Apps.Core.Operations/Squidex.Domain.Apps.Core.Operations.csproj # backend/src/Squidex.Infrastructure/Squidex.Infrastructure.csproj # backend/src/Squidex/Squidex.csproj # backend/tests/Squidex.Data.Tests/MongoDb/Infrastructure/MongoQueryTests.cs # backend/tests/Squidex.Data.Tests/Squidex.Data.Tests.csproj
Squidex · Jan 20, 2025 · 25e04d9 · 25e04d9
2 parents 401f175 + d998f65
commit 25e04d9
Show file tree

Hide file tree

Showing 22 changed files with 107 additions and 89 deletions.
diff --git a/backend/Squidex.sln b/backend/Squidex.sln
@@ -22,8 +22,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Squidex.Shared", "src\Squid
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Squidex.Domain.Users", "src\Squidex.Domain.Users\Squidex.Domain.Users.csproj", "{F7771E22-47BD-45C4-A133-FD7F1DE27CA0}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Squidex.Domain.Users.MongoDb", "src\Squidex.Domain.Users.MongoDb\Squidex.Domain.Users.MongoDb.csproj", "{27CF800D-890F-4882-BF05-44EC3233537D}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Squidex.Domain.Users.Tests", "tests\Squidex.Domain.Users.Tests\Squidex.Domain.Users.Tests.csproj", "{42184546-E3CB-4D4F-9495-43979B9C63B9}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{360C300D-0F7E-439D-A437-714C959E3CAD}"
@@ -54,9 +52,9 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Migrations", "src\Migration
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "data", "data", "{3378B841-53F8-48CC-87C1-1B30CF912BFD}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Squidex.Data.MongoDb", "src\Squidex.Data.MongoDb\Squidex.Data.MongoDb.csproj", "{F754F05E-02FF-47B2-AB46-BB05C7E6B29D}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Squidex.Data.MongoDb", "src\Squidex.Data.MongoDb\Squidex.Data.MongoDb.csproj", "{F754F05E-02FF-47B2-AB46-BB05C7E6B29D}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Squidex.Data.Tests", "tests\Squidex.Data.Tests\Squidex.Data.Tests.csproj", "{AA2F3C32-E3C8-4DF3-A365-F25C7EC19BCD}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Squidex.Data.Tests", "tests\Squidex.Data.Tests\Squidex.Data.Tests.csproj", "{AA2F3C32-E3C8-4DF3-A365-F25C7EC19BCD}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -132,18 +130,6 @@ Global
 		{F7771E22-47BD-45C4-A133-FD7F1DE27CA0}.Release|x64.Build.0 = Release|Any CPU
 		{F7771E22-47BD-45C4-A133-FD7F1DE27CA0}.Release|x86.ActiveCfg = Release|Any CPU
 		{F7771E22-47BD-45C4-A133-FD7F1DE27CA0}.Release|x86.Build.0 = Release|Any CPU
-		{27CF800D-890F-4882-BF05-44EC3233537D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{27CF800D-890F-4882-BF05-44EC3233537D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{27CF800D-890F-4882-BF05-44EC3233537D}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{27CF800D-890F-4882-BF05-44EC3233537D}.Debug|x64.Build.0 = Debug|Any CPU
-		{27CF800D-890F-4882-BF05-44EC3233537D}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{27CF800D-890F-4882-BF05-44EC3233537D}.Debug|x86.Build.0 = Debug|Any CPU
-		{27CF800D-890F-4882-BF05-44EC3233537D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{27CF800D-890F-4882-BF05-44EC3233537D}.Release|Any CPU.Build.0 = Release|Any CPU
-		{27CF800D-890F-4882-BF05-44EC3233537D}.Release|x64.ActiveCfg = Release|Any CPU
-		{27CF800D-890F-4882-BF05-44EC3233537D}.Release|x64.Build.0 = Release|Any CPU
-		{27CF800D-890F-4882-BF05-44EC3233537D}.Release|x86.ActiveCfg = Release|Any CPU
-		{27CF800D-890F-4882-BF05-44EC3233537D}.Release|x86.Build.0 = Release|Any CPU
 		{42184546-E3CB-4D4F-9495-43979B9C63B9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{42184546-E3CB-4D4F-9495-43979B9C63B9}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{42184546-E3CB-4D4F-9495-43979B9C63B9}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -287,7 +273,6 @@ Global
 		{FD0AFD44-7A93-4F9E-B5ED-72582392E435} = {4C6B06C2-6D77-4E0E-AE32-D7050236433A}
 		{5E75AB7D-6F01-4313-AFF1-7F7128FFD71F} = {7EDE8CF1-B1E4-4005-B154-834B944E0D7A}
 		{F7771E22-47BD-45C4-A133-FD7F1DE27CA0} = {7EDE8CF1-B1E4-4005-B154-834B944E0D7A}
-		{27CF800D-890F-4882-BF05-44EC3233537D} = {7EDE8CF1-B1E4-4005-B154-834B944E0D7A}
 		{42184546-E3CB-4D4F-9495-43979B9C63B9} = {7EDE8CF1-B1E4-4005-B154-834B944E0D7A}
 		{F0A83301-50A5-40EA-A1A2-07C7858F5A3F} = {4C6B06C2-6D77-4E0E-AE32-D7050236433A}
 		{6B3F75B6-5888-468E-BA4F-4FC725DAEF31} = {4C6B06C2-6D77-4E0E-AE32-D7050236433A}

diff --git a/backend/src/Squidex.Data.MongoDb/Squidex.Data.MongoDb.csproj b/backend/src/Squidex.Data.MongoDb/Squidex.Data.MongoDb.csproj
@@ -25,11 +25,11 @@
     <PackageReference Include="MongoDB.Driver.Core.Extensions.DiagnosticSources" Version="1.5.0" />
     <PackageReference Include="MongoDB.Driver.GridFS" Version="2.30.0" />
     <PackageReference Include="RefactoringEssentials" Version="5.6.0" PrivateAssets="all" />
-    <PackageReference Include="Squidex.AI.Mongo" Version="6.26.0" />
-    <PackageReference Include="Squidex.Assets.Mongo" Version="6.26.0" />
-    <PackageReference Include="Squidex.Events.Mongo" Version="6.26.0" />
-    <PackageReference Include="Squidex.Hosting" Version="6.26.0" />
-    <PackageReference Include="Squidex.Messaging.Mongo" Version="6.26.0" />
+    <PackageReference Include="Squidex.AI.Mongo" Version="6.28.0" />
+    <PackageReference Include="Squidex.Assets.Mongo" Version="6.28.0" />
+    <PackageReference Include="Squidex.Events.Mongo" Version="6.28.0" />
+    <PackageReference Include="Squidex.Hosting" Version="6.28.0" />
+    <PackageReference Include="Squidex.Messaging.Mongo" Version="6.28.0" />
     <PackageReference Include="Squidex.OpenIddict.MongoDb" Version="5.8.1" />
     <PackageReference Include="StyleCop.Analyzers" Version="1.1.118" PrivateAssets="all" />
     <PackageReference Include="System.ValueTuple" Version="4.5.0" />

diff --git a/backend/src/Squidex.Domain.Apps.Core.Operations/Squidex.Domain.Apps.Core.Operations.csproj b/backend/src/Squidex.Domain.Apps.Core.Operations/Squidex.Domain.Apps.Core.Operations.csproj
@@ -28,8 +28,8 @@
     <PackageReference Include="Microsoft.Extensions.Http" Version="8.0.1" />
     <PackageReference Include="NJsonSchema" Version="11.0.2" />
     <PackageReference Include="RefactoringEssentials" Version="5.6.0" PrivateAssets="all" />
-    <PackageReference Include="Squidex.AI" Version="6.26.0" />
-    <PackageReference Include="Squidex.Messaging.Subscriptions" Version="6.26.0" />
+    <PackageReference Include="Squidex.AI" Version="6.28.0" />
+    <PackageReference Include="Squidex.Messaging.Subscriptions" Version="6.28.0" />
     <PackageReference Include="StyleCop.Analyzers" Version="1.1.118" PrivateAssets="all" />
     <PackageReference Include="System.Collections.Immutable" Version="8.0.0" />
     <PackageReference Include="System.Linq.Async" Version="6.0.1" />

diff --git a/backend/src/Squidex.Infrastructure/Squidex.Infrastructure.csproj b/backend/src/Squidex.Infrastructure/Squidex.Infrastructure.csproj
@@ -24,13 +24,13 @@
     <PackageReference Include="NodaTime" Version="3.2.0" />
     <PackageReference Include="OpenTelemetry.Api" Version="1.9.0" />
     <PackageReference Include="RefactoringEssentials" Version="5.6.0" PrivateAssets="all" />
-    <PackageReference Include="Squidex.Assets" Version="6.26.0" />
-    <PackageReference Include="Squidex.Caching" Version="6.26.0" />
-    <PackageReference Include="Squidex.Events" Version="6.26.0" />
-    <PackageReference Include="Squidex.Hosting.Abstractions" Version="6.26.0" />
-    <PackageReference Include="Squidex.Log" Version="6.26.0" />
-    <PackageReference Include="Squidex.Messaging" Version="6.26.0" />
-    <PackageReference Include="Squidex.Text" Version="6.26.0" />
+    <PackageReference Include="Squidex.Assets" Version="6.28.0" />
+    <PackageReference Include="Squidex.Caching" Version="6.28.0" />
+    <PackageReference Include="Squidex.Events" Version="6.28.0" />
+    <PackageReference Include="Squidex.Hosting.Abstractions" Version="6.28.0" />
+    <PackageReference Include="Squidex.Log" Version="6.28.0" />
+    <PackageReference Include="Squidex.Messaging" Version="6.28.0" />
+    <PackageReference Include="Squidex.Text" Version="6.28.0" />
     <PackageReference Include="StyleCop.Analyzers" Version="1.1.118" PrivateAssets="all" />
     <PackageReference Include="System.Collections.Immutable" Version="8.0.0" />
     <PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />

diff --git a/backend/src/Squidex/Config/Domain/SerializationServices.cs b/backend/src/Squidex/Config/Domain/SerializationServices.cs
@@ -26,6 +26,7 @@
 using Squidex.Domain.Apps.Core.Schemas;
 using Squidex.Domain.Apps.Core.Schemas.Json;
 using Squidex.Domain.Apps.Events;
+using Squidex.Events.Utils;
 using Squidex.Infrastructure;
 using Squidex.Infrastructure.Commands;
 using Squidex.Infrastructure.EventSourcing;
@@ -48,6 +49,7 @@ private static JsonSerializerOptions ConfigureJson(TypeRegistry typeRegistry, Js
         options.Converters.Add(new StringConverter<PropertyPath>(x => x));
 
         options.ConfigureForNodaTime(DateTimeZoneProviders.Tzdb);
+        options.Converters.Add(new HeaderValueConverter());
         options.Converters.Add(new GeoJsonConverterFactory());
         options.Converters.Add(new PolymorphicConverter<IEvent>(typeRegistry));
         options.Converters.Add(new PolymorphicConverter<EnrichedEvent>(typeRegistry));

diff --git a/backend/src/Squidex/Squidex.csproj b/backend/src/Squidex/Squidex.csproj
@@ -61,20 +61,18 @@
     <PackageReference Include="OpenTelemetry.Instrumentation.Runtime" Version="1.9.0" />
     <PackageReference Include="RefactoringEssentials" Version="5.6.0" PrivateAssets="all" />
     <PackageReference Include="ReportGenerator" Version="5.4.1" PrivateAssets="all" />
-    <PackageReference Include="Squidex.Assets.Azure" Version="6.26.0" />
-    <PackageReference Include="Squidex.Assets.GoogleCloud" Version="6.26.0" />
-    <PackageReference Include="Squidex.Assets.FTP" Version="6.26.0" />
-    <PackageReference Include="Squidex.Assets.ImageMagick" Version="6.26.0" />
-    <PackageReference Include="Squidex.Assets.ImageSharp" Version="6.26.0" />
-    <PackageReference Include="Squidex.Assets.Mongo" Version="6.26.0" />
-    <PackageReference Include="Squidex.Assets.S3" Version="6.26.0" />
-    <PackageReference Include="Squidex.Assets.TusAdapter" Version="6.26.0" />
+    <PackageReference Include="Squidex.Assets.Azure" Version="6.28.0" />
+    <PackageReference Include="Squidex.Assets.GoogleCloud" Version="6.28.0" />
+    <PackageReference Include="Squidex.Assets.FTP" Version="6.28.0" />
+    <PackageReference Include="Squidex.Assets.ImageMagick" Version="6.28.0" />
+    <PackageReference Include="Squidex.Assets.ImageSharp" Version="6.28.0" />
+    <PackageReference Include="Squidex.Assets.S3" Version="6.28.0" />
+    <PackageReference Include="Squidex.Assets.TusAdapter" Version="6.28.0" />
     <PackageReference Include="Squidex.ClientLibrary" Version="20.1.0" />
-    <PackageReference Include="Squidex.Events.GetEventStore" Version="6.26.0" />
-    <PackageReference Include="Squidex.Hosting" Version="6.26.0" />
-    <PackageReference Include="Squidex.Messaging.All" Version="6.26.0" />
-    <PackageReference Include="Squidex.Messaging.Subscriptions" Version="6.26.0" />
-    <PackageReference Include="Squidex.OpenIddict.MongoDb" Version="5.8.1" />
+    <PackageReference Include="Squidex.Events.GetEventStore" Version="6.28.0" />
+    <PackageReference Include="Squidex.Hosting" Version="6.28.0" />
+    <PackageReference Include="Squidex.Messaging.All" Version="6.28.0" />
+    <PackageReference Include="Squidex.Messaging.Subscriptions" Version="6.28.0" />
     <PackageReference Include="StyleCop.Analyzers" Version="1.1.118" PrivateAssets="all" />
     <PackageReference Include="YDotNet" Version="0.4.1" />
     <PackageReference Include="YDotNet.Native" Version="0.4.1" />

diff --git a/backend/tests/Squidex.Data.Tests/MongoDb/Infrastructure/MongoQueryTests.cs b/backend/tests/Squidex.Data.Tests/MongoDb/Infrastructure/MongoQueryTests.cs
@@ -11,15 +11,14 @@
 using NodaTime.Text;
 using Squidex.Infrastructure;
 using Squidex.Infrastructure.Queries;
-using Squidex.Infrastructure.TestHelpers;
 using Squidex.TestHelpers;
 using ClrFilter = Squidex.Infrastructure.Queries.ClrFilter;
 
 namespace Squidex.MongoDb.Infrastructure;
 
 public class MongoQueryTests
 {
-    private sealed class TestEntity
+    public sealed class TestEntity
     {
         public DomainId Id { get; set; }
 

diff --git a/backend/tests/Squidex.Data.Tests/Squidex.Data.Tests.csproj b/backend/tests/Squidex.Data.Tests/Squidex.Data.Tests.csproj
@@ -17,7 +17,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="FakeItEasy" Version="8.3.0" />
-    <PackageReference Include="FluentAssertions" Version="6.12.2" />
+    <PackageReference Include="FluentAssertions" Version="[7.0.0]" />
     <PackageReference Include="Meziantou.Analyzer" Version="2.0.179">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

diff --git a/backend/tests/Squidex.Domain.Apps.Core.Tests/Squidex.Domain.Apps.Core.Tests.csproj b/backend/tests/Squidex.Domain.Apps.Core.Tests/Squidex.Domain.Apps.Core.Tests.csproj
@@ -14,7 +14,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="FakeItEasy" Version="8.3.0" />
-    <PackageReference Include="FluentAssertions" Version="6.12.2" />
+    <PackageReference Include="FluentAssertions" Version="[7.0.0]" />
     <PackageReference Include="Meziantou.Analyzer" Version="2.0.179">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

diff --git a/backend/tests/Squidex.Domain.Apps.Core.Tests/TestHelpers/TestUtils.cs b/backend/tests/Squidex.Domain.Apps.Core.Tests/TestHelpers/TestUtils.cs
@@ -23,6 +23,7 @@
 using Squidex.Domain.Apps.Core.Schemas;
 using Squidex.Domain.Apps.Core.Schemas.Json;
 using Squidex.Domain.Apps.Events;
+using Squidex.Events.Utils;
 using Squidex.Infrastructure;
 using Squidex.Infrastructure.Commands;
 using Squidex.Infrastructure.EventSourcing;
@@ -80,13 +81,23 @@ public static JsonSerializerOptions DefaultOptions(Action<JsonSerializerOptions>
 
         options.ConfigureForNodaTime(DateTimeZoneProviders.Tzdb);
         options.Converters.Add(new GeoJsonConverterFactory());
-        options.Converters.Add(new PolymorphicConverter<IEvent>(TypeRegistry));
+        options.Converters.Add(new HeaderValueConverter());
+        options.Converters.Add(new JsonValueConverter());
         options.Converters.Add(new PolymorphicConverter<FieldProperties>(TypeRegistry));
+        options.Converters.Add(new PolymorphicConverter<IEvent>(TypeRegistry));
         options.Converters.Add(new PolymorphicConverter<RuleAction>(TypeRegistry));
         options.Converters.Add(new PolymorphicConverter<RuleTrigger>(TypeRegistry));
-        options.Converters.Add(new JsonValueConverter());
         options.Converters.Add(new ReadonlyDictionaryConverterFactory());
         options.Converters.Add(new ReadonlyListConverterFactory());
+        options.Converters.Add(new StringConverter<CompareOperator>());
+        options.Converters.Add(new StringConverter<DomainId>());
+        options.Converters.Add(new StringConverter<Language>());
+        options.Converters.Add(new StringConverter<NamedId<DomainId>>());
+        options.Converters.Add(new StringConverter<NamedId<Guid>>());
+        options.Converters.Add(new StringConverter<NamedId<long>>());
+        options.Converters.Add(new StringConverter<NamedId<string>>());
+        options.Converters.Add(new StringConverter<RefToken>());
+        options.Converters.Add(new StringConverter<Status>());
         options.Converters.Add(new SurrogateJsonConverter<ClaimsPrincipal, ClaimsPrincipalSurrogate>());
         options.Converters.Add(new SurrogateJsonConverter<FieldCollection<RootField>, FieldsSurrogate>());
         options.Converters.Add(new SurrogateJsonConverter<FilterNode<JsonValue>, JsonFilterSurrogate>());
@@ -97,15 +108,6 @@ public static JsonSerializerOptions DefaultOptions(Action<JsonSerializerOptions>
         options.Converters.Add(new SurrogateJsonConverter<Schema, SchemaSurrogate>());
         options.Converters.Add(new SurrogateJsonConverter<WorkflowStep, WorkflowStepSurrogate>());
         options.Converters.Add(new SurrogateJsonConverter<WorkflowTransition, WorkflowTransitionSurrogate>());
-        options.Converters.Add(new StringConverter<CompareOperator>());
-        options.Converters.Add(new StringConverter<DomainId>());
-        options.Converters.Add(new StringConverter<NamedId<DomainId>>());
-        options.Converters.Add(new StringConverter<NamedId<Guid>>());
-        options.Converters.Add(new StringConverter<NamedId<long>>());
-        options.Converters.Add(new StringConverter<NamedId<string>>());
-        options.Converters.Add(new StringConverter<Language>());
-        options.Converters.Add(new StringConverter<RefToken>());
-        options.Converters.Add(new StringConverter<Status>());
         options.Converters.Add(new JsonStringEnumConverter());
         options.IncludeFields = true;
         options.TypeInfoResolver = new DefaultJsonTypeInfoResolver()

diff --git a/backend/tests/Squidex.Domain.Apps.Entities.Tests/Contents/GraphQL/GraphQLTestBase.cs b/backend/tests/Squidex.Domain.Apps.Entities.Tests/Contents/GraphQL/GraphQLTestBase.cs
@@ -118,6 +118,7 @@ protected CachingGraphQLResolver CreateSut(params Schema[] schemas)
 
         var serviceProvider =
             new ServiceCollection()
+                .AddSingleton(TimeProvider.System)
                 .AddLogging(options =>
                 {
                     options.AddDebug();

diff --git a/backend/tests/Squidex.Domain.Apps.Entities.Tests/Squidex.Domain.Apps.Entities.Tests.csproj b/backend/tests/Squidex.Domain.Apps.Entities.Tests/Squidex.Domain.Apps.Entities.Tests.csproj
@@ -21,7 +21,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="FakeItEasy" Version="8.3.0" />
-    <PackageReference Include="FluentAssertions" Version="6.12.2" />
+    <PackageReference Include="FluentAssertions" Version="[7.0.0]" />
     <PackageReference Include="GraphQL" Version="8.2.1" />
     <PackageReference Include="GraphQL.SystemTextJson" Version="8.2.1" />
     <PackageReference Include="Lorem.Universal.Net" Version="4.0.80" />

diff --git a/backend/tests/Squidex.Domain.Apps.Entities.Tests/TestHelpers/VerifySettings.cs b/backend/tests/Squidex.Domain.Apps.Entities.Tests/TestHelpers/VerifySettings.cs
@@ -9,6 +9,7 @@
 using Argon;
 using NodaTime;
 using NodaTime.Text;
+using Squidex.Events;
 using Squidex.Infrastructure;
 using Squidex.Infrastructure.Json.Objects;
 
@@ -47,6 +48,28 @@ public override void Write(VerifyJsonWriter writer, JsonObject value)
         }
     }
 
+    private sealed class HeaderValueConverter : WriteOnlyJsonConverter<HeaderValue>
+    {
+        public override void Write(VerifyJsonWriter writer, HeaderValue value)
+        {
+            switch (value.Value)
+            {
+                case string s:
+                    writer.WriteValue(s);
+                    break;
+                case double n:
+                    writer.WriteValue(n);
+                    break;
+                case bool b:
+                    writer.WriteValue(b);
+                    break;
+                case null:
+                    writer.WriteNull();
+                    break;
+            }
+        }
+    }
+
     private sealed class JsonValueConverter : WriteOnlyJsonConverter<JsonValue>
     {
         public override void Write(VerifyJsonWriter writer, JsonValue value)
@@ -128,15 +151,22 @@ public static void Initialize()
 
         VerifierSettings.AddExtraSettings(s =>
         {
+            s.Converters.Add(new HeaderValueConverter());
             s.Converters.Add(new JsonArrayConverter());
             s.Converters.Add(new JsonObjectConverter());
             s.Converters.Add(new JsonValueConverter());
             s.ContractResolver = new ContractResolver(s.ContractResolver!);
         });
 
+        static bool IsDateTime(object? value)
+        {
+            return value is string s && InstantPattern.ExtendedIso.Parse(s).Success;
+        }
+
         VerifierSettings.ScrubInlineGuids();
         VerifierSettings.IgnoreMembersWithType<Instant>();
-        VerifierSettings.IgnoreInstance<JsonValue>(x => x.Type == JsonValueType.String && InstantPattern.ExtendedIso.Parse(x.ToString()).Success);
+        VerifierSettings.IgnoreInstance<HeaderValue>(x => IsDateTime(x.Value));
+        VerifierSettings.IgnoreInstance<JsonValue>(x => IsDateTime(x.Value));
         VerifierSettings.IgnoreMember("Secret");
     }
 }
diff --git a/backend/tests/Squidex.Domain.Users.Tests/Squidex.Domain.Users.Tests.csproj b/backend/tests/Squidex.Domain.Users.Tests/Squidex.Domain.Users.Tests.csproj
@@ -8,14 +8,13 @@
     <Nullable>enable</Nullable>
   </PropertyGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\src\Squidex.Domain.Users.MongoDb\Squidex.Domain.Users.MongoDb.csproj" />
     <ProjectReference Include="..\..\src\Squidex.Domain.Users\Squidex.Domain.Users.csproj" />
     <ProjectReference Include="..\..\src\Squidex.Infrastructure\Squidex.Infrastructure.csproj" />
     <ProjectReference Include="..\..\src\Squidex.Shared\Squidex.Shared.csproj" />
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="FakeItEasy" Version="8.3.0" />
-    <PackageReference Include="FluentAssertions" Version="6.12.2" />
+    <PackageReference Include="FluentAssertions" Version="[7.0.0]" />
     <PackageReference Include="Meziantou.Analyzer" Version="2.0.179">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>