introduce runtime parameter so that we can inject the servicekey used instead of the servicekey bound

Author: DominicUllmann

src/Ninject.Web.AspNetCore/AspNetCoreKernel.cs

@@ -7,7 +7,9 @@
 using Ninject.Planning.Bindings.Resolvers;
 using Ninject.Web.AspNetCore.Components;
 using System;
+using System.Linq;
 using Ninject.Planning.Strategies;
+using Ninject.Web.AspNetCore.Parameters;
 using Ninject.Web.AspNetCore.Planning;
 
 namespace Ninject.Web.AspNetCore
@@ -39,7 +41,16 @@ protected override Func<IBinding, bool> SatifiesRequest(IRequest request)
 					// as we can't register constraints via microsoft.extensions.dependencyinjection, 
 					// we always check for the latest binding
 					// Note that we have at least one constraint for the servicekey >= .NET 8.0
-					latest = binding.Metadata.Get<BindingIndex.Item>(nameof(BindingIndex))?.IsLatest ?? true;
+					object requestIndexKey = null;
+#if NET8_0_OR_GREATER
+					var serviceKeyParameter = request.Parameters.LastOrDefault(x => x is ServiceKeyParameter) 
+						as ServiceKeyParameter;
+					if (serviceKeyParameter != null)
+					{
+						requestIndexKey = serviceKeyParameter.ServiceKey;
+					}
+#endif
+					latest = binding.Metadata.Get<BindingIndex.Item>(nameof(BindingIndex))?.IsLatest(requestIndexKey) ?? true;
 				}
 				return binding.Matches(request) && request.Matches(binding) && latest;
 			};

src/Ninject.Web.AspNetCore/BindingIndex.cs

@@ -26,9 +26,18 @@ public Item Next(Type serviceType, object indexKey)
 			return next;
 		}
 
-		private bool IsLatest(Type serviceType, object indexKey, Item item)
+		private bool IsLatest(Type serviceType, object registeredIndexKey, object requestIndexKey, Item item)
 		{
-			return _bindingIndexMap[new ServiceTypeKey(serviceType, indexKey)] == item;
+			var match = _bindingIndexMap[new ServiceTypeKey(serviceType, registeredIndexKey)] == item;
+#if NET8_0_OR_GREATER
+			if (registeredIndexKey == KeyedService.AnyKey)
+			{
+				// if the binding is registered with anykey, it should only be considered as latest if there is no
+				// exact match with the requestIndexKey
+				match = !_bindingIndexMap.TryGetValue(new ServiceTypeKey(serviceType, requestIndexKey), out _);
+			}
+#endif
+			return match;
 		}
 
 		public class Item
@@ -39,8 +48,7 @@ public class Item
 			public int TotalIndex { get; }
 			public int TypeIndex { get; }
 			public object IndexKey { get; }
-
-			public bool IsLatest => _root.IsLatest(_serviceType, IndexKey, this);
+			
 			public int Precedence => _root.Count - TotalIndex;
 
 			public Item(BindingIndex root, Type serviceType, object indexKey, int totalIndex, int typeIndex)
@@ -51,6 +59,8 @@ public Item(BindingIndex root, Type serviceType, object indexKey, int totalIndex
 				TypeIndex = typeIndex;
 				IndexKey = indexKey;
 			}
+			
+			public bool IsLatest(object requestIndexKey) => _root.IsLatest(_serviceType, IndexKey, requestIndexKey, this);
 		}
 
 		/// <summary>

src/Ninject.Web.AspNetCore/DefaultDescriptorAdapter.cs

@@ -1,5 +1,6 @@
 using System;
 using Microsoft.Extensions.DependencyInjection;
