call ModulesMiddleware from sharedFeaturesMiddleware

ModularMonolith.sln

@@ -45,7 +45,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Modules.Subscriptions.Integ
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Web", "Web", "{079BF8CF-63EB-4836-ABB1-FD49B5EE5AD5}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Shared.Client", "Source\Shared\Client\Shared.Client.csproj", "{FCC4866D-C903-4F2D-8A03-19AE86DA180B}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Shared.Client", "Source\Shared\Client\Shared.Client.csproj", "{FCC4866D-C903-4F2D-8A03-19AE86DA180B}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

Source/Modules/TenantIdentity/Features/DomainFeatures/TenantAggregate/Application/Commands/RemoveUserFromTenant.cs

@@ -1,6 +1,5 @@
 using Modules.TenantIdentity.Features.Infrastructure.EFCore;
 using Shared.Features.CQRS.Command;
-using Shared.Kernel.BuildingBlocks;
 using System.Threading;
 
 namespace Modules.TenantIdentity.Features.DomainFeatures.TenantAggregate.Application.Commands

Source/Shared/Client/Components/Modals/DefaultModalOptions.cs

@@ -0,0 +1,6 @@
+namespace Shared.Client.Components.Modals
+{
+    public class DefaultModalOptions
+    {
+    }
+}

Source/Shared/Client/Components/Modals/DeletionReassuranceModal.razor

@@ -0,0 +1 @@
+

Source/Shared/Features/CQRS/Query/IQueryHandler.cs

@@ -1,6 +1,4 @@
-using Shared.Features.Server;
-
-namespace Shared.Features.CQRS.Query
+namespace Shared.Features.CQRS.Query
 {
     public interface IQueryHandler<in TQuery, TQueryResult> where TQuery : IQuery<TQueryResult>
     {

Source/Shared/Features/Modules/Registrator.cs

@@ -33,7 +33,7 @@ public static void AddModules(this IServiceCollection services)
             services.RegisterCQRS(startupModules.Where(sm => sm.Startup.FeaturesAssembly is not null).Select(sm => sm.Startup.FeaturesAssembly).ToArray());
         }
 
-        public static IApplicationBuilder UseModules(this IApplicationBuilder app, IHostEnvironment env)
+        public static IApplicationBuilder UseModulesMiddleware(this IApplicationBuilder app, IHostEnvironment env)
         {
             // Adds endpoints defined in modules
             var modules = app

Source/Shared/Features/Registrator.cs

@@ -1,4 +1,5 @@
 using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.Hosting;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Shared.Features.CQRS;
@@ -26,10 +27,11 @@ public static IServiceCollection AddSharedFeatures(this IServiceCollection servi
             return services;
         }
 
-        public static IApplicationBuilder UseSharedFeaturesMiddleware(this IApplicationBuilder app)
+        public static IApplicationBuilder UseSharedFeaturesMiddleware(this IApplicationBuilder app, IWebHostEnvironment env)
         {
             app.UseEFCoreMiddleware();
             app.UseServerExecutionContextMiddleware();
+            app.UseModulesMiddleware(env);
 
             return app;
         }

Source/Shared/Features/Server/ExecutionContext/ServerExecutionContext.cs

@@ -3,10 +3,6 @@
 using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
-using Shared.Features.CQRS.Command;
-using Shared.Features.CQRS.DomainEvent;
-using Shared.Features.CQRS.IntegrationEvent;
-using Shared.Features.CQRS.Query;
 using Shared.Kernel.BuildingBlocks;
 using Shared.Kernel.BuildingBlocks.Auth;
 using Shared.Kernel.Extensions.ClaimsPrincipal;

Source/Web/Server/Startup.cs

@@ -10,7 +10,6 @@
 using Shared.Features.Modules;
 using Shared.Features;
 using Modules.Subscription.Server;
-using Shared.Features.Server.ExecutionContext;
 
 namespace Web.Server
 {
@@ -67,9 +66,7 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
             app.UseAuthorization();
 
             app.UseBuildingBlocksMiddleware();
-            app.UseSharedFeaturesMiddleware();
-
-            app.UseModules(env);
+            app.UseSharedFeaturesMiddleware(env);
 
             app.UseEndpoints(endpoints =>
             {