From e0dc92b3c8bd77324ad9b911b5f2c0165cc0c9db Mon Sep 17 00:00:00 2001 From: yinchang0626 Date: Mon, 24 May 2021 20:26:45 +0800 Subject: [PATCH] resolve #9112 and #9102 (cherry picked from commit 83adc457f3a5bd5c24648a5a3ed4c386ea873cff) --- .../IdentityModelRemoteServiceHttpClientAuthenticator.cs | 2 +- .../Volo/Abp/IdentityModel/IdentityModelTokenCacheItem.cs | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/framework/src/Volo.Abp.Http.Client.IdentityModel/Volo/Abp/Http/Client/IdentityModel/IdentityModelRemoteServiceHttpClientAuthenticator.cs b/framework/src/Volo.Abp.Http.Client.IdentityModel/Volo/Abp/Http/Client/IdentityModel/IdentityModelRemoteServiceHttpClientAuthenticator.cs index 0b1749f445..e03cb804f7 100644 --- a/framework/src/Volo.Abp.Http.Client.IdentityModel/Volo/Abp/Http/Client/IdentityModel/IdentityModelRemoteServiceHttpClientAuthenticator.cs +++ b/framework/src/Volo.Abp.Http.Client.IdentityModel/Volo/Abp/Http/Client/IdentityModel/IdentityModelRemoteServiceHttpClientAuthenticator.cs @@ -20,7 +20,7 @@ namespace Volo.Abp.Http.Client.IdentityModel { await IdentityModelAuthenticationService.TryAuthenticateAsync( context.Client, - context.RemoteService.GetIdentityClient() + context.RemoteService.GetIdentityClient() ?? context.RemoteServiceName ); } } diff --git a/framework/src/Volo.Abp.IdentityModel/Volo/Abp/IdentityModel/IdentityModelTokenCacheItem.cs b/framework/src/Volo.Abp.IdentityModel/Volo/Abp/IdentityModel/IdentityModelTokenCacheItem.cs index e8f8dfb8db..a0d2604b39 100644 --- a/framework/src/Volo.Abp.IdentityModel/Volo/Abp/IdentityModel/IdentityModelTokenCacheItem.cs +++ b/framework/src/Volo.Abp.IdentityModel/Volo/Abp/IdentityModel/IdentityModelTokenCacheItem.cs @@ -5,7 +5,6 @@ using Volo.Abp.MultiTenancy; namespace Volo.Abp.IdentityModel { [Serializable] - [IgnoreMultiTenancy] public class IdentityModelTokenCacheItem { public string AccessToken { get; set; }