Omit Integrated security keyword when Authentication is defined in additional connection string attributes.

Cannot use 'Authentication' with 'Integrated Security'.

Author: claudiamurialdo

dotnet/src/dotnetframework/GxClasses/Data/GXDataCommon.cs

@@ -1016,6 +1016,33 @@ public virtual string ReplaceKeyword(string data, string keyword, string newKeyw
 						res.Append(newKeyword);
 						res.Append('=');
 						res.Append(prop[1]);
+						res.Append(';');
+					}
+					else
+					{
+						res.Append(s);
+						res.Append(';');
+					}
+				}
+			}
+			return res.ToString();
+		}
+		public virtual string ReplaceKeyValue(string data, string keyword, string newValue)
+		{
+			char[] sep = { ';' };
+			StringBuilder res = new StringBuilder("");
+			string[] props = data.Split(sep);
+			foreach (string s in props)
+			{
+				if (s != null && s.Length > 0)
+				{
+					string[] prop = s.Split('=');
+					if (prop != null && prop.Length == 2 && prop[0].Trim().Equals(keyword, StringComparison.OrdinalIgnoreCase))
+					{
+						res.Append(keyword);
+						res.Append('=');
+						res.Append(newValue);
+						res.Append(';');
 					}
 					else
 					{
@@ -1066,21 +1093,19 @@ public string GetParameterValue(string conStr, string searchParam)
 				return string.Empty;
 			else
 			{
-				
-				int posBegin = 0;
-				int posEnd = 0;
 				string paramVal = string.Empty;
 
-				posBegin = conStr.IndexOf(searchParam, StringComparison.OrdinalIgnoreCase);
+				int posBegin = conStr.IndexOf(searchParam, StringComparison.OrdinalIgnoreCase);
 				if (posBegin > -1)
 				{
 
 					posBegin += searchParam.Length + 1;
+					int posEnd;
 					if (conStr.LastIndexOf(';') > posBegin)
-						
+
 						posEnd = conStr.IndexOf(';', posBegin);
 					else
-						
+
 						posEnd = conStr.Length;
 
 					paramVal = conStr.Substring(posBegin, (posEnd - posBegin));
@@ -1570,6 +1595,8 @@ public class GxSqlServer : GxDataRecord
 		private int MAX_CREATE_TRIES = 3;
 		private const int MILLISECONDS_BETWEEN_RETRY_ATTEMPTS = 500;
 		private const string MULTIPLE_DATAREADERS = "MultipleActiveResultSets";
+		private const string INTEGRATED_SECURITY = "Integrated Security";
+		private const string INTEGRATED_SECURITY_NO = "no";
 
 		private bool multipleDatareadersEnabled;
 
@@ -1992,6 +2019,14 @@ private bool UserIdAllowed(SqlConnectionStringBuilder sqlConnectionString)
 			else
 				return true;
 		}
+		private string ResolveConnectionStringAuthentication(string extra, SqlConnectionStringBuilder sqlConnectionString)
+		{
+			if (sqlConnectionString!=null && sqlConnectionString.Authentication != SqlAuthenticationMethod.NotSpecified && sqlConnectionString.IntegratedSecurity)
+			{
+				return ReplaceKeyValue(extra, INTEGRATED_SECURITY, INTEGRATED_SECURITY_NO);
+			}
+			return extra;
+		}
 #endif
 		protected override string BuildConnectionString(string datasourceName, string userId, 
 			string userPassword,string databaseName, string port, string schema, string extra)
@@ -2020,6 +2055,7 @@ protected override string BuildConnectionString(string datasourceName, string us
 			{
 				connectionString.AppendFormat(";Password={0}", userPassword);
 			}
+			extra = ResolveConnectionStringAuthentication(extra, additionalConnectionString);
 #else
 			if (userId!=null)
 			{

dotnet/test/DotNetCoreUnitTest/Domain/GxConnectionTest.cs

@@ -43,6 +43,11 @@ public void AzureADAuthenticationConnectionString()
 			Assert.DoesNotContain(password, connStr, StringComparison.OrdinalIgnoreCase);
 			Assert.DoesNotContain(user, connStr, StringComparison.OrdinalIgnoreCase);
 
+			additionalConnectionString = "Authentication=Active Directory Integrated;Integrated Security=yes";
+			connStr = sqlserver.BuildConnectionStringImpl(server, user, password, database, port, string.Empty, additionalConnectionString);
+			Assert.Contains("Integrated Security=no", connStr, StringComparison.OrdinalIgnoreCase);
+			Assert.Contains("Authentication=Active Directory Integrated", connStr, StringComparison.OrdinalIgnoreCase);
+
 		}
 	}
 }