Resolved #7508: Use the default language setting if user hasn't selected a language.

framework/src/Volo.Abp.AspNetCore.MultiTenancy/Volo/Abp/AspNetCore/MultiTenancy/MultiTenancyMiddleware.cs

@@ -1,7 +1,15 @@
-using System.Threading.Tasks;
+using System;
+using System.Globalization;
+using System.Threading.Tasks;
 using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Localization;
+using Microsoft.AspNetCore.RequestLocalization;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Options;
 using Volo.Abp.DependencyInjection;
+using Volo.Abp.Localization;
 using Volo.Abp.MultiTenancy;
+using Volo.Abp.Settings;
 
 namespace Volo.Abp.AspNetCore.MultiTenancy
 {
@@ -23,8 +31,62 @@ namespace Volo.Abp.AspNetCore.MultiTenancy
             var tenant = await _tenantConfigurationProvider.GetAsync(saveResolveResult: true);
             using (_currentTenant.Change(tenant?.Id, tenant?.Name))
             {
+                var requestCulture = await TryGetRequestCultureAsync(context);
+                if (requestCulture != null)
+                {
+                    CultureInfo.CurrentCulture = requestCulture.Culture;
+                    CultureInfo.CurrentUICulture = requestCulture.UICulture;
+                    AbpRequestCultureCookieHelper.SetCultureCookie(
+                        context,
+                        requestCulture
+                    );
+                }
+
                 await next(context);
             }
         }
+
+        private async Task<RequestCulture> TryGetRequestCultureAsync(HttpContext httpContext)
+        {
+            var requestCultureFeature = httpContext.Features.Get<IRequestCultureFeature>();
+
+            /* If requestCultureFeature == null, that means the RequestLocalizationMiddleware was not used
+             * and we don't want to set the culture. */
+            if (requestCultureFeature == null)
+            {
+                return null;
+            }
+
+            /* If requestCultureFeature.Provider is not null, that means RequestLocalizationMiddleware
+             * already picked a language, so we don't need to set the default. */
+            if (requestCultureFeature.Provider != null)
+            {
+                return null;
+            }
+
+            var settingProvider = httpContext.RequestServices.GetRequiredService<ISettingProvider>();
+            var defaultLanguage = await settingProvider.GetOrNullAsync(LocalizationSettingNames.DefaultLanguage);
+            if (defaultLanguage.IsNullOrWhiteSpace())
+            {
+                return null;
+            }
+
+            string culture;
+            string uiCulture;
+
+            if (defaultLanguage.Contains(';'))
+            {
+                var splitted = defaultLanguage.Split(';');
+                culture = splitted[0];
+                uiCulture = splitted[1];
+            }
+            else
+            {
+                culture = defaultLanguage;
+                uiCulture = defaultLanguage;
+            }
+
+            return new RequestCulture(CultureInfo.GetCultureInfo(culture), CultureInfo.GetCultureInfo(uiCulture));
+        }
     }
 }

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

@@ -7,7 +7,8 @@ namespace Volo.Abp.AspNetCore.Mvc.Client
     {
         public static string CreateCacheKey(ICurrentUser currentUser)
         {
-            return $"ApplicationConfiguration_{currentUser.Id?.ToString("N") ?? "Anonymous"}_{CultureInfo.CurrentUICulture.Name}";
+            var userKey = currentUser.Id?.ToString("N") ?? "Anonymous";
+            return $"ApplicationConfiguration_{userKey}_{CultureInfo.CurrentUICulture.Name}";
         }
     }
 }

framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/Localization/AbpLanguagesController.cs

@@ -1,7 +1,7 @@
-using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Localization;
+using Microsoft.AspNetCore.Localization;
 using Microsoft.AspNetCore.Mvc;
 using System;
+using Microsoft.AspNetCore.RequestLocalization;
 using Volo.Abp.Localization;
 
 namespace Volo.Abp.AspNetCore.Mvc.Localization
