From 2cc867e771a36d21af3419a9cd09fa766831f344 Mon Sep 17 00:00:00 2001 From: maliming Date: Mon, 16 Nov 2020 17:15:29 +0800 Subject: [PATCH 1/2] Remove `Updates AbpClaimTypes` code. --- .../MyProjectNameHttpApiHostModule.cs | 7 ------- 1 file changed, 7 deletions(-) diff --git a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.HttpApi.Host/MyProjectNameHttpApiHostModule.cs b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.HttpApi.Host/MyProjectNameHttpApiHostModule.cs index abe3a018bd..9dbb9987ed 100644 --- a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.HttpApi.Host/MyProjectNameHttpApiHostModule.cs +++ b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.HttpApi.Host/MyProjectNameHttpApiHostModule.cs @@ -105,12 +105,6 @@ namespace MyCompanyName.MyProjectName options.Languages.Add(new LanguageInfo("zh-Hant", "zh-Hant", "繁體中文")); }); - //Updates AbpClaimTypes to be compatible with identity server claims. - AbpClaimTypes.UserId = JwtClaimTypes.Subject; - AbpClaimTypes.UserName = JwtClaimTypes.Name; - AbpClaimTypes.Role = JwtClaimTypes.Role; - AbpClaimTypes.Email = JwtClaimTypes.Email; - context.Services.AddAuthentication(JwtBearerDefaults.AuthenticationScheme) .AddJwtBearer(options => { @@ -173,7 +167,6 @@ namespace MyCompanyName.MyProjectName app.UseRouting(); app.UseCors(DefaultCorsPolicyName); app.UseAuthentication(); - app.UseAbpClaimsMap(); if (MultiTenancyConsts.IsEnabled) { app.UseMultiTenancy(); From 362c31c0847c6b52393fec8c422f3a6b478dab95 Mon Sep 17 00:00:00 2001 From: maliming Date: Mon, 16 Nov 2020 17:51:43 +0800 Subject: [PATCH 2/2] Remove UseAbpClaimsMap middleware. --- .../Volo.CmsKit.HttpApi.Host/CmsKitHttpApiHostModule.cs | 7 ------- 1 file changed, 7 deletions(-) diff --git a/modules/cms-kit/host/Volo.CmsKit.HttpApi.Host/CmsKitHttpApiHostModule.cs b/modules/cms-kit/host/Volo.CmsKit.HttpApi.Host/CmsKitHttpApiHostModule.cs index a4660cd675..57b49409fc 100644 --- a/modules/cms-kit/host/Volo.CmsKit.HttpApi.Host/CmsKitHttpApiHostModule.cs +++ b/modules/cms-kit/host/Volo.CmsKit.HttpApi.Host/CmsKitHttpApiHostModule.cs @@ -104,12 +104,6 @@ namespace Volo.CmsKit options.Languages.Add(new LanguageInfo("zh-Hant", "zh-Hant", "繁體中文")); }); - //Updates AbpClaimTypes to be compatible with identity server claims. - AbpClaimTypes.UserId = JwtClaimTypes.Subject; - AbpClaimTypes.UserName = JwtClaimTypes.Name; - AbpClaimTypes.Role = JwtClaimTypes.Role; - AbpClaimTypes.Email = JwtClaimTypes.Email; - context.Services.AddAuthentication(JwtBearerDefaults.AuthenticationScheme) .AddJwtBearer(options => { @@ -172,7 +166,6 @@ namespace Volo.CmsKit app.UseRouting(); app.UseCors(DefaultCorsPolicyName); app.UseAuthentication(); - app.UseAbpClaimsMap(); if (MultiTenancyConsts.IsEnabled) { app.UseMultiTenancy();