+using Ninject.Activation;
 
 namespace Ninject.Web.AspNetCore
 {
@@ -19,7 +20,7 @@ public DefaultDescriptorAdapter(ServiceDescriptor descriptor)
 		public Type ImplementationType => _descriptor.ImplementationType;
 		public object ImplementationInstance => _descriptor.ImplementationInstance;
 		public bool UseServiceFactory => _descriptor.ImplementationFactory != null;
-		public object InstantiateFromServiceFactory(IServiceProvider provider)
+		public object InstantiateFromServiceFactory(IServiceProvider provider, IContext context)
 		{
 			return _descriptor.ImplementationFactory(provider);
 		}

src/Ninject.Web.AspNetCore/IDescriptorAdapter.cs

@@ -1,5 +1,6 @@
 using System;
 using Microsoft.Extensions.DependencyInjection;
+using Ninject.Activation;
 
 namespace Ninject.Web.AspNetCore
 {
@@ -27,7 +28,7 @@ public interface IDescriptorAdapter
 		/// <summary>
 		/// If UseServiceFactory returns true, use this method to instantiate via factory.
 		/// </summary>
-		object InstantiateFromServiceFactory(IServiceProvider provider);
+		object InstantiateFromServiceFactory(IServiceProvider provider, IContext context);
 
 		/// <summary>
 		/// The lifetime coonfigured for the service descriptor

src/Ninject.Web.AspNetCore/KeyedDescriptorAdapter.cs

@@ -1,5 +1,8 @@
 using System;
+using System.Linq;
 using Microsoft.Extensions.DependencyInjection;
+using Ninject.Activation;
+using Ninject.Web.AspNetCore.Parameters;
 
 namespace Ninject.Web.AspNetCore
 {
@@ -20,9 +23,15 @@ public KeyedDescriptorAdapter(ServiceDescriptor descriptor)
 		public Type ImplementationType => _descriptor.KeyedImplementationType;
 		public object ImplementationInstance => _descriptor.KeyedImplementationInstance;
 		public bool UseServiceFactory => _descriptor.KeyedImplementationFactory != null;
-		public object InstantiateFromServiceFactory(IServiceProvider provider)
+		public object InstantiateFromServiceFactory(IServiceProvider provider, IContext context)
 		{
-			return _descriptor.KeyedImplementationFactory(provider, _descriptor.ServiceKey);
+			object serviceKey = _descriptor.ServiceKey;
+			var keyParameter = context.Parameters.LastOrDefault(x => x is ServiceKeyParameter) as ServiceKeyParameter;
+			if (keyParameter != null)
+			{
+				serviceKey = keyParameter.ServiceKey;
+			}
+			return _descriptor.KeyedImplementationFactory(provider, serviceKey);
 		}
 
 		public ServiceLifetime Lifetime => _descriptor.Lifetime;

src/Ninject.Web.AspNetCore/NinjectServiceProvider.cs

@@ -5,7 +5,9 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
+using Ninject.Parameters;
 using Ninject.Planning.Bindings;
+using Ninject.Web.AspNetCore.Parameters;
 using Ninject.Web.AspNetCore.Planning;
 
 namespace Ninject.Web.AspNetCore
@@ -91,14 +93,16 @@ public object GetKeyedService(Type serviceType, object serviceKey)
 			{
 				EnsureNotAnyKey(serviceKey, serviceType);
 				result = _resolutionRoot.TryGet(serviceType,
-					metadata => metadata.DoesMetadataMatchServiceKey(serviceKey, true));
+					metadata => metadata.DoesMetadataMatchServiceKey(serviceKey, true),
+					new ServiceKeyParameter(serviceKey));
 			}
 			else
 			{
 				// Ninject is not evaluating metadata constraint when resolving a IEnumerable<T>, see KernelBase.UpdateRequest
 				// Therefore, need to implement a workaround to not instantiate here bindings with a different servicekey value
 				result = ConvertToTypedEnumerable(elementType,
-					_resolutionRoot.GetAll(elementType, metadata => metadata.DoesMetadataMatchServiceKey(serviceKey, false)));
+					_resolutionRoot.GetAll(elementType, metadata => metadata.DoesMetadataMatchServiceKey(serviceKey, false),
+						new ServiceKeyParameter(serviceKey)));
 			}
 
 			return result;
@@ -115,14 +119,16 @@ public object GetRequiredKeyedService(Type serviceType, object serviceKey)
 			if (!IsListType(serviceType, out var elementType))
 			{
 				EnsureNotAnyKey(serviceKey, serviceType);
-				return _resolutionRoot.Get(serviceType, metadata => metadata.DoesMetadataMatchServiceKey(serviceKey, true));
+				return _resolutionRoot.Get(serviceType, metadata => metadata.DoesMetadataMatchServiceKey(serviceKey, true),
+					new ServiceKeyParameter(serviceKey));
 			}
 			else
 			{
 				// Ninject is not evaluating metadata constraint when resolving a IEnumerable<T>, see KernelBase.UpdateRequest
 				// Therefore, need to implement a workaround to not instantiate here bindings with a different servicekey value
 				return ConvertToTypedEnumerable(elementType,
-					_resolutionRoot.GetAll(elementType, metadata => metadata.DoesMetadataMatchServiceKey(serviceKey, false)));
+					_resolutionRoot.GetAll(elementType, metadata => metadata.DoesMetadataMatchServiceKey(serviceKey, false),
+						new ServiceKeyParameter(serviceKey)));
 			}
 		}
 

