Merge pull request #12947 from abpframework/IAsyncInitialize-patch

Remove IAsyncInitialize interface.

framework/src/Volo.Abp.AspNetCore.Components.Web/Volo/Abp/AspNetCore/Components/Web/AbpAspNetCoreComponentsWebModule.cs

@@ -13,11 +13,6 @@ namespace Volo.Abp.AspNetCore.Components.Web;
     )]
 public class AbpAspNetCoreComponentsWebModule : AbpModule
 {
-    public override void PreConfigureServices(ServiceConfigurationContext context)
-    {
-
-    }
-
     public override void ConfigureServices(ServiceConfigurationContext context)
     {
         context.Services.Replace(ServiceDescriptor.Transient<IComponentActivator, ServiceProviderComponentActivator>());

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

@@ -7,11 +7,7 @@ using Volo.Abp.DependencyInjection;
 
 namespace Volo.Abp.AspNetCore.Components.Web.Security;
 
-[ExposeServices(
-    typeof(AbpComponentsClaimsCache),
-    typeof(IAsyncInitialize)
-)]
-public class AbpComponentsClaimsCache : IScopedDependency, IAsyncInitialize
+public class AbpComponentsClaimsCache : IScopedDependency
 {
     public ClaimsPrincipal Principal { get; private set; }
 

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

@@ -1,15 +1,12 @@
 using System;
-using System.Globalization;
 using System.Runtime.CompilerServices;
 using System.Threading.Tasks;
 using JetBrains.Annotations;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Volo.Abp;
-using Volo.Abp.AspNetCore.Components.Web;
 using Volo.Abp.AspNetCore.Components.Web.DependencyInjection;
 using Volo.Abp.AspNetCore.Components.WebAssembly;
-using Volo.Abp.AspNetCore.Mvc.Client;
 using Volo.Abp.DependencyInjection;
 using Volo.Abp.Modularity;
 
@@ -76,34 +73,5 @@ public static class AbpWebAssemblyHostBuilderExtensions
             .GetRequiredService<IClientScopeServiceProviderAccessor>()).ServiceProvider = serviceProvider;
 
         await application.InitializeAsync(serviceProvider);
-        await InitializeModulesAsync(serviceProvider);
-        await SetCurrentLanguageAsync(serviceProvider);
-    }
-
-    private async static Task InitializeModulesAsync(IServiceProvider serviceProvider)
-    {
-        foreach (var service in serviceProvider.GetServices<IAsyncInitialize>())
-        {
-            await service.InitializeAsync();
-        }
-    }
-
-    private async static Task SetCurrentLanguageAsync(IServiceProvider serviceProvider)
-    {
-        var configurationClient = serviceProvider.GetRequiredService<ICachedApplicationConfigurationClient>();
-        var utilsService = serviceProvider.GetRequiredService<IAbpUtilsService>();
-        var configuration = await configurationClient.GetAsync();
-        var cultureName = configuration.Localization?.CurrentCulture?.CultureName;
-        if (!cultureName.IsNullOrEmpty())
-        {
-            var culture = new CultureInfo(cultureName);
-            CultureInfo.DefaultThreadCurrentCulture = culture;
-            CultureInfo.DefaultThreadCurrentUICulture = culture;
-        }
-
-        if (CultureInfo.CurrentUICulture.TextInfo.IsRightToLeft)
-        {
-            await utilsService.AddClassToTagAsync("body", "rtl");
-        }
     }
 }

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

@@ -1,10 +1,15 @@
-using Microsoft.Extensions.DependencyInjection;
+using System;
+using System.Globalization;
+using System.Threading.Tasks;
+using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using Volo.Abp.AspNetCore.Components.Web;
 using Volo.Abp.AspNetCore.Components.Web.ExceptionHandling;
+using Volo.Abp.AspNetCore.Components.Web.Security;
 using Volo.Abp.AspNetCore.Mvc.Client;
 using Volo.Abp.Http.Client;
 using Volo.Abp.Modularity;
+using Volo.Abp.Threading;
 using Volo.Abp.UI;
 
 namespace Volo.Abp.AspNetCore.Components.WebAssembly;
@@ -33,4 +38,35 @@ public class AbpAspNetCoreComponentsWebAssemblyModule : AbpModule
             .GetHostBuilder().Logging
             .AddProvider(new AbpExceptionHandlingLoggerProvider(context.Services));
     }
