Merge pull request #8707 from abpframework/auto-merge/rel-4-3/325

Merge branch dev with rel-4.3

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

@@ -1,6 +1,7 @@
 using System.Security.Claims;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Components.Authorization;
+using Microsoft.Extensions.DependencyInjection;
 using Volo.Abp.DependencyInjection;
 
 namespace Volo.Abp.AspNetCore.Components.Web.Security
@@ -9,15 +10,19 @@ namespace Volo.Abp.AspNetCore.Components.Web.Security
         typeof(AbpComponentsClaimsCache),
         typeof(IAsyncInitialize)
     )]
-    public class AbpComponentsClaimsCache : ISingletonDependency, IAsyncInitialize
+    public class AbpComponentsClaimsCache : IScopedDependency, IAsyncInitialize
     {
         public ClaimsPrincipal Principal { get; private set; }
 
         private readonly AuthenticationStateProvider _authenticationStateProvider;
 
-        public AbpComponentsClaimsCache(AuthenticationStateProvider authenticationStateProvider)
+        public AbpComponentsClaimsCache(IClientScopeServiceProviderAccessor clientScopeServiceProviderAccessor)
         {
-            _authenticationStateProvider = authenticationStateProvider;
+            _authenticationStateProvider = clientScopeServiceProviderAccessor.ServiceProvider.GetRequiredService<AuthenticationStateProvider>();
+            _authenticationStateProvider.AuthenticationStateChanged += async (task) =>
+            {
+                Principal = (await task).User;
+            };
         }
 
         public virtual async Task InitializeAsync()

framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme/Themes/Basic/LoginDisplay.razor.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Components;
+using Microsoft.AspNetCore.Components.Authorization;
 using Microsoft.AspNetCore.Components.Routing;
 using Volo.Abp.UI.Navigation;
 
@@ -10,6 +11,9 @@ namespace Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme.Themes.Basic
     {
         [Inject]
         protected IMenuManager MenuManager { get; set; }
+        
+        [Inject]
+        protected AuthenticationStateProvider AuthenticationStateProvider { get; set; }
 
         protected ApplicationMenu Menu { get; set; }
 
@@ -18,6 +22,12 @@ namespace Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme.Themes.Basic
             Menu = await MenuManager.GetAsync(StandardMenus.User);
 
             Navigation.LocationChanged += OnLocationChanged;
+
+            AuthenticationStateProvider.AuthenticationStateChanged += async (task) =>
+            {
+                Menu = await MenuManager.GetAsync(StandardMenus.User);
+                await InvokeAsync(StateHasChanged);
+            };
         }
 
         protected virtual void OnLocationChanged(object sender, LocationChangedEventArgs e)

framework/src/Volo.Abp.AspNetCore.Components.WebAssembly/Microsoft/AspNetCore/Components/WebAssembly/Hosting/AbpWebAssemblyHostBuilderExtensions.cs

@@ -48,17 +48,12 @@ namespace Microsoft.AspNetCore.Components.WebAssembly.Hosting
             Check.NotNull(application, nameof(application));
             Check.NotNull(serviceProvider, nameof(serviceProvider));
 
-            var serviceProviderAccessor = (ComponentsClientScopeServiceProviderAccessor)
+            ((ComponentsClientScopeServiceProviderAccessor) serviceProvider
-                serviceProvider.GetRequiredService<IClientScopeServiceProviderAccessor>();
+                .GetRequiredService<IClientScopeServiceProviderAccessor>()).ServiceProvider = serviceProvider;
-            serviceProviderAccessor.ServiceProvider = serviceProvider;
 
             application.Initialize(serviceProvider);
-
+            await InitializeModulesAsync(serviceProvider);
-            using (var scope = serviceProvider.CreateScope())
+            await SetCurrentLanguageAsync(serviceProvider);
-            {
-                await InitializeModulesAsync(scope.ServiceProvider);
-                await SetCurrentLanguageAsync(scope);
-            }
         }
 
         private static async Task InitializeModulesAsync(IServiceProvider serviceProvider)
@@ -69,11 +64,11 @@ namespace Microsoft.AspNetCore.Components.WebAssembly.Hosting
             }
         }
 
-        private static async Task SetCurrentLanguageAsync(IServiceScope scope)
+        private static async Task SetCurrentLanguageAsync(IServiceProvider serviceProvider)
         {
-            var configurationClient = scope.ServiceProvider.GetRequiredService<ICachedApplicationConfigurationClient>();
+            var configurationClient = serviceProvider.GetRequiredService<ICachedApplicationConfigurationClient>();
-            var utilsService = scope.ServiceProvider.GetRequiredService<IAbpUtilsService>();
+            var utilsService = serviceProvider.GetRequiredService<IAbpUtilsService>();
-            var configuration = configurationClient.Get();
+            var configuration = await configurationClient.GetAsync();
             var cultureName = configuration.Localization?.CurrentCulture?.CultureName;
             if (!cultureName.IsNullOrEmpty())
             {

framework/src/Volo.Abp.AspNetCore.Components.WebAssembly/Volo/Abp/AspNetCore/Components/WebAssembly/WebAssemblyCurrentPrincipalAccessor.cs

@@ -1,4 +1,5 @@
 using System.Security.Claims;
+using Microsoft.Extensions.DependencyInjection;
 using Volo.Abp.AspNetCore.Components.Web.Security;
 using Volo.Abp.DependencyInjection;
 using Volo.Abp.Security.Claims;
@@ -10,9 +11,9 @@ namespace Volo.Abp.AspNetCore.Components.WebAssembly
         protected AbpComponentsClaimsCache ClaimsCache { get; }
 
         public WebAssemblyCurrentPrincipalAccessor(
-            AbpComponentsClaimsCache claimsCache)
+            IClientScopeServiceProviderAccessor clientScopeServiceProviderAccessor)
         {
-            ClaimsCache = claimsCache;
+            ClaimsCache = clientScopeServiceProviderAccessor.ServiceProvider.GetRequiredService<AbpComponentsClaimsCache>();
         }
 
         protected override ClaimsPrincipal GetClaimsPrincipal()