Updated mongoDb driver for compatibility with MongoDB >= 8 (#265)

CR4567 · Chris · web-flow · commit 6b5dbe530c41 · 2025-06-12T15:47:31.000+02:00
* updated mongoDb driver

* fix render issue in new mongo client update

* updated squidex packages

* add conditions for imagemagick

* fix ImageMagick conditional import

* moved build.props to correct folder

* some package adjustments

* added kafka package condition

---------

Co-authored-by: Chris &lt;reichelt@easierlife.de&gt;
diff --git a/Dockerfile b/Dockerfile
@@ -25,7 +25,7 @@ RUN dotnet restore
 COPY backend .
  
 # Test Backend
-RUN dotnet test --no-restore --filter Category!=Dependencies
+RUN dotnet test --no-restore --filter Category!=Dependencies --configuration Release
 
 # Publish
 RUN dotnet publish src/Notifo/Notifo.csproj --output /build/ --configuration Release -p:version=$NOTIFO__BUILD__VERSION
diff --git a/backend/Directory.Build.props b/backend/Directory.Build.props
@@ -0,0 +1,13 @@
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+    <PropertyGroup Condition="'$(Configuration)' == 'Debug'">
+        <DefineConstants>$(DefineConstants);INCLUDE_MAGICK;INCLUDE_KAFKA</DefineConstants>
+    </PropertyGroup>
+
+    <PropertyGroup Condition="'$(DefineConstants.Contains(INCLUDE_MAGICK))'">
+        <IncludeMagick>true</IncludeMagick>
+    </PropertyGroup>
+
+    <PropertyGroup Condition="'$(DefineConstants.Contains(INCLUDE_KAFKA))'">
+        <IncludeKafka>true</IncludeKafka>
+    </PropertyGroup>
+</Project>
diff --git a/backend/src/Notifo.Domain.Integrations/Notifo.Domain.Integrations.csproj b/backend/src/Notifo.Domain.Integrations/Notifo.Domain.Integrations.csproj
@@ -10,7 +10,6 @@
 
   <ItemGroup>
     <PackageReference Include="AWSSDK.SimpleEmail" Version="3.7.401.11" />
-    <PackageReference Include="Confluent.Kafka" Version="2.5.3" />
     <PackageReference Include="Discord.Net" Version="3.16.0" />
     <PackageReference Include="FirebaseAdmin" Version="3.0.1" />
     <PackageReference Include="FluentValidation" Version="11.10.0" />
@@ -23,9 +22,9 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Http" Version="8.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Http" Version="8.0.1" />
     <PackageReference Include="Microsoft.Extensions.Options" Version="8.0.2" />
-    <PackageReference Include="MongoDB.Driver" Version="2.28.0" />
+    <PackageReference Include="MongoDB.Driver" Version="2.30.0" />
     <PackageReference Include="NodaTime" Version="3.1.12" />
     <PackageReference Include="OpenNotifications" Version="0.3.0" />
     <PackageReference Include="RefactoringEssentials" Version="5.6.0" PrivateAssets="all" />
@@ -36,7 +35,7 @@
     <PackageReference Include="Telegram.Bot" Version="19.0.0" />
     <PackageReference Include="Twilio" Version="7.3.1" />
   </ItemGroup>
-
+  
   <ItemGroup>
     <ProjectReference Include="..\Notifo.Domain.Integrations.Abstractions\Notifo.Domain.Integrations.Abstractions.csproj" />
     <ProjectReference Include="..\Notifo.Infrastructure\Notifo.Infrastructure.csproj" />
diff --git a/backend/src/Notifo.Domain/Notifo.Domain.csproj b/backend/src/Notifo.Domain/Notifo.Domain.csproj
@@ -28,11 +28,11 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Http" Version="8.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Http" Version="8.0.1" />
     <PackageReference Include="Microsoft.Extensions.Options" Version="8.0.2" />
     <PackageReference Include="Mjml.Net" Version="4.1.0" />
     <PackageReference Include="Mjml.Net.PostProcessors" Version="4.1.0" />
-    <PackageReference Include="MongoDB.Driver" Version="2.28.0" />
+    <PackageReference Include="MongoDB.Driver" Version="2.30.0" />
     <PackageReference Include="NodaTime" Version="3.1.12" />
     <PackageReference Include="RefactoringEssentials" Version="5.6.0" PrivateAssets="all" />
     <PackageReference Include="System.Collections" Version="4.3.0" />
diff --git a/backend/src/Notifo.Identity/Notifo.Identity.csproj b/backend/src/Notifo.Identity/Notifo.Identity.csproj
@@ -19,7 +19,7 @@
 	<PackageReference Include="Microsoft.Extensions.Options" Version="8.0.2" />
 	<PackageReference Include="Microsoft.IdentityModel.Protocols.OpenIdConnect" Version="8.0.2" />
 	<PackageReference Include="OpenIddict.AspNetCore" Version="5.8.0" />
-	<PackageReference Include="Squidex.OpenIddict.MongoDb" Version="5.8.1" />
+	<PackageReference Include="Squidex.OpenIddict.MongoDb" Version="5.8.4" />
 	<PackageReference Include="RefactoringEssentials" Version="5.6.0" PrivateAssets="all" />
 	<PackageReference Include="StyleCop.Analyzers" Version="1.1.118" PrivateAssets="all" />
 	<PackageReference Include="System.Text.Json" Version="8.0.5" />
diff --git a/backend/src/Notifo.Infrastructure/Assets/AssetsServiceExtensions.cs b/backend/src/Notifo.Infrastructure/Assets/AssetsServiceExtensions.cs
@@ -9,6 +9,10 @@
 using MongoDB.Driver;
 using MongoDB.Driver.GridFS;
 using Squidex.Assets;
+#if INCLUDE_MAGICK
+using Squidex.Assets.ImageMagick;
+#endif
+using Squidex.Assets.ImageSharp;
 using Squidex.Assets.Remote;
 
 namespace Microsoft.Extensions.DependencyInjection;
@@ -17,11 +21,23 @@ public static class AssetsServiceExtensions
 {
     public static void AddMyAssets(this IServiceCollection services, IConfiguration config)
     {
-        var thumbnailGenerator = new CompositeThumbnailGenerator(
-            [
-                new ImageSharpThumbnailGenerator(),
-                new ImageMagickThumbnailGenerator()
-            ]);
+        services.AddSingletonAs<ImageSharpThumbnailGenerator>()
+            .AsSelf();
+
+#if INCLUDE_MAGICK
+        services.AddSingletonAs<ImageMagickThumbnailGenerator>()
+            .AsSelf();
+#endif
+
+        services.AddSingletonAs(c =>
+                new CompositeThumbnailGenerator(
+                [
+                    c.GetRequiredService<ImageSharpThumbnailGenerator>(),
+#if INCLUDE_MAGICK
+                    c.GetRequiredService<ImageMagickThumbnailGenerator>(),
+#endif
+                ]))
+            .AsSelf();
 
         var resizerUrl = config.GetValue<string>("assets:resizerUrl");
 
@@ -32,13 +48,15 @@ public static void AddMyAssets(this IServiceCollection services, IConfiguration
                 options.BaseAddress = new Uri(resizerUrl);
             });
 
-            services.AddSingletonAs(c => new RemoteThumbnailGenerator(c.GetRequiredService<IHttpClientFactory>(), thumbnailGenerator))
-                .As<IAssetThumbnailGenerator>();
+            services.AddSingletonAs<IAssetThumbnailGenerator>(c => new RemoteThumbnailGenerator(
+                    c.GetRequiredService<IHttpClientFactory>(),
+                    c.GetRequiredService<CompositeThumbnailGenerator>()))
+                .AsSelf();
         }
         else
         {
-            services.AddSingletonAs(c => thumbnailGenerator)
-                .As<IAssetThumbnailGenerator>();
+            services.AddSingletonAs<IAssetThumbnailGenerator>(c => c.GetRequiredService<CompositeThumbnailGenerator>())
+                .AsSelf();
         }
 
         config.ConfigureByOption("assetStore:type", new Alternatives
diff --git a/backend/src/Notifo.Infrastructure/MongoDb/MongoDbExtensions.cs b/backend/src/Notifo.Infrastructure/MongoDb/MongoDbExtensions.cs
@@ -113,10 +113,9 @@ public static FilterDefinition<T> Eq<T>(this FilterDefinitionBuilder<T> builder,
         return new RawFilterDefinition<T>(filter);
     }
 
-    private sealed class RawFilterDefinition<T>(BsonDocument document)
-    : FilterDefinition<T>
+    private sealed class RawFilterDefinition<T>(BsonDocument document) : FilterDefinition<T>
     {
-        public override BsonDocument Render(IBsonSerializer<T> documentSerializer, IBsonSerializerRegistry serializerRegistry, LinqProvider linqProvider)
+        public override BsonDocument Render(RenderArgs<T> args)
         {
             return document;
         }
diff --git a/backend/src/Notifo.Infrastructure/Notifo.Infrastructure.csproj b/backend/src/Notifo.Infrastructure/Notifo.Infrastructure.csproj
@@ -15,39 +15,42 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="Microsoft.Extensions.Caching.Abstractions" Version="8.0.0" />
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.1" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.2" />
     <PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="8.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.1" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Configuration" Version="8.0.0" />
-    <PackageReference Include="Microsoft.Extensions.ObjectPool" Version="8.0.8" />
+    <PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.1" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.3" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Configuration" Version="8.0.1" />
+    <PackageReference Include="Microsoft.Extensions.ObjectPool" Version="8.0.16" />
     <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="8.0.0" />
     <PackageReference Include="Microsoft.Extensions.Options.DataAnnotations" Version="8.0.0" />
-    <PackageReference Include="MongoDB.Driver" Version="2.28.0" />
+    <PackageReference Include="MongoDB.Driver" Version="2.30.0" />
     <PackageReference Include="MongoDB.Driver.Core.Extensions.DiagnosticSources" Version="1.5.0" />
     <PackageReference Include="NodaTime" Version="3.1.12" />
     <PackageReference Include="NodaTime.Serialization.SystemTextJson" Version="1.2.0" />
     <PackageReference Include="OpenTelemetry" Version="1.9.0" />
     <PackageReference Include="RefactoringEssentials" Version="5.6.0" PrivateAssets="all" />
-    <PackageReference Include="Squidex.Assets" Version="6.19.0" />
-    <PackageReference Include="Squidex.Assets.Azure" Version="6.19.0" />
-    <PackageReference Include="Squidex.Assets.FTP" Version="6.19.0" />
-    <PackageReference Include="Squidex.Assets.GoogleCloud" Version="6.19.0" />
-    <PackageReference Include="Squidex.Assets.ImageMagick" Version="6.19.0" />
-    <PackageReference Include="Squidex.Assets.ImageSharp" Version="6.19.0" />
-    <PackageReference Include="Squidex.Assets.Mongo" Version="6.19.0" />
-    <PackageReference Include="Squidex.Assets.S3" Version="6.19.0" />
-    <PackageReference Include="Squidex.Caching" Version="6.19.0" />
-    <PackageReference Include="Squidex.Hosting" Version="6.19.0" />
-    <PackageReference Include="Squidex.Hosting.Abstractions" Version="6.19.0" />
-    <PackageReference Include="Squidex.Log" Version="6.19.0" />
-    <PackageReference Include="Squidex.Messaging" Version="6.19.0" />
-    <PackageReference Include="Squidex.Text" Version="6.19.0" />
+    <PackageReference Include="Squidex.Assets" Version="7.22.0" />
+    <PackageReference Include="Squidex.Assets.Azure" Version="7.22.0" />
+    <PackageReference Include="Squidex.Assets.FTP" Version="7.22.0" />
+    <PackageReference Include="Squidex.Assets.GoogleCloud" Version="7.22.0" />
+    <PackageReference Include="Squidex.Assets.ImageSharp" Version="7.22.0" />
+    <PackageReference Include="Squidex.Assets.Mongo" Version="7.22.0" />
+    <PackageReference Include="Squidex.Assets.S3" Version="7.22.0" />
+    <PackageReference Include="Squidex.Caching" Version="7.22.0" />
+    <PackageReference Include="Squidex.Hosting" Version="7.22.0" />
+    <PackageReference Include="Squidex.Hosting.Abstractions" Version="7.22.0" />
+    <PackageReference Include="Squidex.Log" Version="7.22.0" />
+    <PackageReference Include="Squidex.Messaging" Version="7.22.0" />
+    <PackageReference Include="Squidex.Text" Version="7.22.0" />
     <PackageReference Include="StyleCop.Analyzers" Version="1.1.118" PrivateAssets="all" />
     <PackageReference Include="System.Text.Json" Version="8.0.5" />
     <PackageReference Include="System.Threading.Tasks.Dataflow" Version="8.0.1" />
   </ItemGroup>
 
+  <ItemGroup Condition="'$(IncludeMagick)' == 'true'">
+    <PackageReference Include="Squidex.Assets.ImageMagick" Version="7.22.0" />
+  </ItemGroup>
+  
   <ItemGroup>
     <AdditionalFiles Include="..\..\stylecop.json" Link="stylecop.json" />
   </ItemGroup>
diff --git a/backend/src/Notifo/Areas/Account/Pages/Setup.cshtml.cs b/backend/src/Notifo/Areas/Account/Pages/Setup.cshtml.cs
@@ -13,6 +13,7 @@
 using Notifo.Identity;
 using Notifo.Infrastructure.Reflection;
 using Squidex.Assets;
+using Squidex.Assets.FTP;
 using NotifoValidationException = Notifo.Infrastructure.Validation.ValidationException;
 
 #pragma warning disable MA0048 // File name must match type name
diff --git a/backend/src/Notifo/Notifo.csproj b/backend/src/Notifo/Notifo.csproj
@@ -19,7 +19,7 @@
     <PackageReference Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="8.0.8" />
     <PackageReference Include="Microsoft.AspNetCore.SignalR.StackExchangeRedis" Version="8.0.8" />
     <PackageReference Include="Microsoft.AspNetCore.SpaServices.Extensions" Version="8.0.8" />
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.1" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.2" />
     <PackageReference Include="Microsoft.Extensions.Options" Version="8.0.2" />
     <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="8.0.5" />
     <PackageReference Include="Namotion.Reflection" Version="3.1.1" />
@@ -30,7 +30,7 @@
     <PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.9.0" />
     <PackageReference Include="OpenTelemetry.Instrumentation.Http" Version="1.9.0" />
     <PackageReference Include="RefactoringEssentials" Version="5.6.0" PrivateAssets="all" />
-    <PackageReference Include="Squidex.Messaging.All" Version="6.19.0" />
+    <PackageReference Include="Squidex.Messaging.All" Version="7.22.0" />
     <PackageReference Include="Squidex.OpenTelemetry.Exporter.Stackdriver" Version="0.0.0-alpha.0.97" />
     <PackageReference Include="StyleCop.Analyzers" Version="1.1.118" PrivateAssets="all" />
     <PackageReference Include="System.Text.Json" Version="8.0.5" />
@@ -43,6 +43,10 @@
     <ProjectReference Include="..\Notifo.Infrastructure\Notifo.Infrastructure.csproj" />
   </ItemGroup>
 
+  <ItemGroup Condition="'$(IncludeKafka)' == 'true'">
+    <PackageReference Include="Squidex.Messaging.Kafka" Version="7.23.0" />
+  </ItemGroup>
+
   <ItemGroup>
     <None Remove="Areas\Api\Controllers\TrackingPixel.png" />
   </ItemGroup>
diff --git a/backend/src/Notifo/ServiceExtensions.cs b/backend/src/Notifo/ServiceExtensions.cs
@@ -59,10 +59,21 @@ public static void AddMyStorage(this IServiceCollection services, IConfiguration
 
     public static void AddMyMessaging(this IServiceCollection services, IConfiguration config)
     {
-        services.AddMessaging()
-            .AddTransport(config)
+        var builder = services.AddMessaging()
             .AddMyUserEvents(config)
             .AddMyUserNotifications(config);
+
+#if INCLUDE_KAFKA
+        var type = config.GetValue<string>("messaging:type");
+
+        if (string.Equals(type, "Kafka", StringComparison.OrdinalIgnoreCase))
+        {
+            builder.AddKafkaTransport(config);
+            return;
+        }
+#endif
+
+        builder.AddTransport(config);
     }
 
     public static void AddMyClustering(this IServiceCollection services, IConfiguration config, SignalROptions signalROptions)

Original file line number	Diff line number	Diff line change
`@@ -113,10 +113,9 @@ public static FilterDefinition<T> Eq<T>(this FilterDefinitionBuilder<T> builder,`
`113`	`113`	`return new RawFilterDefinition<T>(filter);`
`114`	`114`	`}`
`115`	`115`
`116`		`- private sealed class RawFilterDefinition<T>(BsonDocument document)`
`117`		`- : FilterDefinition<T>`
	`116`	`+ private sealed class RawFilterDefinition<T>(BsonDocument document) : FilterDefinition<T>`
`118`	`117`	`{`
`119`		`- public override BsonDocument Render(IBsonSerializer<T> documentSerializer, IBsonSerializerRegistry serializerRegistry, LinqProvider linqProvider)`
	`118`	`+ public override BsonDocument Render(RenderArgs<T> args)`
`120`	`119`	`{`
`121`	`120`	`return document;`
`122`	`121`	`}`