Merge pull request #6804 from abpframework/issue/6767

Fix: Cli - Incorrect port settings

framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/App/AppTemplateBase.cs

@@ -24,6 +24,7 @@ namespace Volo.Abp.Cli.ProjectBuilding.Templates.App
 
             SwitchDatabaseProvider(context, steps);
             DeleteUnrelatedProjects(context, steps);
+            RemoveUnnecessaryPorts(context, steps);
             RandomizeSslPorts(context, steps);
             RandomizeStringEncryption(context, steps);
             UpdateNuGetConfig(context, steps);
@@ -176,6 +177,11 @@ namespace Volo.Abp.Cli.ProjectBuilding.Templates.App
             }
         }
 
+        private static void RemoveUnnecessaryPorts(ProjectBuildContext context, List<ProjectBuildPipelineStep> steps)
+        {
+            steps.Add(new RemoveUnnecessaryPortsStep());
+        }
+
         private static void RandomizeSslPorts(ProjectBuildContext context, List<ProjectBuildPipelineStep> steps)
         {
             if (context.BuildArgs.ExtraProperties.ContainsKey("no-random-port"))

framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/RemoveUnnecessaryPortsStep.cs

@@ -0,0 +1,46 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using Volo.Abp.Cli.ProjectBuilding.Building;
+
+namespace Volo.Abp.Cli.ProjectBuilding.Templates
+{
+    public class RemoveUnnecessaryPortsStep : ProjectBuildPipelineStep
+    {
+        public override void Execute(ProjectBuildContext context)
+        {
+            var httpApiHostAppSettings = context.Files.FirstOrDefault(f => f.Name.EndsWith(".HttpApi.Host/appsettings.json"));
+
+            if (httpApiHostAppSettings == null)
+            {
+                return;
+            }
+
+            var portsToRemoveFromCors = new List<string>();
+
+            var appSettingsJson = JObject.Parse(httpApiHostAppSettings.Content);
+            var appJson = (JObject) appSettingsJson["App"];
+
+            if (context.BuildArgs.UiFramework != UiFramework.Angular)
+            {
+                appJson.Property("ClientUrl")?.Remove();
+                portsToRemoveFromCors.Add("4200");
+            }
+            if (context.BuildArgs.UiFramework != UiFramework.Blazor)
+            {
+                portsToRemoveFromCors.Add("44307");
+            }
+
+            if (appJson["CorsOrigins"] != null)
+            {
+                appJson["CorsOrigins"] = string.Join(",",
+                        appJson["CorsOrigins"].ToString().Split(",").Where(u=> !portsToRemoveFromCors.Any(u.EndsWith))
+                    );
+            }
+
+            httpApiHostAppSettings.SetContent(JsonConvert.SerializeObject(appSettingsJson, Formatting.Indented));
+        }
+    }
+}