@@ -20,12 +20,10 @@ namespace Volo.Abp.AspNetCore.Mvc.Localization
                 throw new AbpException("Unknown language: " + culture + ". It must be a valid culture!");
             }
 
-            string cookieValue = CookieRequestCultureProvider.MakeCookieValue(new RequestCulture(culture, uiCulture));
-
-            Response.Cookies.Append(CookieRequestCultureProvider.DefaultCookieName, cookieValue, new CookieOptions
-            {
-                Expires = Clock.Now.AddYears(2)
-            });
+            AbpRequestCultureCookieHelper.SetCultureCookie(
+                HttpContext,
+                new RequestCulture(culture, uiCulture)
+            );
 
             if (!string.IsNullOrWhiteSpace(returnUrl))
             {

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

@@ -0,0 +1,23 @@
+using System;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Localization;
+
+namespace Microsoft.AspNetCore.RequestLocalization
+{
+    public static class AbpRequestCultureCookieHelper
+    {
+        public static void SetCultureCookie(
+            HttpContext httpContext,
+            RequestCulture requestCulture)
+        {
+            httpContext.Response.Cookies.Append(
+                CookieRequestCultureProvider.DefaultCookieName,
+                CookieRequestCultureProvider.MakeCookieValue(requestCulture),
+                new CookieOptions
+                {
+                    Expires = DateTime.Now.AddYears(2)
+                }
+            );
+        }
+    }
+}

framework/src/Volo.Abp.Http.Client/Volo/Abp/Http/Client/DynamicProxying/ApiDescriptionFinder.cs

@@ -1,24 +1,38 @@
 using System;
+using System.Globalization;
 using System.Linq;
 using System.Net.Http;
+using System.Net.Http.Headers;
 using System.Reflection;
 using System.Text.Json;
 using System.Threading.Tasks;
+using Microsoft.Extensions.Options;
 using Volo.Abp.DependencyInjection;
 using Volo.Abp.Http.Modeling;
+using Volo.Abp.MultiTenancy;
 using Volo.Abp.Threading;
+using Volo.Abp.Tracing;
 
 namespace Volo.Abp.Http.Client.DynamicProxying
 {
     public class ApiDescriptionFinder : IApiDescriptionFinder, ITransientDependency
     {
         public ICancellationTokenProvider CancellationTokenProvider { get; set; }
-
         protected IApiDescriptionCache Cache { get; }
-
-        public ApiDescriptionFinder(IApiDescriptionCache cache)
+        protected AbpCorrelationIdOptions AbpCorrelationIdOptions { get; }
+        protected ICorrelationIdProvider CorrelationIdProvider { get; }
+        protected ICurrentTenant CurrentTenant { get; }
+
+        public ApiDescriptionFinder(
+            IApiDescriptionCache cache,
+            IOptions<AbpCorrelationIdOptions> abpCorrelationIdOptions,
+            ICorrelationIdProvider correlationIdProvider,
+            ICurrentTenant currentTenant)
         {
             Cache = cache;
+            AbpCorrelationIdOptions = abpCorrelationIdOptions.Value;
+            CorrelationIdProvider = correlationIdProvider;
+            CurrentTenant = currentTenant;
             CancellationTokenProvider = NullCancellationTokenProvider.Instance;
         }
 
@@ -71,10 +85,19 @@ namespace Volo.Abp.Http.Client.DynamicProxying
             return await Cache.GetAsync(baseUrl, () => GetApiDescriptionFromServerAsync(client, baseUrl));
         }
 
-        protected virtual async Task<ApplicationApiDescriptionModel> GetApiDescriptionFromServerAsync(HttpClient client, string baseUrl)
+        protected virtual async Task<ApplicationApiDescriptionModel> GetApiDescriptionFromServerAsync(
+            HttpClient client,
+            string baseUrl)
         {
-            var response = await client.GetAsync(
-                baseUrl.EnsureEndsWith('/') + "api/abp/api-definition",
+            var requestMessage = new HttpRequestMessage(
+                HttpMethod.Get,
+                baseUrl.EnsureEndsWith('/') + "api/abp/api-definition"
+            );
+
+            AddHeaders(requestMessage);
+
+            var response = await client.SendAsync(
+                requestMessage,
                 CancellationTokenProvider.Token
             );
 
@@ -93,6 +116,30 @@ namespace Volo.Abp.Http.Client.DynamicProxying
             return (ApplicationApiDescriptionModel)result;
         }
 
+        protected virtual void AddHeaders(HttpRequestMessage requestMessage)
+        {
+            //CorrelationId
+            requestMessage.Headers.Add(AbpCorrelationIdOptions.HttpHeaderName, CorrelationIdProvider.Get());
+
+            //TenantId
+            if (CurrentTenant.Id.HasValue)
+            {
+                //TODO: Use AbpAspNetCoreMultiTenancyOptions to get the key
+                requestMessage.Headers.Add(TenantResolverConsts.DefaultTenantKey, CurrentTenant.Id.Value.ToString());
+            }
+
+            //Culture
+            //TODO: Is that the way we want? Couldn't send the culture (not ui culture)
+            var currentCulture = CultureInfo.CurrentUICulture.Name ?? CultureInfo.CurrentCulture.Name;
+            if (!currentCulture.IsNullOrEmpty())
+            {
+                requestMessage.Headers.AcceptLanguage.Add(new StringWithQualityHeaderValue(currentCulture));
+            }
+
+            //X-Requested-With
+            requestMessage.Headers.Add("X-Requested-With", "XMLHttpRequest");
+        }
+
         protected virtual bool TypeMatches(MethodParameterApiDescriptionModel actionParameter, ParameterInfo methodParameter)
         {
             return NormalizeTypeName(actionParameter.TypeAsString) ==

framework/src/Volo.Abp.Http.Client/Volo/Abp/Http/Client/DynamicProxying/DynamicHttpProxyInterceptor.cs

@@ -136,7 +136,13 @@ namespace Volo.Abp.Http.Client.DynamicProxying
 
             var client = HttpClientFactory.Create(clientConfig.RemoteServiceName);
 
-            var action = await ApiDescriptionFinder.FindActionAsync(client, remoteServiceConfig.BaseUrl, typeof(TService), invocation.Method);
+            var action = await ApiDescriptionFinder.FindActionAsync(
+                client,
+                remoteServiceConfig.BaseUrl,
+                typeof(TService),
+                invocation.Method
+            );
+
             var apiVersion = GetApiVersionInfo(action);
             var url = remoteServiceConfig.BaseUrl.EnsureEndsWith('/') + UrlBuilder.GenerateUrlWithParameters(action, invocation.ArgumentsDictionary, apiVersion);
 
@@ -156,9 +162,11 @@ namespace Volo.Abp.Http.Client.DynamicProxying
                 )
             );
 
-            var response = await client.SendAsync(requestMessage,
+            var response = await client.SendAsync(
+                requestMessage,
                 HttpCompletionOption.ResponseHeadersRead /*this will buffer only the headers, the content will be used as a stream*/,
-                GetCancellationToken());
+                GetCancellationToken()
+            );
 
             if (!response.IsSuccessStatusCode)
             {
@@ -196,7 +204,11 @@ namespace Volo.Abp.Http.Client.DynamicProxying
             return action.SupportedVersions.Last(); //TODO: Ensure to get the latest version!
         }
 
-        protected virtual void AddHeaders(IAbpMethodInvocation invocation, ActionApiDescriptionModel action, HttpRequestMessage requestMessage, ApiVersionInfo apiVersion)
+        protected virtual void AddHeaders(
+            IAbpMethodInvocation invocation,
+            ActionApiDescriptionModel action,
+            HttpRequestMessage requestMessage,
+            ApiVersionInfo apiVersion)
         {
             //API Version
             if (!apiVersion.Version.IsNullOrEmpty())