From c8a8f99ccc16ef325668207de3eb322d522f1448 Mon Sep 17 00:00:00 2001 From: maliming Date: Sat, 2 Apr 2022 23:18:53 +0800 Subject: [PATCH] Update AbpOpenIddictTenantResolveContributor.cs --- .../AbpOpenIddictTenantResolveContributor.cs | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/modules/openiddict/src/Volo.Abp.OpenIddict.AspNetCore/Volo/Abp/OpenIddict/AbpOpenIddictTenantResolveContributor.cs b/modules/openiddict/src/Volo.Abp.OpenIddict.AspNetCore/Volo/Abp/OpenIddict/AbpOpenIddictTenantResolveContributor.cs index 5ef61e3bef..4869b2e520 100644 --- a/modules/openiddict/src/Volo.Abp.OpenIddict.AspNetCore/Volo/Abp/OpenIddict/AbpOpenIddictTenantResolveContributor.cs +++ b/modules/openiddict/src/Volo.Abp.OpenIddict.AspNetCore/Volo/Abp/OpenIddict/AbpOpenIddictTenantResolveContributor.cs @@ -1,5 +1,6 @@ using System.Security.Principal; using System.Threading.Tasks; +using Microsoft.AspNetCore; using Microsoft.AspNetCore.Authentication; using Microsoft.AspNetCore.Http; using Microsoft.Extensions.DependencyInjection; @@ -23,7 +24,13 @@ public class AbpOpenIddictTenantResolveContributor : HttpTenantResolveContributo return null; } - var principal = (await httpContext.AuthenticateAsync(OpenIddictServerAspNetCoreDefaults.AuthenticationScheme)).Principal; - return principal?.FindTenantId().ToString(); + if (httpContext.GetOpenIddictServerRequest() != null) + { + context.Handled = true; + var principal = (await httpContext.AuthenticateAsync(OpenIddictServerAspNetCoreDefaults.AuthenticationScheme)).Principal; + return principal?.FindTenantId().ToString(); + } + + return null; } }