src/Ninject.Web.AspNetCore/Parameters/ServiceKeyParameter.cs

@@ -0,0 +1,15 @@
+using Ninject.Parameters;
+
+
+namespace Ninject.Web.AspNetCore.Parameters
+{
+	public class ServiceKeyParameter : Parameter
+	{
+		public ServiceKeyParameter(object value) : base(nameof(ServiceKeyParameter), value, true)
+		{
+			ServiceKey = value;
+		}
+
+		public object ServiceKey { get; }
+	}
+}

src/Ninject.Web.AspNetCore/Planning/ParameterTargetWithKeyedSupport.cs

@@ -1,9 +1,11 @@
 using System;
+using System.Linq;
 using System.Reflection;
 using Microsoft.Extensions.DependencyInjection;
 using Ninject.Activation;
 using Ninject.Planning.Bindings;
 using Ninject.Planning.Targets;
+using Ninject.Web.AspNetCore.Parameters;
 
 namespace Ninject.Web.AspNetCore.Planning
 {
@@ -81,10 +83,25 @@ object ITarget.ResolveWithin(IContext parent)
 			if (serviceKeyAttributes?.Length > 0)
 			{
 				var result = parent.Binding.Metadata.GetServiceKey();
-				if (result == KeyedService.AnyKey && this.Type == typeof(string))
+				var serviceKeyParameter = parent.Parameters.LastOrDefault(x => x is ServiceKeyParameter) as ServiceKeyParameter;
+				if (serviceKeyParameter != null)
 				{
-					// expected to automatically convert from AnyKey to string representation
-					result = KeyedService.AnyKey.ToString();
+					result = serviceKeyParameter.ServiceKey;
+				}
+
+				var asConvertible = result as IConvertible;
+				if (asConvertible != null)
+				{
+					try
+					{
+						result = Convert.ChangeType(asConvertible, this.Type);
+					}
+					catch (InvalidCastException)
+					{
+						// we have to throw and InvalidOperationException in this case, a InvalidCastException
+						// is not passing the tests
+						throw new InvalidOperationException("Cannot convert " + asConvertible + " to " + this.Type);
+					}
 				}
 
 				return result;

src/Ninject.Web.AspNetCore/ServiceCollectionAdapter.cs

@@ -104,7 +104,7 @@ private IBindingNamedWithOrOnSyntax<T> ConfigureImplementationAndLifecycleWithAd
 					// correct _scoped_ IServiceProvider is used. Fall back to root IServiceProvider when not created
 					// through a NinjectServiceProvider (some tests do this to prove a point)
 					var scopeProvider = context.GetServiceProviderScopeParameter()?.SourceServiceProvider ?? context.Kernel.Get<IServiceProvider>();
-					return adapter.InstantiateFromServiceFactory(scopeProvider) as T;
+					return adapter.InstantiateFromServiceFactory(scopeProvider, context) as T;
 				}), adapter.Lifetime);
 			}
 			else