Put UseAbpRequestLocalization after the UseMultiTenancy

6 years ago · d0ef06e928
15 changed files with 34 additions and 21 deletions
--- a/samples/MicroserviceDemo/applications/BackendAdminApp.Host/BackendAdminAppHostModule.cs
+++ b/samples/MicroserviceDemo/applications/BackendAdminApp.Host/BackendAdminAppHostModule.cs
@ -119,11 +119,13 @@ namespace BackendAdminApp.Host
            app.UseVirtualFiles();
            app.UseRouting();
            app.UseAuthentication();
-            app.UseAbpRequestLocalization();
+            
            if (MsDemoConsts.IsMultiTenancyEnabled)
            {
                app.UseMultiTenancy();
            }
+
+            app.UseAbpRequestLocalization();
            app.UseAuthorization();
            app.UseSwagger();
            app.UseSwaggerUI(options =>
--- a/samples/MicroserviceDemo/applications/PublicWebSite.Host/PublicWebSiteHostModule.cs
+++ b/samples/MicroserviceDemo/applications/PublicWebSite.Host/PublicWebSiteHostModule.cs
@ -97,11 +97,13 @@ namespace PublicWebSite.Host
            app.UseVirtualFiles();
            app.UseRouting();
            app.UseAuthentication();
-            app.UseAbpRequestLocalization();
+            
            if (MsDemoConsts.IsMultiTenancyEnabled)
            {
                app.UseMultiTenancy();
            }
+
+            app.UseAbpRequestLocalization();
            app.UseAuthorization();
            app.UseConfiguredEndpoints();
        }
--- a/samples/MicroserviceDemo/microservices/BloggingService.Host/BloggingServiceHostModule.cs
+++ b/samples/MicroserviceDemo/microservices/BloggingService.Host/BloggingServiceHostModule.cs
@ -136,11 +136,13 @@ namespace BloggingService.Host
                currentPrincipalAccessor.Principal.AddIdentity(new ClaimsIdentity(mapClaims.Select(p => new Claim(map[p.Type], p.Value, p.ValueType, p.Issuer))));
                await next();
            });
-            app.UseAbpRequestLocalization(); //TODO: localization?
+            
            if (MsDemoConsts.IsMultiTenancyEnabled)
            {
                app.UseMultiTenancy();
            }
