From c7e73be5591376ab46e0c071a353988afcc2e26a Mon Sep 17 00:00:00 2001
From: cKey <35512826+colinin@users.noreply.github.com>
Date: Wed, 14 Dec 2022 11:57:10 +0800
Subject: [PATCH] fix openiddict
---
.../AuthServerHttpApiHostModule.Configure.cs | 2 +-
.../AuthServerHttpApiHostModule.cs | 10 ++--------
...MicroService.AuthServer.HttpApi.Host.csproj | 3 ++-
.../appsettings.Development.json | 2 +-
.../AuthServerModule.Configure.cs | 18 +++++++++---------
5 files changed, 15 insertions(+), 20 deletions(-)
diff --git a/aspnet-core/services/LY.MicroService.AuthServer.HttpApi.Host/AuthServerHttpApiHostModule.Configure.cs b/aspnet-core/services/LY.MicroService.AuthServer.HttpApi.Host/AuthServerHttpApiHostModule.Configure.cs
index 202cac417..73c9be8ba 100644
--- a/aspnet-core/services/LY.MicroService.AuthServer.HttpApi.Host/AuthServerHttpApiHostModule.Configure.cs
+++ b/aspnet-core/services/LY.MicroService.AuthServer.HttpApi.Host/AuthServerHttpApiHostModule.Configure.cs
@@ -313,7 +313,7 @@ public partial class AuthServerHttpApiHostModule
if (isDevelopment)
{
- services.AddAlwaysAllowAuthorization();
+ // services.AddAlwaysAllowAuthorization();
}
if (!isDevelopment)
diff --git a/aspnet-core/services/LY.MicroService.AuthServer.HttpApi.Host/AuthServerHttpApiHostModule.cs b/aspnet-core/services/LY.MicroService.AuthServer.HttpApi.Host/AuthServerHttpApiHostModule.cs
index c591ddea8..fadd89a68 100644
--- a/aspnet-core/services/LY.MicroService.AuthServer.HttpApi.Host/AuthServerHttpApiHostModule.cs
+++ b/aspnet-core/services/LY.MicroService.AuthServer.HttpApi.Host/AuthServerHttpApiHostModule.cs
@@ -1,4 +1,3 @@
-using DotNetCore.CAP;
using LINGYUN.Abp.Account;
using LINGYUN.Abp.AspNetCore.HttpOverrides;
using LINGYUN.Abp.AspNetCore.Mvc.Localization;
@@ -20,7 +19,6 @@ using Microsoft.AspNetCore.Hosting;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Hosting;
using Volo.Abp;
-using Volo.Abp.AspNetCore.Authentication.JwtBearer;
using Volo.Abp.AspNetCore.MultiTenancy;
using Volo.Abp.AspNetCore.Serilog;
using Volo.Abp.Autofac;
@@ -52,7 +50,6 @@ namespace LY.MicroService.AuthServer;
typeof(AbpSettingManagementEntityFrameworkCoreModule),
typeof(AbpPermissionManagementEntityFrameworkCoreModule),
typeof(AbpLocalizationManagementEntityFrameworkCoreModule),
- typeof(AbpAspNetCoreAuthenticationJwtBearerModule),
typeof(AbpAuthorizationOrganizationUnitsModule),
typeof(AbpAuditLoggingElasticsearchModule),
typeof(AbpEmailingExceptionHandlingModule),
@@ -98,6 +95,8 @@ public partial class AuthServerHttpApiHostModule : AbpModule
public override void OnApplicationInitialization(ApplicationInitializationContext context)
{
var app = context.GetApplicationBuilder();
+ // 本地化
+ app.UseMapRequestLocalization();
// http调用链
app.UseCorrelationId();
// 虚拟文件系统
@@ -108,13 +107,8 @@ public partial class AuthServerHttpApiHostModule : AbpModule
app.UseCors(DefaultCorsPolicyName);
// 认证
app.UseAuthentication();
- app.UseAbpClaimsMap();
- // jwt
- app.UseJwtTokenMiddleware();
// 多租户
app.UseMultiTenancy();
- // 本地化
- app.UseMapRequestLocalization();
// 授权
app.UseAuthorization();
// Swagger
diff --git a/aspnet-core/services/LY.MicroService.AuthServer.HttpApi.Host/LY.MicroService.AuthServer.HttpApi.Host.csproj b/aspnet-core/services/LY.MicroService.AuthServer.HttpApi.Host/LY.MicroService.AuthServer.HttpApi.Host.csproj
index 00b6a07cc..e57119d03 100644
--- a/aspnet-core/services/LY.MicroService.AuthServer.HttpApi.Host/LY.MicroService.AuthServer.HttpApi.Host.csproj
+++ b/aspnet-core/services/LY.MicroService.AuthServer.HttpApi.Host/LY.MicroService.AuthServer.HttpApi.Host.csproj
@@ -14,6 +14,7 @@
all
runtime; build; native; contentfiles; analyzers; buildtransitive
+
@@ -27,11 +28,11 @@
-
+
diff --git a/aspnet-core/services/LY.MicroService.AuthServer.HttpApi.Host/appsettings.Development.json b/aspnet-core/services/LY.MicroService.AuthServer.HttpApi.Host/appsettings.Development.json
index d604e4e05..ffcd82faf 100644
--- a/aspnet-core/services/LY.MicroService.AuthServer.HttpApi.Host/appsettings.Development.json
+++ b/aspnet-core/services/LY.MicroService.AuthServer.HttpApi.Host/appsettings.Development.json
@@ -60,7 +60,7 @@
"InstanceName": "LINGYUN.Abp.Application"
},
"AuthServer": {
- "Authority": "http://127.0.0.1:44385/",
+ "Authority": "http://127.0.0.1:44385",
"ApiName": "lingyun-abp-application"
},
"AuditLogging": {
diff --git a/aspnet-core/services/LY.MicroService.AuthServer/AuthServerModule.Configure.cs b/aspnet-core/services/LY.MicroService.AuthServer/AuthServerModule.Configure.cs
index 49ccbeda6..1b5ee56e4 100644
--- a/aspnet-core/services/LY.MicroService.AuthServer/AuthServerModule.Configure.cs
+++ b/aspnet-core/services/LY.MicroService.AuthServer/AuthServerModule.Configure.cs
@@ -85,7 +85,7 @@ public partial class AuthServerModule
{
builder.AddValidation(options =>
{
- options.AddAudiences("lingyun-abp-application");
+ options.AddAudiences("lingyun-abp-api-resource");
options.UseLocalServer();
@@ -270,15 +270,15 @@ public partial class AuthServerModule
}
private void ConfigureSecurity(IServiceCollection services, IConfiguration configuration, bool isDevelopment = false)
{
- services.ForwardIdentityAuthenticationForBearer(OpenIddictValidationAspNetCoreDefaults.AuthenticationScheme);
+ //services.ForwardIdentityAuthenticationForBearer(OpenIddictValidationAspNetCoreDefaults.AuthenticationScheme);
- services.AddAuthentication()
- .AddJwtBearer(options =>
- {
- options.Authority = configuration["AuthServer:Authority"];
- options.RequireHttpsMetadata = false;
- options.Audience = configuration["AuthServer:ApiName"];
- });
+ //services.AddAuthentication()
+ // .AddJwtBearer(options =>
+ // {
+ // options.Authority = configuration["AuthServer:Authority"];
+ // options.RequireHttpsMetadata = false;
+ // options.Audience = configuration["AuthServer:ApiName"];
+ // });
if (!isDevelopment)
{