AddXXProvider返回OptionsBuilder类型

xljiulang · xljiulang · commit 41cff264c7d9 · 2020-09-15T08:56:37.000+08:00
diff --git a/WebApiClientCore.Extensions.NewtonsoftJson/WebApiClientCore.Extensions.NewtonsoftJson.csproj b/WebApiClientCore.Extensions.NewtonsoftJson/WebApiClientCore.Extensions.NewtonsoftJson.csproj
@@ -8,7 +8,7 @@
     <SignAssembly>true</SignAssembly>
     <AssemblyOriginatorKeyFile>Sign.snk</AssemblyOriginatorKeyFile>
 
-    <Version>1.1.0-beta1</Version>
+    <Version>1.1.0-beta3</Version>
     <Authors>laojiu</Authors>
     <Company>laojiu</Company>
     <Copyright>Copyright © laojiu 2017-2020</Copyright>
diff --git a/WebApiClientCore.Extensions.OAuths/Microsoft.Extensions/DependencyInjection/TokenProviderBuilderExtensions.cs b/WebApiClientCore.Extensions.OAuths/Microsoft.Extensions/DependencyInjection/TokenProviderBuilderExtensions.cs
diff --git a/WebApiClientCore.Extensions.OAuths/Microsoft.Extensions/DependencyInjection/TokenProviderExtensions.GrantTypeClient.cs b/WebApiClientCore.Extensions.OAuths/Microsoft.Extensions/DependencyInjection/TokenProviderExtensions.GrantTypeClient.cs
@@ -1,4 +1,5 @@
-﻿using System;
+﻿using Microsoft.Extensions.Options;
+using System;
 using WebApiClientCore.Extensions.OAuths.TokenProviders;
 
 namespace Microsoft.Extensions.DependencyInjection
@@ -14,9 +15,10 @@ public static partial class TokenProviderExtensions
         /// <typeparam name="THttpApi">接口类型</typeparam>
         /// <param name="services"></param>
         /// <returns></returns>     
-        public static ITokenProviderBuilder AddClientCredentialsTokenProvider<THttpApi>(this IServiceCollection services)
+        public static OptionsBuilder<ClientCredentialsOptions> AddClientCredentialsTokenProvider<THttpApi>(this IServiceCollection services)
         {
-            return services.AddTokenProvider<THttpApi, ClientCredentialsTokenProvider>();
+            var builder = services.AddTokenProvider<THttpApi, ClientCredentialsTokenProvider>();
+            return new OptionsBuilder<ClientCredentialsOptions>(builder.Services, builder.Name);
         }
 
         /// <summary>
@@ -26,11 +28,9 @@ public static ITokenProviderBuilder AddClientCredentialsTokenProvider<THttpApi>(
         /// <param name="services"></param>
         /// <param name="configureOptions">配置</param>
         /// <returns></returns>
-        public static ITokenProviderBuilder AddClientCredentialsTokenProvider<THttpApi>(this IServiceCollection services, Action<ClientCredentialsOptions> configureOptions)
+        public static OptionsBuilder<ClientCredentialsOptions> AddClientCredentialsTokenProvider<THttpApi>(this IServiceCollection services, Action<ClientCredentialsOptions> configureOptions)
         {
-            return services
-                .AddClientCredentialsTokenProvider<THttpApi>()
-                .ConfigureClientCredentials(configureOptions);
+            return services.AddClientCredentialsTokenProvider<THttpApi>().Configure(configureOptions);
         }
     }
 }
diff --git a/WebApiClientCore.Extensions.OAuths/Microsoft.Extensions/DependencyInjection/TokenProviderExtensions.GrantTypePassword.cs b/WebApiClientCore.Extensions.OAuths/Microsoft.Extensions/DependencyInjection/TokenProviderExtensions.GrantTypePassword.cs
@@ -1,4 +1,5 @@
-﻿using System;
+﻿using Microsoft.Extensions.Options;
+using System;
 using WebApiClientCore.Extensions.OAuths.TokenProviders;
 
 namespace Microsoft.Extensions.DependencyInjection
@@ -14,9 +15,10 @@ public static partial class TokenProviderExtensions
         /// <typeparam name="THttpApi">接口类型</typeparam>
         /// <param name="services"></param>
         /// <returns></returns>
-        public static ITokenProviderBuilder AddPasswordCredentialsTokenProvider<THttpApi>(this IServiceCollection services)
+        public static OptionsBuilder<PasswordCredentialsOptions> AddPasswordCredentialsTokenProvider<THttpApi>(this IServiceCollection services)
         {
-            return services.AddTokenProvider<THttpApi, PasswordCredentialsTokenProvider>();
+            var builder = services.AddTokenProvider<THttpApi, PasswordCredentialsTokenProvider>();
+            return new OptionsBuilder<PasswordCredentialsOptions>(builder.Services, builder.Name);
         }
 
         /// <summary>