+
+            app.UseAbpRequestLocalization(); //TODO: localization?
            app.UseSwagger();
            app.UseSwaggerUI(options =>
            {
--- a/samples/MicroserviceDemo/microservices/IdentityService.Host/IdentityServiceHostModule.cs
+++ b/samples/MicroserviceDemo/microservices/IdentityService.Host/IdentityServiceHostModule.cs
@ -102,7 +102,6 @@ namespace IdentityService.Host
            app.UseVirtualFiles();
            app.UseRouting();
            app.UseAuthentication();
-            app.UseAbpRequestLocalization(); //TODO: localization?

            if (MsDemoConsts.IsMultiTenancyEnabled)
            {
@ -123,6 +122,7 @@ namespace IdentityService.Host
                currentPrincipalAccessor.Principal.AddIdentity(new ClaimsIdentity(mapClaims.Select(p => new Claim(map[p.Type], p.Value, p.ValueType, p.Issuer))));
                await next();
            });
+            app.UseAbpRequestLocalization(); //TODO: localization?
            app.UseSwagger();
            app.UseSwaggerUI(options =>
            {
--- a/samples/MicroserviceDemo/microservices/ProductService.Host/ProductServiceHostModule.cs
+++ b/samples/MicroserviceDemo/microservices/ProductService.Host/ProductServiceHostModule.cs
@ -120,11 +120,13 @@ namespace ProductService.Host
                currentPrincipalAccessor.Principal.AddIdentity(new ClaimsIdentity(mapClaims.Select(p => new Claim(map[p.Type], p.Value, p.ValueType, p.Issuer))));
                await next();
            });
-            app.UseAbpRequestLocalization(); //TODO: localization?
+            
            if (MsDemoConsts.IsMultiTenancyEnabled)
            {
                app.UseMultiTenancy();
            }
+
+            app.UseAbpRequestLocalization(); //TODO: localization?
            app.UseSwagger();
            app.UseSwaggerUI(options =>
            {
--- a/samples/MicroserviceDemo/microservices/TenantManagementService.Host/TenantManagementServiceHostModule.cs
+++ b/samples/MicroserviceDemo/microservices/TenantManagementService.Host/TenantManagementServiceHostModule.cs
@ -121,11 +121,13 @@ namespace TenantManagementService.Host
                currentPrincipalAccessor.Principal.AddIdentity(new ClaimsIdentity(mapClaims.Select(p => new Claim(map[p.Type], p.Value, p.ValueType, p.Issuer))));
                await next();
            });
-            app.UseAbpRequestLocalization(); //TODO: localization?
+            
            if (MsDemoConsts.IsMultiTenancyEnabled)
            {
                app.UseMultiTenancy();
            }
+
+            app.UseAbpRequestLocalization(); //TODO: localization?
            app.UseSwagger();
            app.UseSwaggerUI(options =>
            {
--- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.Host/MyProjectNameHttpApiHostModule.cs
+++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.Host/MyProjectNameHttpApiHostModule.cs
@ -179,11 +179,13 @@ namespace MyCompanyName.MyProjectName
            app.UseRouting();
            app.UseCors(DefaultCorsPolicyName);
            app.UseAuthentication();
-            app.UseAbpRequestLocalization();
+            
            if (MultiTenancyConsts.IsEnabled)
            {
                app.UseMultiTenancy();
            }
+
+            app.UseAbpRequestLocalization();
            app.UseAuthorization();

            app.UseSwagger();
--- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.HostWithIds/MyProjectNameHttpApiHostModule.cs
+++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.HostWithIds/MyProjectNameHttpApiHostModule.cs
@ -169,14 +169,14 @@ namespace MyCompanyName.MyProjectName
            app.UseRouting();
            app.UseCors(DefaultCorsPolicyName);
            app.UseAuthentication();
-            app.UseJwtTokenMiddleware();
-            app.UseAbpRequestLocalization();
+            app.UseJwtTokenMiddleware();    
            
            if (MultiTenancyConsts.IsEnabled)
            {
                app.UseMultiTenancy();
            }

+            app.UseAbpRequestLocalization();
            app.UseIdentityServer();
            app.UseAuthorization();

--- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.IdentityServer/MyProjectNameIdentityServerModule.cs
+++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.IdentityServer/MyProjectNameIdentityServerModule.cs
@ -155,13 +155,13 @@ namespace MyCompanyName.MyProjectName
            app.UseRouting();
            app.UseCors(DefaultCorsPolicyName);
            app.UseAuthentication();
-            app.UseAbpRequestLocalization();

            if (MultiTenancyConsts.IsEnabled)
            {
                app.UseMultiTenancy();
            }
            
+            app.UseAbpRequestLocalization();
            app.UseIdentityServer();
            app.UseAuthorization();
            app.UseAuditing();
--- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web.Host/MyProjectNameWebModule.cs
+++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web.Host/MyProjectNameWebModule.cs
@ -226,13 +226,13 @@ namespace MyCompanyName.MyProjectName.Web
            app.UseVirtualFiles();
            app.UseRouting();
            app.UseAuthentication();
-            app.UseAbpRequestLocalization();

            if (MultiTenancyConsts.IsEnabled)
            {
                app.UseMultiTenancy();
            }

+            app.UseAbpRequestLocalization();
            app.UseAuthorization();

            app.UseSwagger();
--- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web/MyProjectNameWebModule.cs
+++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web/MyProjectNameWebModule.cs
@ -206,12 +206,13 @@ namespace MyCompanyName.MyProjectName.Web
            app.UseRouting();
            app.UseAuthentication();
            app.UseJwtTokenMiddleware();
-            app.UseAbpRequestLocalization();

            if (MultiTenancyConsts.IsEnabled)
            {
                app.UseMultiTenancy();
            }
+
+            app.UseAbpRequestLocalization();
            app.UseIdentityServer();
            app.UseAuthorization();
            app.UseSwagger();
--- a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.HttpApi.Host/MyProjectNameHttpApiHostModule.cs
+++ b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.HttpApi.Host/MyProjectNameHttpApiHostModule.cs
@ -166,13 +166,13 @@ namespace MyCompanyName.MyProjectName
            app.UseRouting();
            app.UseCors(DefaultCorsPolicyName);        
            app.UseAuthentication();
-            app.UseAbpRequestLocalization();

            if (MultiTenancyConsts.IsEnabled)
            {
                app.UseMultiTenancy();
            }

+            app.UseAbpRequestLocalization();
            app.UseAuthorization();
            app.UseSwagger();
            app.UseSwaggerUI(options =>
--- a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.IdentityServer/MyProjectNameIdentityServerModule.cs
+++ b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.IdentityServer/MyProjectNameIdentityServerModule.cs
@ -188,13 +188,13 @@ namespace MyCompanyName.MyProjectName
            app.UseCors(DefaultCorsPolicyName); 
            app.UseAuthentication();
            app.UseJwtTokenMiddleware();
-            app.UseAbpRequestLocalization();
-
+            
            if (MultiTenancyConsts.IsEnabled)
            {
                app.UseMultiTenancy();
            }

+            app.UseAbpRequestLocalization();
            app.UseIdentityServer();
            app.UseAuthorization();
            app.UseSwagger();
--- a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Host/MyProjectNameWebHostModule.cs
+++ b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Host/MyProjectNameWebHostModule.cs
@ -234,17 +234,16 @@ namespace MyCompanyName.MyProjectName
            app.UseHttpsRedirection();
            app.UseVirtualFiles();
            app.UseRouting();
-            app.UseAuthentication();
-            app.UseAbpRequestLocalization();
+            app.UseAuthentication(); 

            if (MultiTenancyConsts.IsEnabled)
            {
                app.UseMultiTenancy();
            }

+            app.UseAbpRequestLocalization();
            app.UseAuthorization();

-
            app.UseSwagger();
            app.UseSwaggerUI(options =>
            {
--- a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Unified/MyProjectNameWebUnifiedModule.cs
+++ b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Unified/MyProjectNameWebUnifiedModule.cs
@ -128,14 +128,15 @@ namespace MyCompanyName.MyProjectName
            app.UseVirtualFiles();
            app.UseRouting();
            app.UseAuthentication();
-            app.UseAbpRequestLocalization();
-            app.UseAuthorization();
-            
+
            if (MultiTenancyConsts.IsEnabled)
            {
                app.UseMultiTenancy();
            }

+            app.UseAbpRequestLocalization();
+            app.UseAuthorization();
+            
            app.UseSwagger();
            app.UseSwaggerUI(options =>
            {