移除创建不明确的ITokenProvider`1

Twtcer · Sep 14, 2020 · a40788c · a40788c
1 parent 5c9cc21
commit a40788c
Show file tree

Hide file tree

Showing 8 changed files with 31 additions and 93 deletions.
diff --git a/WebApiClientCore.Extensions.OAuths/HttpMessageHandlers/OAuthTokenHandler.cs b/WebApiClientCore.Extensions.OAuths/HttpMessageHandlers/OAuthTokenHandler.cs
@@ -1,6 +1,4 @@
-using Microsoft.Extensions.DependencyInjection;
-using System;
-using System.Net;
+using System.Net;
 using System.Net.Http;
 using System.Net.Http.Headers;
 using System.Threading;

diff --git a/WebApiClientCore.Extensions.OAuths/ITokenProviderFactory.cs b/WebApiClientCore.Extensions.OAuths/ITokenProviderFactory.cs
@@ -7,13 +7,6 @@ namespace WebApiClientCore.Extensions.OAuths
     /// </summary>
     public interface ITokenProviderFactory
     {
-        /// <summary>
-        /// 返回是否可以创建token提供者
-        /// </summary>
-        /// <param name="httpApiType">接口类型</param>
-        /// <returns></returns>
-        public bool CanCreate(Type httpApiType);
-
         /// <summary>
         /// 创建token提供者
         /// </summary>

diff --git a/WebApiClientCore.Extensions.OAuths/ITokenProvider`.cs b/WebApiClientCore.Extensions.OAuths/ITokenProvider`.cs
diff --git a/...Core.Extensions.OAuths/Microsoft.Extensions/DependencyInjection/TokenHandlerExtensions.cs b/...Core.Extensions.OAuths/Microsoft.Extensions/DependencyInjection/TokenHandlerExtensions.cs
@@ -35,7 +35,7 @@ public static IHttpClientBuilder AddOAuthTokenHandler<TOAuthTokenHandler>(this I
             var httpApiType = builder.GetHttpApiType();
             if (httpApiType == null)
             {
-                throw new InvalidOperationException($"无效的{nameof(IHttpClientBuilder)}");
+                throw new InvalidOperationException($"无效的{nameof(IHttpClientBuilder)}，找不到其关联的http接口类型");
             }
 
             builder.Services.TryAddTransient(serviceProvider =>

diff --git a/...ore.Extensions.OAuths/Microsoft.Extensions/DependencyInjection/TokenProviderExtensions.cs b/...ore.Extensions.OAuths/Microsoft.Extensions/DependencyInjection/TokenProviderExtensions.cs
@@ -69,13 +69,14 @@ private static ITokenProviderBuilder AddTokenProviderCore<THttpApi, TTokenProvid
             where TTokenProvider : class, ITokenProvider
         {
             var name = $"{typeof(TTokenProvider).Name}+{typeof(THttpApi).Name}";
+            var hashCode = HashCode.Combine(typeof(THttpApi), typeof(TTokenProvider));
+            name = hashCode < 0 ? $"{name}{hashCode}" : $"{name}+{hashCode}";
 
             services
                .AddOptions<TokenProviderFactoryOptions>()
                .Configure(o => o.Register<THttpApi, TTokenProvider>(name));
 
             services.TryAddSingleton<ITokenProviderFactory, TokenProviderFactory>();
-            services.TryAddSingleton(typeof(ITokenProvider<>), typeof(TypeTokenProvider<>));
             services.AddHttpApi<IOAuthTokenClientApi>(o => o.KeyValueSerializeOptions.IgnoreNullValues = true);
 
             return new TokenProviderBuilder(name, services);

diff --git a/WebApiClientCore.Extensions.OAuths/TokenProviderFactories/TokenProviderDescriptor.cs b/WebApiClientCore.Extensions.OAuths/TokenProviderFactories/TokenProviderDescriptor.cs
@@ -97,5 +97,14 @@ public override int GetHashCode()
         {
             return HashCode.Combine(this.Name, this.Type);
         }
+
+        /// <summary>
+        /// 转换为string
+        /// </summary>
+        /// <returns></returns>
+        public override string ToString()
+        {
+            return this.Name;
+        }
     }
 }
diff --git a/WebApiClientCore.Extensions.OAuths/TokenProviderFactories/TokenProviderFactory.cs b/WebApiClientCore.Extensions.OAuths/TokenProviderFactories/TokenProviderFactory.cs
@@ -23,29 +23,23 @@ public TokenProviderFactory(IServiceProvider serviceProvider, IOptions<TokenProv
             this.options = options.Value;
         }
 
-        /// <summary>
-        /// 返回是否可以创建token提供者
-        /// </summary>
-        /// <param name="httpApiType">接口类型</param>
-        /// <returns></returns>
-        public bool CanCreate(Type httpApiType)
-        {
-            if (httpApiType == null)
-            {
-                return false;
-            }
-            return this.options.ContainsKey(httpApiType);
-        }
+
 
         /// <summary>
         /// 创建token提供者
         /// </summary>
         /// <param name="httpApiType">接口类型</param>
         /// <param name="typeMatchMode">类型匹配模式</param>     
         /// <returns></returns>
+        /// <exception cref="ArgumentNullException"></exception>
         /// <exception cref="InvalidOperationException"></exception>
         public ITokenProvider Create(Type httpApiType, TypeMatchMode typeMatchMode)
         {
+            if (httpApiType == null)
+            {
+                throw new ArgumentNullException(nameof(httpApiType));
+            }
+
             if (typeMatchMode == TypeMatchMode.TypeOnly)
             {
                 return this.Create(httpApiType);
@@ -64,6 +58,17 @@ public ITokenProvider Create(Type httpApiType, TypeMatchMode typeMatchMode)
         }
 
 
+        /// <summary>
+        /// 返回是否可以创建token提供者
+        /// </summary>
+        /// <param name="httpApiType">接口类型</param>
+        /// <returns></returns>
+        private bool CanCreate(Type httpApiType)
+        {
+            return this.options.ContainsKey(httpApiType);
+        }
+
+
         /// <summary>
         /// 创建token提供者
         /// </summary>

diff --git a/WebApiClientCore.Extensions.OAuths/TokenProviders/TypeTokenProvider.cs b/WebApiClientCore.Extensions.OAuths/TokenProviders/TypeTokenProvider.cs