Browse Source

Remove `IAbpClaimsPrincipalFactory` from `AbpComponentsClaimsCache`.

pull/18268/head
maliming 3 years ago
parent
commit
d9abb2bc00
No known key found for this signature in database GPG Key ID: A646B9CB645ECEA4
  1. 7
      framework/src/Volo.Abp.AspNetCore.Components.Web/Volo/Abp/AspNetCore/Components/Web/Security/AbpComponentsClaimsCache.cs

7
framework/src/Volo.Abp.AspNetCore.Components.Web/Volo/Abp/AspNetCore/Components/Web/Security/AbpComponentsClaimsCache.cs

@ -1,9 +1,9 @@
using System.Security.Claims; using System.Security.Claims;
using System.Threading.Tasks; using System.Threading.Tasks;
using JetBrains.Annotations;
using Microsoft.AspNetCore.Components.Authorization; using Microsoft.AspNetCore.Components.Authorization;
using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection;
using Volo.Abp.DependencyInjection; using Volo.Abp.DependencyInjection;
using Volo.Abp.Security.Claims;
namespace Volo.Abp.AspNetCore.Components.Web.Security; namespace Volo.Abp.AspNetCore.Components.Web.Security;
@ -12,18 +12,16 @@ public class AbpComponentsClaimsCache : IScopedDependency
public ClaimsPrincipal Principal { get; private set; } = default!; public ClaimsPrincipal Principal { get; private set; } = default!;
private readonly AuthenticationStateProvider? _authenticationStateProvider; private readonly AuthenticationStateProvider? _authenticationStateProvider;
private readonly IAbpClaimsPrincipalFactory _abpClaimsPrincipalFactory;
public AbpComponentsClaimsCache( public AbpComponentsClaimsCache(
IClientScopeServiceProviderAccessor serviceProviderAccessor) IClientScopeServiceProviderAccessor serviceProviderAccessor)
{ {
_authenticationStateProvider = serviceProviderAccessor.ServiceProvider.GetService<AuthenticationStateProvider>(); _authenticationStateProvider = serviceProviderAccessor.ServiceProvider.GetService<AuthenticationStateProvider>();
_abpClaimsPrincipalFactory = serviceProviderAccessor.ServiceProvider.GetRequiredService<IAbpClaimsPrincipalFactory>();
if (_authenticationStateProvider != null) if (_authenticationStateProvider != null)
{ {
_authenticationStateProvider.AuthenticationStateChanged += async (task) => _authenticationStateProvider.AuthenticationStateChanged += async (task) =>
{ {
Principal = await _abpClaimsPrincipalFactory.CreateDynamicAsync((await task).User); Principal = (await task).User;
}; };
} }
} }
@ -34,7 +32,6 @@ public class AbpComponentsClaimsCache : IScopedDependency
{ {
var authenticationState = await _authenticationStateProvider.GetAuthenticationStateAsync(); var authenticationState = await _authenticationStateProvider.GetAuthenticationStateAsync();
Principal = authenticationState.User; Principal = authenticationState.User;
await _abpClaimsPrincipalFactory.CreateDynamicAsync(Principal);
} }
} }
} }

Loading…
Cancel
Save