More flexible per-request IoC registration

Author: Daniel15

src/React.Web/WebInitializer.cs

@@ -9,6 +9,7 @@
 
 using System.Web;
 using Microsoft.Web.Infrastructure.DynamicModuleHelper;
+using React.TinyIoC;
 using React.Web;
 using React.Web.TinyIoC;
 
@@ -26,10 +27,25 @@ internal static class WebInitializer
 		/// </summary>
 		public static void Initialize()
 		{
-			Initializer.Initialize(() => new HttpContextLifetimeProvider());
+			Initializer.Initialize(AsPerRequestSingleton);
 			DynamicModuleUtility.RegisterModule(typeof(IocPerRequestDisposal));
 		}
 
+		/// <summary>
+		/// Registers a class such that every ASP.NET web request has a single instance of it.
+		/// Instances will be stored in HttpContext.
+		/// </summary>
+		/// <param name="registerOptions">Registration options</param>
+		/// <returns>Registration options (for chaining)</returns>
+		private static TinyIoCContainer.RegisterOptions AsPerRequestSingleton(TinyIoCContainer.RegisterOptions registerOptions)
+		{
+			return TinyIoCContainer.RegisterOptions.ToCustomLifetimeManager(
+				registerOptions,
+				new HttpContextLifetimeProvider(),
+				"per request singleton"
+			);
+		}
+
 		/// <summary>
 		/// Handles disposing per-request IoC instances at the end of the request
 		/// </summary>

src/React/Initializer.cs

@@ -11,6 +11,7 @@
 using System.Linq;
 using System.Reflection;
 using React.TinyIoC;
+using RegisterOptions = React.TinyIoC.TinyIoCContainer.RegisterOptions;
 
 namespace React
 {
@@ -22,18 +23,24 @@ public static class Initializer
 		/// <summary>
 		/// Intialise ReactJS.NET
 		/// </summary>
-		public static void Initialize(Func<TinyIoCContainer.ITinyIoCObjectLifetimeProvider> requestLifetimeProviderFactory)
+		/// <param name="requestLifetimeRegistration">
+		/// A function used to register IoC components with a per-request lifetime
+		/// </param>
+		public static void Initialize(Func<RegisterOptions, RegisterOptions> requestLifetimeRegistration)
 		{
-			InitializeIoC(requestLifetimeProviderFactory);
+			InitializeIoC(requestLifetimeRegistration);
 		}
 
 		/// <summary>
 		/// Initialises the IoC container by finding all <see cref="IAssemblyRegistration"/> 
 		/// implementations and calling their <see cref="IAssemblyRegistration.Register"/> methods.
 		/// </summary>
-		private static void InitializeIoC(Func<TinyIoCContainer.ITinyIoCObjectLifetimeProvider> requestLifetimeProviderFactory)
+		/// <param name="requestLifetimeRegistration">
+		/// A function used to register IoC components with a per-request lifetime
+		/// </param>
+		private static void InitializeIoC(Func<RegisterOptions, RegisterOptions> requestLifetimeRegistration)
 		{
-			TinyIoCExtensions.RequestLifetimeProviderFactory = requestLifetimeProviderFactory;
+			TinyIoCExtensions.AsRequestLifetime = requestLifetimeRegistration;
 			var types = AppDomain.CurrentDomain.GetAssemblies()
 				// Only bother checking React assemblies
 				.Where(IsReactAssembly)

src/React/TinyIoCExtensions.cs

@@ -9,6 +9,7 @@
 
 using System;
 using React.TinyIoC;
+using RegisterOptions = React.TinyIoC.TinyIoCContainer.RegisterOptions;
 
 namespace React
 {
@@ -20,7 +21,7 @@ public static class TinyIoCExtensions
 		/// <summary>
 		/// Gets or sets the factory used to create per-request lifetime providers
 		/// </summary>
-		internal static Func<TinyIoCContainer.ITinyIoCObjectLifetimeProvider> RequestLifetimeProviderFactory { private get; set; }
+		internal static Func<RegisterOptions, RegisterOptions> AsRequestLifetime { private get; set; }
 
 		/// <summary>
 		/// Registers a class in IoC that uses a singleton per "request". This is generally in the
@@ -30,20 +31,16 @@ public static class TinyIoCExtensions
 		/// <returns>The class registration (fluent interface)</returns>
 		public static TinyIoCContainer.RegisterOptions AsPerRequestSingleton(this TinyIoCContainer.RegisterOptions registerOptions)
 		{
-			if (RequestLifetimeProviderFactory == null)
+			if (AsRequestLifetime == null)
 			{
 				throw new Exception(
-					"RequestLifetimeProviderFactory needs to be set for per-request ReactJS.NET " +
+					"AsRequestLifetime needs to be set for per-request ReactJS.NET " +
 					"assembly registrations to work. Please ensure you are calling " +
 					"React.Initializer.Initialize() before using any ReactJS.NET functionality."
 				);
 			}
 
-			return TinyIoCContainer.RegisterOptions.ToCustomLifetimeManager(
-				registerOptions,
-				RequestLifetimeProviderFactory(),
-				"per request singleton"
-			);
+			return AsRequestLifetime(registerOptions);
 		}
 	}
 }