@@ -26,11 +28,9 @@ public static ITokenProviderBuilder AddPasswordCredentialsTokenProvider<THttpApi
         /// <param name="services"></param>
         /// <param name="configureOptions">配置</param>
         /// <returns></returns>
-        public static ITokenProviderBuilder AddPasswordCredentialsTokenProvider<THttpApi>(this IServiceCollection services, Action<PasswordCredentialsOptions> configureOptions)
+        public static OptionsBuilder<PasswordCredentialsOptions> AddPasswordCredentialsTokenProvider<THttpApi>(this IServiceCollection services, Action<PasswordCredentialsOptions> configureOptions)
         {
-            return services
-                .AddPasswordCredentialsTokenProvider<THttpApi>()
-                .ConfigurePasswordCredentials(configureOptions);
+            return services.AddPasswordCredentialsTokenProvider<THttpApi>().Configure(configureOptions);
         }
     }
 }
diff --git a/WebApiClientCore.Extensions.OAuths/WebApiClientCore.Extensions.OAuths.csproj b/WebApiClientCore.Extensions.OAuths/WebApiClientCore.Extensions.OAuths.csproj
@@ -8,7 +8,7 @@
     <SignAssembly>true</SignAssembly>
     <AssemblyOriginatorKeyFile>Sign.snk</AssemblyOriginatorKeyFile>
 
-    <Version>1.1.0-beta2</Version>
+    <Version>1.1.0-beta3</Version>
     <Authors>laojiu</Authors>
     <Company>laojiu</Company>
     <Copyright>Copyright © laojiu 2017-2020</Copyright>
diff --git a/WebApiClientCore/WebApiClientCore.csproj b/WebApiClientCore/WebApiClientCore.csproj
@@ -5,7 +5,7 @@
     <TargetFramework>netstandard2.1</TargetFramework>
     <DocumentationFile>bin\$(Configuration)\$(TargetFramework)\$(AssemblyName).xml</DocumentationFile>
 
-    <Version>1.1.0-beta2</Version>
+    <Version>1.1.0-beta3</Version>
     <Authors>laojiu</Authors>
     <Company>laojiu</Company>
     <Copyright>Copyright © laojiu 2017-2020</Copyright>

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`		`-using System;`
	`1`	`+using Microsoft.Extensions.Options;`
	`2`	`+using System;`
`2`	`3`	`using WebApiClientCore.Extensions.OAuths.TokenProviders;`
`3`	`4`
`4`	`5`	`namespace Microsoft.Extensions.DependencyInjection`
`@@ -14,9 +15,10 @@ public static partial class TokenProviderExtensions`
`14`	`15`	`/// <typeparam name="THttpApi">接口类型</typeparam>`
`15`	`16`	`/// <param name="services"></param>`
`16`	`17`	`/// <returns></returns>`
`17`		`- public static ITokenProviderBuilder AddClientCredentialsTokenProvider<THttpApi>(this IServiceCollection services)`
	`18`	`+ public static OptionsBuilder<ClientCredentialsOptions> AddClientCredentialsTokenProvider<THttpApi>(this IServiceCollection services)`
`18`	`19`	`{`
`19`		`- return services.AddTokenProvider<THttpApi, ClientCredentialsTokenProvider>();`
	`20`	`+ var builder = services.AddTokenProvider<THttpApi, ClientCredentialsTokenProvider>();`
	`21`	`+ return new OptionsBuilder<ClientCredentialsOptions>(builder.Services, builder.Name);`
`20`	`22`	`}`
`21`	`23`
`22`	`24`	`/// <summary>`
`@@ -26,11 +28,9 @@ public static ITokenProviderBuilder AddClientCredentialsTokenProvider<THttpApi>(`
`26`	`28`	`/// <param name="services"></param>`
`27`	`29`	`/// <param name="configureOptions">配置</param>`
`28`	`30`	`/// <returns></returns>`
`29`		`- public static ITokenProviderBuilder AddClientCredentialsTokenProvider<THttpApi>(this IServiceCollection services, Action<ClientCredentialsOptions> configureOptions)`
	`31`	`+ public static OptionsBuilder<ClientCredentialsOptions> AddClientCredentialsTokenProvider<THttpApi>(this IServiceCollection services, Action<ClientCredentialsOptions> configureOptions)`
`30`	`32`	`{`
`31`		`- return services`
`32`		`- .AddClientCredentialsTokenProvider<THttpApi>()`
`33`		`- .ConfigureClientCredentials(configureOptions);`
	`33`	`+ return services.AddClientCredentialsTokenProvider<THttpApi>().Configure(configureOptions);`
`34`	`34`	`}`
`35`	`35`	`}`
`36`	`36`	`}`