Cherry pick branch 'genexuslabs:http-client-authentication' into beta

genexuslabs · Jan 6, 2025 · c49fc99 · c49fc99
1 parent 5195249
commit c49fc99
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/dotnet/src/dotnetframework/GxClasses/Domain/GxHttpClient.cs b/dotnet/src/dotnetframework/GxClasses/Domain/GxHttpClient.cs
@@ -484,13 +484,19 @@ public string get_ProxyHost()
 		{
 			return _proxyHost;
 		}
+#if NETCORE
+		private static Encoding ISO_8859_1 = Encoding.Latin1;
+#else
+		private static Encoding ISO_8859_1 = Encoding.GetEncoding("ISO-8859-1");
+#endif
+		private const string AuthenticationSchemeBasic = "Basic";
 		public void AddAuthentication(int scheme, string realm, string user, string password)
 		{
 			if (scheme >= _Basic && scheme <= _Kerberos)
 				_authCollection.Add(new GxAuthScheme(scheme, realm, user, password));
 			if (scheme == _Basic) {
-				string authHeader = Convert.ToBase64String(Encoding.UTF8.GetBytes($"{user}:{password}"));
-				AddHeader(HttpHeader.AUTHORIZATION, new AuthenticationHeaderValue("Basic", authHeader).ToString());
+				string authHeader = Convert.ToBase64String(ISO_8859_1.GetBytes($"{user}:{password}"));
+				AddHeader(HttpHeader.AUTHORIZATION, new AuthenticationHeaderValue(AuthenticationSchemeBasic, authHeader).ToString());
 			}
 		}
 
@@ -1038,7 +1044,7 @@ async Task ReadResponseDataAsync()
 				}
 			}
 		}
-		#endif
+#endif
 		bool UseOldHttpClient(string name)
 		{
 			if (Config.GetValueOf("useoldhttpclient", out string useOld) && useOld.StartsWith("y", StringComparison.OrdinalIgnoreCase))