Avoid AsyncHelper usage in the DefaultAbpRequestLocalizationOptionsProvider

framework/src/Volo.Abp.AspNetCore/Microsoft/AspNetCore/RequestLocalization/AbpRequestLocalizationMiddleware.cs

@@ -25,7 +25,9 @@ namespace Microsoft.AspNetCore.RequestLocalization
         {
             var middleware = new RequestLocalizationMiddleware(
                 next,
-                new OptionsWrapper<RequestLocalizationOptions>(_requestLocalizationOptionsProvider.GetLocalizationOptions()),
+                new OptionsWrapper<RequestLocalizationOptions>(
+                    await _requestLocalizationOptionsProvider.GetLocalizationOptionsAsync()
+                ),
                 _loggerFactory
             );
 

framework/src/Volo.Abp.AspNetCore/Microsoft/AspNetCore/RequestLocalization/DefaultAbpRequestLocalizationOptionsProvider.cs

@@ -2,67 +2,76 @@
 using System.Collections.Generic;
 using System.Globalization;
 using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Localization;
 using Microsoft.Extensions.DependencyInjection;
+using Nito.AsyncEx;
 using Volo.Abp.DependencyInjection;
 using Volo.Abp.Localization;
 using Volo.Abp.Settings;
-using Volo.Abp.Threading;
 
 namespace Microsoft.AspNetCore.RequestLocalization
 {
     public class DefaultAbpRequestLocalizationOptionsProvider : IAbpRequestLocalizationOptionsProvider, ISingletonDependency
     {
-        private readonly IServiceProvider _serviceProvider;
-        private Lazy<RequestLocalizationOptions> _lazyRequestLocalizationOptions;
+        private readonly IServiceScopeFactory _serviceProviderFactory;
+        private readonly SemaphoreSlim _syncSemaphore;
+        private Action<RequestLocalizationOptions> _optionsAction;
+        private RequestLocalizationOptions _requestLocalizationOptions;
 
-        public DefaultAbpRequestLocalizationOptionsProvider(IServiceProvider serviceProvider)
+        public DefaultAbpRequestLocalizationOptionsProvider(IServiceScopeFactory serviceProviderFactory)
         {
-            _serviceProvider = serviceProvider;
+            _serviceProviderFactory = serviceProviderFactory;
+            _syncSemaphore = new SemaphoreSlim(1, 1);
         }
 
         public void InitLocalizationOptions(Action<RequestLocalizationOptions> optionsAction = null)
         {
-            _lazyRequestLocalizationOptions = new Lazy<RequestLocalizationOptions>(() =>
+            _optionsAction = optionsAction;
+        }
+
+        public async Task<RequestLocalizationOptions> GetLocalizationOptionsAsync()
+        {
+            if (_requestLocalizationOptions == null)
             {
-                using (var serviceScope = _serviceProvider.CreateScope())
+                using (await _syncSemaphore.LockAsync())
                 {
-                    var languageProvider = serviceScope.ServiceProvider.GetRequiredService<ILanguageProvider>();
-                    var settingProvider = serviceScope.ServiceProvider.GetRequiredService<ISettingProvider>();
+                    using (var serviceScope = _serviceProviderFactory.CreateScope())
+                    {
+                        var languageProvider = serviceScope.ServiceProvider.GetRequiredService<ILanguageProvider>();
+                        var settingProvider = serviceScope.ServiceProvider.GetRequiredService<ISettingProvider>();
 
-                    var languages = AsyncHelper.RunSync(languageProvider.GetLanguagesAsync);
-                    var defaultLanguage = AsyncHelper.RunSync(() =>
-                        settingProvider.GetOrNullAsync(LocalizationSettingNames.DefaultLanguage));
+                        var languages = await languageProvider.GetLanguagesAsync();
+                        var defaultLanguage = await settingProvider.GetOrNullAsync(LocalizationSettingNames.DefaultLanguage);
 
-                    var options = !languages.Any()
-                        ? new RequestLocalizationOptions()
-                        : new RequestLocalizationOptions
-                        {
-                            DefaultRequestCulture = DefaultGetRequestCulture(defaultLanguage, languages),
+                        var options = !languages.Any()
+                            ? new RequestLocalizationOptions()
+                            : new RequestLocalizationOptions
+                            {
+                                DefaultRequestCulture = DefaultGetRequestCulture(defaultLanguage, languages),
 
-                            SupportedCultures = languages
-                                .Select(l => l.CultureName)
-                                .Distinct()
-                                .Select(c => new CultureInfo(c))
-                                .ToArray(),
+                                SupportedCultures = languages
+                                    .Select(l => l.CultureName)
+                                    .Distinct()
+                                    .Select(c => new CultureInfo(c))
+                                    .ToArray(),
 
-                            SupportedUICultures = languages
-                                .Select(l => l.UiCultureName)
-                                .Distinct()
-                                .Select(c => new CultureInfo(c))
-                                .ToArray()
-                        };
+                                SupportedUICultures = languages
+                                    .Select(l => l.UiCultureName)
+                                    .Distinct()
+                                    .Select(c => new CultureInfo(c))
+                                    .ToArray()
+                            };
 
-                    optionsAction?.Invoke(options);
-                    return options;
+                        _optionsAction?.Invoke(options);
+                        _requestLocalizationOptions = options;
+                    }
                 }
-            }, true);
-        }
+            }
 
-        public RequestLocalizationOptions GetLocalizationOptions()
-        {
-            return _lazyRequestLocalizationOptions.Value;
+            return _requestLocalizationOptions;
         }
 
         private static RequestCulture DefaultGetRequestCulture(string defaultLanguage, IReadOnlyList<LanguageInfo> languages)

framework/src/Volo.Abp.AspNetCore/Microsoft/AspNetCore/RequestLocalization/IAbpRequestLocalizationOptionsProvider.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Threading.Tasks;
 using Microsoft.AspNetCore.Builder;
 
 namespace Microsoft.AspNetCore.RequestLocalization
@@ -7,6 +8,6 @@ namespace Microsoft.AspNetCore.RequestLocalization
     {
         void InitLocalizationOptions(Action<RequestLocalizationOptions> optionsAction = null);
 
-        RequestLocalizationOptions GetLocalizationOptions();
+        Task<RequestLocalizationOptions> GetLocalizationOptionsAsync();
     }
 }