From ac01b61c11fcde9fb759b24c9f464f49af3f5a94 Mon Sep 17 00:00:00 2001
From: korytiak <78151424+korytiak@users.noreply.github.com>
Date: Fri, 11 Jul 2025 22:25:32 +0200
Subject: [PATCH 1/2] Update ConnectionService.cs to allow on-prem ports with
 OAuth, otherwise options for on-prem OAuth service client are very limited

On-prem deployment very often use non-standard ports like 444
---
 src/GeneralTools/DataverseClient/Client/ConnectionService.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/GeneralTools/DataverseClient/Client/ConnectionService.cs b/src/GeneralTools/DataverseClient/Client/ConnectionService.cs
index 23c50b6..820af65 100644
--- a/src/GeneralTools/DataverseClient/Client/ConnectionService.cs
+++ b/src/GeneralTools/DataverseClient/Client/ConnectionService.cs
@@ -1471,7 +1471,7 @@ private async Task<IOrganizationService> DoDirectLoginAsync(bool IsOnPrem = fals
 
             IOrganizationService dvService = null;
             Uri OrgWorkingURI = null;
-            if (!IsOnPrem || _eAuthType == AuthenticationType.OAuth) // Use this even if its onPrem, when auth type == oauth. 
+            if (!IsOnPrem)
             {
                 OrgWorkingURI = new Uri(string.Format(SoapOrgUriFormat, _targetInstanceUriToConnectTo.Scheme, _targetInstanceUriToConnectTo.DnsSafeHost));
             }

From 477429f2af1d3fc9307a9df01223add13033c460 Mon Sep 17 00:00:00 2001
From: korytiak <78151424+korytiak@users.noreply.github.com>
Date: Sun, 20 Jul 2025 16:28:27 +0200
Subject: [PATCH 2/2] Update ConnectionService.cs, use Authority instead of
 DnsSafeHost to preserve the port for on-prem hosts

---
 src/GeneralTools/DataverseClient/Client/ConnectionService.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/GeneralTools/DataverseClient/Client/ConnectionService.cs b/src/GeneralTools/DataverseClient/Client/ConnectionService.cs
index 820af65..2c1621a 100644
--- a/src/GeneralTools/DataverseClient/Client/ConnectionService.cs
+++ b/src/GeneralTools/DataverseClient/Client/ConnectionService.cs
@@ -1473,11 +1473,11 @@ private async Task<IOrganizationService> DoDirectLoginAsync(bool IsOnPrem = fals
             Uri OrgWorkingURI = null;
             if (!IsOnPrem)
             {
-                OrgWorkingURI = new Uri(string.Format(SoapOrgUriFormat, _targetInstanceUriToConnectTo.Scheme, _targetInstanceUriToConnectTo.DnsSafeHost));
+                OrgWorkingURI = new Uri(string.Format(SoapOrgUriFormat, _targetInstanceUriToConnectTo.Scheme, _targetInstanceUriToConnectTo.Authority));
             }
             else
             {
-                OrgWorkingURI = new Uri(string.Format(SoapOrgUriFormat, _targetInstanceUriToConnectTo.Scheme, $"{_targetInstanceUriToConnectTo.DnsSafeHost}/{_organization}"));
+                OrgWorkingURI = new Uri(string.Format(SoapOrgUriFormat, _targetInstanceUriToConnectTo.Scheme, $"{_targetInstanceUriToConnectTo.Authority}/{_organization}"));
             }
             _targetInstanceUriToConnectTo = OrgWorkingURI;