provide hook for configuring lifetime scope before it is built

Chris Santero · Chris Santero · commit d973bb1087d9 · 2015-07-13T16:48:07.000-04:00
diff --git a/JSONAPI.AcceptanceTests.EntityFrameworkTestWebApp/Startup.cs b/JSONAPI.AcceptanceTests.EntityFrameworkTestWebApp/Startup.cs
@@ -33,17 +33,6 @@ public Startup(Func<TestDbContext> dbContextFactory)
 
         public void Configuration(IAppBuilder app)
         {
-            var containerBuilder = new ContainerBuilder();
-            containerBuilder.Register(c => _dbContextFactory())
-                .AsSelf()
-                .As<DbContext>()
-                .InstancePerRequest();
-            containerBuilder.RegisterModule<JsonApiAutofacEntityFrameworkModule>();
-            containerBuilder.RegisterType<CustomEntityFrameworkResourceObjectMaterializer>()
-                .As<IEntityFrameworkResourceObjectMaterializer>();
-            containerBuilder.RegisterApiControllers(Assembly.GetExecutingAssembly());
-            var container = containerBuilder.Build();
-
             var configuration = new JsonApiConfiguration();
             configuration.RegisterEntityFrameworkResourceType<Building>();
             configuration.RegisterEntityFrameworkResourceType<City>();
@@ -70,7 +59,18 @@ public void Configuration(IAppBuilder app)
             }); // Example of a resource that is mapped from a DB entity
             configuration.RegisterResourceType<StarshipOfficerDto>();
 
-            var configurator = new JsonApiHttpAutofacConfigurator(container);
+            var configurator = new JsonApiHttpAutofacConfigurator();
+            configurator.OnApplicationLifetimeScopeCreating(builder =>
+            {
+                builder.Register(c => _dbContextFactory())
+                    .AsSelf()
+                    .As<DbContext>()
+                    .InstancePerRequest();
+                builder.RegisterModule<JsonApiAutofacEntityFrameworkModule>();
+                builder.RegisterType<CustomEntityFrameworkResourceObjectMaterializer>()
+                    .As<IEntityFrameworkResourceObjectMaterializer>();
+                builder.RegisterApiControllers(Assembly.GetExecutingAssembly());
+            });
             configurator.OnApplicationLifetimeScopeBegun(applicationLifetimeScope =>
             {
                 // TODO: is this a candidate for spinning into a JSONAPI.Autofac.WebApi.Owin package? Yuck
diff --git a/JSONAPI.Autofac/JsonApiHttpAutofacConfigurator.cs b/JSONAPI.Autofac/JsonApiHttpAutofacConfigurator.cs
@@ -9,25 +9,44 @@ namespace JSONAPI.Autofac
     public class JsonApiHttpAutofacConfigurator
     {
         private readonly ILifetimeScope _lifetimeScope;
+        private Action<ContainerBuilder> _appLifetimeScopeCreating;
         private Action<ILifetimeScope> _appLifetimeScopeBegunAction;
 
+        public JsonApiHttpAutofacConfigurator()
+        {
+        }
+
         public JsonApiHttpAutofacConfigurator(ILifetimeScope lifetimeScope)
         {
             _lifetimeScope = lifetimeScope;
         }
 
+        public void OnApplicationLifetimeScopeCreating(Action<ContainerBuilder> appLifetimeScopeCreating)
+        {
+            _appLifetimeScopeCreating = appLifetimeScopeCreating;
+        }
+
         public void OnApplicationLifetimeScopeBegun(Action<ILifetimeScope> appLifetimeScopeBegunAction)
         {
             _appLifetimeScopeBegunAction = appLifetimeScopeBegunAction;
         }
 
         public void Apply(HttpConfiguration httpConfiguration, IJsonApiConfiguration jsonApiConfiguration)
         {
-            var applicationLifetimeScope = _lifetimeScope.BeginLifetimeScope(containerBuilder =>
+            ILifetimeScope applicationLifetimeScope;
+            if (_lifetimeScope == null)
             {
-                var module = new JsonApiAutofacModule(jsonApiConfiguration);
-                containerBuilder.RegisterModule(module);
-            });
+                var builder = new ContainerBuilder();
+                ConfigureApplicationLifetimeScope(jsonApiConfiguration, builder);
+                applicationLifetimeScope = builder.Build();
+            }
+            else
+            {
+                applicationLifetimeScope = _lifetimeScope.BeginLifetimeScope(containerBuilder =>
+                {
+                    ConfigureApplicationLifetimeScope(jsonApiConfiguration, containerBuilder);
+                });
+            }
 
             if (_appLifetimeScopeBegunAction != null)
                 _appLifetimeScopeBegunAction(applicationLifetimeScope);
@@ -36,5 +55,14 @@ public void Apply(HttpConfiguration httpConfiguration, IJsonApiConfiguration jso
             jsonApiHttpConfiguration.Apply(httpConfiguration);
             httpConfiguration.DependencyResolver = new AutofacWebApiDependencyResolver(applicationLifetimeScope);
         }
+
+        private void ConfigureApplicationLifetimeScope(IJsonApiConfiguration jsonApiConfiguration, ContainerBuilder containerBuilder)
+        {
+            var module = new JsonApiAutofacModule(jsonApiConfiguration);
+            containerBuilder.RegisterModule(module);
+
+            if (_appLifetimeScopeCreating != null)
+                _appLifetimeScopeCreating(containerBuilder); 
+        }
     }
 }