+
+    public override void OnApplicationInitialization(ApplicationInitializationContext context)
+    {
+        AsyncHelper.RunSync(() => OnApplicationInitializationAsync(context));
+    }
+
+    public async override Task OnApplicationInitializationAsync(ApplicationInitializationContext context)
+    {
+        await context.ServiceProvider.GetRequiredService<WebAssemblyCachedApplicationConfigurationClient>().InitializeAsync();
+        await context.ServiceProvider.GetRequiredService<AbpComponentsClaimsCache>().InitializeAsync();
+        await SetCurrentLanguageAsync(context.ServiceProvider);
+    }
+
+    private async static Task SetCurrentLanguageAsync(IServiceProvider serviceProvider)
+    {
+        var configurationClient = serviceProvider.GetRequiredService<ICachedApplicationConfigurationClient>();
+        var utilsService = serviceProvider.GetRequiredService<IAbpUtilsService>();
+        var configuration = await configurationClient.GetAsync();
+        var cultureName = configuration.Localization?.CurrentCulture?.CultureName;
+        if (!cultureName.IsNullOrEmpty())
+        {
+            var culture = new CultureInfo(cultureName);
+            CultureInfo.DefaultThreadCurrentCulture = culture;
+            CultureInfo.DefaultThreadCurrentUICulture = culture;
+        }
+
+        if (CultureInfo.CurrentUICulture.TextInfo.IsRightToLeft)
+        {
+            await utilsService.AddClassToTagAsync("body", "rtl");
+        }
+    }
 }

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

@@ -7,11 +7,6 @@ using Volo.Abp.MultiTenancy;
 
 namespace Volo.Abp.AspNetCore.Components.WebAssembly;
 
-[ExposeServices(
-    typeof(WebAssemblyCachedApplicationConfigurationClient),
-    typeof(ICachedApplicationConfigurationClient),
-    typeof(IAsyncInitialize)
-    )]
 public class WebAssemblyCachedApplicationConfigurationClient : ICachedApplicationConfigurationClient, ITransientDependency
 {
     protected AbpApplicationConfigurationClientProxy ApplicationConfigurationAppService { get; }

framework/src/Volo.Abp.AspNetCore.Mvc.Client.Common/Volo/Abp/AspNetCore/Mvc/Client/ICachedApplicationConfigurationClient.cs

@@ -3,7 +3,7 @@ using Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations;
 
 namespace Volo.Abp.AspNetCore.Mvc.Client;
 
-public interface ICachedApplicationConfigurationClient : IAsyncInitialize
+public interface ICachedApplicationConfigurationClient
 {
     Task<ApplicationConfigurationDto> GetAsync();
 

framework/src/Volo.Abp.AspNetCore.Mvc.Client/Volo/Abp/AspNetCore/Mvc/Client/AbpAspNetCoreMvcClientModule.cs

@@ -1,5 +1,8 @@
-using Volo.Abp.EventBus;
+using System.Threading.Tasks;
+using Microsoft.Extensions.DependencyInjection;
+using Volo.Abp.EventBus;
 using Volo.Abp.Modularity;
+using Volo.Abp.Threading;
 
 namespace Volo.Abp.AspNetCore.Mvc.Client;
 
@@ -9,4 +12,13 @@ namespace Volo.Abp.AspNetCore.Mvc.Client;
     )]
 public class AbpAspNetCoreMvcClientModule : AbpModule
 {
+    public override void OnApplicationInitialization(ApplicationInitializationContext context)
+    {
+        AsyncHelper.RunSync(() => OnApplicationInitializationAsync(context));
+    }
+
+    public async override Task OnApplicationInitializationAsync(ApplicationInitializationContext context)
+    {
+        await context.ServiceProvider.GetRequiredService<MvcCachedApplicationConfigurationClient>().InitializeAsync();
+    }
 }

framework/src/Volo.Abp.AspNetCore.Mvc.Client/Volo/Abp/AspNetCore/Mvc/Client/MvcCachedApplicationConfigurationClient.cs

@@ -11,11 +11,6 @@ using Volo.Abp.Users;
 
 namespace Volo.Abp.AspNetCore.Mvc.Client;
 
-[ExposeServices(
-    typeof(MvcCachedApplicationConfigurationClient),
-    typeof(ICachedApplicationConfigurationClient),
-    typeof(IAsyncInitialize)
-    )]
 public class MvcCachedApplicationConfigurationClient : ICachedApplicationConfigurationClient, ITransientDependency
 {
     protected IHttpContextAccessor HttpContextAccessor { get; }

framework/src/Volo.Abp.Core/Volo/Abp/IAsyncInitialize.cs

@@ -1,12 +0,0 @@
-using System.Threading.Tasks;
-
-namespace Volo.Abp;
-
-/// <summary>
-/// IMPORTANT: THIS IS AN INTERNAL CLASS TO BE USED BY THE ABP FRAMEWORK.
-/// IT WILL BE REMOVED IN THE FUTURE VERSIONS. DON'T USE IT!
-/// </summary>
-public interface IAsyncInitialize //TODO: Remove once we have async module initialization
-{
-    Task InitializeAsync();
-}