From 907094ee0a475b33d4d7473fb9901a6df208a3ef Mon Sep 17 00:00:00 2001 From: Yunus Emre Kalkan Date: Thu, 31 Mar 2022 14:52:32 +0300 Subject: [PATCH] Cli project generation: Consider AbpAccountPublic in blazor appsettings files --- ...tingsFilePortChangeForSeparatedIdentityServersStep.cs | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/App/BlazorAppsettingsFilePortChangeForSeparatedIdentityServersStep.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/App/BlazorAppsettingsFilePortChangeForSeparatedIdentityServersStep.cs index 903d877488..0a89d41a45 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/App/BlazorAppsettingsFilePortChangeForSeparatedIdentityServersStep.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/App/BlazorAppsettingsFilePortChangeForSeparatedIdentityServersStep.cs @@ -17,15 +17,20 @@ public class BlazorAppsettingsFilePortChangeForSeparatedIdentityServersStep : Pr appsettingsFile.NormalizeLineEndings(); var lines = appsettingsFile.GetLines(); - for (var i = 0; i < lines.Length; i++) + for (var i = 1; i < lines.Length; i++) { var line = lines[i]; + var previousLine = lines[i-1]; if (line.Contains("Authority") && line.Contains("localhost")) { line = line.Replace("44305", "44301"); } - else if (line.Contains("BaseUrl") && line.Contains("localhost")) + else if (previousLine.Contains("AbpAccountPublic") && line.Contains("BaseUrl") && line.Contains("localhost")) + { + line = line.Replace("44305", "44301"); + } + else if (previousLine.Contains("Default") && line.Contains("BaseUrl") && line.Contains("localhost")) { line = line.Replace("44305", "44300"); }