From fe2f66a30479a0e22247f3cc6f11c62bd1e10e87 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Halil=20=C4=B0brahim=20Kalkan?= <hi_kalkan@yahoo.com>
Date: Tue, 17 Dec 2019 19:05:39 +0300
Subject: [PATCH] Eleminate AsyncHelper.RunSync usage from
 RemoteLocalizationContributor.

---
 .../CachedApplicationConfigurationClient.cs   | 28 +++++++++++++++++++
 .../ICachedApplicationConfigurationClient.cs  |  2 ++
 .../Client/RemoteLocalizationContributor.cs   |  4 +--
 3 files changed, 31 insertions(+), 3 deletions(-)

diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.Client/Volo/Abp/AspNetCore/Mvc/Client/CachedApplicationConfigurationClient.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.Client/Volo/Abp/AspNetCore/Mvc/Client/CachedApplicationConfigurationClient.cs
index 838150fd49..fc2ba3eb13 100644
--- a/framework/src/Volo.Abp.AspNetCore.Mvc.Client/Volo/Abp/AspNetCore/Mvc/Client/CachedApplicationConfigurationClient.cs
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.Client/Volo/Abp/AspNetCore/Mvc/Client/CachedApplicationConfigurationClient.cs
@@ -7,6 +7,7 @@ using Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations;
 using Volo.Abp.Caching;
 using Volo.Abp.DependencyInjection;
 using Volo.Abp.Http.Client.DynamicProxying;
+using Volo.Abp.Threading;
 using Volo.Abp.Users;
 
 namespace Volo.Abp.AspNetCore.Mvc.Client
@@ -30,6 +31,33 @@ namespace Volo.Abp.AspNetCore.Mvc.Client
             Cache = cache;
         }
 
+        public ApplicationConfigurationDto Get()
+        {
+            var cacheKey = CreateCacheKey();
+            var httpContext = HttpContextAccessor?.HttpContext;
+
+            if (httpContext != null && httpContext.Items[cacheKey] is ApplicationConfigurationDto configuration)
+            {
+                return configuration;
+            }
+
+            configuration = Cache.GetOrAdd(
+                cacheKey,
+                () => AsyncHelper.RunSync(Proxy.Service.GetAsync),
+                () => new DistributedCacheEntryOptions
+                {
+                    AbsoluteExpirationRelativeToNow = TimeSpan.FromSeconds(120) //TODO: Should be configurable. Default value should be higher (5 mins would be good).
+                }
+            );
+
+            if (httpContext != null)
+            {
+                httpContext.Items[cacheKey] = configuration;
+            }
+
+            return configuration;
+        }
+
         public async Task<ApplicationConfigurationDto> GetAsync()
         {
             var cacheKey = CreateCacheKey();
diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.Client/Volo/Abp/AspNetCore/Mvc/Client/ICachedApplicationConfigurationClient.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.Client/Volo/Abp/AspNetCore/Mvc/Client/ICachedApplicationConfigurationClient.cs
index 71d9d8cddf..00f195166c 100644
--- a/framework/src/Volo.Abp.AspNetCore.Mvc.Client/Volo/Abp/AspNetCore/Mvc/Client/ICachedApplicationConfigurationClient.cs
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.Client/Volo/Abp/AspNetCore/Mvc/Client/ICachedApplicationConfigurationClient.cs
@@ -5,6 +5,8 @@ namespace Volo.Abp.AspNetCore.Mvc.Client
 {
     public interface ICachedApplicationConfigurationClient
     {
+        ApplicationConfigurationDto Get();
+
         Task<ApplicationConfigurationDto> GetAsync();
     }
 }
\ No newline at end of file
diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.Client/Volo/Abp/AspNetCore/Mvc/Client/RemoteLocalizationContributor.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.Client/Volo/Abp/AspNetCore/Mvc/Client/RemoteLocalizationContributor.cs
index 79033f3679..4b92f1083f 100644
--- a/framework/src/Volo.Abp.AspNetCore.Mvc.Client/Volo/Abp/AspNetCore/Mvc/Client/RemoteLocalizationContributor.cs
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.Client/Volo/Abp/AspNetCore/Mvc/Client/RemoteLocalizationContributor.cs
@@ -55,9 +55,7 @@ namespace Volo.Abp.AspNetCore.Mvc.Client
 
         private Dictionary<string, string> GetResourceOrNull()
         {
-            var applicationConfigurationDto = AsyncHelper.RunSync(
-                () => _applicationConfigurationClient.GetAsync()
-            );
+            var applicationConfigurationDto = _applicationConfigurationClient.Get();
 
             var resource = applicationConfigurationDto
                 .Localization.Values