Fix to make scoped dependencies work in router.

gautema · Sep 18, 2017 · 6b469d3 · 6b469d3
1 parent b196157
commit 6b469d3
Showing 1 changed file with 26 additions and 5 deletions.
diff --git a/Sample/CQRSWeb/Startup.cs b/Sample/CQRSWeb/Startup.cs
@@ -14,6 +14,8 @@
 using System.Linq;
 using CQRSlite.Messages;
 using CQRSlite.Routing;
+using Microsoft.AspNetCore.Http;
+using ISession = CQRSlite.Domain.ISession;
 
 namespace CQRSWeb
 {
@@ -29,10 +31,10 @@ public IServiceProvider ConfigureServices(IServiceCollection services)
             services.AddSingleton<ICommandSender>(y => y.GetService<Router>());
             services.AddSingleton<IEventPublisher>(y => y.GetService<Router>());
             services.AddSingleton<IHandlerRegistrar>(y => y.GetService<Router>());
-            services.AddScoped<ISession, Session>();
             services.AddSingleton<IEventStore, InMemoryEventStore>();
-            services.AddScoped<ICache, MemoryCache>();
+            services.AddSingleton<ICache, MemoryCache>();
             services.AddScoped<IRepository>(y => new CacheRepository(new Repository(y.GetService<IEventStore>()), y.GetService<IEventStore>(), y.GetService<ICache>()));
+            services.AddScoped<ISession, Session>();
 
             services.AddTransient<IReadModelFacade, ReadModelFacade>();
 
@@ -48,13 +50,12 @@ public IServiceProvider ConfigureServices(IServiceCollection services)
                     .AsSelf()
                     .WithTransientLifetime()
             );
-
             // Add framework services.
             services.AddMvc();
 
-            //Register router
+            //Register routes
             var serviceProvider = services.BuildServiceProvider();
-            var registrar = new RouteRegistrar(serviceProvider);
+            var registrar = new RouteRegistrar(new Provider(serviceProvider));
             registrar.Register(typeof(InventoryCommandHandlers));
 
             return serviceProvider;
@@ -74,4 +75,24 @@ public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerF
             });
         }
     }
+
+
+    //This makes scoped services work inside router.
+    public class Provider : IServiceProvider
+    {
+        private readonly ServiceProvider _serviceProvider;
+        private readonly IHttpContextAccessor _contextAccessor;
+
+        public Provider(ServiceProvider serviceProvider)
+        {
+            _serviceProvider = serviceProvider;
+            _contextAccessor = _serviceProvider.GetService<IHttpContextAccessor>();
+        }
+
+        public object GetService(Type serviceType)
+        {
+            return _contextAccessor?.HttpContext?.RequestServices.GetService(serviceType) ??
+                   _serviceProvider.GetService(serviceType);
+        }
+    }
 }