From 501742596dd85d5701df9eaf286c86b225326c84 Mon Sep 17 00:00:00 2001 From: liangshiwei Date: Tue, 1 Sep 2020 09:31:46 +0800 Subject: [PATCH] Update templates --- .../DependencyInjection/AbpOpenIdConnectExtensions.cs | 7 ++++--- ...olo.Abp.AspNetCore.Authentication.OpenIdConnect.csproj | 1 + .../AbpAspNetCoreAuthenticationOpenIdConnectModule.cs | 8 ++++---- .../MyCompanyName.MyProjectName.Web.Host.csproj | 1 - .../MyProjectNameWebModule.cs | 3 --- .../MyCompanyName.MyProjectName.Web.Host.csproj | 1 - .../MyProjectNameWebHostModule.cs | 6 ++---- 7 files changed, 11 insertions(+), 16 deletions(-) diff --git a/framework/src/Volo.Abp.AspNetCore.Authentication.OpenIdConnect/Microsoft/Extensions/DependencyInjection/AbpOpenIdConnectExtensions.cs b/framework/src/Volo.Abp.AspNetCore.Authentication.OpenIdConnect/Microsoft/Extensions/DependencyInjection/AbpOpenIdConnectExtensions.cs index 4e0b11d2ec..20341e0d1b 100644 --- a/framework/src/Volo.Abp.AspNetCore.Authentication.OpenIdConnect/Microsoft/Extensions/DependencyInjection/AbpOpenIdConnectExtensions.cs +++ b/framework/src/Volo.Abp.AspNetCore.Authentication.OpenIdConnect/Microsoft/Extensions/DependencyInjection/AbpOpenIdConnectExtensions.cs @@ -1,6 +1,7 @@ using System; using System.Threading.Tasks; using Microsoft.AspNetCore.Authentication; +using Microsoft.AspNetCore.Authentication.OAuth.Claims; using Microsoft.AspNetCore.Authentication.OpenIdConnect; using Microsoft.Extensions.Options; using Volo.Abp.AspNetCore.MultiTenancy; @@ -20,8 +21,10 @@ namespace Microsoft.Extensions.DependencyInjection public static AuthenticationBuilder AddAbpOpenIdConnect(this AuthenticationBuilder builder, string authenticationScheme, string displayName, Action configureOptions) { - builder.AddOpenIdConnect(authenticationScheme, displayName, options => + return builder.AddOpenIdConnect(authenticationScheme, displayName, options => { + options.ClaimActions.MapAbpClaimTypes(); + options.Events = new OpenIdConnectEvents { OnAuthorizationCodeReceived = receivedContext => @@ -40,8 +43,6 @@ namespace Microsoft.Extensions.DependencyInjection } }; }); - - return builder; } } } diff --git a/framework/src/Volo.Abp.AspNetCore.Authentication.OpenIdConnect/Volo.Abp.AspNetCore.Authentication.OpenIdConnect.csproj b/framework/src/Volo.Abp.AspNetCore.Authentication.OpenIdConnect/Volo.Abp.AspNetCore.Authentication.OpenIdConnect.csproj index 4c628c5323..30f56491c5 100644 --- a/framework/src/Volo.Abp.AspNetCore.Authentication.OpenIdConnect/Volo.Abp.AspNetCore.Authentication.OpenIdConnect.csproj +++ b/framework/src/Volo.Abp.AspNetCore.Authentication.OpenIdConnect/Volo.Abp.AspNetCore.Authentication.OpenIdConnect.csproj @@ -14,6 +14,7 @@ + diff --git a/framework/src/Volo.Abp.AspNetCore.Authentication.OpenIdConnect/Volo/Abp/AspNetCore/Authentication/OpenIdConnect/AbpAspNetCoreAuthenticationOpenIdConnectModule.cs b/framework/src/Volo.Abp.AspNetCore.Authentication.OpenIdConnect/Volo/Abp/AspNetCore/Authentication/OpenIdConnect/AbpAspNetCoreAuthenticationOpenIdConnectModule.cs index eddb41a2f7..13a8fd5c04 100644 --- a/framework/src/Volo.Abp.AspNetCore.Authentication.OpenIdConnect/Volo/Abp/AspNetCore/Authentication/OpenIdConnect/AbpAspNetCoreAuthenticationOpenIdConnectModule.cs +++ b/framework/src/Volo.Abp.AspNetCore.Authentication.OpenIdConnect/Volo/Abp/AspNetCore/Authentication/OpenIdConnect/AbpAspNetCoreAuthenticationOpenIdConnectModule.cs @@ -1,12 +1,12 @@ -using Volo.Abp.Modularity; +using Volo.Abp.AspNetCore.Authentication.OAuth; +using Volo.Abp.Modularity; using Volo.Abp.MultiTenancy; -using Volo.Abp.Security; namespace Volo.Abp.AspNetCore.Authentication.OpenIdConnect { [DependsOn( - typeof(AbpSecurityModule), - typeof(AbpMultiTenancyModule))] + typeof(AbpMultiTenancyModule), + typeof(AbpAspNetCoreAuthenticationOAuthModule))] public class AbpAspNetCoreAuthenticationOpenIdConnectModule : AbpModule { diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web.Host/MyCompanyName.MyProjectName.Web.Host.csproj b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web.Host/MyCompanyName.MyProjectName.Web.Host.csproj index e1ed669566..c2f4f602ea 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web.Host/MyCompanyName.MyProjectName.Web.Host.csproj +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web.Host/MyCompanyName.MyProjectName.Web.Host.csproj @@ -27,7 +27,6 @@ - diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web.Host/MyProjectNameWebModule.cs b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web.Host/MyProjectNameWebModule.cs index 4a9bc4b2d3..7939bf80d0 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web.Host/MyProjectNameWebModule.cs +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web.Host/MyProjectNameWebModule.cs @@ -50,7 +50,6 @@ namespace MyCompanyName.MyProjectName.Web [DependsOn( typeof(MyProjectNameHttpApiModule), typeof(MyProjectNameHttpApiClientModule), - typeof(AbpAspNetCoreAuthenticationOAuthModule), typeof(AbpAspNetCoreAuthenticationOpenIdConnectModule), typeof(AbpAspNetCoreMvcClientModule), typeof(AbpAspNetCoreMvcUiBasicThemeModule), @@ -144,8 +143,6 @@ namespace MyCompanyName.MyProjectName.Web options.Scope.Add("email"); options.Scope.Add("phone"); options.Scope.Add("MyProjectName"); - - options.ClaimActions.MapAbpClaimTypes(); }); } diff --git a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Host/MyCompanyName.MyProjectName.Web.Host.csproj b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Host/MyCompanyName.MyProjectName.Web.Host.csproj index e266e7ef35..f80745bf4a 100644 --- a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Host/MyCompanyName.MyProjectName.Web.Host.csproj +++ b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Host/MyCompanyName.MyProjectName.Web.Host.csproj @@ -18,7 +18,6 @@ - diff --git a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Host/MyProjectNameWebHostModule.cs b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Host/MyProjectNameWebHostModule.cs index de907e72c2..8e2aaf1187 100644 --- a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Host/MyProjectNameWebHostModule.cs +++ b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Host/MyProjectNameWebHostModule.cs @@ -18,6 +18,7 @@ using MyCompanyName.MyProjectName.Web; using StackExchange.Redis; using Volo.Abp; using Volo.Abp.AspNetCore.Authentication.OAuth; +using Volo.Abp.AspNetCore.Authentication.OpenIdConnect; using Volo.Abp.AspNetCore.MultiTenancy; using Volo.Abp.AspNetCore.Mvc.Client; using Volo.Abp.AspNetCore.Mvc.Localization; @@ -51,7 +52,7 @@ namespace MyCompanyName.MyProjectName [DependsOn( typeof(MyProjectNameWebModule), typeof(MyProjectNameHttpApiClientModule), - typeof(AbpAspNetCoreAuthenticationOAuthModule), + typeof(AbpAspNetCoreAuthenticationOpenIdConnectModule), typeof(AbpAspNetCoreMvcClientModule), typeof(AbpAspNetCoreMvcUiBasicThemeModule), typeof(AbpAutofacModule), @@ -155,9 +156,6 @@ namespace MyCompanyName.MyProjectName options.Scope.Add("email"); options.Scope.Add("phone"); options.Scope.Add("MyProjectName"); - - options.ClaimActions.MapJsonKey(AbpClaimTypes.UserName, "name"); - options.ClaimActions.DeleteClaim("name"); }); }