From 0b2546ed04838fdcf84ecb2fccdec7d6f9f19bbb Mon Sep 17 00:00:00 2001
From: Alper Ebicoglu <alper.ebicoglu@volosoft.com>
Date: Mon, 30 Mar 2020 21:09:54 +0300
Subject: [PATCH] closes #3208

---
 .../Steps/ConnectionStringChangeStep.cs       | 70 ++++++++++++-------
 1 file changed, 43 insertions(+), 27 deletions(-)

diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/Steps/ConnectionStringChangeStep.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/Steps/ConnectionStringChangeStep.cs
index 491955650b..02bc8219b8 100644
--- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/Steps/ConnectionStringChangeStep.cs
+++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/Steps/ConnectionStringChangeStep.cs
@@ -7,29 +7,64 @@ using System.Text.RegularExpressions;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 using Volo.Abp.Cli.ProjectBuilding.Files;
+using Volo.Abp.Text;
 
 namespace Volo.Abp.Cli.ProjectBuilding.Building.Steps
 {
     public class ConnectionStringChangeStep : ProjectBuildPipelineStep
     {
+        private const string DefaultConnectionStringKey = "Default";
+
         public override void Execute(ProjectBuildContext context)
         {
-            var newConnectionString = "\"Default\": \"" + context.BuildArgs.ConnectionString + "\"";
-
             var appSettingsJsonFiles = context.Files.Where(f =>
-                f.Name.EndsWith("appsettings.json", StringComparison.OrdinalIgnoreCase));
+                f.Name.EndsWith("appsettings.json", StringComparison.OrdinalIgnoreCase))
+                .ToArray();
+
+            if (!appSettingsJsonFiles.Any())
+            {
+                return;
+            }
+
+            var newConnectionString = $"\"{DefaultConnectionStringKey}: \"{context.BuildArgs.ConnectionString}\"";
 
             foreach (var appSettingsJson in appSettingsJsonFiles)
             {
                 try
                 {
-                    var appSettingJsonContentWithoutBom = GetStringWithoutBom(appSettingsJson.Bytes);
+                    var appSettingJsonContentWithoutBom = StringHelper.ConvertFromBytesWithoutBom(appSettingsJson.Bytes);
                     var jsonObject = JObject.Parse(appSettingJsonContentWithoutBom);
-                    var connectionStringContainer = (JContainer)jsonObject["ConnectionStrings"];
-                    var firstConnectionString = connectionStringContainer.First;
-                    var defaultConnectionString = firstConnectionString.ToString();
 
-                    appSettingsJson.ReplaceText(defaultConnectionString, newConnectionString);
+                    var connectionStringContainer = (JContainer)jsonObject?["ConnectionStrings"];
+                    if (connectionStringContainer == null)
+                    {
+                        continue;
+                    }
+
+                    if (!connectionStringContainer.Any())
+                    {
+                        continue;
+                    }
+
+                    var connectionStrings = connectionStringContainer.ToList();
+
+                    foreach (var connectionString in connectionStrings)
+                    {
+                        var property = ((JProperty)connectionString);
+                        var connectionStringName = property.Name;
+
+                        if (connectionStringName == DefaultConnectionStringKey)
+                        {
+                            var defaultConnectionString = property.ToString();
+                            if (defaultConnectionString == null)
+                            {
+                                continue;
+                            }
+
+                            appSettingsJson.ReplaceText(defaultConnectionString, newConnectionString);
+                            break;
+                        }
+                    }
                 }
                 catch (Exception ex)
                 {
@@ -37,24 +72,5 @@ namespace Volo.Abp.Cli.ProjectBuilding.Building.Steps
                 }
             }
         }
-
-        private static string GetStringWithoutBom(byte[] bytes)
-        {
-            if (bytes == null)
-            {
-                return null;
-            }
-            
-            var hasBom =  bytes.Length >= 3 && bytes[0] == 0xEF && bytes[1] == 0xBB && bytes[2] == 0xBF;
-
-            if (hasBom)
-            {
-                return Encoding.UTF8.GetString(bytes, 3, bytes.Length - 3);
-            }
-            else
-            {
-                return Encoding.UTF8.GetString(bytes);
-            }
-        }
     }
 }