From ebdad9f91e8ad15760681b2fc4c678161d410c76 Mon Sep 17 00:00:00 2001
From: Paul Johnson <paul@rustybox.co.uk>
Date: Mon, 2 Nov 2020 10:54:29 +0000
Subject: [PATCH] Add additional "mutliple unique" registrations and rename
 extension for clarity.

---
 src/Umbraco.Core/ServiceCollectionExtensions.cs      | 11 ++++-------
 src/Umbraco.Web.Common/Runtime/AspNetCoreComposer.cs |  8 +++-----
 2 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/src/Umbraco.Core/ServiceCollectionExtensions.cs b/src/Umbraco.Core/ServiceCollectionExtensions.cs
index e6fcd43af1..d1c89ea17e 100644
--- a/src/Umbraco.Core/ServiceCollectionExtensions.cs
+++ b/src/Umbraco.Core/ServiceCollectionExtensions.cs
@@ -13,18 +13,15 @@ namespace Umbraco.Core
             => services.Replace(ServiceDescriptor.Singleton<TService, TImplementing>());
 
         /// <summary>
-        /// Registers a unique service as a single instance implementing two interfaces.
+        /// Registers a singleton instance against multiple interfaces.
         /// </summary>
-        /// <remarks>
-        /// Hat-tip: https://stackoverflow.com/a/55402016/489433
-        /// </remarks>
-        public static void AddUnique<TService1, TService2, TImplementing>(this IServiceCollection services)
+        public static void AddMultipleUnique<TService1, TService2, TImplementing>(this IServiceCollection services)
             where TService1 : class
             where TService2 : class
             where TImplementing : class, TService1, TService2
         {
-            services.Replace(ServiceDescriptor.Singleton<TService1, TImplementing>());
-            services.Replace(ServiceDescriptor.Singleton<TService2, TImplementing>(x => (TImplementing)x.GetService<TService1>()));
+            services.AddUnique<TService1, TImplementing>();
+            services.AddUnique<TService2>(factory => (TImplementing) factory.GetRequiredService<TService1>());
         }
 
         public static void AddUnique<TImplementing>(this IServiceCollection services)
diff --git a/src/Umbraco.Web.Common/Runtime/AspNetCoreComposer.cs b/src/Umbraco.Web.Common/Runtime/AspNetCoreComposer.cs
index 832cfdb488..2ba38b6e02 100644
--- a/src/Umbraco.Web.Common/Runtime/AspNetCoreComposer.cs
+++ b/src/Umbraco.Web.Common/Runtime/AspNetCoreComposer.cs
@@ -49,13 +49,12 @@ namespace Umbraco.Web.Common.Runtime
             composition.Services.AddUnique<IRequestAccessor, AspNetCoreRequestAccessor>();
 
             // Our own netcore implementations
-            composition.Services.AddUnique<IUmbracoApplicationLifetimeManager, AspNetCoreUmbracoApplicationLifetime>();
-            composition.Services.AddUnique<IUmbracoApplicationLifetime, AspNetCoreUmbracoApplicationLifetime>();
+            composition.Services.AddMultipleUnique<IUmbracoApplicationLifetimeManager, IUmbracoApplicationLifetime, AspNetCoreUmbracoApplicationLifetime>();
 
             composition.Services.AddUnique<IApplicationShutdownRegistry, AspNetCoreApplicationShutdownRegistry>();
 
             // The umbraco request lifetime
-            composition.Services.AddUnique<IUmbracoRequestLifetime, IUmbracoRequestLifetimeManager, UmbracoRequestLifetime>();
+            composition.Services.AddMultipleUnique<IUmbracoRequestLifetime, IUmbracoRequestLifetimeManager, UmbracoRequestLifetime>();
 
             // Password hasher
             composition.Services.AddUnique<IPasswordHasher, AspNetCorePasswordHasher>();
@@ -64,8 +63,7 @@ namespace Umbraco.Web.Common.Runtime
             composition.Services.AddTransient<IIpResolver, AspNetCoreIpResolver>();
             composition.Services.AddUnique<IUserAgentProvider, AspNetCoreUserAgentProvider>();
 
-            composition.Services.AddUnique<ISessionIdResolver, AspNetCoreSessionManager>();
-            composition.Services.AddUnique<ISessionManager, AspNetCoreSessionManager>();
+            composition.Services.AddMultipleUnique<ISessionIdResolver, ISessionManager, AspNetCoreSessionManager>();
 
             composition.Services.AddUnique<IMarchal, AspNetCoreMarchal>();